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

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

Revision: 2063
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2063&view=rev
Author:   bradtofel
Date:     2007-10-29 14:44:06 -0700 (Mon, 29 Oct 2007)

Log Message:
-----------
BUGFIX: (unreported) shorter than 14-digit request dates were causing String out of bounds exceptions. Now they are padded to 14 digits.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/DateRangeFilter.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/EndDateFilter.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/StartDateFilter.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/DateRangeFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/DateRangeFilter.java	2007-10-19 00:01:34 UTC (rev 2062)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/DateRangeFilter.java	2007-10-29 21:44:06 UTC (rev 2063)
@@ -26,6 +26,7 @@
 
 import org.archive.wayback.WaybackConstants;
 import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.Timestamp;
 import org.archive.wayback.util.ObjectFilter;
 
 /**
@@ -45,8 +46,8 @@
 	 * @param last String latest date to include
 	 */
 	public DateRangeFilter(final String first, final String last) {
-		this.first = first;
-		this.last = last;
+		this.first = Timestamp.parseBefore(first).getDateStr();
+		this.last = Timestamp.parseAfter(last).getDateStr();
 	}
 
 	/* (non-Javadoc)

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/EndDateFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/EndDateFilter.java	2007-10-19 00:01:34 UTC (rev 2062)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/EndDateFilter.java	2007-10-29 21:44:06 UTC (rev 2063)
@@ -26,8 +26,10 @@
 
 import org.archive.wayback.WaybackConstants;
 import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.Timestamp;
 import org.archive.wayback.util.ObjectFilter;
 
+
 /**
  * SearchResultFilter which includes all records until 1 is found beyond end 
  * date then it aborts processing. Assumed usage is for URL matches, when 
@@ -44,7 +46,7 @@
 	 * @param endDate String timestamp which marks the end of includable records
 	 */
 	public EndDateFilter(final String endDate) {
-		this.endDate = endDate;
+		this.endDate = Timestamp.parseAfter(endDate).getDateStr();
 	}
 
 	/* (non-Javadoc)

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/StartDateFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/StartDateFilter.java	2007-10-19 00:01:34 UTC (rev 2062)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/StartDateFilter.java	2007-10-29 21:44:06 UTC (rev 2063)
@@ -26,6 +26,7 @@
 
 import org.archive.wayback.WaybackConstants;
 import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.Timestamp;
 import org.archive.wayback.util.ObjectFilter;
 
 /**
@@ -47,7 +48,7 @@
 	 * 		records
 	 */
 	public StartDateFilter(final String startDate) {
-		this.startDate = startDate;
+		this.startDate = Timestamp.parseBefore(startDate).getDateStr();
 	}
 
 	/* (non-Javadoc)


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