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

Timestamp:

2009-11-05T14:49:12+13:00 (14 years ago)

Author:

mdewsnip

Message:

Added a null pointer check to prevent rare errors when there are no terms in a search (it is entirely a filter).

File:

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

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

@@ -204 +204 @@
             int lucene_doc_num = hits.id(i - 1);
             Document doc = hits.doc(i - 1);
-            int doc_term_freq = ((Integer) doc_term_freq_map.get(new Integer(lucene_doc_num))).intValue();
+            int doc_term_freq = 0;
+            Integer doc_term_freq_object = (Integer) doc_term_freq_map.get(new Integer(lucene_doc_num));
+            if (doc_term_freq_object != null)
+            {
+            doc_term_freq = doc_term_freq_object.intValue();
+            }
             lucene_query_result.addDoc(doc.get("docOID").trim(), hits.score(i-1), doc_term_freq);
         }
@@ -222 +227 @@
             int lucene_doc_num = hits.scoreDocs[i - 1].doc;
             Document doc = reader.document(lucene_doc_num);
-            int doc_term_freq = ((Integer) doc_term_freq_map.get(new Integer(lucene_doc_num))).intValue();
+            int doc_term_freq = 0;
+            Integer doc_term_freq_object = (Integer) doc_term_freq_map.get(new Integer(lucene_doc_num));
+            if (doc_term_freq_object != null)
+            {
+            doc_term_freq = doc_term_freq_object.intValue();
+            }
             lucene_query_result.addDoc(doc.get("docOID").trim(), hits.scoreDocs[i-1].score, doc_term_freq);
         }