[jsword-svn] r1743 - in trunk: bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents bibledesktop/etc/jnlp jsword jsword/jar jsword/jar/lucene-2.3.0 jsword/src/main/java/org/crosswire/jsword/index/lucene jsword/src/main/java/org/crosswire/jsword/passage
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Sat Feb 2 08:48:18 MST 2008
Author: dmsmith
Date: 2008-02-02 08:48:16 -0700 (Sat, 02 Feb 2008)
New Revision: 1743
Added:
trunk/jsword/jar/lucene-2.3.0/
trunk/jsword/jar/lucene-2.3.0/LICENSE.txt
trunk/jsword/jar/lucene-2.3.0/NOTICE.txt
trunk/jsword/jar/lucene-2.3.0/lucene-2.3.0-src.zip
trunk/jsword/jar/lucene-2.3.0/lucene-analyzers-2.3.0.jar
trunk/jsword/jar/lucene-2.3.0/lucene-core-2.3.0.jar
trunk/jsword/jar/lucene-2.3.0/lucene-snowball-2.3.0.jar
Removed:
trunk/jsword/jar/lucene-2.2.0/
Modified:
trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
trunk/jsword/.classpath
trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/Verse.java
Log:
Upgraded lucene from 2.2.0 to 2.3.0.
Modified: trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist
===================================================================
--- trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist 2008-02-02 14:29:03 UTC (rev 1742)
+++ trunk/bibledesktop/etc/installer/macosx/BibleDesktop.app/Contents/Info.plist 2008-02-02 15:48:16 UTC (rev 1743)
@@ -41,9 +41,9 @@
<string>$JAVAROOT/jsword-common- at release.version@.jar</string>
<string>$JAVAROOT/jsword-common-swing- at release.version@.jar</string>
<string>$JAVAROOT/jsword-common-aqua-1.0.6.jar</string>
- <string>$JAVAROOT/lucene-core-2.2.0.jar</string>
- <string>$JAVAROOT/lucene-snowball-2.2.0.jar</string>
- <string>$JAVAROOT/lucene-analyzers-2.2.0.jar</string>
+ <string>$JAVAROOT/lucene-core-2.3.0.jar</string>
+ <string>$JAVAROOT/lucene-snowball-2.3.0.jar</string>
+ <string>$JAVAROOT/lucene-analyzers-2.3.0.jar</string>
<string>$JAVAROOT/icu4j_3_6_1.jar</string>
<string>$JAVAROOT/jdom-1.0.jar</string>
<string>$JAVAROOT/commons-codec-1.3.jar</string>
Modified: trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp
===================================================================
--- trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2008-02-02 14:29:03 UTC (rev 1742)
+++ trunk/bibledesktop/etc/jnlp/bibledesktop.jnlp 2008-02-02 15:48:16 UTC (rev 1743)
@@ -39,9 +39,9 @@
<jar href="commons-httpclient-3.0.1.jar"/>
<jar href="commons-logging-1.1.jar"/>
<jar href="commons-net-1.4.1.jar"/>
- <jar href="lucene-core-2.2.0.jar"/>
- <jar href="lucene-snowball-2.2.0.jar"/>
- <jar href="lucene-analyzers-2.2.0.jar"/>
+ <jar href="lucene-core-2.3.0.jar"/>
+ <jar href="lucene-snowball-2.3.0.jar"/>
+ <jar href="lucene-analyzers-2.3.0.jar"/>
<jar href="icu4j_3_6_1.jar"/>
<jar href="jlfgr-1_0.jar"/>
<property name="apple.laf.useScreenMenuBar" value="true"/>
Modified: trunk/jsword/.classpath
===================================================================
--- trunk/jsword/.classpath 2008-02-02 14:29:03 UTC (rev 1742)
+++ trunk/jsword/.classpath 2008-02-02 15:48:16 UTC (rev 1743)
@@ -4,8 +4,8 @@
<classpathentry exported="true" kind="src" path="/common"/>
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="lib" path="jar/lucene-2.2.0/lucene-core-2.2.0.jar" sourcepath="jar/lucene-2.2.0/lucene-2.2.0-src.zip"/>
- <classpathentry kind="lib" path="jar/lucene-2.2.0/lucene-snowball-2.2.0.jar" />
- <classpathentry kind="lib" path="jar/lucene-2.2.0/lucene-analyzers-2.2.0.jar" />
+ <classpathentry kind="lib" path="jar/lucene-2.3.0/lucene-analyzers-2.3.0.jar" sourcepath="jar/lucene-2.3.0/lucene-2.3.0-src.zip"/>
+ <classpathentry kind="lib" path="jar/lucene-2.3.0/lucene-core-2.3.0.jar" sourcepath="jar/lucene-2.3.0/lucene-2.3.0-src.zip"/>
+ <classpathentry kind="lib" path="jar/lucene-2.3.0/lucene-snowball-2.3.0.jar" sourcepath="jar/lucene-2.3.0/lucene-2.3.0-src.zip"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Added: trunk/jsword/jar/lucene-2.3.0/LICENSE.txt
===================================================================
--- trunk/jsword/jar/lucene-2.3.0/LICENSE.txt (rev 0)
+++ trunk/jsword/jar/lucene-2.3.0/LICENSE.txt 2008-02-02 15:48:16 UTC (rev 1743)
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Added: trunk/jsword/jar/lucene-2.3.0/NOTICE.txt
===================================================================
--- trunk/jsword/jar/lucene-2.3.0/NOTICE.txt (rev 0)
+++ trunk/jsword/jar/lucene-2.3.0/NOTICE.txt 2008-02-02 15:48:16 UTC (rev 1743)
@@ -0,0 +1,12 @@
+Apache Lucene
+Copyright 2006 The Apache Software Foundation
+
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).
+
+The snowball stemmers in
+ contrib/snowball/src/java/net/sf/snowball
+were developed by Martin Porter and Richard Boulton.
+The full snowball package is available from
+ http://snowball.tartarus.org/
+
Added: trunk/jsword/jar/lucene-2.3.0/lucene-2.3.0-src.zip
===================================================================
(Binary files differ)
Property changes on: trunk/jsword/jar/lucene-2.3.0/lucene-2.3.0-src.zip
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsword/jar/lucene-2.3.0/lucene-analyzers-2.3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsword/jar/lucene-2.3.0/lucene-analyzers-2.3.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsword/jar/lucene-2.3.0/lucene-core-2.3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsword/jar/lucene-2.3.0/lucene-core-2.3.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jsword/jar/lucene-2.3.0/lucene-snowball-2.3.0.jar
===================================================================
(Binary files differ)
Property changes on: trunk/jsword/jar/lucene-2.3.0/lucene-snowball-2.3.0.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java 2008-02-02 14:29:03 UTC (rev 1742)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java 2008-02-02 15:48:16 UTC (rev 1743)
@@ -23,7 +23,6 @@
import java.io.File;
import java.io.IOException;
-import java.io.StringReader;
import java.net.URI;
import java.util.ArrayList;
import java.util.Iterator;
@@ -356,11 +355,19 @@
String oldRootName = ""; //$NON-NLS-1$
int percent = 0;
String rootName = ""; //$NON-NLS-1$
- String text = ""; //$NON-NLS-1$
BookData data = null;
Key subkey = null;
- Document doc = null;
Element osis = null;
+
+ // Set up for reuse.
+ Document doc = new Document();
+ Field keyField = new Field(FIELD_KEY, "", Field.Store.YES, Field.Index.UN_TOKENIZED, Field.TermVector.NO); //$NON-NLS-1$
+ Field bodyField = new Field(FIELD_BODY, "", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.NO); //$NON-NLS-1$
+ Field strongField = new Field(FIELD_STRONG, "", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.NO); //$NON-NLS-1$
+ Field xrefField = new Field(FIELD_XREF, "", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.NO); //$NON-NLS-1$
+ Field noteField = new Field(FIELD_NOTE, "", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.NO); //$NON-NLS-1$
+ Field headingField = new Field(FIELD_HEADING, "", Field.Store.NO, Field.Index.TOKENIZED, Field.TermVector.NO); //$NON-NLS-1$
+
int size = key.getCardinality();
int subCount = count;
for (Iterator it = key.iterator(); it.hasNext(); )
@@ -388,37 +395,38 @@
continue;
}
+ // Remove all fields from the document
+ doc.getFields().clear();
+
// Do the actual indexing
- text = OSISUtil.getCanonicalText(osis);
- doc = null;
- if (text != null && text.length() > 0)
- {
- doc = new Document();
- doc.add(new Field(FIELD_KEY, subkey.getOsisRef(), Field.Store.YES, Field.Index.UN_TOKENIZED));
- doc.add(new Field(FIELD_BODY, new StringReader(text)));
- }
+ // Always add the key
+ keyField.setValue(subkey.getOsisRef());
+ doc.add(keyField);
+ addField(doc, bodyField, OSISUtil.getCanonicalText(osis));
+
if (hasStrongs)
{
- doc = addField(doc, FIELD_STRONG, OSISUtil.getStrongsNumbers(osis));
+ addField(doc, strongField, OSISUtil.getStrongsNumbers(osis));
}
if (hasXRefs)
{
- doc = addField(doc, FIELD_XREF, OSISUtil.getReferences(osis));
+ addField(doc, xrefField, OSISUtil.getReferences(osis));
}
if (hasNotes)
{
- doc = addField(doc, FIELD_NOTE, OSISUtil.getNotes(osis));
+ addField(doc, noteField, OSISUtil.getNotes(osis));
}
if (hasHeadings)
{
- doc = addField(doc, FIELD_HEADING, OSISUtil.getHeadings(osis));
+ addField(doc, headingField, OSISUtil.getHeadings(osis));
}
- if (doc != null)
+ // Add the document if we added more than just the key.
+ if (doc.getFields().size() > 1)
{
writer.addDocument(doc);
}
@@ -428,7 +436,7 @@
if (!rootName.equals(oldRootName))
{
oldRootName = rootName;
- job.setSectionName(Msg.INDEXING.toString(rootName));
+ job.setSectionName(rootName);
}
subCount++;
@@ -446,18 +454,13 @@
}
}
- private Document addField(Document theDoc, String field, String text)
+ private void addField(Document doc, Field field, String text)
{
- Document doc = theDoc;
if (text != null && text.length() > 0)
{
- if (doc == null)
- {
- doc = new Document();
- }
- doc.add(new Field(field, text, Field.Store.NO, Field.Index.TOKENIZED));
+ field.setValue(text);
+ doc.add(field);
}
- return doc;
}
/**
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/Verse.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/Verse.java 2008-02-02 14:29:03 UTC (rev 1742)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/Verse.java 2008-02-02 15:48:16 UTC (rev 1743)
@@ -201,7 +201,7 @@
{
try
{
- return BibleInfo.getPreferredBookName(book);
+ return BibleInfo.getShortBookName(book);
}
catch (NoSuchKeyException ex)
{
More information about the jsword-svn
mailing list