Changeset 29522

Timestamp:

2014-12-03T12:40:42+13:00 (9 years ago)

Author:

kjdon

Message:

need to check that namespaceURI is not null before using it, new method, getMetadataValue - get a metadata value from a metadata list

File:

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

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

@@ -1041 +1041 @@
         {
             Node child = children.item(i);
-            if (child.getNodeType() == Node.ELEMENT_NODE && child.getNamespaceURI().equals(namespace_uri) && child.getLocalName().equals(node_local_name))
+            if (child.getNodeType() == Node.ELEMENT_NODE && child.getNamespaceURI() != null && child.getNamespaceURI().equals(namespace_uri) && child.getLocalName().equals(node_local_name))
             {
                 if (((Element) child).getAttribute(attribute_name).equals(attribute_value))
@@ -1058 +1058 @@
         {
             Node child = children.item(i);
-            if (child.getNodeType() == Node.ELEMENT_NODE && child.getNamespaceURI().equals(namespace_uri) && child.getLocalName().equals(node_local_name))
+            if (child.getNodeType() == Node.ELEMENT_NODE && child.getNamespaceURI() != null && child.getNamespaceURI().equals(namespace_uri) && child.getLocalName().equals(node_local_name))
             {
                 if (((Element) child).getAttribute(attribute_name).equals(attribute_value))
@@ -1141 +1141 @@
         {
             Node child = children.item(i);
-            if (child.getNodeType() == Node.ELEMENT_NODE && child.getNamespaceURI().equals(namespace) && child.getLocalName() != null && child.getLocalName().equals(node_local_name))
+            if (child.getNodeType() == Node.ELEMENT_NODE && child.getNamespaceURI() != null && child.getNamespaceURI().equals(namespace) && child.getLocalName() != null && child.getLocalName().equals(node_local_name))
             {
                 if (((Element) child).getAttribute(attribute_name).equals(attribute_value))
@@ -1220 +1220 @@
     }
 
+  public static String getMetadataValue(Element metadata_list, String name) {
+    Element meta = getNamedElement(metadata_list, METADATA_ELEM, NAME_ATT, name);
+    if (meta == null) {
+      return "";
+    }
+    String att_value = meta.getAttribute(VALUE_ATT);
+    if (att_value.equals("")) {
+      // try the text
+      att_value = getNodeText(meta);
+    }
+    return att_value;
+  }
     /**
      * Returns the appropriate language element from a display elem, display is