Changeset 25977

Timestamp:

2012-07-19T14:28:07+12:00 (11 years ago)

Author:

sjm84

Message:

Remove the assumption that top level format statements apply to the classifier

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java (modified) (7 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/service/AbstractBrowse.java

@@ -20 +20 @@
 
 // Greenstone classes
+import java.util.ArrayList;
+
+import org.apache.log4j.Logger;
+import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.GSXML;
-import org.greenstone.gsdl3.util.GSPath;
 import org.greenstone.gsdl3.util.MacroResolver;
 import org.greenstone.gsdl3.util.OID;
-
-// XML classes
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
-
-// General Java classes
-import java.util.ArrayList;
-
-import org.apache.log4j.*;
 
 /**
@@ -95 +91 @@
                 macro_resolver.addMacros(replacement_elem);
             }
-
         }
 
@@ -139 +134 @@
         {
             Element cl = (Element) classifiers.item(i);
+
             Element new_cl = (Element) this.doc.importNode(cl, false); // just import this node, not the children
 
@@ -146 +142 @@
             if (format != null)
             {
-
                 //copy all the children
                 NodeList elems = format.getChildNodes();
@@ -270 +265 @@
     static boolean extractExtraClassifierInfo(Element info, Element extra_info)
     {
-
         if (extra_info == null)
         {
@@ -319 +313 @@
                     Element e = (Element) display_names.item(j);
                     cl.appendChild(owner.importNode(e, true));
-
                 }
             }
@@ -325 +318 @@
             // get the format element if any 
             Element format = (Element) GSXML.getChildByTagName(node_extra, GSXML.FORMAT_ELEM);
-            if (format == null)
-            { // try a generic one that applies to all classifiers
-                format = (Element) GSXML.getChildByTagName(extra_info, GSXML.FORMAT_ELEM);
-            }
             if (format != null)
             { // append to index info