Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [2376] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourcestore
|
From: <bra...@us...> - 2008-07-01 23:47:42
|
Revision: 2376
http://archive-access.svn.sourceforge.net/archive-access/?rev=2376&view=rev
Author: bradtofel
Date: 2008-07-01 16:47:50 -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/AutoIndexThread.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/Http11ResourceStore.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocalResourceFileResourceStore.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocalResourceStore.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/AutoIndexThread.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/AutoIndexThread.java 2008-07-01 23:46:33 UTC (rev 2375)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/AutoIndexThread.java 2008-07-01 23:47:50 UTC (rev 2376)
@@ -7,7 +7,7 @@
import java.util.Iterator;
import java.util.logging.Logger;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.resourceindex.updater.IndexClient;
import org.archive.wayback.util.CloseableIterator;
import org.archive.wayback.util.DirMaker;
@@ -151,7 +151,7 @@
try {
LOGGER.info("Indexing " + file.getAbsolutePath());
- CloseableIterator<SearchResult> itr = store.indexFile(file);
+ CloseableIterator<CaptureSearchResult> itr = store.indexFile(file);
if(indexClient.addSearchResults(cdxBase, itr)) {
if (!workFlagFile.delete()) {
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/Http11ResourceStore.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/Http11ResourceStore.java 2008-07-01 23:46:33 UTC (rev 2375)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/Http11ResourceStore.java 2008-07-01 23:47:50 UTC (rev 2376)
@@ -28,9 +28,8 @@
import java.net.URL;
import org.archive.wayback.ResourceStore;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.exception.ResourceNotAvailableException;
import org.archive.wayback.resourcestore.resourcefile.ArcWarcFilenameFilter;
import org.archive.wayback.resourcestore.resourcefile.ResourceFactory;
@@ -50,21 +49,16 @@
private String urlPrefix = null;
- public Resource retrieveResource(SearchResult result) throws IOException,
+ public Resource retrieveResource(CaptureSearchResult result) throws IOException,
ResourceNotAvailableException {
// extract ARC filename
- String fileName = result.get(WaybackConstants.RESULT_ARC_FILE);
+ String fileName = result.getFile();
if(fileName == null || fileName.length() < 1) {
throw new IOException("No ARC/WARC name in search result...");
}
- // extract offset + convert to long
- final String offsetString = result.get(WaybackConstants.RESULT_OFFSET);
- if(offsetString == null || offsetString.length() < 1) {
- throw new IOException("No ARC/WARC offset in search result...");
- }
- final long offset = Long.parseLong(offsetString);
+ final long offset = result.getOffset();
if(!fileName.endsWith(ArcWarcFilenameFilter.ARC_SUFFIX)
&& !fileName.endsWith(ArcWarcFilenameFilter.ARC_GZ_SUFFIX)
&& !fileName.endsWith(ArcWarcFilenameFilter.WARC_SUFFIX)
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocalResourceFileResourceStore.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocalResourceFileResourceStore.java 2008-07-01 23:46:33 UTC (rev 2375)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocalResourceFileResourceStore.java 2008-07-01 23:47:50 UTC (rev 2376)
@@ -29,9 +29,8 @@
import java.net.URL;
import org.archive.wayback.ResourceStore;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.exception.ResourceNotAvailableException;
import org.archive.wayback.resourcestore.locationdb.ResourceFileLocationDB;
import org.archive.wayback.resourcestore.resourcefile.ResourceFactory;
@@ -50,26 +49,21 @@
/* (non-Javadoc)
* @see org.archive.wayback.ResourceStore#retrieveResource(org.archive.wayback.core.SearchResult)
*/
- public Resource retrieveResource(SearchResult result) throws IOException,
+ public Resource retrieveResource(CaptureSearchResult result) throws IOException,
ResourceNotAvailableException {
// extract ARC filename
- String fileName = result.get(WaybackConstants.RESULT_ARC_FILE);
+ String fileName = result.getFile();
if(fileName == null || fileName.length() < 1) {
throw new IOException("No ARC/WARC name in search result...");
}
- // extract offset + convert to long
- final String offsetString = result.get(WaybackConstants.RESULT_OFFSET);
- if(offsetString == null || offsetString.length() < 1) {
- throw new IOException("No ARC/WARC offset in search result...");
- }
String urls[] = db.nameToUrls(fileName);
if(urls == null || urls.length == 0) {
throw new ResourceNotAvailableException("Unable to locate(" +
fileName + ")");
}
- final long offset = Long.parseLong(offsetString);
+ final long offset = result.getOffset();
Resource r = null;
// TODO: attempt multiple threads?
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocalResourceStore.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocalResourceStore.java 2008-07-01 23:46:33 UTC (rev 2375)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocalResourceStore.java 2008-07-01 23:47:50 UTC (rev 2376)
@@ -8,9 +8,8 @@
import java.util.List;
import org.archive.wayback.ResourceStore;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.exception.ConfigurationException;
import org.archive.wayback.exception.ResourceNotAvailableException;
import org.archive.wayback.resourcestore.indexer.ArcIndexer;
@@ -49,13 +48,6 @@
indexThread.start();
}
}
- protected String resultToFileName(SearchResult result) {
- return result.get(WaybackConstants.RESULT_ARC_FILE);
- }
-
- protected long resultToOffset(SearchResult result) {
- return Long.parseLong(result.get(WaybackConstants.RESULT_OFFSET));
- }
public File getLocalFile(String fileName) {
// try adding suffixes: empty string is first in the list
@@ -75,10 +67,10 @@
return null;
}
- public Resource retrieveResource(SearchResult result) throws IOException,
+ public Resource retrieveResource(CaptureSearchResult result) throws IOException,
ResourceNotAvailableException {
- String fileName = resultToFileName(result);
- long offset = resultToOffset(result);
+ String fileName = result.getFile();
+ long offset = result.getOffset();
File file = getLocalFile(fileName);
if (file == null) {
@@ -92,8 +84,8 @@
}
}
- public CloseableIterator<SearchResult> indexFile(File dataFile) throws IOException {
- CloseableIterator<SearchResult> itr = null;
+ public CloseableIterator<CaptureSearchResult> indexFile(File dataFile) throws IOException {
+ CloseableIterator<CaptureSearchResult> itr = null;
String name = dataFile.getName();
if(name.endsWith(ARC_EXTENSION)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
