archive-access-cvs

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

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

Revision: 2037
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2037&view=rev
Author:   bradtofel
Date:     2007-10-12 12:03:38 -0700 (Fri, 12 Oct 2007)

Log Message:
-----------
BUGFIX: System.err.println >> LOGGER.info|fine

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java	2007-10-10 20:47:04 UTC (rev 2036)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java	2007-10-12 19:03:38 UTC (rev 2037)
@@ -25,6 +25,7 @@
 package org.archive.wayback.accesscontrol.staticmap;
 
 import java.util.Map;
+import java.util.logging.Logger;
 
 import org.apache.commons.httpclient.URIException;
 import org.archive.wayback.WaybackConstants;
@@ -39,6 +40,8 @@
  * @version $Date$, $Revision$
  */
 public class StaticMapExclusionFilter implements ObjectFilter<SearchResult> {
+	private static final Logger LOGGER = Logger.getLogger(
+			StaticMapExclusionFilter.class.getName());
 
 	private String lastChecked = null;
 	private boolean lastCheckedExcluded = false;
@@ -58,9 +61,9 @@
 				if(nextSearch == null) {
 					break;
 				}
-				System.err.println("EXCLUSION-MAP:Checking " + nextSearch);
+				LOGGER.fine("EXCLUSION-MAP:Checking " + nextSearch);
 				if(exclusionMap.containsKey(nextSearch)) {
-					System.err.println("EXCLUSION-MAP: EXCLUDED: \"" + nextSearch + "\" (" + url +")");
+					LOGGER.fine("EXCLUSION-MAP: EXCLUDED: \"" + nextSearch + "\" (" + url +")");
 					return true;
 				}
 			}

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java	2007-10-10 20:47:04 UTC (rev 2036)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java	2007-10-12 19:03:38 UTC (rev 2037)
@@ -96,7 +96,7 @@
 			}
 			String surt = line.startsWith("(") ? line : 
 				SURTTokenizer.prefixKey(line);
-			System.err.println("EXCLUSION-MAP: adding " + surt);
+			LOGGER.fine("EXCLUSION-MAP: adding " + surt);
 			newMap.put(surt, null);
 		}
 		itr.close();


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

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

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

Revision: 2358
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2358&view=rev
Author:   bradtofel
Date:     2008-07-01 16:26:31 -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/staticmap/StaticMapExclusionFilter.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java	2008-07-01 23:25:55 UTC (rev 2357)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilter.java	2008-07-01 23:26:31 UTC (rev 2358)
@@ -28,8 +28,7 @@
 import java.util.logging.Logger;
 
 import org.apache.commons.httpclient.URIException;
-import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
 import org.archive.wayback.surt.SURTTokenizer;
 import org.archive.wayback.util.ObjectFilter;
 
@@ -39,7 +38,7 @@
  * @author brad
  * @version $Date$, $Revision$
  */
-public class StaticMapExclusionFilter implements ObjectFilter<SearchResult> {
+public class StaticMapExclusionFilter implements ObjectFilter<CaptureSearchResult> {
 	private static final Logger LOGGER = Logger.getLogger(
 			StaticMapExclusionFilter.class.getName());
 
@@ -76,8 +75,8 @@
 	/* (non-Javadoc)
 	 * @see org.archive.wayback.resourceindex.SearchResultFilter#filterSearchResult(org.archive.wayback.core.SearchResult)
 	 */
-	public int filterObject(SearchResult r) {
-		String url = r.get(WaybackConstants.RESULT_URL);
+	public int filterObject(CaptureSearchResult r) {
+		String url = r.getOriginalUrl();
 		if(lastChecked != null) {
 			if(lastChecked.equals(url)) {
 				return lastCheckedExcluded ? 

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java	2008-07-01 23:25:55 UTC (rev 2357)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/accesscontrol/staticmap/StaticMapExclusionFilterFactory.java	2008-07-01 23:26:31 UTC (rev 2358)
@@ -31,7 +31,7 @@
 import java.util.logging.Logger;
 
 import org.archive.wayback.accesscontrol.ExclusionFilterFactory;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
 import org.archive.wayback.surt.SURTTokenizer;
 import org.archive.wayback.util.CloseableIterator;
 import org.archive.wayback.util.ObjectFilter;
@@ -107,7 +107,7 @@
 	 * @param wbRequest 
 	 * @return SearchResultFilter 
 	 */
-	public ObjectFilter<SearchResult> get() {
+	public ObjectFilter<CaptureSearchResult> get() {
 		if(currentMap == null) {
 			return null;
 		}


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