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

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

Revision: 2631
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2631&view=rev
Author:   bradtofel
Date:     2008-11-06 22:53:25 +0000 (Thu, 06 Nov 2008)

Log Message:
-----------
BUGFIX(ACC-46): anchorDate adherence is now configured on AccessPoint, and is disabled by default.

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

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-11-06 22:51:24 UTC (rev 2630)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/core/CaptureSearchResults.java	2008-11-06 22:53:25 UTC (rev 2631)
@@ -100,17 +100,22 @@
 	}
 	/**
 	 * @param wbRequest
-	 * @param err if true, then check Request Anchor Window and Date, throwing
-	 *        exception if no Result is within the Window.
+	 * @param useAnchor if true, then check Request Anchor Window and Date,
+	 * 		  throwing exception if no Result is within the Window.
 	 * @return The closest CaptureSearchResult to the request.
 	 */
-	public CaptureSearchResult getClosest(WaybackRequest wbRequest, boolean err) 
+	public CaptureSearchResult getClosest(WaybackRequest wbRequest, 
+			boolean useAnchor) 
 		throws AnchorWindowTooSmallException {
 
 		CaptureSearchResult closest = null;
 		long closestDistance = 0;
 		CaptureSearchResult cur = null;
-		String anchorDate = wbRequest.getAnchorTimestamp();
+		String anchorDate = null;
+		// TODO: check if HTTP request referrer is set before using? 
+		if(useAnchor) {
+			anchorDate = wbRequest.getAnchorTimestamp();
+		}
 		long maxWindow = -1;
 		long wantTime = wbRequest.getReplayDate().getTime();
 		if(anchorDate != null) {
@@ -129,7 +134,7 @@
 				closestDistance = curDistance;
 			}
 		}
-		if(err && (maxWindow > 0)) {
+		if(useAnchor && (maxWindow > 0)) {
 			if(closestDistance > maxWindow) {
 				throw new AnchorWindowTooSmallException("Closest is " + 
 						closestDistance + " seconds away, Window is " + 


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