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

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

Revision: 2356
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2356&view=rev
Author:   bradtofel
Date:     2008-07-01 16:25:27 -0700 (Tue, 01 Jul 2008)

Log Message:
-----------
REFACTOR: SearchResult => (Url|Capture)SearchResult

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/remote/RemoteExclusionFilter.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/remote/RemoteExclusionFilterFactory.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/remote/RemoteExclusionFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/remote/RemoteExclusionFilter.java	2008-07-01 23:24:50 UTC (rev 2355)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/remote/RemoteExclusionFilter.java	2008-07-01 23:25:27 UTC (rev 2356)
@@ -32,8 +32,7 @@
 import java.net.URLEncoder;
 import java.util.logging.Logger;
 
-import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
 import org.archive.wayback.util.ObjectFilter;
 
 /**
@@ -43,7 +42,7 @@
  * @author brad
  * @version $Date: 2006-10-17 15:21:15 -0700 (Tue, 17 Oct 2006) $, $Revision: 1276 $
  */
-public class RemoteExclusionFilter implements ObjectFilter<SearchResult> {
+public class RemoteExclusionFilter implements ObjectFilter<CaptureSearchResult> {
 	private static final Logger LOGGER = Logger.getLogger(RemoteExclusionFilter.class
 			.getName());
 
@@ -90,7 +89,7 @@
 		finalUrl.append(URL_ARGUMENT);
 		finalUrl.append("=");
 		try {
-			finalUrl.append(URLEncoder.encode("http://"+urlString,"UTF-8"));
+			finalUrl.append(URLEncoder.encode(urlString,"UTF-8"));
 		} catch (UnsupportedEncodingException e) {
 			// TODO what happenned here?
 			e.printStackTrace();
@@ -146,9 +145,9 @@
 	/* (non-Javadoc)
 	 * @see org.archive.wayback.resourceindex.SearchResultFilter#filterSearchResult(org.archive.wayback.core.SearchResult)
 	 */
-	public int filterObject(SearchResult r) {
-		String captureDate = r.get(WaybackConstants.RESULT_CAPTURE_DATE);
-		String url = r.get(WaybackConstants.RESULT_URL);
+	public int filterObject(CaptureSearchResult r) {
+		String captureDate = r.getCaptureTimestamp();
+		String url = r.getOriginalUrl();
 		return isBlocked(url,captureDate) ?	FILTER_EXCLUDE : FILTER_INCLUDE;
 	}
 }

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/remote/RemoteExclusionFilterFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/remote/RemoteExclusionFilterFactory.java	2008-07-01 23:24:50 UTC (rev 2355)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/remote/RemoteExclusionFilterFactory.java	2008-07-01 23:25:27 UTC (rev 2356)
@@ -25,7 +25,7 @@
 package org.archive.wayback.accesscontrol.remote;
 
 import org.archive.wayback.accesscontrol.ExclusionFilterFactory;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
 import org.archive.wayback.util.ObjectFilter;
 
 /**
@@ -43,7 +43,7 @@
 	/* (non-Javadoc)
 	 * @see org.archive.wayback.resourceindex.ExclusionFilterFactory#get()
 	 */
-	public ObjectFilter<SearchResult> get() {
+	public ObjectFilter<CaptureSearchResult> get() {
 		return new RemoteExclusionFilter(exclusionUrlPrefix, exclusionUserAgent);
 	}
 


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