Changeset 30666 for main/trunk/greenstone3/src/java

Timestamp:

2016-08-04T11:41:02+12:00 (8 years ago)

Author:

kjdon

Message:

if att value is null for getNamedElement, will now return the first one with the specified attribute, regardless of value

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/util/GSXML.java (modified) (3 diffs)

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

@@ -140 +140 @@
     public static final String LANG_ATT = "lang";
   public static final String KEY_ATT = "key";
+  public static final String DICTIONARY_ATT = "dictionary";
     public static final String HREF_ATT = "href";
     public static final String TYPE_ATT = "type";
@@ -1047 +1048 @@
     }
 
-    /** returns the element parent/node_name[@attribute_name='attribute_value'] */
+    /** returns the element parent/node_name[@attribute_name='attribute_value'] 
+     if attribute_value is null, just returns the first one with that attribute */
     public static Element getNamedElement(Element parent, String node_name, String attribute_name, String attribute_value)
     {
@@ -1057 +1059 @@
             if (child.getNodeName().equals(node_name))
             {
-                if (((Element) child).getAttribute(attribute_name).equals(attribute_value))
-                    return (Element) child;
-            }
-        }
+              String att_val = ((Element) child).getAttribute(attribute_name);
+              if (!att_val.equals("") ) {
+                if (attribute_value == null || att_val.equals(attribute_value)) {
+                  return (Element) child;
+                }
+              }
+            }
+        } // for each child
         // not found
         return null;