Changeset 9007 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action

Timestamp:

2005-02-10T16:50:32+13:00 (19 years ago)

Author:

kjdon

Message:

added a check for null term element in search term highlighting code. fields for mgpp were being parsed as a term, but don't match a term element

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/DocumentAction.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

@@ -609 +609 @@
         String term = performed_query.substring(term_start, i);
         System.err.println("Term: " + term);
-
-        HashSet phrase_query_p_term_x_variants = new HashSet();
+        
         Element term_element = GSXML.getNamedElement(query_term_list_element, GSXML.TERM_ELEM, GSXML.NAME_ATT, term);
-        NodeList term_equivalent_terms_nodelist = term_element.getElementsByTagName("equivTermList");
-        for (int j = 0; j < term_equivalent_terms_nodelist.getLength(); j++) {
-            Element term_equivalent_terms_element = (Element) term_equivalent_terms_nodelist.item(j);
-            String[] term_equivalent_terms = GSXML.getAttributeValuesFromList(term_equivalent_terms_element, GSXML.NAME_ATT);
-            for (int k = 0; k < term_equivalent_terms.length; k++) {
-            System.err.println("Adding query term variant: " + term_equivalent_terms[k]);
-            phrase_query_p_term_x_variants.add(term_equivalent_terms[k]);
+        if (term_element != null) {
+            
+            HashSet phrase_query_p_term_x_variants = new HashSet();
+            
+            NodeList term_equivalent_terms_nodelist = term_element.getElementsByTagName("equivTermList");
+            for (int j = 0; j < term_equivalent_terms_nodelist.getLength(); j++) {
+            Element term_equivalent_terms_element = (Element) term_equivalent_terms_nodelist.item(j);
+            String[] term_equivalent_terms = GSXML.getAttributeValuesFromList(term_equivalent_terms_element, GSXML.NAME_ATT);
+            for (int k = 0; k < term_equivalent_terms.length; k++) {
+                System.err.println("Adding query term variant: " + term_equivalent_terms[k]);
+                phrase_query_p_term_x_variants.add(term_equivalent_terms[k]);
+            }
             }
-        }
-        phrase_query_p_term_variants_list.add(phrase_query_p_term_x_variants);
-
-        if (in_phrase == false) {
-            phrase_query_term_variants_hierarchy.add(phrase_query_p_term_variants_list);
-            phrase_query_p_term_variants_list = new ArrayList();
-        }
-        }
-
+            phrase_query_p_term_variants_list.add(phrase_query_p_term_x_variants);
+            
+            if (in_phrase == false) {
+            phrase_query_term_variants_hierarchy.add(phrase_query_p_term_variants_list);
+            phrase_query_p_term_variants_list = new ArrayList();
+            }
+        }
+        }
         // Watch for phrases (surrounded by quotes)
         if (character == '\"') {