archive-access-cvs

[Archive-access-cvs] SF.net SVN: archive-access:[2823] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXIndex. java

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

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

Log Message:
-----------
TWEAK: changed scope of adaptIterator() to allow subclasses to use it

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXIndex.java	2009-10-23 00:35:10 UTC (rev 2822)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXIndex.java	2009-10-23 00:37:11 UTC (rev 2823)
@@ -49,7 +49,8 @@
 	 */
 	private static final long serialVersionUID = 1L;
 
-	private CloseableIterator<CaptureSearchResult> adaptIterator(Iterator<String> itr) {
+	protected CloseableIterator<CaptureSearchResult> adaptIterator(Iterator<String> itr)
+		throws IOException {
 		return new AdaptedIterator<String,CaptureSearchResult>(itr,
 				new CDXLineToSearchResultAdapter());
 	}


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

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

Revision: 3551
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3551&view=rev
Author:   bradtofel
Date:     2011-10-25 17:54:42 +0000 (Tue, 25 Oct 2011)
Log Message:
-----------
OPTIMIZ: now uses more efficient SortedCompositeIterator

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXIndex.java	2011-10-25 01:13:05 UTC (rev 3550)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXIndex.java	2011-10-25 17:54:42 UTC (rev 3551)
@@ -28,8 +28,8 @@
 import org.archive.wayback.resourceindex.SearchResultSource;
 import org.archive.wayback.util.AdaptedIterator;
 import org.archive.wayback.util.CloseableIterator;
-import org.archive.wayback.util.CompositeSortedIterator;
 import org.archive.wayback.util.flatfile.FlatFile;
+import org.archive.wayback.util.iterator.SortedCompositeIterator;
 
 /**
  * 
@@ -96,10 +96,10 @@
 		Iterator<CaptureSearchResult> forwardItr = adaptIterator(getRecordIterator(prefix));
 		Iterator<CaptureSearchResult> reverseItr = adaptIterator(getReverseRecordIterator(prefix));
 		Comparator<CaptureSearchResult> comparator = new CaptureSRComparator(wantDate);
-		CompositeSortedIterator<CaptureSearchResult> itr = 
-			new CompositeSortedIterator<CaptureSearchResult>(comparator);
-		itr.addComponent(forwardItr);
-		itr.addComponent(reverseItr);
+		SortedCompositeIterator<CaptureSearchResult> itr = 
+			new SortedCompositeIterator<CaptureSearchResult>(comparator);
+		itr.addIterator(forwardItr);
+		itr.addIterator(reverseItr);
 		return itr;
 	}
 

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