[Archive-access-cvs] SF.net SVN: archive-access: [2276] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java

[<bra...@us...>]

Revision: 2276
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2276&view=rev
Author:   bradtofel
Date:     2008-06-03 17:03:40 -0700 (Tue, 03 Jun 2008)

Log Message:
-----------
BUGFIX: moved extract HTTP request call to beginning of fixup.
FEATURE: added keySet() to get Set of request filters.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java	2008-06-04 00:02:04 UTC (rev 2275)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java	2008-06-04 00:03:40 UTC (rev 2276)
@@ -27,6 +27,7 @@
 import java.util.Iterator;
 import java.util.Locale;
 import java.util.ResourceBundle;
+import java.util.Set;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 
@@ -259,6 +260,7 @@
 	 * @param httpRequest
 	 */
 	public void fixup(HttpServletRequest httpRequest) {
+		extractHttpRequestInfo(httpRequest);
 		String startDate = get(WaybackConstants.REQUEST_START_DATE);
 		String endDate = get(WaybackConstants.REQUEST_END_DATE);
 		String exactDate = get(WaybackConstants.REQUEST_EXACT_DATE);
@@ -287,7 +289,6 @@
 			put(WaybackConstants.REQUEST_EXACT_DATE, Timestamp
 					.padEndDateStr(exactDate));
 		}
-		extractHttpRequestInfo(httpRequest);
 	}
 
 	/**
@@ -408,4 +409,8 @@
 	public void setExclusionFilter(ObjectFilter<SearchResult> exclusionFilter) {
 		this.exclusionFilter = exclusionFilter;
 	}
+
+	public Set<String> keySet() {
+		return filters.keySet();
+	}
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.