Changeset 14358 for gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

Timestamp:

2007-08-09T16:19:12+12:00 (17 years ago)

Author:

qq6

Message:

fixed a bug in updateCollectionConfigXML()

File:

• gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java (modified) (3 diffs)

gli/trunk/src/org/greenstone/gatherer/collection/CollectionManager.java

@@ -1405 +1405 @@
     Document new_cfg_doc = XMLTools.parseXMLFile(new_cfg);
     Element collection_config = new_cfg_doc.getDocumentElement();
-
+    
     Node browseNode = XMLTools.getChildByTagNameIndexed(collection_config, StaticStrings.BROWSE_STR, 0);
     NodeList classifier_children = ((Element)browseNode).getElementsByTagName(StaticStrings.CLASSIFIER_STR);
@@ -1470 +1470 @@
             option_element.setAttribute(StaticStrings.VALUE_ATTRIBUTE, sort);
         }
-        else if(name_str.equals("buttonname") && buttonname == "") {
-            option_element.setAttribute(StaticStrings.VALUE_ATTRIBUTE, metadata);           
-        }
-        else if(buttonname == null) {
+        else if(name_str.equals("buttonname") && (buttonname == "" || buttonname == null)) {
             // No buttonname has been specified. Lets create one using the metadata as its value
             Element option = new_cfg_doc.createElement(StaticStrings.OPTION_STR);
@@ -1482 +1479 @@
         }
     }
-    
     }