Changeset 30159 for main

Timestamp:

2015-09-02T11:30:32+12:00 (9 years ago)

Author:

kjdon

Message:

making all search results indexes start from 0 not 1.

Location:

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

Files:

• GS2LuceneQuery.java (modified) (4 diffs)
• SharedSoleneQuery.java (modified) (2 diffs)

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

@@ -330 +330 @@
         // Output the matching documents
         lucene_query_result.setStartResults(start_results);
-        lucene_query_result.setEndResults(hits.totalHits);
-
-        for (int i = start_results; i <= hits.totalHits; i++) {
-            int lucene_doc_num = hits.scoreDocs[i - 1].doc;
+        lucene_query_result.setEndResults(hits.totalHits); // ??
+
+        for (int i = start_results; i < hits.totalHits; i++) {
+          int lucene_doc_num = hits.scoreDocs[i ].doc; // i-1
             Document doc = reader.document(lucene_doc_num);
             int doc_term_freq = 0;
@@ -341 +341 @@
             doc_term_freq = doc_term_freq_object.intValue();
             }
-            lucene_query_result.addDoc(doc.get("docOID").trim(), hits.scoreDocs[i-1].score, doc_term_freq);
+            lucene_query_result.addDoc(doc.get("docOID").trim(), hits.scoreDocs[i].score, doc_term_freq);
         }
         }
@@ -356 +356 @@
 
         // Output the matching documents
-        for (int i = start_results; (i <= hits.scoreDocs.length && i <= end_results); i++) {
-            int lucene_doc_num = hits.scoreDocs[i - 1].doc;
+        for (int i = start_results; (i < hits.scoreDocs.length && i < end_results); i++) {
+            int lucene_doc_num = hits.scoreDocs[i].doc;
             Document doc = reader.document(lucene_doc_num);
             int doc_term_freq = 0;
@@ -365 +365 @@
             doc_term_freq = doc_term_freq_object.intValue();
             }
-            lucene_query_result.addDoc(doc.get("docOID").trim(), hits.scoreDocs[i-1].score, doc_term_freq);
+            lucene_query_result.addDoc(doc.get("docOID").trim(), hits.scoreDocs[i].score, doc_term_freq);
         }
         }

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

@@ -41 +41 @@
     protected String sort_field = null;
     protected String filter_string = null;
-    protected int start_results=1;
+    protected int start_results=0;
     protected int end_results=Integer.MAX_VALUE;
 
@@ -107 +107 @@
         
     public void setStartResults(int start_results) {
-    if (start_results < 1) {
-        start_results = 1;
+    if (start_results < 0) {
+        start_results = 0;
     }
     this.start_results = start_results;