Changeset 29143

Timestamp:

2014-07-16T21:20:11+12:00 (10 years ago)

Author:

ak19

Message:

Part of port from lucene3.3.0 to lucene4.7.2. LuceneWrapper related. Changes to Greenstone3's main src code, build.xml and .classpath file, to swith over from using Lucene3Wrapper to Lucene4Wrapper

Location:

main/trunk/greenstone3

Files:

• .classpath (modified) (2 diffs)
• build.xml (modified) (2 diffs)
• src/java/org/greenstone/gsdl3/service/GS2LuceneSearch.java (modified) (1 diff)
• src/java/org/greenstone/gsdl3/service/LuceneSearch.java (modified) (3 diffs)
• src/java/org/greenstone/gsdl3/service/SharedSoleneGS2FieldSearch.java (modified) (1 diff)

main/trunk/greenstone3/.classpath

@@ -15 +15 @@
     <classpathentry kind="lib" path="gs2build/bin/java/GLIServer.jar"/>
     <classpathentry kind="lib" path="gs2build/bin/java/JDBMWrapper.jar"/>
-    <classpathentry kind="lib" path="gs2build/bin/java/LuceneWrapper3.jar"/>
+    <classpathentry kind="lib" path="gs2build/bin/java/LuceneWrapper4.jar"/>
     <classpathentry kind="lib" path="gs2build/bin/java/xalan.jar"/>
     <classpathentry kind="lib" path="gs2build/common-src/indexers/lucene-gs/lib/lucene-core-2.3.2.jar"/>
     <classpathentry kind="lib" path="gs2build/common-src/indexers/lucene-gs/lib/lucene-core-3.3.0.jar"/>
-    <classpathentry kind="lib" path="gs2build/common-src/indexers/lucene-gs/LuceneWrapper3.jar"/>
+    <classpathentry kind="lib" path="gs2build/common-src/indexers/lucene-gs/lib/lucene-core-4.7.2.jar"/>
+    <classpathentry kind="lib" path="gs2build/common-src/indexers/lucene-gs/lib/lucene-analyzers-common-4.7.2.jar"/>
+    <classpathentry kind="lib" path="gs2build/common-src/indexers/lucene-gs/lib/lucene-analyzers-kuromoji-4.7.2.jar"/>
+    <classpathentry kind="lib" path="gs2build/common-src/indexers/lucene-gs/lib/lucene-analyzers-queryparser-4.7.2.jar"/>
+    <classpathentry kind="lib" path="gs2build/common-src/indexers/lucene-gs/LuceneWrapper4.jar"/>
     <classpathentry kind="lib" path="gs2build/common-src/indexers/mg/mg.jar"/>
     <classpathentry kind="lib" path="gs2build/common-src/indexers/mgpp/mgpp.jar"/>
@@ -75 +79 @@
     <classpathentry kind="lib" path="web/WEB-INF/lib/log4j-1.2.8.jar"/>
     <classpathentry kind="lib" path="web/WEB-INF/lib/lucene-1.4.1.jar"/>
-    <classpathentry kind="lib" path="web/WEB-INF/lib/LuceneWrapper3.jar"/>
+    <classpathentry kind="lib" path="web/WEB-INF/lib/LuceneWrapper4.jar"/>
     <classpathentry kind="lib" path="web/WEB-INF/lib/mail.jar"/>
     <classpathentry kind="lib" path="web/WEB-INF/lib/maxent-2.4.0.jar"/>

main/trunk/greenstone3/build.xml

@@ -2195 +2195 @@
     </if>
 
-    <copy file="${lucene.home}/LuceneWrapper3.jar" todir="${web.lib}"/>    
+    <copy file="${lucene.home}/LuceneWrapper4.jar" todir="${web.lib}"/>    
   </target>
   
@@ -2401 +2401 @@
     <!-- LuceneWrapper jar file not installed by default -->
     <mkdir dir="${gs2build.home}/bin/java"/>
-    <copy file="${lucene.home}/LuceneWrapper3.jar" todir="${gs2build.home}/bin/java"/>
+    <copy file="${lucene.home}/LuceneWrapper4.jar" todir="${gs2build.home}/bin/java"/>
 
   </target>

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/GS2LuceneSearch.java

@@ -29 +29 @@
 
 import org.apache.log4j.Logger;
-import org.greenstone.LuceneWrapper3.GS2LuceneQuery;
-import org.greenstone.LuceneWrapper3.LuceneQueryResult;
+import org.greenstone.LuceneWrapper4.GS2LuceneQuery;
+import org.greenstone.LuceneWrapper4.LuceneQueryResult;
 import org.greenstone.gsdl3.util.FacetWrapper;
 import org.greenstone.gsdl3.util.GSFile;

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/LuceneSearch.java

@@ -8 +8 @@
 
 import org.apache.log4j.Logger;
+import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.index.Term;
@@ -173 +174 @@
             index_dir += File.separator + index;
             Directory index_dir_dir = FSDirectory.open(new File(index_dir));
-            IndexSearcher searcher = new IndexSearcher(index_dir_dir);
+            IndexReader reader = DirectoryReader.open(index_dir_dir); //deprecated: IndexReader.open(index_dir_dir);
+            IndexSearcher searcher = new IndexSearcher(reader);
 
             Term term = new Term("content", query_string);
@@ -182 +184 @@
 
             GSXML.addMetadata(metadata_list, "numDocsMatched", "" + hits.scoreDocs.length);
-
-            IndexReader reader = searcher.getIndexReader();
 
             for (int i = 0; i < hits.scoreDocs.length; i++)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/SharedSoleneGS2FieldSearch.java

@@ -23 +23 @@
 
 import org.apache.log4j.Logger;
-import org.greenstone.LuceneWrapper3.SharedSoleneQuery;
+import org.greenstone.LuceneWrapper4.SharedSoleneQuery;
 import org.greenstone.gsdl3.util.GSXML;
 import org.greenstone.gsdl3.util.XMLConverter;