Changeset 14183 for greenstone3/trunk/src/java

Timestamp:

2007-06-15T22:28:11+12:00 (17 years ago)

Author:

xiao

Message:

instead of simply retrieving the first child of format element in the search element, modify to find the format element which has at least one gsf:template child element

File:

• greenstone3/trunk/src/java/org/greenstone/gsdl3/service/AbstractSearch.java (modified) (1 diff)

greenstone3/trunk/src/java/org/greenstone/gsdl3/service/AbstractSearch.java

@@ -124 +124 @@
     if (format==null) {
         String path = GSPath.appendLink(GSXML.SEARCH_ELEM, GSXML.FORMAT_ELEM);
-        format = (Element) GSXML.getNodeByPath(extra_info, path);
-    }
-    //Element format = (Element) GSXML.getChildByTagName(info, GSXML.FORMAT_ELEM);
+
+      //note by xiao: instead of retrieving the first 'format' element inside the 'search'
+      // element, we are trying to find the real format element which has at least one
+      // 'gsf:template' child element. (extra_info is collectionConfig.xml)
+      //format = (Element) GSXML.getNodeByPath(extra_info, path);
+      Element search_elem = (Element) GSXML.getChildByTagName(extra_info, GSXML.SEARCH_ELEM);
+      NodeList format_elems = null;
+      if (search_elem != null) {
+        format_elems = search_elem.getElementsByTagName(GSXML.FORMAT_ELEM);
+      }
+      for(int i=0; i<format_elems.getLength(); i++) {
+          format = (Element)format_elems.item(i);
+          if (format.getElementsByTagName("gsf:template").getLength() != 0) {
+            break;
+          }
+      }
+    }//end of if(format==null)
+    //
     if (format != null) {
         this.format_info_map.put(TEXT_QUERY_SERVICE, this.doc.importNode(format, true));