Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [2216] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback
|
From: <bra...@us...> - 2008-03-10 22:00:54
|
Revision: 2216
http://archive-access.svn.sourceforge.net/archive-access/?rev=2216&view=rev
Author: bradtofel
Date: 2008-03-10 15:00:46 -0700 (Mon, 10 Mar 2008)
Log Message:
-----------
BUGFIX: (ACC-14) now generate a fresh latest timestamp (if one is not configured) each time one is needed, instead of using the "default" one we generated when the JVM starts up.
Modified Paths:
--------------
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/PathPrefixDatePrefixQueryRequestParser.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/ReplayRequestParser.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixRequestParser.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/CompositeRequestParser.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
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 2008-03-04 05:01:52 UTC (rev 2215)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathDatePrefixQueryRequestParser.java 2008-03-10 22:00:46 UTC (rev 2216)
@@ -61,8 +61,8 @@
String startDate;
String endDate;
if(dateStr.length() == 0) {
- startDate = earliestTimestamp;
- endDate = latestTimestamp;
+ startDate = getEarliestTimestamp();
+ endDate = getLatestTimestamp();
} else {
startDate = Timestamp.parseBefore(dateStr).getDateStr();
endDate = Timestamp.parseAfter(dateStr).getDateStr();
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathPrefixDatePrefixQueryRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathPrefixDatePrefixQueryRequestParser.java 2008-03-04 05:01:52 UTC (rev 2215)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathPrefixDatePrefixQueryRequestParser.java 2008-03-10 22:00:46 UTC (rev 2216)
@@ -60,8 +60,8 @@
String startDate;
String endDate;
if(dateStr.length() == 0) {
- startDate = earliestTimestamp;
- endDate = latestTimestamp;
+ startDate = getEarliestTimestamp();
+ endDate = getLatestTimestamp();
} else {
startDate = Timestamp.parseBefore(dateStr).getDateStr();
endDate = Timestamp.parseAfter(dateStr).getDateStr();
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/ReplayRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/ReplayRequestParser.java 2008-03-04 05:01:52 UTC (rev 2215)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/ReplayRequestParser.java 2008-03-10 22:00:46 UTC (rev 2216)
@@ -75,8 +75,8 @@
String startDate = null;
String endDate = null;
if (dateStr.length() == 14) {
- startDate = earliestTimestamp;
- endDate = latestTimestamp;
+ startDate = getEarliestTimestamp();
+ endDate = getLatestTimestamp();
} else {
// classic behavior:
@@ -85,8 +85,8 @@
// dateStr = endDate;
// "better" behavior:
- startDate = earliestTimestamp;
- endDate = latestTimestamp;
+ startDate = getEarliestTimestamp();
+ endDate = getLatestTimestamp();
dateStr = Timestamp.parseAfter(dateStr).getDateStr();
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixRequestParser.java 2008-03-04 05:01:52 UTC (rev 2215)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixRequestParser.java 2008-03-10 22:00:46 UTC (rev 2216)
@@ -108,8 +108,8 @@
String startDate;
String endDate;
if(dateStr.length() == 0) {
- startDate = earliestTimestamp;
- endDate = latestTimestamp;
+ startDate = getEarliestTimestamp();
+ endDate = getLatestTimestamp();
} else {
startDate = Timestamp.parseBefore(dateStr).getDateStr();
endDate = Timestamp.parseAfter(dateStr).getDateStr();
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 2008-03-04 05:01:52 UTC (rev 2215)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/BaseRequestParser.java 2008-03-10 22:00:46 UTC (rev 2216)
@@ -66,10 +66,8 @@
protected int maxRecords = DEFAULT_MAX_RECORDS;
- protected String earliestTimestamp =
- Timestamp.earliestTimestamp().getDateStr();
- protected String latestTimestamp =
- Timestamp.latestTimestamp().getDateStr();
+ protected String earliestTimestamp = null;
+ protected String latestTimestamp = null;
protected static String getMapParam(Map<String,String[]> queryMap,
String field) {
@@ -128,15 +126,21 @@
* @return
*/
public String getEarliestTimestamp() {
- return earliestTimestamp;
+ if(earliestTimestamp != null) {
+ return earliestTimestamp;
+
+ }
+ return Timestamp.earliestTimestamp().getDateStr();
}
public String getLatestTimestamp() {
- return latestTimestamp;
+ if(latestTimestamp != null) {
+ return latestTimestamp;
+ }
+ return Timestamp.latestTimestamp().getDateStr();
}
public void setLatestTimestamp(String timestamp) {
this.latestTimestamp = Timestamp.parseAfter(timestamp).getDateStr();
}
-
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/CompositeRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/CompositeRequestParser.java 2008-03-04 05:01:52 UTC (rev 2215)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/CompositeRequestParser.java 2008-03-10 22:00:46 UTC (rev 2216)
@@ -47,8 +47,12 @@
parsers = getRequestParsers();
for(int i = 0; i < parsers.length; i++) {
parsers[i].setMaxRecords(maxRecords);
- parsers[i].setEarliestTimestamp(earliestTimestamp);
- parsers[i].setLatestTimestamp(latestTimestamp);
+ if(earliestTimestamp != null) {
+ parsers[i].setEarliestTimestamp(earliestTimestamp);
+ }
+ if(latestTimestamp != null) {
+ parsers[i].setLatestTimestamp(latestTimestamp);
+ }
}
}
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 2008-03-04 05:01:52 UTC (rev 2215)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/FormRequestParser.java 2008-03-10 22:00:46 UTC (rev 2216)
@@ -88,11 +88,11 @@
}
if(wbRequest.get(WaybackConstants.REQUEST_START_DATE) == null) {
wbRequest.put(WaybackConstants.REQUEST_START_DATE,
- earliestTimestamp);
+ getEarliestTimestamp());
}
if(wbRequest.get(WaybackConstants.REQUEST_END_DATE) == null) {
wbRequest.put(WaybackConstants.REQUEST_END_DATE,
- latestTimestamp);
+ getLatestTimestamp());
}
}
if(wbRequest != null) {
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 2008-03-04 05:01:52 UTC (rev 2215)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/OpenSearchRequestParser.java 2008-03-10 22:00:46 UTC (rev 2216)
@@ -146,11 +146,11 @@
}
if(wbRequest.get(WaybackConstants.REQUEST_START_DATE) == null) {
wbRequest.put(WaybackConstants.REQUEST_START_DATE,
- earliestTimestamp);
+ getEarliestTimestamp());
}
if(wbRequest.get(WaybackConstants.REQUEST_END_DATE) == null) {
wbRequest.put(WaybackConstants.REQUEST_END_DATE,
- latestTimestamp);
+ getLatestTimestamp());
}
wbRequest.fixup(httpRequest);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
