[Archive-access-cvs] SF.net SVN: archive-access:[3059] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/ PathDatePrefixQueryRequestParser.java

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

Revision: 3059
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3059&view=rev
Author:   bradtofel
Date:     2010-04-24 00:24:24 +0000 (Sat, 24 Apr 2010)

Log Message:
-----------
FEATURE: Now accepts 14-digits-plus-asterisk as a valid *query* datespec, allowing a query to include additional date context.

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathDatePrefixQueryRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathDatePrefixQueryRequestParser.java	2010-04-24 00:22:40 UTC (rev 3058)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathDatePrefixQueryRequestParser.java	2010-04-24 00:24:24 UTC (rev 3059)
@@ -53,7 +53,7 @@
 	 * URL
 	 */
 	private final static Pattern WB_QUERY_REGEX = Pattern
-			.compile("^(\\d{0,13})\\*/(.*[^*])$");
+			.compile("^(\\d{0,14})\\*/(.*[^*])$");
 
 	public WaybackRequest parse(String requestPath, AccessPoint ap) {
 		
@@ -66,16 +66,24 @@
 			String urlStr = matcher.group(2);
 
 			String startDate;
-			String endDate;			
+			String endDate;
+			String requestDate;
 			if(dateStr.length() == 0) {
 				startDate = getEarliestTimestamp();
 				endDate = getLatestTimestamp();
+				requestDate = endDate;
+			} else if(dateStr.length() == 14) {
+				startDate = getEarliestTimestamp();
+				endDate = getLatestTimestamp();
+				requestDate = Timestamp.parseAfter(dateStr).getDateStr();
 			} else {
 				startDate = Timestamp.parseBefore(dateStr).getDateStr();
 				endDate = Timestamp.parseAfter(dateStr).getDateStr();
+				requestDate = endDate;
 			}
 			wbRequest.setStartTimestamp(startDate);
 			wbRequest.setEndTimestamp(endDate);
+			wbRequest.setReplayTimestamp(requestDate);
 			wbRequest.setCaptureQueryRequest();
             wbRequest.setRequestUrl(urlStr);
 		}


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