Changeset 9435

Timestamp:

2005-03-15T16:20:32+13:00 (19 years ago)

Author:

kjdon

Message:

if we have found some format in the info element, don't look for it in extra_info elem. this way you can put some format stuff in buildConfig for other search services, otherwise they are all trying to use the same format

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractSearch.java (modified) (2 diffs)

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

@@ -93 +93 @@
 
     // add some format info to service map if there is any - look in extra info
-    String path = GSPath.appendLink(GSXML.SEARCH_ELEM, GSXML.FORMAT_ELEM);
-    Element format = (Element) GSXML.getNodeByPath(extra_info, path);
-    
+    // first look in buildConfig
+    Element format = (Element)GSXML.getChildByTagName(info, GSXML.FORMAT_ELEM);
+    
+    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);
     if (format != null) {
@@ -102 +106 @@
     
     // look for document display format - for documentType
-    path = GSPath.appendLink(GSXML.DISPLAY_ELEM, GSXML.FORMAT_ELEM);
+    String path = GSPath.appendLink(GSXML.DISPLAY_ELEM, GSXML.FORMAT_ELEM);
     Element display_format = (Element)GSXML.getNodeByPath(extra_info, path);
     if (display_format != null) {