Revision: 3577
http://archive-access.svn.sourceforge.net/archive-access/?rev=3577&view=rev
Author: bradtofel
Date: 2011-12-18 00:23:05 +0000 (Sun, 18 Dec 2011)
Log Message:
-----------
Cleanup - removed old arc-cdx option, which is deprecated, and would only lead to confusion. Removed old code that was commented out.
Modified Paths:
--------------
trunk/archive-access/projects/archive-commons/src/main/java/org/archive/extract/ResourceExtractor.java
Modified: trunk/archive-access/projects/archive-commons/src/main/java/org/archive/extract/ResourceExtractor.java
===================================================================
--- trunk/archive-access/projects/archive-commons/src/main/java/org/archive/extract/ResourceExtractor.java 2011-12-18 00:20:39 UTC (rev 3576)
+++ trunk/archive-access/projects/archive-commons/src/main/java/org/archive/extract/ResourceExtractor.java 2011-12-18 00:23:05 UTC (rev 3577)
@@ -4,7 +4,6 @@
import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
-import java.io.PrintStream;
import java.io.PrintWriter;
import java.net.URISyntaxException;
import java.nio.charset.Charset;
@@ -49,8 +48,6 @@
System.err.println("\tOPT can be one of:");
System.err.println("\t\t-cdx\tProduce output in NEW-SURT-Wayback CDX format");
System.err.println("\t\t\t (note that column 1 is NOT standard Wayback canonicalized)\n");
- System.err.println("\t\t-arc-cdx\tProduce output in semi-Wayback CDX format");
- System.err.println("\t\t\t (note that column 1 is NOT canonicalized)\n");
System.err.println("\t\t-wat\tembed JSON output in a compressed WARC" +
"wrapper, for storage, or sharing.");
return exitCode;
@@ -87,18 +84,13 @@
if(args.length == arg + 2) {
if(args[arg].equals("-cdx")) {
path = args[arg+1];
-// out = new CDXExtractorOutput(os);
out = new RealCDXExtractorOutput(new PrintWriter(new OutputStreamWriter(os, Charset.forName("UTF-8"))));
- } else if(args[arg].equals("-arc-cdx")) {
- path = args[arg+1];
- out = new CDXExtractorOutput(new PrintStream(os));
-
+
} else if(args[arg].equals("-wat")) {
path = args[arg+1];
out = new WATExtractorOutput(os);
} else {
String filter = args[arg+1];
-// out = new FilteredExtractorOuput(os, filter);
out = new JSONViewExtractorOutput(os, filter);
}
} else {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
