Changeset 25763

Timestamp:

2012-06-06T14:30:26+12:00 (12 years ago)

Author:

sjm84

Message:

Fixed some deprecated stuff in LuceneSearch

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/LuceneSearch.java (modified) (7 diffs)

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

@@ -2 +2 @@
 
 // Greenstone classes
-import org.greenstone.gsdl3.util.*;
-
-// XML classes
-import org.w3c.dom.Element;
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-
+import java.io.File;
+import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.ArrayList;
-
-import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.document.*; //Document;
-import org.apache.lucene.search.Searcher;
+
+import org.apache.log4j.Logger;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.Term;
 import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.index.IndexReader;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.queryParser.QueryParser;
-//import org.apache.lucene.search.Hits;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
-import org.apache.lucene.index.Term;
+import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.FSDirectory;
-import org.apache.lucene.store.Directory;
-
-import org.greenstone.LuceneWrapper3.GS2Analyzer;
-import java.io.File;
-import java.io.Serializable;
-
-import org.apache.log4j.*;
-
-/**
- *
- */
+import org.greenstone.gsdl3.util.GSFile;
+import org.greenstone.gsdl3.util.GSXML;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
 
 public class LuceneSearch extends AbstractTextSearch
 {
-
     static Logger logger = Logger.getLogger(org.greenstone.gsdl3.service.LuceneSearch.class.getName());
 
@@ -115 +98 @@
     protected void initResultElement(Element result, Element doc_node_list, Element metadata_list)
     {
-
         // Create a new (empty) result message
         result.setAttribute(GSXML.FROM_ATT, QUERY_SERVICE);
@@ -139 +121 @@
     protected boolean hasQueryString(Element param_list, Element metadata_list)
     {
-
         // Process the request parameters to make sure a query has been specified
         HashMap<String, Serializable> params = GSXML.extractParams(param_list, false);
@@ -157 +138 @@
     protected Element processTextQuery(Element request)
     {
-
         Element result = this.doc.createElement(GSXML.RESPONSE_ELEM);
         Element doc_node_list = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
@@ -189 +169 @@
             index_dir += File.separator + index;
             Directory index_dir_dir = FSDirectory.open(new File(index_dir));
-            Searcher searcher = new IndexSearcher(index_dir_dir);
-            Analyzer analyzer = new GS2Analyzer();
+            IndexSearcher searcher = new IndexSearcher(index_dir_dir);
 
             Term term = new Term("content", query_string);
@@ -200 +179 @@
             GSXML.addMetadata(this.doc, metadata_list, "numDocsMatched", "" + hits.scoreDocs.length);
 
-            IndexReader reader = ((IndexSearcher) searcher).getIndexReader();
+            IndexReader reader = searcher.getIndexReader();
 
             for (int i = 0; i < hits.scoreDocs.length; i++)
@@ -219 +198 @@
         return result;
     }
-
 }