Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [2417] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback
|
From: <bra...@us...> - 2008-07-07 21:57:22
|
Revision: 2417
http://archive-access.svn.sourceforge.net/archive-access/?rev=2417&view=rev
Author: bradtofel
Date: 2008-07-07 14:57:30 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
REFACTOR: moved WaybackConstants.REQUEST* to WaybackRequest class.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/WaybackConstants.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayDispatcher.java
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/PathDateRangeQueryRequestParser.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/PathPrefixDateRangeQueryRequestParser.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/authenticationcontrol/HTTPAuthBooleanOperator.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/authenticationcontrol/IPMatchesBooleanOperator.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/CaptureSearchResults.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/SearchResults.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java
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/domainprefix/DomainPrefixReplayDispatcher.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/exception/BaseExceptionRenderer.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/UIQueryResults.java
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/ResultsTimelinePartitionsFactory.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
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/LocalResourceIndex.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/NutchResourceIndex.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/RemoteResourceIndex.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/distributed/AlphaPartitionedIndex.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/WaybackConstants.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/WaybackConstants.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/WaybackConstants.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -24,6 +24,7 @@
*/
package org.archive.wayback;
+
/**
*
*
@@ -48,319 +49,6 @@
public static final String DNS_URL_PREFIX = "dns:";
/**
- * Request: (query) filter results to those prefixed with this (possibly
- * partial) 14-digit timestamp
- */
- public static final String REQUEST_DATE = "date";
-
- /**
- * Request: filter results before this 14-digit timestamp
- */
- public static final String REQUEST_START_DATE = "startdate";
-
- /**
- * Request: filter results after this 14-digit timestamp
- */
- public static final String REQUEST_END_DATE = "enddate";
-
- /**
- * Request: (replay) find closest result to this 14-digit timestamp
- */
- public static final String REQUEST_EXACT_DATE = "exactdate";
-
- /**
- * Request: URL or URL prefix requested
- */
- public static final String REQUEST_URL = "url";
-
- /**
- * Request: Original URL or URL prefix requested.
- * This version differs from @{link {@link #REQUEST_URL} in that its
- * the URL before it was passed via the UURIFactory cleanup.
- */
- public static final String REQUEST_URL_CLEANED = "cleanedurl";
-
- /**
- * Request: URL of referrer, if supplied, or "" if not
- */
- public static final String REQUEST_REFERER_URL = "refererurl";
-
- /**
- * Request: defines type - urlquery, urlprefixquery, or replay
- */
- public static final String REQUEST_TYPE = "type";
-
- /**
- * Request: xml data requested
- */
- public static final String REQUEST_XML_DATA = "xmldata";
-
- /**
- * Request: urlquery type request
- */
- public static final String REQUEST_URL_QUERY = "urlquery";
-
- /**
- * Request: urlprefixquery type request
- */
- public static final String REQUEST_URL_PREFIX_QUERY = "urlprefixquery";
-
- /**
- * Request: replay type request
- */
- public static final String REQUEST_REPLAY_QUERY = "replay";
-
- /**
- * Request: closest type request
- */
- public static final String REQUEST_CLOSEST_QUERY = "urlclosestquery";
-
- /**
- * Request: resolution of results to be displayed: (TimeLine mode)
- */
- public static final String REQUEST_RESOLUTION = "resolution";
-
- /**
- * Request: replay actual document or metadata for document: "yes" means
- * replay metadata only, not the actual document: (TimeLine mode)
- */
- public static final String REQUEST_META_MODE = "metamode";
-
- /**
- * Request: hour resolution (TimeLine mode)
- */
- public static final String REQUEST_RESOLUTION_HOURS = "hours";
-
- /**
- * Request: day resolution (TimeLine mode)
- */
- public static final String REQUEST_RESOLUTION_DAYS = "days";
-
- /**
- * Request: month resolution (TimeLine mode)
- */
- public static final String REQUEST_RESOLUTION_MONTHS = "months";
-
- /**
- * Request: two-month resolution (TimeLine mode)
- */
- public static final String REQUEST_RESOLUTION_TWO_MONTHS = "twomonths";
-
- /**
- * Request: year resolution (TimeLine mode)
- */
- public static final String REQUEST_RESOLUTION_YEARS = "years";
-
- /**
- * Request: auto resolution (TimeLine mode)
- */
- public static final String REQUEST_RESOLUTION_AUTO = "auto";
-
- /**
- * Request: Remote Address, string IP address: "127.0.0.1"
- */
- public static final String REQUEST_REMOTE_ADDRESS = "remoteaddress";
-
- /**
- * Request: Wayback Hostname: the string "Host:" HTTP header
- */
- public static final String REQUEST_WAYBACK_HOSTNAME = "waybackhostname";
-
- /**
- * Request: Wayback Port: the port the remote user connected to for this
- * request.
- */
- public static final String REQUEST_WAYBACK_PORT = "waybackport";
-
- /**
- * Request: Wayback Context: the string context used in the request,
- * if applicable.
- */
- public static final String REQUEST_WAYBACK_CONTEXT = "waybackcontext";
-
- /**
- * Request: Authorization Type: "BASIC", "SSL", or "" if none.
- */
- public static final String REQUEST_AUTH_TYPE = "requestauthtype";
-
- /**
- * Request: Remote User or "" if the request did not contain auth info.
- */
- public static final String REQUEST_REMOTE_USER = "requestremoteuser";
-
- /**
- * Request: Best Guess at users requested locale.
- */
- public static final String REQUEST_LOCALE_LANG = "requestlocalelang";
-
- /**
- * Request: Indicates user only wants results that exactly match the
- * requested hostname -- no canonicalization.
- */
- public static final String REQUEST_EXACT_HOST_ONLY = "requestexacthost";
- /**
- * Request: indicates positive value for any request boolean flag.
- */
- public static final String REQUEST_YES = "yes";
-
- /**
- * Results: type of results: "Capture" or "Url"
- */
- public static final String RESULTS_TYPE = "resultstype";
-
- /**
- * Results: indicates SearchResult objects within the SearchResults are of
- * type UrlSearchResults.
- */
- public static final String RESULTS_TYPE_URL = "resultstypeurl";
-
- /**
- * Results: indicates SearchResult objects within the SearchResults are of
- * type CaptureSearchResults.
- */
- public static final String RESULTS_TYPE_CAPTURE = "resultstypecapture";
-
- /**
- * Results: int total number of records matching, not all necc. returned.
- */
- public static final String RESULTS_NUM_RESULTS = "numresults";
-
- /**
- * Results: int first record of all matching returned, 1-based
- */
- public static final String RESULTS_FIRST_RETURNED = "firstreturned";
-
- /**
- * Results: int total number of records *returned* in results
- */
- public static final String RESULTS_NUM_RETURNED = "numreturned";
-
- /**
- * Results: int number of results requested
- */
- public static final String RESULTS_REQUESTED = "resultsrequested";
-
-
- /**
- * Result: as close as possible to original URL of captured document given
- * informatio accessible only within the index.
- *
- * This may not always yield the exact URL requested: some canonicalization
- * operations are irreversible.
- * Example: lowercasing of GET URI encoded arguments
- * http://foo.com/q?a=%3F => foo.com/q?a=%3f
- * Example: rearrangement of GET URI encoded arguments
- * http://foo.com/q?b=1&a=1 => foo.com/q?a=1&b=1
- * Example: removal of sessionID information from request path
- * http://foo.com/SESSION_A2KSM2/i.htm => foo.com/i.htm
- *
- */
- public static final String RESULT_URL = "url";
-
- /**
- * Result: canonicalized(lookup key) form of URL of captured document
- */
- public static final String RESULT_URL_KEY = "urlkey";
-
- /**
- * Result: 14-digit timestamp when document was captured
- */
- public static final String RESULT_CAPTURE_DATE = "capturedate";
-
- /**
- * Result: basename of ARC file containing this document.
- */
- public static final String RESULT_ARC_FILE = "arcfile";
-
- /**
- * Result: compressed byte offset within ARC file where this document's
- * gzip envelope begins.
- */
- public static final String RESULT_OFFSET = "compressedoffset";
-
- /**
- * Result: compressed byte offset within ARC file where this document's
- * gzip envelope Ends.
- */
- public static final String RESULT_END_OFFSET = "compressedendoffset";
-
- /**
- * Result: original exact host from which this document was captured.
- */
- public static final String RESULT_ORIG_HOST = "originalhost";
-
- /**
- * Result: best-guess at mime-type of this document.
- */
- public static final String RESULT_MIME_TYPE = "mimetype";
-
- /**
- * Result: 3-digit integer HTTP response code. may be '0' in some
- * fringe conditions, old ARCs, bug in crawler, etc.
- */
- public static final String RESULT_HTTP_CODE = "httpresponsecode";
-
- /**
- * Result: all or part of the 32-digit hexadecimal MD5 digest of this
- * document
- */
- public static final String RESULT_MD5_DIGEST= "md5digest";
-
- /**
- * Result: URL that this document redirected to, or '-' if it does
- * not redirect
- */
- public static final String RESULT_REDIRECT_URL = "redirecturl";
-
- /**
- * Result: flag within a SearchResult that indicates this is the closest to
- * a particular requested date.
- */
- public static final String RESULT_CLOSEST_INDICATOR = "closest";
- public static final String RESULT_CLOSEST_VALUE = "true";
-
- /**
- * Result: this key being present indicates that this particular capture
- * was not actually stored, and that other values within this SearchResult
- * are actually values from a different record which *should* be identical
- * to this capture, had it been stored.
- */
- public static final String RESULT_DUPLICATE_ANNOTATION = "duplicate";
-
- /**
- * Result: this key is present when the RESULT_DUPLICATE_ANNOTATION is also
- * present, with the value indicating the last date that was actually
- * stored for this duplicate.
- */
- public static final String RESULT_DUPLICATE_STORED_DATE = "duplicate-date";
-
- /**
- * flag indicates that this document was downloaded and verified as
- * identical to a previous capture by digest.
- */
- public static final String RESULT_DUPLICATE_DIGEST = "digest";
-
- /**
- * flag indicates that this document was NOT downloaded, but that the
- * origin server indicated that the document had not changed, based on
- * If-Modified HTTP request headers.
- */
- public static final String RESULT_DUPLICATE_HTTP = "http";
-
-
- /**
- * Name of configuration in web.xml for maximum number of results to return
- * in index searches.
- */
- public static final String MAX_RESULTS_CONFIG_NAME = "maxresults";
-
- /**
- * Name of configuration in web.xml for default number of results to show
- * on each page
- */
- public static final String RESULTS_PER_PAGE_CONFIG_NAME = "resultsperpage";
-
- /**
* HTTP Header for redirection URL
*/
public final static String LOCATION_HTTP_HEADER = "Location";
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayDispatcher.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayDispatcher.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/ArchivalUrlReplayDispatcher.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -28,7 +28,6 @@
import org.archive.wayback.ReplayDispatcher;
import org.archive.wayback.ReplayRenderer;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.Resource;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.core.WaybackRequest;
@@ -76,7 +75,7 @@
// if the result is not for the exact date requested, redirect to the
// exact date. some capture dates are not 14 digits, only compare as
// many digits as are in the result date:
- String reqDateStr = wbRequest.get(WaybackConstants.REQUEST_DATE);
+ String reqDateStr = wbRequest.get(WaybackRequest.REQUEST_DATE);
String resDateStr = result.getCaptureTimestamp();
if(!resDateStr.equals(reqDateStr.substring(0, resDateStr.length()))) {
return redirect;
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-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathDatePrefixQueryRequestParser.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -28,7 +28,6 @@
import java.util.regex.Pattern;
import org.apache.commons.httpclient.URIException;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.requestparser.PathRequestParser;
@@ -67,10 +66,10 @@
startDate = Timestamp.parseBefore(dateStr).getDateStr();
endDate = Timestamp.parseAfter(dateStr).getDateStr();
}
- wbRequest.put(WaybackConstants.REQUEST_START_DATE,startDate);
- wbRequest.put(WaybackConstants.REQUEST_END_DATE,endDate);
- wbRequest.put(WaybackConstants.REQUEST_TYPE,
- WaybackConstants.REQUEST_URL_QUERY);
+ wbRequest.put(WaybackRequest.REQUEST_START_DATE,startDate);
+ wbRequest.put(WaybackRequest.REQUEST_END_DATE,endDate);
+ wbRequest.put(WaybackRequest.REQUEST_TYPE,
+ WaybackRequest.REQUEST_URL_QUERY);
try {
wbRequest.setRequestUrl(urlStr);
} catch (URIException e) {
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathDateRangeQueryRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathDateRangeQueryRequestParser.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathDateRangeQueryRequestParser.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -28,7 +28,6 @@
import java.util.regex.Pattern;
import org.apache.commons.httpclient.URIException;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.requestparser.PathRequestParser;
@@ -62,10 +61,10 @@
String startDate = Timestamp.parseBefore(startDateStr).getDateStr();
String endDate = Timestamp.parseAfter(endDateStr).getDateStr();
- wbRequest.put(WaybackConstants.REQUEST_START_DATE,startDate);
- wbRequest.put(WaybackConstants.REQUEST_END_DATE,endDate);
- wbRequest.put(WaybackConstants.REQUEST_TYPE,
- WaybackConstants.REQUEST_URL_QUERY);
+ wbRequest.put(WaybackRequest.REQUEST_START_DATE,startDate);
+ wbRequest.put(WaybackRequest.REQUEST_END_DATE,endDate);
+ wbRequest.put(WaybackRequest.REQUEST_TYPE,
+ WaybackRequest.REQUEST_URL_QUERY);
try {
wbRequest.setRequestUrl(urlStr);
} catch (URIException e) {
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-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathPrefixDatePrefixQueryRequestParser.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -28,7 +28,6 @@
import java.util.regex.Pattern;
import org.apache.commons.httpclient.URIException;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.requestparser.PathRequestParser;
@@ -67,12 +66,12 @@
endDate = Timestamp.parseAfter(dateStr).getDateStr();
}
- wbRequest.put(WaybackConstants.REQUEST_START_DATE,
+ wbRequest.put(WaybackRequest.REQUEST_START_DATE,
startDate);
- wbRequest.put(WaybackConstants.REQUEST_END_DATE,endDate);
+ wbRequest.put(WaybackRequest.REQUEST_END_DATE,endDate);
- wbRequest.put(WaybackConstants.REQUEST_TYPE,
- WaybackConstants.REQUEST_URL_PREFIX_QUERY);
+ wbRequest.put(WaybackRequest.REQUEST_TYPE,
+ WaybackRequest.REQUEST_URL_PREFIX_QUERY);
try {
wbRequest.setRequestUrl(urlStr);
} catch (URIException e) {
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathPrefixDateRangeQueryRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathPrefixDateRangeQueryRequestParser.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/PathPrefixDateRangeQueryRequestParser.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -28,7 +28,6 @@
import java.util.regex.Pattern;
import org.apache.commons.httpclient.URIException;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.requestparser.PathRequestParser;
@@ -59,12 +58,12 @@
String urlStr = matcher.group(3);
String startDate = Timestamp.parseBefore(startDateStr).getDateStr();
String endDate = Timestamp.parseAfter(endDateStr).getDateStr();
- wbRequest.put(WaybackConstants.REQUEST_START_DATE,
+ wbRequest.put(WaybackRequest.REQUEST_START_DATE,
startDate);
- wbRequest.put(WaybackConstants.REQUEST_END_DATE,endDate);
+ wbRequest.put(WaybackRequest.REQUEST_END_DATE,endDate);
- wbRequest.put(WaybackConstants.REQUEST_TYPE,
- WaybackConstants.REQUEST_URL_PREFIX_QUERY);
+ wbRequest.put(WaybackRequest.REQUEST_TYPE,
+ WaybackRequest.REQUEST_URL_PREFIX_QUERY);
try {
wbRequest.setRequestUrl(urlStr);
} catch (URIException e) {
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-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/archivalurl/requestparser/ReplayRequestParser.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -30,7 +30,6 @@
import org.apache.commons.httpclient.URIException;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.requestparser.PathRequestParser;
@@ -87,12 +86,12 @@
dateStr = Timestamp.parseAfter(dateStr).getDateStr();
}
- wbRequest.put(WaybackConstants.REQUEST_EXACT_DATE, dateStr);
- wbRequest.put(WaybackConstants.REQUEST_START_DATE, startDate);
- wbRequest.put(WaybackConstants.REQUEST_END_DATE, endDate);
+ wbRequest.put(WaybackRequest.REQUEST_EXACT_DATE, dateStr);
+ wbRequest.put(WaybackRequest.REQUEST_START_DATE, startDate);
+ wbRequest.put(WaybackRequest.REQUEST_END_DATE, endDate);
- wbRequest.put(WaybackConstants.REQUEST_TYPE,
- WaybackConstants.REQUEST_REPLAY_QUERY);
+ wbRequest.put(WaybackRequest.REQUEST_TYPE,
+ WaybackRequest.REQUEST_REPLAY_QUERY);
try {
// String wbPrefix = wbRequest.getDefaultWaybackPrefix();
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/authenticationcontrol/HTTPAuthBooleanOperator.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/authenticationcontrol/HTTPAuthBooleanOperator.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/authenticationcontrol/HTTPAuthBooleanOperator.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -2,7 +2,6 @@
import java.util.List;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.util.operator.BooleanOperator;
@@ -12,7 +11,7 @@
if(allowedUsers == null) {
return false;
}
- String currentUser = value.get(WaybackConstants.REQUEST_REMOTE_USER);
+ String currentUser = value.get(WaybackRequest.REQUEST_REMOTE_USER);
if(currentUser == null) {
return false;
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/authenticationcontrol/IPMatchesBooleanOperator.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/authenticationcontrol/IPMatchesBooleanOperator.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/authenticationcontrol/IPMatchesBooleanOperator.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -4,7 +4,6 @@
import java.util.List;
import java.util.logging.Logger;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.util.IPRange;
import org.archive.wayback.util.operator.BooleanOperator;
@@ -34,7 +33,7 @@
if(allowedRanges == null) {
return false;
}
- String ipString = value.get(WaybackConstants.REQUEST_REMOTE_ADDRESS);
+ String ipString = value.get(WaybackRequest.REQUEST_REMOTE_ADDRESS);
if(ipString == null) {
return false;
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/CaptureSearchResults.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/CaptureSearchResults.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/CaptureSearchResults.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -28,7 +28,6 @@
import java.util.Date;
import java.util.Iterator;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.exception.AnchorWindowTooSmallException;
/**
@@ -113,7 +112,7 @@
String anchorDate = wbRequest.get(WaybackRequest.REQUEST_ANCHOR_DATE);
long maxWindow = -1;
long wantTime = Timestamp.parseBefore(wbRequest
- .get(WaybackConstants.REQUEST_EXACT_DATE)).getDate().getTime();
+ .get(WaybackRequest.REQUEST_EXACT_DATE)).getDate().getTime();
if(anchorDate != null) {
wantTime = Timestamp.parseBefore(anchorDate).getDate().getTime();
String anchorWindow = wbRequest.get(WaybackRequest.REQUEST_ANCHOR_WINDOW);
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/SearchResults.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/SearchResults.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/SearchResults.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -69,6 +69,23 @@
private long firstReturned = -1;
private long matchingCount = -1;
private long numRequested = -1;
+
+ /**
+ * Results: indicates SearchResult objects within the SearchResults are of
+ * type UrlSearchResults.
+ */
+ public static final String RESULTS_TYPE_URL = "resultstypeurl";
+
+ /**
+ * Results: indicates SearchResult objects within the SearchResults are of
+ * type CaptureSearchResults.
+ */
+ public static final String RESULTS_TYPE_CAPTURE = "resultstypecapture";
+
+ /**
+ * Results: type of results: "Capture" or "Url"
+ */
+ public static final String RESULTS_TYPE = "resultstype";
/**
* @param key
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/UIResults.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -30,7 +30,6 @@
import org.apache.commons.httpclient.URIException;
import org.archive.wayback.ResultURIConverter;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.util.StringFormatter;
import org.archive.wayback.webapp.AccessPoint;
@@ -73,8 +72,8 @@
public String makeCaptureQueryUrl(String url) {
WaybackRequest newWBR = wbRequest.clone();
- newWBR.put(WaybackConstants.REQUEST_TYPE,
- WaybackConstants.REQUEST_URL_QUERY);
+ newWBR.put(WaybackRequest.REQUEST_TYPE,
+ WaybackRequest.REQUEST_URL_QUERY);
try {
newWBR.setRequestUrl(url);
} catch (URIException e) {
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-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/WaybackRequest.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -37,7 +37,6 @@
import org.apache.commons.httpclient.URIException;
import org.archive.net.UURI;
import org.archive.net.UURIFactory;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.requestparser.OpenSearchRequestParser;
import org.archive.wayback.util.ObjectFilter;
import org.archive.wayback.util.StringFormatter;
@@ -67,17 +66,144 @@
private HashMap<String,String> filters = new HashMap<String,String>();
private StringFormatter formatter = null;
+ /**
+ * Request: Authorization Type: "BASIC", "SSL", or "" if none.
+ */
+ public static final String REQUEST_AUTH_TYPE = "requestauthtype";
+ /**
+ * Request: Wayback Context: the string context used in the request,
+ * if applicable.
+ */
+ public static final String REQUEST_WAYBACK_CONTEXT = "waybackcontext";
+ /**
+ * Request: Wayback Port: the port the remote user connected to for this
+ * request.
+ */
+ public static final String REQUEST_WAYBACK_PORT = "waybackport";
+ /**
+ * Request: Wayback Hostname: the string "Host:" HTTP header
+ */
+ public static final String REQUEST_WAYBACK_HOSTNAME = "waybackhostname";
+ /**
+ * Request: Remote Address, string IP address: "127.0.0.1"
+ */
+ public static final String REQUEST_REMOTE_ADDRESS = "remoteaddress";
+ /**
+ * Request: auto resolution (TimeLine mode)
+ */
+ public static final String REQUEST_RESOLUTION_AUTO = "auto";
+ /**
+ * Request: year resolution (TimeLine mode)
+ */
+ public static final String REQUEST_RESOLUTION_YEARS = "years";
+ /**
+ * Request: two-month resolution (TimeLine mode)
+ */
+ public static final String REQUEST_RESOLUTION_TWO_MONTHS = "twomonths";
+ /**
+ * Request: month resolution (TimeLine mode)
+ */
+ public static final String REQUEST_RESOLUTION_MONTHS = "months";
+ /**
+ * Request: day resolution (TimeLine mode)
+ */
+ public static final String REQUEST_RESOLUTION_DAYS = "days";
+ /**
+ * Request: hour resolution (TimeLine mode)
+ */
+ public static final String REQUEST_RESOLUTION_HOURS = "hours";
+ /**
+ * Request: replay actual document or metadata for document: "yes" means
+ * replay metadata only, not the actual document: (TimeLine mode)
+ */
+ public static final String REQUEST_META_MODE = "metamode";
+ /**
+ * Request: resolution of results to be displayed: (TimeLine mode)
+ */
+ public static final String REQUEST_RESOLUTION = "resolution";
+ /**
+ * Request: closest type request
+ */
+ public static final String REQUEST_CLOSEST_QUERY = "urlclosestquery";
+ /**
+ * Request: replay type request
+ */
+ public static final String REQUEST_REPLAY_QUERY = "replay";
+ /**
+ * Request: urlprefixquery type request
+ */
+ public static final String REQUEST_URL_PREFIX_QUERY = "urlprefixquery";
+ /**
+ * Request: urlquery type request
+ */
+ public static final String REQUEST_URL_QUERY = "urlquery";
+ /**
+ * Request: xml data requested
+ */
+ public static final String REQUEST_XML_DATA = "xmldata";
+ /**
+ * Request: defines type - urlquery, urlprefixquery, or replay
+ */
+ public static final String REQUEST_TYPE = "type";
+ /**
+ * Request: URL of referrer, if supplied, or "" if not
+ */
+ public static final String REQUEST_REFERER_URL = "refererurl";
+ /**
+ * Request: Original URL or URL prefix requested.
+ * This version differs from @{link {@link REQUEST_URL} in that its
+ * the URL before it was passed via the UURIFactory cleanup.
+ */
+ public static final String REQUEST_URL_CLEANED = "cleanedurl";
+ /**
+ * Request: URL or URL prefix requested
+ */
+ public static final String REQUEST_URL = "url";
+ /**
+ * Request: (replay) find closest result to this 14-digit timestamp
+ */
+ public static final String REQUEST_EXACT_DATE = "exactdate";
+ /**
+ * Request: filter results after this 14-digit timestamp
+ */
+ public static final String REQUEST_END_DATE = "enddate";
+ /**
+ * Request: filter results before this 14-digit timestamp
+ */
+ public static final String REQUEST_START_DATE = "startdate";
+ /**
+ * Request: (query) filter results to those prefixed with this (possibly
+ * partial) 14-digit timestamp
+ */
+ public static final String REQUEST_DATE = "date";
+ /**
+ * Request: Remote User or "" if the request did not contain auth info.
+ */
+ public static final String REQUEST_REMOTE_USER = "requestremoteuser";
+ /**
+ * Request: Best Guess at users requested locale.
+ */
+ public static final String REQUEST_LOCALE_LANG = "requestlocalelang";
+ /**
+ * Request: Indicates user only wants results that exactly match the
+ * requested hostname -- no canonicalization.
+ */
+ public static final String REQUEST_EXACT_HOST_ONLY = "requestexacthost";
+ /**
+ * Request: indicates positive value for any request boolean flag.
+ */
+ public static final String REQUEST_YES = "yes";
private static String UI_RESOURCE_BUNDLE_NAME = "WaybackUI";
private final static String standardHeaders[] = {
- WaybackConstants.REQUEST_REFERER_URL,
- WaybackConstants.REQUEST_REMOTE_ADDRESS,
- WaybackConstants.REQUEST_WAYBACK_HOSTNAME,
- WaybackConstants.REQUEST_WAYBACK_PORT,
- WaybackConstants.REQUEST_WAYBACK_CONTEXT,
- WaybackConstants.REQUEST_AUTH_TYPE,
- WaybackConstants.REQUEST_REMOTE_USER,
- WaybackConstants.REQUEST_LOCALE_LANG };
+ WaybackRequest.REQUEST_REFERER_URL,
+ WaybackRequest.REQUEST_REMOTE_ADDRESS,
+ WaybackRequest.REQUEST_WAYBACK_HOSTNAME,
+ WaybackRequest.REQUEST_WAYBACK_PORT,
+ WaybackRequest.REQUEST_WAYBACK_CONTEXT,
+ WaybackRequest.REQUEST_AUTH_TYPE,
+ WaybackRequest.REQUEST_REMOTE_USER,
+ WaybackRequest.REQUEST_LOCALE_LANG };
/**
* Constructor, possibly/probably this should BE a Properties, instead of
@@ -91,8 +217,8 @@
* @return true if REQUEST_TYPE is set, and is set to REQUEST_REPLAY_QUERY
*/
public boolean isReplayRequest() {
- String type = get(WaybackConstants.REQUEST_TYPE);
- if(type != null && type.equals(WaybackConstants.REQUEST_REPLAY_QUERY)) {
+ String type = get(WaybackRequest.REQUEST_TYPE);
+ if(type != null && type.equals(WaybackRequest.REQUEST_REPLAY_QUERY)) {
return true;
}
return false;
@@ -191,21 +317,21 @@
*/
private void extractHttpRequestInfo(HttpServletRequest httpRequest) {
// attempt to get the HTTP referer if present..
- put(WaybackConstants.REQUEST_REFERER_URL, emptyIfNull(httpRequest
+ put(WaybackRequest.REQUEST_REFERER_URL, emptyIfNull(httpRequest
.getHeader("REFERER")));
- put(WaybackConstants.REQUEST_REMOTE_ADDRESS, emptyIfNull(httpRequest
+ put(WaybackRequest.REQUEST_REMOTE_ADDRESS, emptyIfNull(httpRequest
.getRemoteAddr()));
- put(WaybackConstants.REQUEST_WAYBACK_HOSTNAME, emptyIfNull(httpRequest
+ put(WaybackRequest.REQUEST_WAYBACK_HOSTNAME, emptyIfNull(httpRequest
.getLocalName()));
- put(WaybackConstants.REQUEST_WAYBACK_PORT, String.valueOf(httpRequest
+ put(WaybackRequest.REQUEST_WAYBACK_PORT, String.valueOf(httpRequest
.getLocalPort()));
- put(WaybackConstants.REQUEST_WAYBACK_CONTEXT, emptyIfNull(httpRequest
+ put(WaybackRequest.REQUEST_WAYBACK_CONTEXT, emptyIfNull(httpRequest
.getContextPath()));
- put(WaybackConstants.REQUEST_AUTH_TYPE, emptyIfNull(httpRequest
+ put(WaybackRequest.REQUEST_AUTH_TYPE, emptyIfNull(httpRequest
.getAuthType()));
- put(WaybackConstants.REQUEST_REMOTE_USER, emptyIfNull(httpRequest
+ put(WaybackRequest.REQUEST_REMOTE_USER, emptyIfNull(httpRequest
.getRemoteUser()));
- put(WaybackConstants.REQUEST_LOCALE_LANG,getUserLocale(httpRequest));
+ put(WaybackRequest.REQUEST_LOCALE_LANG,getUserLocale(httpRequest));
Cookie[] cookies = httpRequest.getCookies();
if(cookies != null) {
@@ -264,32 +390,32 @@
*/
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);
- String partialDate = get(WaybackConstants.REQUEST_DATE);
+ String startDate = get(WaybackRequest.REQUEST_START_DATE);
+ String endDate = get(WaybackRequest.REQUEST_END_DATE);
+ String exactDate = get(WaybackRequest.REQUEST_EXACT_DATE);
+ String partialDate = get(WaybackRequest.REQUEST_DATE);
if (partialDate == null) {
partialDate = "";
}
if (startDate == null || startDate.length() == 0) {
- put(WaybackConstants.REQUEST_START_DATE, Timestamp
+ put(WaybackRequest.REQUEST_START_DATE, Timestamp
.padStartDateStr(partialDate));
} else if (startDate.length() < 14) {
- put(WaybackConstants.REQUEST_START_DATE, Timestamp
+ put(WaybackRequest.REQUEST_START_DATE, Timestamp
.padStartDateStr(startDate));
}
if (endDate == null || endDate.length() == 0) {
- put(WaybackConstants.REQUEST_END_DATE, Timestamp
+ put(WaybackRequest.REQUEST_END_DATE, Timestamp
.padEndDateStr(partialDate));
} else if (endDate.length() < 14) {
- put(WaybackConstants.REQUEST_END_DATE, Timestamp
+ put(WaybackRequest.REQUEST_END_DATE, Timestamp
.padEndDateStr(endDate));
}
if (exactDate == null || exactDate.length() == 0) {
- put(WaybackConstants.REQUEST_EXACT_DATE, Timestamp
+ put(WaybackRequest.REQUEST_EXACT_DATE, Timestamp
.padEndDateStr(partialDate));
} else if (exactDate.length() < 14) {
- put(WaybackConstants.REQUEST_EXACT_DATE, Timestamp
+ put(WaybackRequest.REQUEST_EXACT_DATE, Timestamp
.padEndDateStr(exactDate));
}
}
@@ -359,8 +485,8 @@
}
// If its not http, next line throws exception. TODO: Fix.
UURI requestURI = UURIFactory.getInstance(urlStr);
- put(WaybackConstants.REQUEST_URL_CLEANED, requestURI.toString());
- put(WaybackConstants.REQUEST_URL, urlStr);
+ put(WaybackRequest.REQUEST_URL_CLEANED, requestURI.toString());
+ put(WaybackRequest.REQUEST_URL, urlStr);
}
/**
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixReplayDispatcher.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixReplayDispatcher.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixReplayDispatcher.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -26,7 +26,6 @@
import org.archive.wayback.ReplayDispatcher;
import org.archive.wayback.ReplayRenderer;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.core.Resource;
import org.archive.wayback.core.WaybackRequest;
@@ -60,7 +59,7 @@
// if the result is not for the exact date requested, redirect to the
// exact date. some capture dates are not 14 digits, only compare as
// many digits as are in the result date:
- String reqDateStr = wbRequest.get(WaybackConstants.REQUEST_EXACT_DATE);
+ String reqDateStr = wbRequest.get(WaybackRequest.REQUEST_EXACT_DATE);
String resDateStr = result.getCaptureTimestamp();
if((resDateStr.length() > reqDateStr.length()) ||
!resDateStr.equals(reqDateStr.substring(0, resDateStr.length()))) {
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-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/domainprefix/DomainPrefixRequestParser.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -30,7 +30,6 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.httpclient.URIException;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.exception.BadQueryException;
@@ -90,9 +89,9 @@
String requestUrl = getRequestString(host,httpRequest);
- wbRequest.put(WaybackConstants.REQUEST_EXACT_DATE, dateStr);
- wbRequest.put(WaybackConstants.REQUEST_TYPE,
- WaybackConstants.REQUEST_REPLAY_QUERY);
+ wbRequest.put(WaybackRequest.REQUEST_EXACT_DATE, dateStr);
+ wbRequest.put(WaybackRequest.REQUEST_TYPE,
+ WaybackRequest.REQUEST_REPLAY_QUERY);
try {
wbRequest.setRequestUrl(requestUrl);
} catch (URIException e) {
@@ -114,10 +113,10 @@
startDate = Timestamp.parseBefore(dateStr).getDateStr();
endDate = Timestamp.parseAfter(dateStr).getDateStr();
}
- wbRequest.put(WaybackConstants.REQUEST_START_DATE,startDate);
- wbRequest.put(WaybackConstants.REQUEST_END_DATE,endDate);
- wbRequest.put(WaybackConstants.REQUEST_TYPE,
- WaybackConstants.REQUEST_URL_QUERY);
+ wbRequest.put(WaybackRequest.REQUEST_START_DATE,startDate);
+ wbRequest.put(WaybackRequest.REQUEST_END_DATE,endDate);
+ wbRequest.put(WaybackRequest.REQUEST_TYPE,
+ WaybackRequest.REQUEST_URL_QUERY);
String requestUrl = getRequestString(host,httpRequest);
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/exception/BaseExceptionRenderer.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -34,7 +34,6 @@
import javax.servlet.http.HttpServletResponse;
import org.archive.wayback.ExceptionRenderer;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.UIResults;
import org.archive.wayback.core.WaybackRequest;
@@ -69,13 +68,13 @@
if (wbRequest == null) {
return false;
}
- String referer = wbRequest.get(WaybackConstants.REQUEST_REFERER_URL);
+ String referer = wbRequest.get(WaybackRequest.REQUEST_REFERER_URL);
return (referer != null && referer.length() > 0);
}
protected boolean requestIsImage(HttpServletRequest httpRequest,
WaybackRequest wbRequest) {
- String requestUrl = wbRequest.get(WaybackConstants.REQUEST_URL);
+ String requestUrl = wbRequest.get(WaybackRequest.REQUEST_URL);
if (requestUrl == null)
return false;
Matcher matcher = IMAGE_REGEX.matcher(requestUrl);
@@ -85,14 +84,14 @@
protected boolean requestIsJavascript(HttpServletRequest httpRequest,
WaybackRequest wbRequest) {
- String requestUrl = wbRequest.get(WaybackConstants.REQUEST_URL);
+ String requestUrl = wbRequest.get(WaybackRequest.REQUEST_URL);
return (requestUrl != null) && requestUrl.endsWith(".js");
}
protected boolean requestIsCSS(HttpServletRequest httpRequest,
WaybackRequest wbRequest) {
- String requestUrl = wbRequest.get(WaybackConstants.REQUEST_URL);
+ String requestUrl = wbRequest.get(WaybackRequest.REQUEST_URL);
return (requestUrl != null) && requestUrl.endsWith(".css");
}
@@ -104,7 +103,7 @@
if(wbRequest.isQueryRequest()) {
- if(wbRequest.containsKey(WaybackConstants.REQUEST_XML_DATA)) {
+ if(wbRequest.containsKey(WaybackRequest.REQUEST_XML_DATA)) {
jspPath = xmlErrorJsp;
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -33,14 +33,12 @@
import org.archive.io.arc.ARCLocation;
import org.archive.io.arc.ARCRecord;
import org.archive.wayback.UrlCanonicalizer;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.Resource;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.core.CaptureSearchResults;
import org.archive.wayback.core.SearchResults;
import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
-import org.archive.wayback.exception.AnchorWindowTooSmallException;
import org.archive.wayback.exception.LiveDocumentNotAvailableException;
import org.archive.wayback.exception.ResourceNotInArchiveException;
import org.archive.wayback.exception.WaybackException;
@@ -82,9 +80,9 @@
boolean bUseOlder) throws URIException {
WaybackRequest req = new WaybackRequest();
req.setRequestUrl(url.toString());
- req.put(WaybackConstants.REQUEST_TYPE,
- WaybackConstants.REQUEST_CLOSEST_QUERY);
- req.put(WaybackConstants.REQUEST_EXACT_DATE,
+ req.put(WaybackRequest.REQUEST_TYPE,
+ WaybackRequest.REQUEST_CLOSEST_QUERY);
+ req.put(WaybackRequest.REQUEST_EXACT_DATE,
Timestamp.currentTimestamp().getDateStr());
Timestamp earliest = null;
if(bUseOlder) {
@@ -93,11 +91,11 @@
Date d = new Date(System.currentTimeMillis() - maxCacheMS);
earliest = new Timestamp(d);
}
- req.put(WaybackConstants.REQUEST_START_DATE,earliest.getDateStr());
+ req.put(WaybackRequest.REQUEST_START_DATE,earliest.getDateStr());
// for now, assume all live web requests are only satisfiable by the
// exact host -- no massaging.
- req.put(WaybackConstants.REQUEST_EXACT_HOST_ONLY,
- WaybackConstants.REQUEST_YES);
+ req.put(WaybackRequest.REQUEST_EXACT_HOST_ONLY,
+ WaybackRequest.REQUEST_YES);
return req;
}
@@ -166,12 +164,7 @@
e.printStackTrace();
throw new IOException(e.getMessage());
}
- CaptureSearchResult result;
- try {
- result = results.getClosest(wbRequest,false);
- } catch (AnchorWindowTooSmallException e) {
- throw new ResourceNotInArchiveException("Not In archive..");
- }
+ CaptureSearchResult result = results.getClosest(wbRequest);
if(result != null) {
if(isForgedFailedSearchResult(result)) {
if(isForgedFailRecentEnough(result)) {
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyReplayRequestParser.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -30,7 +30,6 @@
import org.apache.commons.httpclient.URIException;
import org.archive.util.InetAddressUtil;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.exception.BadQueryException;
import org.archive.wayback.requestparser.BaseRequestParser;
@@ -92,8 +91,8 @@
e.printStackTrace();
return null;
}
- wbRequest.put(WaybackConstants.REQUEST_TYPE,
- WaybackConstants.REQUEST_REPLAY_QUERY);
+ wbRequest.put(WaybackRequest.REQUEST_TYPE,
+ WaybackRequest.REQUEST_REPLAY_QUERY);
wbRequest.setResultsPerPage(maxRecords);
return wbRequest;
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/proxy/ProxyRequestParser.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -29,7 +29,6 @@
import javax.servlet.http.HttpServletRequest;
import org.archive.wayback.RequestParser;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.exception.BadQueryException;
@@ -71,7 +70,7 @@
String id = httpRequest.getHeader("Proxy-Id");
if (id == null)
id = httpRequest.getRemoteAddr();
- wbRequest.put(WaybackConstants.REQUEST_EXACT_DATE, Timestamp
+ wbRequest.put(WaybackRequest.REQUEST_EXACT_DATE, Timestamp
.getTimestampForId(httpRequest.getContextPath(), id));
wbRequest.fixup(httpRequest);
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/Renderer.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -33,7 +33,6 @@
import org.archive.wayback.QueryRenderer;
import org.archive.wayback.ResultURIConverter;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.CaptureSearchResults;
import org.archive.wayback.core.UrlSearchResults;
import org.archive.wayback.core.WaybackRequest;
@@ -76,7 +75,7 @@
UICaptureQueryResults uiResults = new UICaptureQueryResults(httpRequest, wbRequest,
results, uriConverter);
String jsp = captureJsp;
- if(wbRequest.containsKey(WaybackConstants.REQUEST_XML_DATA)) {
+ if(wbRequest.containsKey(WaybackRequest.REQUEST_XML_DATA)) {
jsp = xmlCaptureJsp;
}
@@ -96,7 +95,7 @@
UIUrlQueryResults uiResults = new UIUrlQueryResults(httpRequest, wbRequest,
results, uriConverter);
String jsp = urlJsp;
- if(wbRequest.containsKey(WaybackConstants.REQUEST_XML_DATA)) {
+ if(wbRequest.containsKey(WaybackRequest.REQUEST_XML_DATA)) {
jsp = xmlUrlJsp;
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/UIQueryResults.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/UIQueryResults.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/UIQueryResults.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -28,7 +28,6 @@
import javax.servlet.http.HttpServletRequest;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.ResultURIConverter;
import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.core.SearchResults;
@@ -80,11 +79,11 @@
WaybackRequest wbRequest, SearchResults results,
ResultURIConverter uriConverter) {
super(wbRequest,uriConverter);
- this.searchUrl = wbRequest.get(WaybackConstants.REQUEST_URL);
+ this.searchUrl = wbRequest.get(WaybackRequest.REQUEST_URL);
this.startTimestamp = Timestamp.parseBefore(results.
- getFilter(WaybackConstants.REQUEST_START_DATE));
+ getFilter(WaybackRequest.REQUEST_START_DATE));
this.endTimestamp = Timestamp.parseAfter(results.getFilter(
- WaybackConstants.REQUEST_END_DATE));
+ WaybackRequest.REQUEST_END_DATE));
this.resultsReturned = results.getReturnedCount();
this.resultsMatching = results.getMatchingCount();
@@ -92,7 +91,7 @@
this.firstResult = results.getFirstReturned() + 1;
this.lastResult = ((firstResult - 1) + resultsReturned);
this.exactRequestedTimestamp = Timestamp.parseAfter(
- wbRequest.get(WaybackConstants.REQUEST_EXACT_DATE));
+ wbRequest.get(WaybackRequest.REQUEST_EXACT_DATE));
// calculate total pages:
numPages = (int) Math.ceil((double)resultsMatching/(double)resultsPerPage);
curPage = (int) Math.floor(((double)(firstResult-1))/(double)resultsPerPage) + 1;
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 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsPartitionsFactory.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -29,7 +29,6 @@
import java.util.Date;
import org.archive.util.ArchiveUtils;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.CaptureSearchResults;
import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
@@ -59,9 +58,9 @@
public static ArrayList<ResultsPartition> get(CaptureSearchResults results,
WaybackRequest wbRequest) {
Timestamp startTS = Timestamp.parseBefore(results.getFilter(
- WaybackConstants.REQUEST_START_DATE));
+ WaybackRequest.REQUEST_START_DATE));
Timestamp endTS = Timestamp.parseAfter(results.getFilter(
- WaybackConstants.REQUEST_END_DATE));
+ WaybackRequest.REQUEST_END_DATE));
String rsd = startTS.getDateStr();
String red = endTS.getDateStr();
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsTimelinePartitionsFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsTimelinePartitionsFactory.java 2008-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/query/resultspartitioner/ResultsTimelinePartitionsFactory.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -28,7 +28,6 @@
import java.util.Calendar;
import org.archive.util.ArchiveUtils;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.CaptureSearchResults;
import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
@@ -145,15 +144,15 @@
int last = Timestamp.parseAfter(results.getLastResultTimestamp()).sse();
int diff = last - first;
if(diff < MAX_HOUR_SECONDS) {
- return WaybackConstants.REQUEST_RESOLUTION_HOURS;
+ return WaybackRequest.REQUEST_RESOLUTION_HOURS;
} else if(diff < MAX_DAY_SECONDS) {
- return WaybackConstants.REQUEST_RESOLUTION_DAYS;
+ return WaybackRequest.REQUEST_RESOLUTION_DAYS;
} else if(diff < MAX_MONTH_SECONDS) {
- return WaybackConstants.REQUEST_RESOLUTION_MONTHS;
+ return WaybackRequest.REQUEST_RESOLUTION_MONTHS;
} else if(diff < MAX_TWO_MONTH_SECONDS) {
- return WaybackConstants.REQUEST_RESOLUTION_TWO_MONTHS;
+ return WaybackRequest.REQUEST_RESOLUTION_TWO_MONTHS;
}
- return WaybackConstants.REQUEST_RESOLUTION_YEARS;
+ return WaybackRequest.REQUEST_RESOLUTION_YEARS;
}
private static ArrayList<ResultsPartition> get(ResultsPartitioner
@@ -167,7 +166,7 @@
int totalPartitions = (partitionCount * 2) + 1; // total # of partitions
// first calculate the "center" based on the exact request date:
- String reqDate = results.getFilter(WaybackConstants.REQUEST_EXACT_DATE);
+ String reqDate = results.getFilter(WaybackRequest.REQUEST_EXACT_DATE);
Calendar centerCal = partitioner.dateStrToCalendar(reqDate);
partitioner.alignStart(centerCal);
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-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/FormRequestParser.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -30,7 +30,6 @@
import javax.servlet.http.HttpServletRequest;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.webapp.AccessPoint;
@@ -61,15 +60,15 @@
String base = wbContext.translateRequestPath(httpRequest);
if(base.startsWith(REPLAY_BASE)) {
- wbRequest.put(WaybackConstants.REQUEST_TYPE,
- WaybackConstants.REQUEST_REPLAY_QUERY);
+ wbRequest.put(WaybackRequest.REQUEST_TYPE,
+ WaybackRequest.REQUEST_REPLAY_QUERY);
} else if(base.startsWith(QUERY_BASE)) {
- wbRequest.put(WaybackConstants.REQUEST_TYPE,
- WaybackConstants.REQUEST_URL_QUERY);
+ wbRequest.put(WaybackRequest.REQUEST_TYPE,
+ WaybackRequest.REQUEST_URL_QUERY);
} else if(base.startsWith(XQUERY_BASE)){
- wbRequest.put(WaybackConstants.REQUEST_TYPE,
- WaybackConstants.REQUEST_URL_QUERY);
- wbRequest.put(WaybackConstants.REQUEST_XML_DATA,"1");
+ wbRequest.put(WaybackRequest.REQUEST_TYPE,
+ WaybackRequest.REQUEST_URL_QUERY);
+ wbRequest.put(WaybackRequest.REQUEST_XML_DATA,"1");
} else {
return null;
@@ -86,12 +85,12 @@
String val = getMapParam(queryMap,key);
wbRequest.put(key,val);
}
- if(wbRequest.get(WaybackConstants.REQUEST_START_DATE) == null) {
- wbRequest.put(WaybackConstants.REQUEST_START_DATE,
+ if(wbRequest.get(WaybackRequest.REQUEST_START_DATE) == null) {
+ wbRequest.put(WaybackRequest.REQUEST_START_DATE,
getEarliestTimestamp());
}
- if(wbRequest.get(WaybackConstants.REQUEST_END_DATE) == null) {
- wbRequest.put(WaybackConstants.REQUEST_END_DATE,
+ if(wbRequest.get(WaybackRequest.REQUEST_END_DATE) == null) {
+ wbRequest.put(WaybackRequest.REQUEST_END_DATE,
getLatestTimestamp());
}
}
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-07-07 21:53:54 UTC (rev 2416)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/requestparser/OpenSearchRequestParser.java 2008-07-07 21:57:30 UTC (rev 2417)
@@ -29,7 +29,6 @@
import javax.servlet.http.HttpServletRequest;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.exception.BadQueryException;
import org.archive.wayback.webapp.AccessPoint;
@@ -87,15 +86,15 @@
String base = wbContext.translateRequestPath(httpRequest);
if(base...
[truncated message content] |
