Changeset 5260

Timestamp:

2003-08-22T13:42:41+12:00 (21 years ago)

Author:

kjdon

Message:

fixed a bug in extractParams - it used to assume all childNodes were param elems, this is not necessarily true if eg read in the param list from a config file

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSXML.java (modified) (1 diff)

trunk/gsdl3/src/java/org/greenstone/gsdl3/util/GSXML.java

@@ -200 +200 @@
     HashMap param_map = new HashMap();
     for (int i=0; i<params.getLength(); i++) {
-        Element param = (Element)params.item(i);
-        String name=param.getAttribute(NAME_ATT);
-        System.out.println("Extracting param "+name);
-        String value=getValue(param); //att or content
-        int pos = name.indexOf('.');
-        if (pos == -1) { // a base param
-        param_map.put(name, value);
-        } else { // a namespaced param
-        
-        String namespace = name.substring(0, pos);
-        name = name.substring(pos+1);
-        System.out.println("namespace = "+namespace+" name= "+name);
-        HashMap map = (HashMap)param_map.get(namespace);
-        if (map == null) {
-            map = new HashMap();
-            param_map.put(namespace, map);
+        if (params.item(i).getNodeName().equals(PARAM_ELEM)) {
+        Element param = (Element)params.item(i);
+        String name=param.getAttribute(NAME_ATT);
+        String value=getValue(param); //att or content
+        int pos = name.indexOf('.');
+        if (pos == -1) { // a base param
+            param_map.put(name, value);
+        } else { // a namespaced param
+            
+            String namespace = name.substring(0, pos);
+            name = name.substring(pos+1);
+            System.out.println("namespace = "+namespace+" name= "+name);
+            HashMap map = (HashMap)param_map.get(namespace);
+            if (map == null) {
+            map = new HashMap();
+            param_map.put(namespace, map);
+            }
+            map.put(name, value);
         }
-        map.put(name, value);
         }
     }