Menu
▾
▴
[Archive-access-cvs] SF.net SVN: archive-access: [2364] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/resourceindex
|
From: <bra...@us...> - 2008-07-01 23:33:26
|
Revision: 2364
http://archive-access.svn.sourceforge.net/archive-access/?rev=2364&view=rev
Author: bradtofel
Date: 2008-07-01 16:33:35 -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/resourceindex/bdb/BDBIndex.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/BDBRecordToSearchResultAdapter.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/SearchResultToBDBRecordAdapter.java
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/CDXLineToSearchResultAdapter.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/SearchResultToCDXLineAdapter.java
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/dynamic/DynamicCDXIndex.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/BDBIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/BDBIndex.java 2008-07-01 23:32:29 UTC (rev 2363)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/BDBIndex.java 2008-07-01 23:33:35 UTC (rev 2364)
@@ -33,7 +33,7 @@
import org.archive.wayback.UrlCanonicalizer;
import org.archive.wayback.bdb.BDBRecord;
import org.archive.wayback.bdb.BDBRecordSet;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.exception.ConfigurationException;
import org.archive.wayback.exception.ResourceIndexNotAvailableException;
import org.archive.wayback.resourceindex.UpdatableSearchResultSource;
@@ -66,9 +66,10 @@
initializeDB(bdbPath,bdbName);
}
- private CloseableIterator<SearchResult> adaptIterator(
+ private CloseableIterator<CaptureSearchResult> adaptIterator(
Iterator<BDBRecord> itr) {
- return new AdaptedIterator<BDBRecord,SearchResult>(itr,new BDBRecordToSearchResultAdapter());
+ return new AdaptedIterator<BDBRecord,CaptureSearchResult>(itr,
+ new BDBRecordToSearchResultAdapter());
}
/*
@@ -76,7 +77,7 @@
*
* @see org.archive.wayback.resourceindex.SearchResultSource#getPrefixIterator(java.lang.String)
*/
- public CloseableIterator<SearchResult> getPrefixIterator(String prefix)
+ public CloseableIterator<CaptureSearchResult> getPrefixIterator(String prefix)
throws ResourceIndexNotAvailableException {
try {
@@ -91,7 +92,7 @@
*
* @see org.archive.wayback.resourceindex.SearchResultSource#getPrefixReverseIterator(java.lang.String)
*/
- public CloseableIterator<SearchResult> getPrefixReverseIterator(String prefix)
+ public CloseableIterator<CaptureSearchResult> getPrefixReverseIterator(String prefix)
throws ResourceIndexNotAvailableException {
try {
return adaptIterator(recordIterator(prefix,false));
@@ -103,20 +104,20 @@
/* (non-Javadoc)
* @see org.archive.wayback.resourceindex.SearchResultSource#cleanup(org.archive.wayback.util.CleanableIterator)
*/
- public void cleanup(CloseableIterator<SearchResult> c) throws IOException {
+ public void cleanup(CloseableIterator<CaptureSearchResult> c) throws IOException {
c.close();
}
/* (non-Javadoc)
* @see org.archive.wayback.resourceindex.UpdatableSearchResultSource#addSearchResults(java.util.Iterator)
*/
- public void addSearchResults(Iterator<SearchResult> itr,
+ public void addSearchResults(Iterator<CaptureSearchResult> itr,
UrlCanonicalizer canonicalizer) throws IOException {
- Adapter<SearchResult,BDBRecord> adapterSRtoBDB =
+ Adapter<CaptureSearchResult,BDBRecord> adapterSRtoBDB =
new SearchResultToBDBRecordAdapter(canonicalizer);
Iterator<BDBRecord> itrBDB =
- new AdaptedIterator<SearchResult,BDBRecord>(itr,
+ new AdaptedIterator<CaptureSearchResult,BDBRecord>(itr,
adapterSRtoBDB);
insertRecords(itrBDB);
@@ -158,8 +159,8 @@
if(op.compareTo("-r") == 0) {
PrintWriter pw = new PrintWriter(System.out);
- CloseableIterator<SearchResult> itrSR = null;
- Adapter<SearchResult,String> adapter =
+ CloseableIterator<CaptureSearchResult> itrSR = null;
+ Adapter<CaptureSearchResult,String> adapter =
new SearchResultToCDXLineAdapter();
CloseableIterator<String> itrS;
@@ -171,7 +172,7 @@
e.printStackTrace();
System.exit(1);
}
- itrS = new AdaptedIterator<SearchResult,String>(itrSR,adapter);
+ itrS = new AdaptedIterator<CaptureSearchResult,String>(itrSR,adapter);
while(itrS.hasNext()) {
String line = itrS.next();
if(!line.startsWith(prefix)) {
@@ -187,7 +188,7 @@
e.printStackTrace();
System.exit(1);
}
- itrS = new AdaptedIterator<SearchResult,String>(itrSR,adapter);
+ itrS = new AdaptedIterator<CaptureSearchResult,String>(itrSR,adapter);
while(itrS.hasNext()) {
pw.println(itrS.next());
@@ -212,11 +213,11 @@
RecordIterator itrS = new RecordIterator(br);
- Adapter<String,SearchResult> adapterStoSR =
+ Adapter<String,CaptureSearchResult> adapterStoSR =
new CDXLineToSearchResultAdapter();
- Iterator<SearchResult> itrSR =
- new AdaptedIterator<String,SearchResult>(itrS,adapterStoSR);
+ Iterator<CaptureSearchResult> itrSR =
+ new AdaptedIterator<String,CaptureSearchResult>(itrS,adapterStoSR);
try {
index.addSearchResults(itrSR, canonicalizer);
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/BDBRecordToSearchResultAdapter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/BDBRecordToSearchResultAdapter.java 2008-07-01 23:32:29 UTC (rev 2363)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/BDBRecordToSearchResultAdapter.java 2008-07-01 23:33:35 UTC (rev 2364)
@@ -27,7 +27,7 @@
import java.io.UnsupportedEncodingException;
import org.archive.wayback.bdb.BDBRecord;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.resourceindex.cdx.CDXLineToSearchResultAdapter;
import org.archive.wayback.util.Adapter;
@@ -38,7 +38,7 @@
* @version $Date$, $Revision$
*/
public class BDBRecordToSearchResultAdapter
- implements Adapter<BDBRecord,SearchResult> {
+ implements Adapter<BDBRecord,CaptureSearchResult> {
private static int DEFAULT_SB_SIZE = 100;
private StringBuilder sb;
@@ -53,7 +53,7 @@
* @param record
* @return SearchResult representation of input BDBRecord
*/
- public SearchResult adapt(BDBRecord record) {
+ public CaptureSearchResult adapt(BDBRecord record) {
sb.setLength(0);
try {
String key = new String(record.getKey().getData(),"UTF-8");
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/SearchResultToBDBRecordAdapter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/SearchResultToBDBRecordAdapter.java 2008-07-01 23:32:29 UTC (rev 2363)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/bdb/SearchResultToBDBRecordAdapter.java 2008-07-01 23:33:35 UTC (rev 2364)
@@ -28,10 +28,9 @@
import org.apache.commons.httpclient.URIException;
import org.archive.wayback.UrlCanonicalizer;
-import org.archive.wayback.WaybackConstants;
import org.archive.wayback.bdb.BDBRecord;
import org.archive.wayback.bdb.BDBRecordSet;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.util.Adapter;
import com.sleepycat.je.DatabaseEntry;
@@ -43,7 +42,7 @@
* @version $Date$, $Revision$
*/
public class SearchResultToBDBRecordAdapter implements
- Adapter<SearchResult,BDBRecord> {
+ Adapter<CaptureSearchResult,BDBRecord> {
private static final Logger LOGGER =
Logger.getLogger(SearchResultToBDBRecordAdapter.class.getName());
@@ -66,11 +65,11 @@
*
* @see org.archive.wayback.util.Adapter#adapt(java.lang.Object)
*/
- public BDBRecord adapt(SearchResult result) {
+ public BDBRecord adapt(CaptureSearchResult result) {
StringBuilder keySB = new StringBuilder(40);
StringBuilder valSB = new StringBuilder(100);
- String origUrl = result.getAbsoluteUrl();
+ String origUrl = result.getOriginalUrl();
String urlKey;
try {
urlKey = canonicalizer.urlStringToKey(origUrl);
@@ -81,22 +80,22 @@
}
keySB.append(urlKey);
keySB.append(DELIMITER);
- keySB.append(result.get(WaybackConstants.RESULT_CAPTURE_DATE));
+ keySB.append(result.getCaptureTimestamp());
keySB.append(DELIMITER);
- keySB.append(result.get(WaybackConstants.RESULT_OFFSET));
+ keySB.append(result.getOffset());
keySB.append(DELIMITER);
- keySB.append(result.get(WaybackConstants.RESULT_ARC_FILE));
+ keySB.append(result.getFile());
- valSB.append(result.get(WaybackConstants.RESULT_ORIG_HOST));
+ valSB.append(result.getOriginalUrl());
valSB.append(DELIMITER);
- valSB.append(result.get(WaybackConstants.RESULT_MIME_TYPE));
+ valSB.append(result.getMimeType());
valSB.append(DELIMITER);
- valSB.append(result.get(WaybackConstants.RESULT_HTTP_CODE));
+ valSB.append(result.getHttpCode());
valSB.append(DELIMITER);
- valSB.append(result.get(WaybackConstants.RESULT_MD5_DIGEST));
+ valSB.append(result.getDigest());
valSB.append(DELIMITER);
- valSB.append(result.get(WaybackConstants.RESULT_REDIRECT_URL));
+ valSB.append(result.getRedirectUrl());
key.setData(BDBRecordSet.stringToBytes(keySB.toString()));
value.setData(BDBRecordSet.stringToBytes(valSB.toString()));
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 2008-07-01 23:32:29 UTC (rev 2363)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXIndex.java 2008-07-01 23:33:35 UTC (rev 2364)
@@ -26,10 +26,9 @@
import java.io.IOException;
import java.util.Comparator;
+import java.util.Date;
import java.util.Iterator;
-import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.SearchResult;
-import org.archive.wayback.core.Timestamp;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.exception.ResourceIndexNotAvailableException;
import org.archive.wayback.resourceindex.SearchResultSource;
import org.archive.wayback.util.AdaptedIterator;
@@ -50,15 +49,15 @@
*/
private static final long serialVersionUID = 1L;
- private CloseableIterator<SearchResult> adaptIterator(Iterator<String> itr) {
- return new AdaptedIterator<String,SearchResult>(itr,
+ private CloseableIterator<CaptureSearchResult> adaptIterator(Iterator<String> itr) {
+ return new AdaptedIterator<String,CaptureSearchResult>(itr,
new CDXLineToSearchResultAdapter());
}
/* (non-Javadoc)
* @see org.archive.wayback.resourceindex.SearchResultSource#getPrefixIterator(java.lang.String)
*/
- public CloseableIterator<SearchResult> getPrefixIterator(String prefix)
+ public CloseableIterator<CaptureSearchResult> getPrefixIterator(String prefix)
throws ResourceIndexNotAvailableException {
try {
return adaptIterator(getRecordIterator(prefix));
@@ -70,7 +69,7 @@
/* (non-Javadoc)
* @see org.archive.wayback.resourceindex.SearchResultSource#getPrefixReverseIterator(java.lang.String)
*/
- public CloseableIterator<SearchResult> getPrefixReverseIterator(String prefix)
+ public CloseableIterator<CaptureSearchResult> getPrefixReverseIterator(String prefix)
throws ResourceIndexNotAvailableException {
try {
return adaptIterator(getReverseRecordIterator(prefix));
@@ -82,10 +81,10 @@
/**
* @param prefix
- * @return Iterator of SearchResults of records starting with prefix
+ * @return Iterator of CaptureSearchResult of records starting with prefix
* @throws IOException
*/
- public Iterator<SearchResult> getUrlIterator(final String prefix) throws IOException {
+ public Iterator<CaptureSearchResult> getUrlIterator(final String prefix) throws IOException {
return adaptIterator(getRecordIterator(prefix));
}
@@ -95,38 +94,36 @@
* @return Iterator of results in closest order to wantTS
* @throws IOException
*/
- public Iterator<SearchResult> getClosestIterator(final String prefix,
- final Timestamp wantTS) throws IOException {
+ public Iterator<CaptureSearchResult> getClosestIterator(final String prefix,
+ final Date wantDate) throws IOException {
- Iterator<SearchResult> forwardItr = adaptIterator(getRecordIterator(prefix));
- Iterator<SearchResult> reverseItr = adaptIterator(getReverseRecordIterator(prefix));
- Comparator<SearchResult> comparator = new TimestampComparator(wantTS);
- CompositeSortedIterator<SearchResult> itr =
- new CompositeSortedIterator<SearchResult>(comparator);
+ 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);
return itr;
}
- private class TimestampComparator implements Comparator<SearchResult> {
- private int wantedSSE;
+ private class CaptureSRComparator implements Comparator<CaptureSearchResult> {
+ private long wantTime;
/**
* @param wanted
*/
- public TimestampComparator(Timestamp wanted) {
- wantedSSE = wanted.sse();
+ public CaptureSRComparator(Date wanted) {
+ wantTime = wanted.getTime();
}
- private int searchResultToDistance(SearchResult sr) {
- String dateStr = sr.get(WaybackConstants.RESULT_CAPTURE_DATE);
- Timestamp ts = new Timestamp(dateStr);
- return Math.abs(wantedSSE - ts.sse());
+ private long searchResultToDistance(CaptureSearchResult sr) {
+ return Math.abs(wantTime - sr.getCaptureDate().getTime());
}
/* (non-Javadoc)
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
*/
- public int compare(SearchResult o1, SearchResult o2) {
- int d1 = searchResultToDistance(o1);
- int d2 = searchResultToDistance(o2);
+ public int compare(CaptureSearchResult o1, CaptureSearchResult o2) {
+ long d1 = searchResultToDistance(o1);
+ long d2 = searchResultToDistance(o2);
if(d1 < d2) {
return -1;
} else if(d1 > d2) {
@@ -139,7 +136,7 @@
/* (non-Javadoc)
* @see org.archive.wayback.resourceindex.SearchResultSource#cleanup(org.archive.wayback.util.CleanableIterator)
*/
- public void cleanup(CloseableIterator<SearchResult> c) throws IOException {
+ public void cleanup(CloseableIterator<CaptureSearchResult> c) throws IOException {
c.close();
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXLineToSearchResultAdapter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXLineToSearchResultAdapter.java 2008-07-01 23:32:29 UTC (rev 2363)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/CDXLineToSearchResultAdapter.java 2008-07-01 23:33:35 UTC (rev 2364)
@@ -25,76 +25,53 @@
package org.archive.wayback.resourceindex.cdx;
-import org.apache.commons.httpclient.URIException;
-import org.archive.net.UURI;
-import org.archive.net.UURIFactory;
-import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.util.Adapter;
/**
- * Adapter that converts a CDX record String into a SearchResult
+ * Adapter that converts a CDX record String into a CaptureSearchResult
*
* @author brad
* @version $Date$, $Revision$
*/
-public class CDXLineToSearchResultAdapter implements Adapter<String,SearchResult> {
+public class CDXLineToSearchResultAdapter implements Adapter<String,CaptureSearchResult> {
- public SearchResult adapt(String line) {
+ public CaptureSearchResult adapt(String line) {
return doAdapt(line);
}
/**
* @param line
* @return SearchResult representation of input line
*/
- public static SearchResult doAdapt(String line) {
- SearchResult result = new SearchResult();
+ public static CaptureSearchResult doAdapt(String line) {
+ CaptureSearchResult result = new CaptureSearchResult();
String[] tokens = line.split(" ");
if (tokens.length != 9) {
return null;
//throw new IllegalArgumentException("Need 9 columns("+line+")");
}
- String url = tokens[0];
- String captureDate = tokens[1];
- String origHost = tokens[2];
+ String urlKey = tokens[0];
+ String captureTS = tokens[1];
+ String originalUrl = tokens[2];
String mimeType = tokens[3];
- String httpResponseCode = tokens[4];
- String md5Fragment = tokens[5];
+ String httpCode = tokens[4];
+ String digest = tokens[5];
String redirectUrl = tokens[6];
long compressedOffset = -1;
if(!tokens[7].equals("-")) {
compressedOffset = Long.parseLong(tokens[7]);
}
- String arcFileName = tokens[8];
+ String fileName = tokens[8];
+ result.setUrlKey(urlKey);
+ result.setCaptureTimestamp(captureTS);
+ result.setOriginalUrl(originalUrl);
+ result.setMimeType(mimeType);
+ result.setHttpCode(httpCode);
+ result.setDigest(digest);
+ result.setRedirectUrl(redirectUrl);
+ result.setOffset(compressedOffset);
+ result.setFile(fileName);
- String origUrl = url;
- if(!url.startsWith(WaybackConstants.DNS_URL_PREFIX)) {
- try {
- UURI uri = UURIFactory.getInstance(
- WaybackConstants.HTTP_URL_PREFIX + url);
- if(uri.getPort() != -1) {
- origHost += ":" + uri.getPort();
- }
- origUrl = origHost + uri.getEscapedPathQuery();
- } catch (URIException e) {
- // TODO Stifle? throw an error?
- e.printStackTrace();
- return null;
- }
- }
-
- result.put(WaybackConstants.RESULT_URL, origUrl);
- result.put(WaybackConstants.RESULT_URL_KEY, url);
- result.put(WaybackConstants.RESULT_CAPTURE_DATE, captureDate);
- result.put(WaybackConstants.RESULT_ORIG_HOST, origHost);
- result.put(WaybackConstants.RESULT_MIME_TYPE, mimeType);
- result.put(WaybackConstants.RESULT_HTTP_CODE, httpResponseCode);
- result.put(WaybackConstants.RESULT_MD5_DIGEST, md5Fragment);
- result.put(WaybackConstants.RESULT_REDIRECT_URL, redirectUrl);
- // HACKHACK:
- result.put(WaybackConstants.RESULT_OFFSET, String.valueOf(compressedOffset));
- result.put(WaybackConstants.RESULT_ARC_FILE, arcFileName);
-
return result;
}
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/SearchResultToCDXLineAdapter.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/SearchResultToCDXLineAdapter.java 2008-07-01 23:32:29 UTC (rev 2363)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/SearchResultToCDXLineAdapter.java 2008-07-01 23:33:35 UTC (rev 2364)
@@ -26,8 +26,7 @@
import java.util.Iterator;
-import org.archive.wayback.WaybackConstants;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.util.AdaptedIterator;
import org.archive.wayback.util.Adapter;
@@ -38,7 +37,7 @@
* @version $Date$, $Revision$
*/
public class SearchResultToCDXLineAdapter implements
-Adapter<SearchResult,String>{
+Adapter<CaptureSearchResult,String>{
private static int DEFAULT_CAPACITY = 120;
private final static String DELIMITER = " ";
@@ -46,33 +45,33 @@
/* (non-Javadoc)
* @see org.archive.wayback.util.Adapter#adapt(java.lang.Object)
*/
- public String adapt(SearchResult result) {
+ public String adapt(CaptureSearchResult result) {
StringBuilder sb = new StringBuilder(DEFAULT_CAPACITY);
- sb.append(result.get(WaybackConstants.RESULT_URL_KEY));
+ sb.append(result.getUrlKey());
sb.append(DELIMITER);
- sb.append(result.get(WaybackConstants.RESULT_CAPTURE_DATE));
+ sb.append(result.getCaptureTimestamp());
sb.append(DELIMITER);
- sb.append(result.get(WaybackConstants.RESULT_ORIG_HOST));
+ sb.append(result.getOriginalUrl());
sb.append(DELIMITER);
- sb.append(result.get(WaybackConstants.RESULT_MIME_TYPE));
+ sb.append(result.getMimeType());
sb.append(DELIMITER);
- sb.append(result.get(WaybackConstants.RESULT_HTTP_CODE));
+ sb.append(result.getHttpCode());
sb.append(DELIMITER);
- sb.append(result.get(WaybackConstants.RESULT_MD5_DIGEST));
+ sb.append(result.getDigest());
sb.append(DELIMITER);
- sb.append(result.get(WaybackConstants.RESULT_REDIRECT_URL));
+ sb.append(result.getRedirectUrl());
sb.append(DELIMITER);
- sb.append(result.get(WaybackConstants.RESULT_OFFSET));
+ sb.append(result.getOffset());
sb.append(DELIMITER);
- sb.append(result.get(WaybackConstants.RESULT_ARC_FILE));
+ sb.append(result.getFile());
return sb.toString();
}
- public static Iterator<String> adapt(Iterator<SearchResult> input) {
- return new AdaptedIterator<SearchResult,String>(input,
+ public static Iterator<String> adapt(Iterator<CaptureSearchResult> input) {
+ return new AdaptedIterator<CaptureSearchResult,String>(input,
new SearchResultToCDXLineAdapter());
}
}
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/dynamic/DynamicCDXIndex.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/dynamic/DynamicCDXIndex.java 2008-07-01 23:32:29 UTC (rev 2363)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/cdx/dynamic/DynamicCDXIndex.java 2008-07-01 23:33:35 UTC (rev 2364)
@@ -35,7 +35,7 @@
import java.util.logging.Logger;
import java.util.regex.Pattern;
-import org.archive.wayback.core.SearchResult;
+import org.archive.wayback.core.CaptureSearchResult;
import org.archive.wayback.exception.ResourceIndexNotAvailableException;
import org.archive.wayback.util.CloseableIterator;
import org.archive.wayback.util.FileDownloader;
@@ -151,7 +151,7 @@
*
* @see org.archive.wayback.resourceindex.SearchResultSource#getPrefixIterator(java.lang.String)
*/
- public CloseableIterator<SearchResult> getPrefixIterator(String prefix)
+ public CloseableIterator<CaptureSearchResult> getPrefixIterator(String prefix)
throws ResourceIndexNotAvailableException {
if(getState() != STATE_SYNCHED) {
throw new ResourceIndexNotAvailableException("Not synchronized");
@@ -164,7 +164,7 @@
*
* @see org.archive.wayback.resourceindex.SearchResultSource#getPrefixReverseIterator(java.lang.String)
*/
- public CloseableIterator<SearchResult> getPrefixReverseIterator(String prefix)
+ public CloseableIterator<CaptureSearchResult> getPrefixReverseIterator(String prefix)
throws ResourceIndexNotAvailableException {
if(getState() != STATE_SYNCHED) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
