Changeset 6165 for trunk

Timestamp:

2003-12-08T15:36:33+13:00 (20 years ago)

Author:

kjdon

Message:

added in default format for all classifiers - put a format elem as child of browse - will be overridden by any inside a classifier elem

Location:

trunk/gsdl3/src/java/org/greenstone/gsdl3

Files:

• action/GS2BrowseAction.java (modified) (1 diff)
• service/GS2Retrieve.java (modified) (2 diffs)

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

@@ -105 +105 @@
         // find the one for the classifier we are in
         Element this_format = GSXML.getNamedElement(format_elem, GSXML.CLASSIFIER_ELEM, GSXML.NAME_ATT, top_id);
+        if (this_format == null) {
+        this_format = (Element)GSXML.getChildByTagName(format_elem, GSXML.DEFAULT_ELEM);
+        }
+
         if (this_format != null) {
         Element new_format = GSXML.duplicateWithNewName(this.doc, this_format, GSXML.FORMAT_ELEM, false);

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

@@ -144 +144 @@
     Element cb_format_info = this.doc.createElement(GSXML.FORMAT_ELEM);
     boolean format_found = false;
+
+    // try the default format first
+    Element def_format = (Element) GSXML.getChildByTagName(info, GSXML.FORMAT_ELEM);
+    if (def_format != null) {
+        cb_format_info.appendChild(GSXML.duplicateWithNewName(this.doc, def_format, GSXML.DEFAULT_ELEM, true));
+        format_found = true;
+    }
+    
     // add in to the description a simplified list of classifiers
         NodeList classifiers = class_list.getElementsByTagName(GSXML.CLASSIFIER_ELEM);
@@ -314 +322 @@
         }
     } // for each classifier
+
+    // now check for default format info
+    Element default_format = (Element)GSXML.getChildByTagName(config_browse, GSXML.FORMAT_ELEM);
+    if (default_format!=null) { // append to  info
+        info.appendChild(owner.importNode(default_format, true));
+    }
+
     return true;
     }