You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@lucene.apache.org by dn...@apache.org on 2005/05/02 00:04:25 UTC
svn commit: r165552 -
/lucene/java/trunk/src/demo/org/apache/lucene/demo/IndexHTML.java
Author: dnaber
Date: Sun May 1 15:04:24 2005
New Revision: 165552
URL: http://svn.apache.org/viewcvs?rev=165552&view=rev
Log:
whitespace cleanup only (no more tabs/spaces mix)
Modified:
lucene/java/trunk/src/demo/org/apache/lucene/demo/IndexHTML.java
Modified: lucene/java/trunk/src/demo/org/apache/lucene/demo/IndexHTML.java
URL: http://svn.apache.org/viewcvs/lucene/java/trunk/src/demo/org/apache/lucene/demo/IndexHTML.java?rev=165552&r1=165551&r2=165552&view=diff
==============================================================================
--- lucene/java/trunk/src/demo/org/apache/lucene/demo/IndexHTML.java (original)
+++ lucene/java/trunk/src/demo/org/apache/lucene/demo/IndexHTML.java Sun May 1 15:04:24 2005
@@ -27,6 +27,7 @@
import java.util.Arrays;
class IndexHTML {
+
private static boolean deleting = false; // true during deletion pass
private static IndexReader reader; // existing index
private static IndexWriter writer; // new index being built
@@ -41,32 +42,30 @@
String usage = "IndexHTML [-create] [-index <index>] <root_directory>";
if (argv.length == 0) {
- System.err.println("Usage: " + usage);
- return;
+ System.err.println("Usage: " + usage);
+ return;
}
for (int i = 0; i < argv.length; i++) {
- if (argv[i].equals("-index")) { // parse -index option
- index = argv[++i];
- } else if (argv[i].equals("-create")) { // parse -create option
- create = true;
- } else if (i != argv.length-1) {
- System.err.println("Usage: " + usage);
- return;
- } else
- root = new File(argv[i]);
+ if (argv[i].equals("-index")) { // parse -index option
+ index = argv[++i];
+ } else if (argv[i].equals("-create")) { // parse -create option
+ create = true;
+ } else if (i != argv.length-1) {
+ System.err.println("Usage: " + usage);
+ return;
+ } else
+ root = new File(argv[i]);
}
Date start = new Date();
if (!create) { // delete stale docs
- deleting = true;
- indexDocs(root, index, create);
+ deleting = true;
+ indexDocs(root, index, create);
}
-
writer = new IndexWriter(index, new StandardAnalyzer(), create);
writer.setMaxFieldLength(1000000);
-
indexDocs(root, index, create); // add new docs
System.out.println("Optimizing index...");
@@ -80,7 +79,7 @@
} catch (Exception e) {
System.out.println(" caught a " + e.getClass() +
- "\n with message: " + e.getMessage());
+ "\n with message: " + e.getMessage());
}
}
@@ -100,13 +99,13 @@
indexDocs(file);
if (deleting) { // delete rest of stale docs
- while (uidIter.term() != null && uidIter.term().field() == "uid") {
- System.out.println("deleting " +
- HTMLDocument.uid2url(uidIter.term().text()));
- reader.delete(uidIter.term());
- uidIter.next();
- }
- deleting = false;
+ while (uidIter.term() != null && uidIter.term().field() == "uid") {
+ System.out.println("deleting " +
+ HTMLDocument.uid2url(uidIter.term().text()));
+ reader.delete(uidIter.term());
+ uidIter.next();
+ }
+ deleting = false;
}
uidIter.close(); // close uid iterator
@@ -121,36 +120,36 @@
String[] files = file.list(); // list its files
Arrays.sort(files); // sort the files
for (int i = 0; i < files.length; i++) // recursively index them
- indexDocs(new File(file, files[i]));
+ indexDocs(new File(file, files[i]));
} else if (file.getPath().endsWith(".html") || // index .html files
- file.getPath().endsWith(".htm") || // index .htm files
- file.getPath().endsWith(".txt")) { // index .txt files
+ file.getPath().endsWith(".htm") || // index .htm files
+ file.getPath().endsWith(".txt")) { // index .txt files
if (uidIter != null) {
- String uid = HTMLDocument.uid(file); // construct uid for doc
+ String uid = HTMLDocument.uid(file); // construct uid for doc
- while (uidIter.term() != null && uidIter.term().field() == "uid" &&
- uidIter.term().text().compareTo(uid) < 0) {
- if (deleting) { // delete stale docs
- System.out.println("deleting " +
- HTMLDocument.uid2url(uidIter.term().text()));
- reader.delete(uidIter.term());
- }
- uidIter.next();
- }
- if (uidIter.term() != null && uidIter.term().field() == "uid" &&
- uidIter.term().text().compareTo(uid) == 0) {
- uidIter.next(); // keep matching docs
- } else if (!deleting) { // add new docs
- Document doc = HTMLDocument.Document(file);
- System.out.println("adding " + doc.get("path"));
- writer.addDocument(doc);
- }
+ while (uidIter.term() != null && uidIter.term().field() == "uid" &&
+ uidIter.term().text().compareTo(uid) < 0) {
+ if (deleting) { // delete stale docs
+ System.out.println("deleting " +
+ HTMLDocument.uid2url(uidIter.term().text()));
+ reader.delete(uidIter.term());
+ }
+ uidIter.next();
+ }
+ if (uidIter.term() != null && uidIter.term().field() == "uid" &&
+ uidIter.term().text().compareTo(uid) == 0) {
+ uidIter.next(); // keep matching docs
+ } else if (!deleting) { // add new docs
+ Document doc = HTMLDocument.Document(file);
+ System.out.println("adding " + doc.get("path"));
+ writer.addDocument(doc);
+ }
} else { // creating a new index
- Document doc = HTMLDocument.Document(file);
- System.out.println("adding " + doc.get("path"));
- writer.addDocument(doc); // add docs unconditionally
+ Document doc = HTMLDocument.Document(file);
+ System.out.println("adding " + doc.get("path"));
+ writer.addDocument(doc); // add docs unconditionally
}
}
}