Menu
▾
▴
archive-access-cvs
Revision: 2017
http://archive-access.svn.sourceforge.net/archive-access/?rev=2017&view=rev
Author: bradtofel
Date: 2007-09-28 15:39:36 -0700 (Fri, 28 Sep 2007)
Log Message:
-----------
FEATURE: now attempts to create missing tmp and target directories.
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/indexer/IndexClient.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/indexer/IndexClient.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/indexer/IndexClient.java 2007-09-28 22:38:08 UTC (rev 2016)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/indexer/IndexClient.java 2007-09-28 22:39:36 UTC (rev 2017)
@@ -114,6 +114,9 @@
// assume a local directory:
File toBeMergedDir = new File(target);
if(!toBeMergedDir.exists()) {
+ toBeMergedDir.mkdirs();
+ }
+ if(!toBeMergedDir.exists()) {
throw new IOException("Target " + target + " does not exist");
}
if(!toBeMergedDir.isDirectory()) {
@@ -360,5 +363,8 @@
*/
public void setTmpDir(String tmpDir) {
this.tmpDir = new File(tmpDir);
+ if(!this.tmpDir.isDirectory()) {
+ this.tmpDir.mkdirs();
+ }
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 2091
http://archive-access.svn.sourceforge.net/archive-access/?rev=2091&view=rev
Author: bradtofel
Date: 2007-11-27 19:13:41 -0800 (Tue, 27 Nov 2007)
Log Message:
-----------
COMMENT: removed lots of unused code..
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/indexer/IndexClient.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/indexer/IndexClient.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/indexer/IndexClient.java 2007-11-28 03:13:01 UTC (rev 2090)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/indexer/IndexClient.java 2007-11-28 03:13:41 UTC (rev 2091)
@@ -60,16 +60,10 @@
private static final Logger LOGGER = Logger.getLogger(IndexClient
.class.getName());
-// private final static String ARC_SUFFIX = ".arc";
-// private final static String ARC_GZ_SUFFIX = ".arc.gz";
-// private final static String CDX_SUFFIX = ".cdx";
-
private String target = null;
private File tmpDir = null;
-// private String submitUrl = null;
private HttpClient client = new HttpClient();
-// private ArcIndexer indexer = null;
/**
* @param cdx
@@ -180,159 +174,6 @@
boolean added = addCDX(tmpFile);
return added;
}
-
-//
-// /**
-// * Inject File argument into the index pipeline specified for this client
-// * using HTTP PUT
-// *
-// * @param cdx
-// * @throws HttpException
-// * @throws IOException
-// */
-// public void uploadCDX(File cdx) throws HttpException, IOException {
-// String basename = cdx.getName();
-// String finalUrl = submitUrl + "/" + basename;
-// PutMethod method = new PutMethod(finalUrl);
-// method.setRequestEntity(new InputStreamRequestEntity(
-// new FileInputStream(cdx)));
-//
-// int statusCode = client.executeMethod(method);
-// if (statusCode != HttpStatus.SC_OK) {
-// throw new IOException("Method failed: " + method.getStatusLine()
-// + " for URL " + finalUrl + " on file "
-// + cdx.getAbsolutePath());
-// }
-// LOGGER.info("Uploaded cdx " + cdx.getAbsolutePath());
-// }
-//
-// /**
-// * Create a CDX file for the arc argument, and add it to the remote
-// * index pipeline for this client.
-// *
-// * @param arc
-// * @param workDir
-// * @throws IOException
-// */
-// public void addArcToIndex(File arc,File workDir) throws IOException {
-// String arcBase = arc.getName();
-// if(arcBase.endsWith(ARC_SUFFIX)) {
-// arcBase = arcBase.substring(0,arcBase.length() -
-// ARC_SUFFIX.length());
-// }
-// String cdxBase = arcBase + CDX_SUFFIX;
-// File tmpCDX = new File(workDir,cdxBase);
-// LOGGER.info("Indexing arc " + arc.getAbsolutePath());
-// SearchResults results = indexer.indexArc(arc);
-// indexer.serializeResults(results, tmpCDX);
-// uploadCDX(tmpCDX);
-// if(!tmpCDX.delete()) {
-// throw new IOException("Unable to unlink " +
-// tmpCDX.getAbsolutePath());
-// }
-// }
-//
-// /**
-// * @param arc
-// * @param os
-// * @throws IOException
-// */
-// public void dumpArcIndex(File arc, OutputStream os) throws IOException {
-// BufferedOutputStream bos = new BufferedOutputStream(os);
-// PrintWriter pw = new PrintWriter(bos);
-// SearchResults results = indexer.indexArc(arc);
-// indexer.serializeResults(results,pw);
-// }
-//
-// /**
-// * Index each ARC in directory, upload CDX to the remote pipeline, and
-// * poke the remote locationDB to let it know where this ARC can be found.
-// *
-// * @param directory
-// * @param httpPrefix
-// * @param locationClient
-// * @param workDir
-// * @throws IOException
-// */
-// public void indexDirectory(File directory, String httpPrefix,
-// FileLocationDBClient locationClient, File workDir)
-// throws IOException {
-// if(!workDir.isDirectory()) {
-// if(workDir.exists()) {
-// throw new IOException("workDir path " +
-// workDir.getAbsolutePath() + " exists but is not a " +
-// "directory");
-// }
-// if(!workDir.mkdirs()) {
-// throw new IOException("Failed to mkdir(" +
-// workDir.getAbsolutePath() + ")");
-// }
-// }
-//
-// if(!httpPrefix.endsWith("/")) {
-// httpPrefix += "/";
-// }
-//
-// FileFilter filter = new FileFilter() {
-// public boolean accept(File daFile) {
-// return daFile.getName().endsWith(ARC_SUFFIX);
-// }
-// };
-//
-// File[] arcs = directory.listFiles(filter);
-// if(arcs == null) {
-// throw new IOException("Directory " + directory.getAbsolutePath() +
-// " is not a directory or had an IO error");
-// }
-// for(int i = 0; i < arcs.length; i++) {
-// File arc = arcs[i];
-// String arcName = arc.getName();
-// String arcUrl = httpPrefix + arcName;
-// addArcToIndex(arc,workDir);
-// LOGGER.info("Adding location " + arcUrl + " for arc " + arcName);
-// locationClient.addArcUrl(arcName,arcUrl);
-// }
-// }
-//
-// /**
-// * @param args
-// */
-// public static void main(String[] args) {
-// if(args.length == 1) {
-// File arc = new File(args[0]);
-// ArcIndexer indexer = new ArcIndexer();
-//
-// BufferedOutputStream bos = new BufferedOutputStream(System.out);
-// PrintWriter pw = new PrintWriter(bos);
-// SearchResults results;
-// try {
-// results = indexer.indexArc(arc);
-// indexer.serializeResults(results,pw);
-// } catch (IOException e) {
-// e.printStackTrace();
-// System.exit(1);
-// }
-// return;
-// } else if(args.length != 5) {
-// System.err.println("Usage: workDir pipelineUrl locationUrl arcDir arcUrlPrefix");
-// System.err.println("Usage: arcPath");
-// return;
-// }
-// File workDir = new File(args[0]);
-// String pipelineUrl = args[1];
-// String locationUrl = args[2];
-// File arcDir = new File(args[3]);
-// String arcDirPrefix = args[4];
-// IndexClient pipeClient;
-// FileLocationDBClient locClient = new FileLocationDBClient(locationUrl);
-// try {
-// pipeClient = new IndexClient(pipelineUrl);
-// pipeClient.indexDirectory(arcDir,arcDirPrefix,locClient,workDir);
-// } catch (IOException e) {
-// e.printStackTrace();
-// System.exit(1);
-// }
-// }
/**
* @return the target
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Revision: 2096
http://archive-access.svn.sourceforge.net/archive-access/?rev=2096&view=rev
Author: bradtofel
Date: 2007-11-29 12:32:18 -0800 (Thu, 29 Nov 2007)
Log Message:
-----------
COMMENT: removed unused (and commented out) imports
Modified Paths:
--------------
trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/indexer/IndexClient.java
Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/indexer/IndexClient.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/indexer/IndexClient.java 2007-11-29 20:30:29 UTC (rev 2095)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourceindex/indexer/IndexClient.java 2007-11-29 20:32:18 UTC (rev 2096)
@@ -24,16 +24,12 @@
*/
package org.archive.wayback.resourceindex.indexer;
-//import java.io.BufferedOutputStream;
import java.io.File;
-//import java.io.FileFilter;
import java.io.BufferedOutputStream;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.PrintWriter;
-//import java.io.OutputStream;
-//import java.io.PrintWriter;
import java.util.Iterator;
import java.util.logging.Logger;
@@ -42,9 +38,6 @@
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.methods.InputStreamRequestEntity;
import org.apache.commons.httpclient.methods.PutMethod;
-//import org.archive.wayback.core.SearchResults;
-//import org.archive.wayback.resourcestore.ArcIndexer;
-//import org.archive.wayback.resourcestore.http.FileLocationDBClient;
import org.archive.wayback.core.SearchResult;
import org.archive.wayback.resourceindex.cdx.SearchResultToCDXLineAdapter;
import org.archive.wayback.util.AdaptedIterator;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X