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

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

Revision: 2534
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2534&view=rev
Author:   bradtofel
Date:     2008-08-11 23:25:34 +0000 (Mon, 11 Aug 2008)

Log Message:
-----------
TWEAK: ResourceStore.retrieveResource() no longer throws IOException: this is now converted into a ResourceNotAvailableException

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ResourceStore.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocationDBResourceStore.java
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/SimpleResourceStore.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ResourceStore.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ResourceStore.java	2008-08-09 02:37:52 UTC (rev 2533)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/ResourceStore.java	2008-08-11 23:25:34 UTC (rev 2534)
@@ -41,11 +41,10 @@
 	 * 
 	 * @param result
 	 * @return Resource object retrieved for the SearchResult
-	 * @throws IOException
 	 * @throws ResourceNotAvailableException 
 	 */
-	public Resource retrieveResource(CaptureSearchResult result) throws IOException, 
-		ResourceNotAvailableException;
+	public Resource retrieveResource(CaptureSearchResult result) 
+		throws ResourceNotAvailableException;
 
 	public void shutdown() throws IOException;
 }

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocationDBResourceStore.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocationDBResourceStore.java	2008-08-09 02:37:52 UTC (rev 2533)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/LocationDBResourceStore.java	2008-08-11 23:25:34 UTC (rev 2534)
@@ -49,15 +49,21 @@
 	/* (non-Javadoc)
 	 * @see org.archive.wayback.ResourceStore#retrieveResource(org.archive.wayback.core.SearchResult)
 	 */
-	public Resource retrieveResource(CaptureSearchResult result) throws IOException,
-			ResourceNotAvailableException {
+	public Resource retrieveResource(CaptureSearchResult result) 
+		throws ResourceNotAvailableException {
 		// extract ARC filename
 		String fileName = result.getFile();
 		if(fileName == null || fileName.length() < 1) {
-			throw new IOException("No ARC/WARC name in search result...");
+			throw new ResourceNotAvailableException("No ARC/WARC name in search result...");
 		}
 
-		String urls[] = db.nameToUrls(fileName);
+		String urls[];
+		try {
+			urls = db.nameToUrls(fileName);
+		} catch (IOException e1) {
+			e1.printStackTrace();
+			throw new ResourceNotAvailableException(e1.getLocalizedMessage());
+		}
 		if(urls == null || urls.length == 0) {
 			throw new ResourceNotAvailableException("Unable to locate(" +
 					fileName + ")");

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/SimpleResourceStore.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/SimpleResourceStore.java	2008-08-09 02:37:52 UTC (rev 2533)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/SimpleResourceStore.java	2008-08-11 23:25:34 UTC (rev 2534)
@@ -48,13 +48,13 @@
 	private String prefix = null;
 
 
-	public Resource retrieveResource(CaptureSearchResult result) throws IOException, 
-		ResourceNotAvailableException {
+	public Resource retrieveResource(CaptureSearchResult result)
+		throws ResourceNotAvailableException {
 
 		// extract ARC filename
 		String fileName = result.getFile();
 		if(fileName == null || fileName.length() < 1) {
-			throw new IOException("No ARC/WARC name in search result...");
+			throw new ResourceNotAvailableException("No ARC/WARC name in search result...");
 		}
 
 		final long offset = result.getOffset();


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