[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.