Return-Path: Delivered-To: apmail-lucene-java-commits-archive@www.apache.org Received: (qmail 47063 invoked from network); 1 May 2005 22:04:27 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 1 May 2005 22:04:27 -0000 Received: (qmail 57274 invoked by uid 500); 1 May 2005 22:05:51 -0000 Delivered-To: apmail-lucene-java-commits-archive@lucene.apache.org Received: (qmail 57244 invoked by uid 500); 1 May 2005 22:05:51 -0000 Mailing-List: contact java-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: java-dev@lucene.apache.org Delivered-To: mailing list java-commits@lucene.apache.org Received: (qmail 57229 invoked by uid 99); 1 May 2005 22:05:51 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Sun, 01 May 2005 15:05:50 -0700 Received: (qmail 47052 invoked by uid 65534); 1 May 2005 22:04:25 -0000 Message-ID: <20050501220425.47051.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r165552 - /lucene/java/trunk/src/demo/org/apache/lucene/demo/IndexHTML.java Date: Sun, 01 May 2005 22:04:25 -0000 To: java-commits@lucene.apache.org From: dnaber@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: dnaber Date: Sun May 1 15:04:24 2005 New Revision: 165552 URL: http://svn.apache.org/viewcvs?rev=3D165552&view=3Drev 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/lu= cene/demo/IndexHTML.java?rev=3D165552&r1=3D165551&r2=3D165552&view=3Ddiff =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- lucene/java/trunk/src/demo/org/apache/lucene/demo/IndexHTML.java (origi= nal) +++ lucene/java/trunk/src/demo/org/apache/lucene/demo/IndexHTML.java Sun Ma= y 1 15:04:24 2005 @@ -27,6 +27,7 @@ import java.util.Arrays; =20 class IndexHTML { + private static boolean deleting =3D 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 =3D "IndexHTML [-create] [-index ] "; =20 if (argv.length =3D=3D 0) { - System.err.println("Usage: " + usage); - return; + System.err.println("Usage: " + usage); + return; } =20 for (int i =3D 0; i < argv.length; i++) { - if (argv[i].equals("-index")) { // parse -index option - index =3D argv[++i]; - } else if (argv[i].equals("-create")) { // parse -create option - create =3D true; - } else if (i !=3D argv.length-1) { - System.err.println("Usage: " + usage); - return; - } else - root =3D new File(argv[i]); + if (argv[i].equals("-index")) { // parse -index option + index =3D argv[++i]; + } else if (argv[i].equals("-create")) { // parse -create option + create =3D true; + } else if (i !=3D argv.length-1) { + System.err.println("Usage: " + usage); + return; + } else + root =3D new File(argv[i]); } =20 Date start =3D new Date(); =20 if (!create) { // delete stale docs - deleting =3D true; - indexDocs(root, index, create); + deleting =3D true; + indexDocs(root, index, create); } - writer =3D new IndexWriter(index, new StandardAnalyzer(), create); writer.setMaxFieldLength(1000000); - indexDocs(root, index, create); // add new docs =20 System.out.println("Optimizing index..."); @@ -80,7 +79,7 @@ =20 } catch (Exception e) { System.out.println(" caught a " + e.getClass() + - "\n with message: " + e.getMessage()); + "\n with message: " + e.getMessage()); } } =20 @@ -100,13 +99,13 @@ indexDocs(file); =20 if (deleting) { // delete rest of stale docs - while (uidIter.term() !=3D null && uidIter.term().field() =3D=3D "uid") { - System.out.println("deleting " + - HTMLDocument.uid2url(uidIter.term().text())); - reader.delete(uidIter.term()); - uidIter.next(); - } - deleting =3D false; + while (uidIter.term() !=3D null && uidIter.term().field() =3D=3D "= uid") { + System.out.println("deleting " + + HTMLDocument.uid2url(uidIter.term().text())); + reader.delete(uidIter.term()); + uidIter.next(); + } + deleting =3D false; } =20 uidIter.close(); // close uid iterator @@ -121,36 +120,36 @@ String[] files =3D file.list(); // list its files Arrays.sort(files); // sort the files for (int i =3D 0; i < files.length; i++) // recursively index them - indexDocs(new File(file, files[i])); + indexDocs(new File(file, files[i])); =20 } 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 =20 if (uidIter !=3D null) { - String uid =3D HTMLDocument.uid(file); // construct uid for doc + String uid =3D HTMLDocument.uid(file); // construct uid for doc =20 - while (uidIter.term() !=3D null && uidIter.term().field() =3D=3D "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() !=3D null && uidIter.term().field() =3D=3D "uid" && - uidIter.term().text().compareTo(uid) =3D=3D 0) { - uidIter.next(); // keep matching docs - } else if (!deleting) { // add new docs - Document doc =3D HTMLDocument.Document(file); - System.out.println("adding " + doc.get("path")); - writer.addDocument(doc); - } + while (uidIter.term() !=3D null && uidIter.term().field() =3D=3D "= 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() !=3D null && uidIter.term().field() =3D=3D "uid= " && + uidIter.term().text().compareTo(uid) =3D=3D 0) { + uidIter.next(); // keep matching docs + } else if (!deleting) { // add new docs + Document doc =3D HTMLDocument.Document(file); + System.out.println("adding " + doc.get("path")); + writer.addDocument(doc); + } } else { // creating a new index - Document doc =3D HTMLDocument.Document(file); - System.out.println("adding " + doc.get("path")); - writer.addDocument(doc); // add docs unconditionally + Document doc =3D HTMLDocument.Document(file); + System.out.println("adding " + doc.get("path")); + writer.addDocument(doc); // add docs unconditionally } } }