Author: snoopdave
Date: Fri Mar 17 12:03:04 2006
New Revision: 386702
URL: http://svn.apache.org/viewcvs?rev=386702&view=rev
Log:
Fixing query string handling to address ROL-1085
Modified:
incubator/roller/trunk/src/org/roller/business/RefererManagerImpl.java
incubator/roller/trunk/src/org/roller/business/referrers/IncomingReferrer.java
incubator/roller/trunk/src/org/roller/business/referrers/ReferrerProcessingJob.java
incubator/roller/trunk/src/org/roller/model/RefererManager.java
incubator/roller/trunk/src/org/roller/presentation/filters/RefererFilter.java
Modified: incubator/roller/trunk/src/org/roller/business/RefererManagerImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/business/RefererManagerImpl.java?rev=386702&r1=386701&r2=386702&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/business/RefererManagerImpl.java
(original)
+++ incubator/roller/trunk/src/org/roller/business/RefererManagerImpl.java Fri
Mar 17 12:03:04 2006
@@ -152,7 +152,6 @@
public void processReferrer(
String requestUrl,
- String queryString,
String referrerUrl,
String weblogHandle,
String entryAnchor,
@@ -231,10 +230,6 @@
} else if (matchRef.size() == 0) {
// Referer was not found in database, so new Referer object
- String requrl = requestUrl;
- if (queryString != null && queryString.length() > 0) {
- requestUrl = requestUrl + "?" + queryString;
- }
Integer one = new Integer(1);
RefererData ref =
new RefererData(
Modified:
incubator/roller/trunk/src/org/roller/business/referrers/IncomingReferrer.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/business/referrers/IncomingReferrer.java?rev=386702&r1=386701&r2=386702&view=diff
==============================================================================
---
incubator/roller/trunk/src/org/roller/business/referrers/IncomingReferrer.java
(original)
+++
incubator/roller/trunk/src/org/roller/business/referrers/IncomingReferrer.java
Fri Mar 17 12:03:04 2006
@@ -15,7 +15,6 @@
private String referrerUrl = null;
private String requestUrl = null;
- private String queryString = null;
private String weblogHandle = null;
private String weblogAnchor = null;
private String weblogDateString = null;
@@ -33,14 +32,6 @@
public String getRequestUrl() {
return requestUrl;
- }
-
- public String getQueryString() {
- return queryString;
- }
-
- public void setQueryString(String queryString) {
- this.queryString = queryString;
}
public void setRequestUrl(String requestUrl) {
Modified:
incubator/roller/trunk/src/org/roller/business/referrers/ReferrerProcessingJob.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/business/referrers/ReferrerProcessingJob.java?rev=386702&r1=386701&r2=386702&view=diff
==============================================================================
---
incubator/roller/trunk/src/org/roller/business/referrers/ReferrerProcessingJob.java
(original)
+++
incubator/roller/trunk/src/org/roller/business/referrers/ReferrerProcessingJob.java
Fri Mar 17 12:03:04 2006
@@ -47,7 +47,6 @@
try {
RefererManager refMgr =
RollerFactory.getRoller().getRefererManager();
refMgr.processReferrer(referrer.getRequestUrl(),
- referrer.getQueryString(),
referrer.getReferrerUrl(),
referrer.getWeblogHandle(),
referrer.getWeblogAnchor(),
Modified: incubator/roller/trunk/src/org/roller/model/RefererManager.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/model/RefererManager.java?rev=386702&r1=386701&r2=386702&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/model/RefererManager.java (original)
+++ incubator/roller/trunk/src/org/roller/model/RefererManager.java Fri Mar 17
12:03:04 2006
@@ -95,7 +95,6 @@
public void processReferrer(
String requestUrl,
- String queryString,
String referrerUrl,
String weblogHandle,
String weblogAnchor,
Modified:
incubator/roller/trunk/src/org/roller/presentation/filters/RefererFilter.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/filters/RefererFilter.java?rev=386702&r1=386701&r2=386702&view=diff
==============================================================================
---
incubator/roller/trunk/src/org/roller/presentation/filters/RefererFilter.java
(original)
+++
incubator/roller/trunk/src/org/roller/presentation/filters/RefererFilter.java
Fri Mar 17 12:03:04 2006
@@ -59,7 +59,12 @@
boolean isRefSpammer = false;
boolean isRobot = false;
String referrerUrl = request.getHeader("Referer");
- String requestUrl = request.getRequestURL().toString();
+ StringBuffer reqsb = request.getRequestURL();
+ if (request.getQueryString() != null) {
+ reqsb.append("?");
+ reqsb.append(request.getQueryString());
+ }
+ String requestUrl = reqsb.toString();
// parse the incoming request and make sure it's a valid page request
WebsiteData weblog = null;
@@ -147,7 +152,6 @@
try {
IncomingReferrer referrer = new IncomingReferrer();
referrer.setReferrerUrl(referrerUrl);
- referrer.setQueryString(request.getQueryString());
referrer.setRequestUrl(requestUrl);
referrer.setWeblogHandle(pageRequest.getWeblogHandle());
referrer.setWeblogAnchor(pageRequest.getWeblogAnchor());
