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

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

Revision: 2094
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2094&view=rev
Author:   bradtofel
Date:     2007-11-29 12:29:26 -0800 (Thu, 29 Nov 2007)

Log Message:
-----------
INTERFACE: changed to use new ArcResource

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCCacheDirectory.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCCacheDirectory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCCacheDirectory.java	2007-11-28 03:15:42 UTC (rev 2093)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCCacheDirectory.java	2007-11-29 20:29:26 UTC (rev 2094)
@@ -30,15 +30,13 @@
 import java.util.List;
 import java.util.logging.Logger;
 
-import org.archive.io.ArchiveRecord;
 import org.archive.io.WriterPoolSettings;
 import org.archive.io.arc.ARCConstants;
-import org.archive.io.arc.ARCReader;
-import org.archive.io.arc.ARCReaderFactory;
-import org.archive.io.arc.ARCRecord;
 import org.archive.io.arc.ARCWriter;
 import org.archive.io.arc.ARCWriterPool;
 import org.archive.wayback.core.Resource;
+import org.archive.wayback.exception.ResourceNotAvailableException;
+import org.archive.wayback.resourcestore.ResourceFactory;
 import org.archive.wayback.util.DirMaker;
 
 /**
@@ -119,7 +117,6 @@
 	 * @throws IOException 
 	 */
 	public Resource getResource(String path, long offset) throws IOException {
-		Resource resource = null;
 		File arc = new File(path);
 		if(!arc.exists()) {
 			String base = arc.getName();
@@ -132,23 +129,13 @@
 				}
 			}
 		}
-
 		LOGGER.info("Retrieving record at " + offset + " in " + 
-				arc.getAbsolutePath());
-		ARCReader reader = null;
+				arc.getAbsolutePath()); 
 		try {
-			reader = ARCReaderFactory.get(arc,true,offset);
-		} catch (IOException e) {
-			throw new RuntimeException(e);
+			return ResourceFactory.getResource(arc, offset);
+		} catch (ResourceNotAvailableException e1) {
+			throw new IOException(e1.getMessage());
 		}
-		
-		ArchiveRecord aRec = reader.get(offset);
-		if(!(aRec instanceof ARCRecord)) {
-			throw new IOException("Not ARCRecord...");
-		}
-		ARCRecord rec = (ARCRecord) aRec;
-		resource = new Resource(rec,reader);
-		return resource;
 	}
 	
 	private WriterPoolSettings getSettings(final boolean isCompressed,

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java	2007-11-28 03:15:42 UTC (rev 2093)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java	2007-11-29 20:29:26 UTC (rev 2094)
@@ -43,6 +43,7 @@
 import org.archive.wayback.exception.ResourceNotInArchiveException;
 import org.archive.wayback.exception.WaybackException;
 import org.archive.wayback.resourcestore.ARCRecordToSearchResultAdapter;
+import org.archive.wayback.resourcestore.ArcResource;
 import org.archive.wayback.util.Adapter;
 import org.archive.wayback.util.UrlCanonicalizer;
 
@@ -203,15 +204,18 @@
 					"ARC(" + name + ") at (" + offset + ")");
 			resource = arcCacheDir.getResource(name, offset);
 			// add the result to the index:
-			ARCRecord record = (ARCRecord) resource.getArcRecord();
+			if(resource instanceof ArcResource) {
+				ArcResource aResource = (ArcResource) resource;
+				ARCRecord record = (ARCRecord) aResource.getArcRecord();
 				
-			SearchResult result = adapter.adapt(record);
-			index.addSearchResult(result);
-			LOGGER.info("Added URL(" + url.toString() + ") in " +
-					"ARC(" + name + ") at (" + offset + ") to LiveIndex");
+				SearchResult result = adapter.adapt(record);
+				index.addSearchResult(result);
+				LOGGER.info("Added URL(" + url.toString() + ") in " +
+						"ARC(" + name + ") at (" + offset + ") to LiveIndex");
 				
-			// we just read thru the doc in order to index it. Reset:
-			resource = arcCacheDir.getResource(name, offset);
+				// we just read thru the doc in order to index it. Reset:
+				resource = arcCacheDir.getResource(name, offset);
+			}
 
 		}
 		


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