Changeset 12846 for trunk/indexers

Timestamp:

2006-09-26T10:09:48+12:00 (18 years ago)

Author:

mdewsnip

Message:

Minor changes.

File:

• trunk/indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneQuery.java (modified) (7 diffs)

trunk/indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneQuery.java

@@ -29 +29 @@
 import org.apache.lucene.search.IndexSearcher;
 import org.apache.lucene.search.Query;
-import org.apache.lucene.search.QueryFilter;
 import org.apache.lucene.search.RangeFilter;
 import org.apache.lucene.search.Searcher;
@@ -37 +36 @@
 public class GS2LuceneQuery
 {
+    static private String TEXTFIELD = "TX";
+
     // Use the standard set of English stop words by default
     static private String[] stop_words = StandardAnalyzer.STOP_WORDS;
@@ -53 +54 @@
 
         // Create one query parser with the standard set of stop words, and one with none
-        QueryParser query_parser = new QueryParser("TX", new StandardAnalyzer(stop_words));
-        QueryParser query_parser_no_stop_words = new QueryParser("TX", new StandardAnalyzer(new String[] { }));
+        QueryParser query_parser = new QueryParser(TEXTFIELD, new StandardAnalyzer(stop_words));
+        QueryParser query_parser_no_stop_words = new QueryParser(TEXTFIELD, new StandardAnalyzer(new String[] { }));
 
         Sort sorter = new Sort();
@@ -143 +144 @@
             while (iter.hasNext()) {
             Term term = (Term) iter.next();
-            // If you wanted to limit this to just TX terms add
+            // If you wanted to limit this to just text terms add
             // something like this:
-            //if (term.field().equals("TX"))
+            //if (term.field().equals(TEXTFIELD))
             term_counts.put(term.text(), new Integer(0));
             term_fields.put(term.text(), term.field());
@@ -160 +161 @@
             Hit hit = (Hit) hit_iter.next();
             Document doc = hit.getDocument();
-            String node_id = doc.get("nodeID");
             
             // May not be paging results
             if (start_results == 1 && end_results == -1) {
+                String node_id = doc.get("nodeID");
                 System.out.println("  <Match id=\"" + node_id + "\" />");
             }
             // Otherwise skip up until page offset
             else if (start_results <= counter && counter <= end_results) {
+                String node_id = doc.get("nodeID");
                 System.out.println("  <Match id=\"" + node_id + "\" />");
             }
@@ -173 +175 @@
             
             // From the document, extract the Term Vector for the
-            // TX field
-            TermFreqVector term_freq_vector = reader.getTermFreqVector(hit.getId(), "TX");
+            // text field
+            TermFreqVector term_freq_vector = reader.getTermFreqVector(hit.getId(), TEXTFIELD);
             if (term_freq_vector != null && term_freq_vector.size() > 0) {
                 int[] term_frequencies = term_freq_vector.getTermFrequencies();
@@ -311 +313 @@
         while (o < mutable_query_string.length()) {
         char c = mutable_query_string.charAt(o);
-        if (s == 0 && c == 'T') {
+        if (s == 0 && c == TEXTFIELD.charAt(0)) {
             ///ystem.err.println("Found T!");
             s = 1;
         }
         else if (s == 1) {
-            if (c == 'X') {
+            if (c == TEXTFIELD.charAt(1)) {
             ///ystem.err.println("Found X!");
             s = 2;