Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [2359] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/liveweb
|
From: <bra...@us...> - 2008-07-01 23:27:09
|
Revision: 2359
http://archive-access.svn.sourceforge.net/archive-access/?rev=2359&view=rev
Author: bradtofel
Date: 2008-07-01 16:27:14 -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/liveweb/ARCCacheDirectory.java
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/LiveWebLocalResourceIndex.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 2008-07-01 23:26:31 UTC (rev 2358)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/ARCCacheDirectory.java 2008-07-01 23:27:14 UTC (rev 2359)
@@ -36,7 +36,7 @@
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.resourcestore.resourcefile.ResourceFactory;
import org.archive.wayback.util.DirMaker;
/**
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 2008-07-01 23:26:31 UTC (rev 2358)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java 2008-07-01 23:27:14 UTC (rev 2359)
@@ -34,17 +34,17 @@
import org.archive.io.arc.ARCRecord;
import org.archive.wayback.UrlCanonicalizer;
import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.CaptureSearchResults;
import org.archive.wayback.core.Resource;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
+import org.archive.wayback.core.CaptureSearchResults;
import org.archive.wayback.core.SearchResults;
import org.archive.wayback.core.Timestamp;
import org.archive.wayback.core.WaybackRequest;
import org.archive.wayback.exception.LiveDocumentNotAvailableException;
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.resourcestore.indexer.ARCRecordToSearchResultAdapter;
+import org.archive.wayback.resourcestore.resourcefile.ArcResource;
import org.archive.wayback.util.url.AggressiveUrlCanonicalizer;
/**
@@ -100,8 +100,8 @@
return req;
}
- private boolean isForgedFailRecentEnough(SearchResult result) {
- String captureDate = result.get(WaybackConstants.RESULT_CAPTURE_DATE);
+ private boolean isForgedFailRecentEnough(CaptureSearchResult result) {
+ String captureDate = result.getCaptureTimestamp();
Timestamp t = new Timestamp(captureDate);
long maxAge = System.currentTimeMillis() - maxFailedCacheMS;
long failAge = t.getDate().getTime();
@@ -111,27 +111,25 @@
return false;
}
- private boolean isForgedFailedSearchResult(SearchResult result) {
- String arcFile = result.get(WaybackConstants.RESULT_ARC_FILE);
+ private boolean isForgedFailedSearchResult(CaptureSearchResult result) {
+ String arcFile = result.getFile();
return arcFile.equals("-");
}
- private SearchResult forgeFailedSearchResult(URL url) {
- SearchResult result = new SearchResult();
+ private CaptureSearchResult forgeFailedSearchResult(URL url) {
+ CaptureSearchResult result = new CaptureSearchResult();
- result.put(WaybackConstants.RESULT_ARC_FILE, "-");
- result.put(WaybackConstants.RESULT_OFFSET, "0");
+ result.setFile("-");
+ result.setOffset(0);
- result.put(WaybackConstants.RESULT_HTTP_CODE, "0");
+ result.setHttpCode("0");
- result.put(WaybackConstants.RESULT_MD5_DIGEST, "-");
- result.put(WaybackConstants.RESULT_MIME_TYPE, "-");
- result.put(WaybackConstants.RESULT_CAPTURE_DATE,
- Timestamp.currentTimestamp().getDateStr());
+ result.setDigest("-");
+ result.setMimeType("-");
+ result.setCaptureDate(new Date());
- result.put(WaybackConstants.RESULT_ORIG_HOST, url.getHost());
- result.put(WaybackConstants.RESULT_REDIRECT_URL, "-");
- result.put(WaybackConstants.RESULT_URL, url.toString());
+ result.setOriginalUrl(url.toString());
+ result.setRedirectUrl("-");
String indexUrl;
try {
@@ -141,7 +139,7 @@
e.printStackTrace();
indexUrl = url.toString();
}
- result.put(WaybackConstants.RESULT_URL_KEY, indexUrl);
+ result.setUrlKey(indexUrl);
return result;
}
@@ -167,7 +165,7 @@
e.printStackTrace();
throw new IOException(e.getMessage());
}
- SearchResult result = results.getClosest(wbRequest);
+ CaptureSearchResult result = results.getClosest(wbRequest);
if(result != null) {
if(isForgedFailedSearchResult(result)) {
if(isForgedFailRecentEnough(result)) {
@@ -178,9 +176,8 @@
throw new ResourceNotInArchiveException("Nope");
}
}
- String name = (String) result.get(WaybackConstants.RESULT_ARC_FILE);
- long offset = Long.parseLong(
- (String) result.get(WaybackConstants.RESULT_OFFSET));
+ String name = result.getFile();
+ long offset = result.getOffset();
resource = arcCacheDir.getResource(name, offset);
}
return resource;
@@ -197,7 +194,7 @@
location = cacher.cache(arcCacheDir, url.toString());
} catch(LiveDocumentNotAvailableException e) {
// record the failure, so we can fail early next time:
- SearchResult result = forgeFailedSearchResult(url);
+ CaptureSearchResult result = forgeFailedSearchResult(url);
index.addSearchResult(result);
LOGGER.info("Added FAIL-URL(" + url.toString() + ") to LiveIndex");
throw e;
@@ -213,7 +210,7 @@
ArcResource aResource = (ArcResource) resource;
ARCRecord record = (ARCRecord) aResource.getArcRecord();
- SearchResult result = adapter.adapt(record);
+ CaptureSearchResult result = adapter.adapt(record);
index.addSearchResult(result);
LOGGER.info("Added URL(" + url.toString() + ") in " +
"ARC(" + name + ") at (" + offset + ") to LiveIndex");
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebLocalResourceIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebLocalResourceIndex.java 2008-07-01 23:26:31 UTC (rev 2358)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebLocalResourceIndex.java 2008-07-01 23:27:14 UTC (rev 2359)
@@ -27,7 +27,7 @@
import java.io.IOException;
import java.util.ArrayList;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.resourceindex.LocalResourceIndex;
/**
@@ -46,10 +46,10 @@
* @throws UnsupportedOperationException
*/
@SuppressWarnings("unchecked")
- public void addSearchResult(SearchResult result)
+ public void addSearchResult(CaptureSearchResult result)
throws UnsupportedOperationException, IOException {
- ArrayList<SearchResult> l = new ArrayList<SearchResult>();
+ ArrayList<CaptureSearchResult> l = new ArrayList<CaptureSearchResult>();
l.add(result);
addSearchResults(l.iterator());
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
