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

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

Revision: 3446
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3446&view=rev
Author:   bradtofel
Date:     2011-05-25 01:21:30 +0000 (Wed, 25 May 2011)

Log Message:
-----------
FEATURE: added "-blockDump" argument, which only produces a list of matching block-offset tuples to STDOUT

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSource.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSource.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSource.java	2011-05-25 01:20:09 UTC (rev 3445)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/ziplines/ZiplinesSearchResultSource.java	2011-05-25 01:21:30 UTC (rev 3446)
@@ -276,6 +276,7 @@
 		ZiplinesSearchResultSource zl = new ZiplinesSearchResultSource(format);
 		PrintWriter pw = new PrintWriter(System.out);
 		int idx;
+		boolean blockDump = false;
 		for(idx = 0; idx < args.length; idx++) {
 			if(args[idx].equals("-format")) {
 				idx++;
@@ -288,6 +289,8 @@
 					e1.printStackTrace();
 					System.exit(1);
 				}
+			} else if(args[idx].equals("-blockDump")) {
+				blockDump = true;
 			} else if(args[idx].equals("-max")) {
 				idx++;
 				if(idx >= args.length) {
@@ -322,15 +325,25 @@
 		
 		try {
 			zl.init();
-			Iterator<String> itr = zl.getStringPrefixIterator(key);
-			boolean truncated = ((StringPrefixIterator)itr).isTruncated();
-			while(itr.hasNext()) {
-				pw.println(itr.next());
+			if(blockDump) {
+				
+				ArrayList<ZiplinedBlock> blocks = zl.getBlockListForPrefix(key);
+				for(ZiplinedBlock block : blocks) {
+					pw.format("%s\t%s\n", block.urlOrPath, block.offset);
+				}
+				pw.close();
+
+			} else {
+				Iterator<String> itr = zl.getStringPrefixIterator(key);
+				boolean truncated = ((StringPrefixIterator)itr).isTruncated();
+				while(itr.hasNext()) {
+					pw.println(itr.next());
+				}
+				pw.close();
+				if(truncated) {
+					System.err.println("Note that results are truncated...");
+				}
 			}
-			pw.close();
-			if(truncated) {
-				System.err.println("Note that results are truncated...");
-			}
 		} catch (ResourceIndexNotAvailableException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();


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