Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [2077] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback
|
From: <bra...@us...> - 2007-11-28 00:40:28
|
Revision: 2077
http://archive-access.svn.sourceforge.net/archive-access/?rev=2077&view=rev
Author: bradtofel
Date: 2007-11-27 16:39:53 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
REFACTOR: common, almost duplicate code BaseRequestParser.addHttpHeaderFields() replaced with WaybackRequest.fixup()
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/BaseRequestParser.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/FormRequestParser.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/OpenSearchRequestParser.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/PathRequestParser.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java 2007-11-06 03:52:49 UTC (rev 2076)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java 2007-11-28 00:39:53 UTC (rev 2077)
@@ -103,7 +103,7 @@
id = httpRequest.getRemoteAddr();
wbRequest.put(WaybackConstants.REQUEST_EXACT_DATE, Timestamp
.getTimestampForId(httpRequest.getContextPath(), id));
- addHttpHeaderFields(wbRequest, httpRequest);
+ wbRequest.fixup(httpRequest);
return wbRequest;
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/BaseRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/BaseRequestParser.java 2007-11-06 03:52:49 UTC (rev 2076)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/BaseRequestParser.java 2007-11-28 00:39:53 UTC (rev 2077)
@@ -29,7 +29,6 @@
import javax.servlet.http.HttpServletRequest;
import org.archive.wayback.RequestParser;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.exception.BadQueryException;
@@ -100,37 +99,6 @@
return (val == null) ? "" : val;
}
-
- private void putUnlessNull(WaybackRequest request, String key, String val) {
- if(val != null) {
- request.put(key, val);
- }
- }
-
- protected void addHttpHeaderFields(WaybackRequest wbRequest,
- HttpServletRequest httpRequest) {
-
- // attempt to get the HTTP referer if present..
- putUnlessNull(wbRequest,WaybackConstants.REQUEST_REFERER_URL,
- httpRequest.getHeader("REFERER"));
- putUnlessNull(wbRequest,WaybackConstants.REQUEST_REMOTE_ADDRESS,
- httpRequest.getRemoteAddr());
- putUnlessNull(wbRequest,WaybackConstants.REQUEST_WAYBACK_HOSTNAME,
- httpRequest.getLocalName());
- putUnlessNull(wbRequest,WaybackConstants.REQUEST_WAYBACK_PORT,
- String.valueOf(httpRequest.getLocalPort()));
- putUnlessNull(wbRequest,WaybackConstants.REQUEST_WAYBACK_CONTEXT,
- httpRequest.getContextPath());
- putUnlessNull(wbRequest,WaybackConstants.REQUEST_AUTH_TYPE,
- httpRequest.getAuthType());
- putUnlessNull(wbRequest,WaybackConstants.REQUEST_REMOTE_USER,
- httpRequest.getRemoteUser());
- putUnlessNull(wbRequest,WaybackConstants.REQUEST_LOCALE_LANG,
- httpRequest.getLocale().getDisplayLanguage());
-
- wbRequest.setLocale(httpRequest.getLocale());
- }
-
/* (non-Javadoc)
* @see org.archive.wayback.RequestParser#parse(javax.servlet.http.HttpServletRequest)
*/
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/FormRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/FormRequestParser.java 2007-11-06 03:52:49 UTC (rev 2076)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/FormRequestParser.java 2007-11-28 00:39:53 UTC (rev 2077)
@@ -96,7 +96,7 @@
}
}
if(wbRequest != null) {
- addHttpHeaderFields(wbRequest, httpRequest);
+ wbRequest.fixup(httpRequest);
}
return wbRequest;
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/OpenSearchRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/OpenSearchRequestParser.java 2007-11-06 03:52:49 UTC (rev 2076)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/OpenSearchRequestParser.java 2007-11-28 00:39:53 UTC (rev 2077)
@@ -152,7 +152,7 @@
wbRequest.put(WaybackConstants.REQUEST_END_DATE,
latestTimestamp);
}
- addHttpHeaderFields(wbRequest, httpRequest);
+ wbRequest.fixup(httpRequest);
return wbRequest;
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/PathRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/PathRequestParser.java 2007-11-06 03:52:49 UTC (rev 2076)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/PathRequestParser.java 2007-11-28 00:39:53 UTC (rev 2077)
@@ -67,7 +67,7 @@
WaybackRequest wbRequest = parse(requestPath);
if(wbRequest != null) {
- addHttpHeaderFields(wbRequest, httpRequest);
+ wbRequest.fixup(httpRequest);
wbRequest.setResultsPerPage(maxRecords);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
