Changeset 21928 for main/trunk

Timestamp:

2010-04-20T17:58:15+12:00 (14 years ago)

Author:

ak19

Message:

Kathy improved some code to deal with my converting formatted strings (containing newlines) into XML (so that it contains empty elements).

File:

• main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/GS2BrowseAction.java (modified) (2 diffs)

main/trunk/greenstone3/src/java/org/greenstone/gsdl3/action/GS2BrowseAction.java

@@ -283 +283 @@
     // process the metadata requests
     Element metadata_response = (Element)this.mr.process(metadata_message);
-        if (did_classifier) {
+    if (did_classifier) {
         // the classifier one will be the first response
         // add the metadata lists for each node back into the 
@@ -293 +293 @@
             return page_response; 
         }
-        NodeList meta_response_cls = pathNode.getChildNodes();
+        //NodeList meta_response_cls = (Element)pathNode.getChildNodes(); // can't handle empty elements from converting formatted strings (with empty newlines) into XML
+        NodeList meta_response_cls = ((Element)pathNode).getElementsByTagName(GSXML.CLASS_NODE_ELEM);
         for (int i = 0; i < cl_nodes.getLength(); i++) {
         GSXML.mergeMetadataLists(cl_nodes.item(i), meta_response_cls.item(i));
-        
         }
     }