Revision: 2065
http://archive-access.svn.sourceforge.net/archive-access/?rev=2065&view=rev
Author: bradtofel
Date: 2007-10-29 16:17:19 -0700 (Mon, 29 Oct 2007)
Log Message:
-----------
BUGFIX: (unreported) previous bugfix in *Date*Filters exposed new bug in handling partial dates in ResultsPartitionsFactory
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitionsFactory.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitionsFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitionsFactory.java 2007-10-29 22:26:11 UTC (rev 2064)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitionsFactory.java 2007-10-29 23:17:19 UTC (rev 2065)
@@ -24,7 +24,6 @@
*/
package org.archive.wayback.query.resultspartitioner;
-import java.text.ParseException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
@@ -32,6 +31,7 @@
import org.archive.util.ArchiveUtils;
import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.SearchResults;
+import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
/**
@@ -60,15 +60,10 @@
WaybackRequest wbRequest) {
String rsd = results.getFilter(WaybackConstants.REQUEST_START_DATE);
String red = results.getFilter(WaybackConstants.REQUEST_END_DATE);
- Date startDate = new Date();
- Date endDate = new Date();
- try {
- startDate = ArchiveUtils.parse14DigitDate(rsd);
- endDate = ArchiveUtils.parse14DigitDate(red);
- } catch (ParseException e) {
- // TODO: better..
- e.printStackTrace();
- }
+
+ Date startDate = Timestamp.parseBefore(rsd).getDate();
+ Date endDate = Timestamp.parseAfter(red).getDate();
+
long msSpanned = endDate.getTime() - startDate.getTime();
int secsSpanned = (int) Math.ceil(msSpanned / 1000);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
