archive-access-cvs

[Archive-access-cvs] SF.net SVN: archive-access:[2820] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/ SelfRedirectFilter.java

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

Revision: 2820
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2820&view=rev
Author:   bradtofel
Date:     2009-10-23 00:14:47 +0000 (Fri, 23 Oct 2009)

Log Message:
-----------
FEATURE: added convenience constructor which takes UrlCanonicalizer

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java	2009-10-23 00:12:40 UTC (rev 2819)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java	2009-10-23 00:14:47 UTC (rev 2820)
@@ -39,10 +39,13 @@
  */
 public class SelfRedirectFilter implements ObjectFilter<CaptureSearchResult> {
 
-	private UrlCanonicalizer canonicalizer = new AggressiveUrlCanonicalizer();
+	private UrlCanonicalizer canonicalizer = null;
 	public SelfRedirectFilter() {
 		canonicalizer = new AggressiveUrlCanonicalizer();
 	}
+	public SelfRedirectFilter(UrlCanonicalizer canonicalizer) {
+		this.canonicalizer = canonicalizer;
+	}
 	/* (non-Javadoc)
 	 * @see org.archive.wayback.util.ObjectFilter#filterObject(java.lang.Object)
 	 */


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:[3012] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/ SelfRedirectFilter.java

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

Revision: 3012
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3012&view=rev
Author:   bradtofel
Date:     2010-04-02 03:08:24 +0000 (Fri, 02 Apr 2010)

Log Message:
-----------
BUGFIX: no longer filters results unless they redirect to the same scheme.

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java	2010-04-02 03:07:20 UTC (rev 3011)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java	2010-04-02 03:08:24 UTC (rev 3012)
@@ -29,6 +29,7 @@
 import org.archive.wayback.core.CaptureSearchResult;
 import org.archive.wayback.util.ObjectFilter;
 import org.archive.wayback.util.url.AggressiveUrlCanonicalizer;
+import org.archive.wayback.util.url.UrlOperations;
 
 /**
  * SearchResultFilter which INCLUDEs all records, unless they redirect to 
@@ -59,7 +60,14 @@
 				try {
 					String redirectKey = canonicalizer.urlStringToKey(redirect);
 					if(redirectKey.compareTo(urlKey) == 0) {
-						return FILTER_EXCLUDE;
+						// only omit if same scheme:
+						String origScheme = 
+							UrlOperations.urlToScheme(r.getOriginalUrl());
+						String redirScheme = 
+							UrlOperations.urlToScheme(redirect);
+						if(origScheme.compareTo(redirScheme) == 0) {
+							return FILTER_EXCLUDE;
+						}
 					}
 				} catch (URIException e) {
 					// emit message (is that right?) and continue


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:[3396] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/ SelfRedirectFilter.java

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

Revision: 3396
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3396&view=rev
Author:   bradtofel
Date:     2011-02-06 14:38:07 +0000 (Sun, 06 Feb 2011)

Log Message:
-----------
LOGGING: replaced stacktrace with log message

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java	2011-02-06 14:37:36 UTC (rev 3395)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java	2011-02-06 14:38:07 UTC (rev 3396)
@@ -19,6 +19,8 @@
  */
 package org.archive.wayback.resourceindex.filters;
 
+import java.util.logging.Logger;
+
 import org.apache.commons.httpclient.URIException;
 import org.archive.wayback.UrlCanonicalizer;
 import org.archive.wayback.core.CaptureSearchResult;
@@ -34,6 +36,8 @@
  * @version $Date$, $Revision$
  */
 public class SelfRedirectFilter implements ObjectFilter<CaptureSearchResult> {
+	private static final Logger LOGGER = Logger.getLogger(SelfRedirectFilter
+			.class.getName());
 
 	private UrlCanonicalizer canonicalizer = null;
 	public SelfRedirectFilter() {
@@ -66,7 +70,9 @@
 					}
 				} catch (URIException e) {
 					// emit message (is that right?) and continue
-					e.printStackTrace();
+					LOGGER.info("Bad redirectURL:" + redirect + 
+							" urlKey:"+ urlKey +
+							" date:"+ r.getCaptureTimestamp());
 				}
 			}
 		}


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:[3479] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/ SelfRedirectFilter.java

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

Revision: 3479
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3479&view=rev
Author:   bradtofel
Date:     2011-06-24 13:31:21 +0000 (Fri, 24 Jun 2011)

Log Message:
-----------
BUGFIX: Simple NPE - not checking returned values

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java	2011-06-16 17:26:31 UTC (rev 3478)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java	2011-06-24 13:31:21 UTC (rev 3479)
@@ -58,13 +58,15 @@
 				String urlKey = r.getUrlKey();
 				try {
 					String redirectKey = canonicalizer.urlStringToKey(redirect);
-					if(redirectKey.compareTo(urlKey) == 0) {
+					if((redirectKey != null) &&
+							(redirectKey.compareTo(urlKey) == 0)) {
 						// only omit if same scheme:
 						String origScheme = 
 							UrlOperations.urlToScheme(r.getOriginalUrl());
 						String redirScheme = 
 							UrlOperations.urlToScheme(redirect);
-						if(origScheme.compareTo(redirScheme) == 0) {
+						if((origScheme != null) && 
+								(origScheme.compareTo(redirScheme) == 0)) {
 							return FILTER_EXCLUDE;
 						}
 					}


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:[3481] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/ SelfRedirectFilter.java

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

Revision: 3481
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3481&view=rev
Author:   bradtofel
Date:     2011-06-26 03:00:40 +0000 (Sun, 26 Jun 2011)

Log Message:
-----------
BUGFIX: was not checking all NPE cases: String.compareTo(other) throws NPE when other is null.

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java	2011-06-25 03:40:03 UTC (rev 3480)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/filters/SelfRedirectFilter.java	2011-06-26 03:00:40 UTC (rev 3481)
@@ -58,14 +58,14 @@
 				String urlKey = r.getUrlKey();
 				try {
 					String redirectKey = canonicalizer.urlStringToKey(redirect);
-					if((redirectKey != null) &&
+					if((redirectKey != null) && (urlKey != null) &&
 							(redirectKey.compareTo(urlKey) == 0)) {
 						// only omit if same scheme:
 						String origScheme = 
 							UrlOperations.urlToScheme(r.getOriginalUrl());
 						String redirScheme = 
 							UrlOperations.urlToScheme(redirect);
-						if((origScheme != null) && 
+						if((origScheme != null) && (redirScheme != null) &&
 								(origScheme.compareTo(redirScheme) == 0)) {
 							return FILTER_EXCLUDE;
 						}


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