Changeset 25983

Timestamp:

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

Author:

sjm84

Message:

A minor fix as well as adding in a new element type

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

@@ -72 +72 @@
     public static final String STYLESHEET_ELEM = "format";//"stylesheet"; // any additional stylesheet stuff is carried in the message inside this elem
     public static final String FORMAT_ELEM = "format"; // config files use format - should we use this instead of stylesheet??
+    public static final String GLOBAL_FORMAT_ELEM = "globalFormat";
     public static final String TERM_ELEM = "term";
     public static final String STOPWORD_ELEM = "stopword";
@@ -713 +714 @@
         while (child != null)
         {
-            if (child.getNodeType() == Node.ELEMENT_NODE && child.getNamespaceURI().equals(namespace) && child.getLocalName() != null && child.getLocalName().equals(local_name))
+            if (child.getNodeType() == Node.ELEMENT_NODE && child.getNamespaceURI() != null && child.getNamespaceURI().equals(namespace) && child.getLocalName() != null && child.getLocalName().equals(local_name))
             {
                 node_list.addNode(child);
@@ -1063 +1064 @@
     public static Element getLastElementByTagNameNS(Element main, String namespace, String node_name)
     {
-
         NodeList nodes = main.getElementsByTagNameNS(namespace, node_name);
         int len = nodes.getLength();