archive-access-cvs

[Archive-access-cvs] SF.net SVN: archive-access: [2312] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/ IndexWorker.java

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

Revision: 2312
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2312&view=rev
Author:   bradtofel
Date:     2008-06-24 17:12:00 -0700 (Tue, 24 Jun 2008)

Log Message:
-----------
REFACTOR: moved Index update code to separate package

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java	2008-06-24 23:43:59 UTC (rev 2311)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java	2008-06-25 00:12:00 UTC (rev 2312)
@@ -29,7 +29,7 @@
 
 import org.archive.wayback.UrlCanonicalizer;
 import org.archive.wayback.core.SearchResult;
-import org.archive.wayback.resourceindex.indexer.IndexClient;
+import org.archive.wayback.resourceindex.updater.IndexClient;
 import org.archive.wayback.resourcestore.ArcIndexer;
 import org.archive.wayback.resourcestore.WarcIndexer;
 import org.archive.wayback.resourcestore.locationdb.ResourceFileLocationDB;


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: [2373] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/ IndexWorker.java

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

Revision: 2373
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2373&view=rev
Author:   bradtofel
Date:     2008-07-01 16:44:18 -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/resourcestore/indexer/IndexWorker.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java	2008-07-01 23:43:08 UTC (rev 2372)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java	2008-07-01 23:44:18 UTC (rev 2373)
@@ -28,7 +28,7 @@
 import java.util.logging.Logger;
 
 import org.archive.wayback.UrlCanonicalizer;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
 import org.archive.wayback.resourceindex.updater.IndexClient;
 import org.archive.wayback.resourcestore.locationdb.ResourceFileLocationDB;
 import org.archive.wayback.util.CloseableIterator;
@@ -102,7 +102,7 @@
 			try {
 				if(pathsOrUrls != null) {
 					for(String pathOrUrl : pathsOrUrls) {
-						CloseableIterator<SearchResult> itr = indexFile(pathOrUrl);
+						CloseableIterator<CaptureSearchResult> itr = indexFile(pathOrUrl);
 						target.addSearchResults(name, itr);
 						itr.close();
 						break;
@@ -115,10 +115,10 @@
 		return worked;
 	}
 	
-	public CloseableIterator<SearchResult> indexFile(String pathOrUrl) 
+	public CloseableIterator<CaptureSearchResult> indexFile(String pathOrUrl) 
 	throws IOException {
 
-		CloseableIterator<SearchResult> itr = null;
+		CloseableIterator<CaptureSearchResult> itr = null;
 		
 		if(pathOrUrl.endsWith(ARC_EXTENSION)) {
 			itr = arcIndexer.iterator(pathOrUrl);


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: [2415] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/ IndexWorker.java

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

Revision: 2415
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2415&view=rev
Author:   bradtofel
Date:     2008-07-07 14:35:06 -0700 (Mon, 07 Jul 2008)

Log Message:
-----------
TWEAK: return from all InterruptedExceptions.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java	2008-07-07 21:34:45 UTC (rev 2414)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/indexer/IndexWorker.java	2008-07-07 21:35:06 UTC (rev 2415)
@@ -161,6 +161,7 @@
 					}
 				} catch (InterruptedException e) {
 					e.printStackTrace();
+					return;
 				} catch (IOException e) {
 					e.printStackTrace();
 				}


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