Changeset 32729 for main

Timestamp:

2019-01-31T16:38:12+13:00 (5 years ago)

Author:

ak19

Message:

Part of Ticket #947 the Lucene Index File Locking Fix. Lucene search had broken for GS2, thanks to Pascal Angst for identifying this. The fix committed at that time was incomplete as it had not been applied for GS2, because GS2 went through GS2LuceneQuery's main() method. GS2LuceneQuery still managed to compile after the fix with no syntax errors, because the superclass' initialise() method ended up getting called from main(), instead of the new GS2LuceneQuery.initialise(IndexReader) variant. Now the GS2LuceneQuery.main() method used by GS2 behaves like the GS2LuceneSearch class used by GS3: first instantiating an IndexReader object then passing this to the GS2LuceneQuery object's initialise(IndexReader) method. Lucene searching should work again in GS2, will test.

File:

• main/trunk/greenstone2/common-src/indexers/lucene-gs/src/org/greenstone/LuceneWrapper4/GS2LuceneQuery.java (modified) (3 diffs)

main/trunk/greenstone2/common-src/indexers/lucene-gs/src/org/greenstone/LuceneWrapper4/GS2LuceneQuery.java

@@ -592 +592 @@
     static protected boolean query_result_caching_enabled = false;
 
-
+    /**
+     * This main() method is used by GS2 to do searches.
+     * In GS2, lucene_query.pl calles this main() method in the LuceneWrapper4.jar. This main method instantiates both
+     * a GS2LuceneQuery and an IndexReader object. It then passes the reader to the GS2LuceneQuery object by calling
+     * the GS2LuceneQuery.initialise(reader) method. This main() method then finally performs the search with the provided query.
+     * GS3 doesn't use this main() method. Instead a GS2LuceneSearch object (of gsdl3.jar) instantiates both
+     * the GS2LuceneQuery and IndexReader objects and proceeds the same way.
+     */
     static public void main (String args[])
     {
@@ -660 +667 @@
         }
         
-        if (!queryer.initialise()) {
-            queryer.cleanUp(); // will close reader object IF reader was instantiated
+        Directory full_indexdir_dir = FSDirectory.open(new File(index_directory));
+        IndexReader reader = DirectoryReader.open(full_indexdir_dir); // Returns a IndexReader reading the index in the given Directory.
+                        // Now readOnly=true by default, and therefore also for searcher created in initialise() call below.
+        if (!queryer.initialise(reader)) {
+        if(reader != null) reader.close(); // close reader object IF reader was instantiated
+        queryer.cleanUp(); // will close searcher object if non-null
         return;
         }
@@ -684 +695 @@
         }
         }
-        queryer.cleanUp();
+        if(reader != null) reader.close();
+        queryer.cleanUp();
     }
     catch (IOException exception) {