archive-access-cvs

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

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

Revision: 1773
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1773&view=rev
Author:   bradtofel
Date:     2007-07-16 15:34:30 -0700 (Mon, 16 Jul 2007)

Log Message:
-----------
TWEAK: now needs to cast type of SearchResults

Modified Paths:
--------------
    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/LiveWebCache.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java	2007-07-16 22:34:00 UTC (rev 1772)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java	2007-07-16 22:34:30 UTC (rev 1773)
@@ -36,6 +36,7 @@
 import org.archive.io.arc.ARCRecord;
 import org.archive.wayback.PropertyConfigurable;
 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.SearchResults;
@@ -159,9 +160,13 @@
 		Resource resource = null;
 		WaybackRequest wbRequest = makeCacheWBRequest(url,maxCacheMS,bUseOlder);
 		
-		SearchResults results;
+		CaptureSearchResults results = null;
 		try {
-			results = index.query(wbRequest);
+			SearchResults gresults = index.query(wbRequest);
+			if(!(gresults instanceof CaptureSearchResults)) {
+				throw new IOException("bad result type...");
+			}
+			results = (CaptureSearchResults) gresults;
 		} catch (ResourceNotInArchiveException e) {
 //			e.printStackTrace();
 			throw e;


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: [1923] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java

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

Revision: 1923
          http://archive-access.svn.sourceforge.net/archive-access/?rev=1923&view=rev
Author:   bradtofel
Date:     2007-08-23 14:27:07 -0700 (Thu, 23 Aug 2007)

Log Message:
-----------
TWEAK: javadoc/comment change.

Modified Paths:
--------------
    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/LiveWebCache.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java	2007-08-23 21:26:20 UTC (rev 1922)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java	2007-08-23 21:27:07 UTC (rev 1923)
@@ -65,7 +65,7 @@
 		new ARCRecordToSearchResultAdapter();
 	
 	/**
-	 * closes all resources (currently unused...)
+	 * closes all resources
 	 */
 	public void shutdown() {
 		arcCacheDir.shutdown();


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: [2411] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java

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

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

Log Message:
-----------
INTERFACE: now call getClosest with optional 2nd arg to prevent exception.

Modified Paths:
--------------
    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/LiveWebCache.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java	2008-07-07 21:29:53 UTC (rev 2410)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/liveweb/LiveWebCache.java	2008-07-07 21:30:27 UTC (rev 2411)
@@ -40,6 +40,7 @@
 import org.archive.wayback.core.SearchResults;
 import org.archive.wayback.core.Timestamp;
 import org.archive.wayback.core.WaybackRequest;
+import org.archive.wayback.exception.AnchorWindowTooSmallException;
 import org.archive.wayback.exception.LiveDocumentNotAvailableException;
 import org.archive.wayback.exception.ResourceNotInArchiveException;
 import org.archive.wayback.exception.WaybackException;
@@ -165,7 +166,12 @@
 			e.printStackTrace();
 			throw new IOException(e.getMessage());
 		}
-		CaptureSearchResult result = results.getClosest(wbRequest);
+		CaptureSearchResult result;
+		try {
+			result = results.getClosest(wbRequest,false);
+		} catch (AnchorWindowTooSmallException e) {
+			throw new ResourceNotInArchiveException("Not In archive..");
+		}
 		if(result != null) {
 			if(isForgedFailedSearchResult(result)) {
 				if(isForgedFailRecentEnough(result)) {


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