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

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

Revision: 2089
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2089&view=rev
Author:   bradtofel
Date:     2007-11-27 19:12:07 -0800 (Tue, 27 Nov 2007)

Log Message:
-----------
BUGFIX: was checking if WARCRecords were of wrong type...

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

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/ResourceFactory.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/ResourceFactory.java	2007-11-28 03:11:14 UTC (rev 2088)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/ResourceFactory.java	2007-11-28 03:12:07 UTC (rev 2089)
@@ -20,6 +20,10 @@
 
 		Resource r = null;
 		String name = file.getName();
+		if(name.endsWith(LocalResourceStore.OPEN_EXTENSION)) {
+			name = name.substring(0, name.length() - 
+					LocalResourceStore.OPEN_EXTENSION.length());
+		}
 		if(name.endsWith(LocalResourceStore.ARC_EXTENSION) || 
 				name.endsWith(LocalResourceStore.ARC_GZ_EXTENSION)) {
 
@@ -37,8 +41,8 @@
 
 			WARCReader reader = WARCReaderFactory.get(file);
 			ArchiveRecord rec = reader.get(offset);
-			if(!(rec instanceof ARCRecord)) {
-				throw new ResourceNotAvailableException("Bad ARCRecord format");
+			if(!(rec instanceof WARCRecord)) {
+				throw new ResourceNotAvailableException("Bad WARCRecord format");
 			}
 			WarcResource wr = new WarcResource((WARCRecord) rec, reader);
 			wr.parseHeaders();


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