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

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

Revision: 2354
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2354&view=rev
Author:   bradtofel
Date:     2008-07-01 16:23:28 -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/CompositeExclusionFilterFactory.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExclusionFilterFactory.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExternalExcluder.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/CompositeExclusionFilterFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/CompositeExclusionFilterFactory.java	2008-07-01 23:21:32 UTC (rev 2353)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/CompositeExclusionFilterFactory.java	2008-07-01 23:23:28 UTC (rev 2354)
@@ -27,7 +27,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
 import org.archive.wayback.resourceindex.filters.CompositeExclusionFilter;
 import org.archive.wayback.util.ObjectFilter;
 
@@ -54,7 +54,7 @@
 	/* (non-Javadoc)
 	 * @see org.archive.wayback.resourceindex.ExclusionFilterFactory#get()
 	 */
-	public ObjectFilter<SearchResult> get() {
+	public ObjectFilter<CaptureSearchResult> get() {
 		Iterator<ExclusionFilterFactory> itr = factories.iterator();
 		CompositeExclusionFilter filter = new CompositeExclusionFilter();
 		while(itr.hasNext()) {

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExclusionFilterFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExclusionFilterFactory.java	2008-07-01 23:21:32 UTC (rev 2353)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExclusionFilterFactory.java	2008-07-01 23:23:28 UTC (rev 2354)
@@ -24,7 +24,7 @@
  */
 package org.archive.wayback.accesscontrol;
 
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
 import org.archive.wayback.util.ObjectFilter;
 /**
  *
@@ -37,7 +37,7 @@
 	 * @return an ObjectFilter object that filters records based on
 	 * some set of exclusion rules
 	 */
-	public ObjectFilter<SearchResult> get();
+	public ObjectFilter<CaptureSearchResult> get();
 	/**
 	 * close any resources used by this ExclusionFilter system.
 	 */

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExternalExcluder.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExternalExcluder.java	2008-07-01 23:21:32 UTC (rev 2353)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/ExternalExcluder.java	2008-07-01 23:23:28 UTC (rev 2354)
@@ -24,10 +24,8 @@
  */
 package org.archive.wayback.accesscontrol;
 
-import org.apache.commons.httpclient.URIException;
-import org.archive.net.LaxURI;
-import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
+import org.archive.wayback.core.Timestamp;
 import org.archive.wayback.util.ObjectFilter;
 import org.springframework.beans.factory.xml.XmlBeanFactory;
 import org.springframework.core.io.FileSystemResource;
@@ -44,12 +42,12 @@
  */
 public class ExternalExcluder {
 	private static ExclusionFilterFactory factory = null;
-	private ObjectFilter<SearchResult> filter = null;
+	private ObjectFilter<CaptureSearchResult> filter = null;
 	private final static String CONFIG_ID = "excluder-factory";
 	/**
 	 * @param filter
 	 */
-	public ExternalExcluder(ObjectFilter<SearchResult> filter) {
+	public ExternalExcluder(ObjectFilter<CaptureSearchResult> filter) {
 		this.filter = filter;
 	}
 	/**
@@ -58,20 +56,10 @@
 	 * @return true if the url-timestamp should not be shown to end users
 	 */
 	public boolean isExcluded(String urlString, String timestamp) {
-		SearchResult sr = new SearchResult();
+		CaptureSearchResult sr = new CaptureSearchResult();
 
-		LaxURI url = null;
-		String host = null;
-		try {
-			url = new LaxURI(urlString,true);
-			host = url.getHost();
-		} catch (URIException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-			return true;
-		}
-		sr.put(WaybackConstants.RESULT_ORIG_HOST, host);
-		sr.put(WaybackConstants.RESULT_URL, urlString);
+		sr.setOriginalUrl(urlString);
+		sr.setCaptureTimestamp(Timestamp.parseBefore(timestamp).getDateStr());
 		
 		int ruling = filter.filterObject(sr);
 		return (ruling != ObjectFilter.FILTER_INCLUDE);


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