Changeset 14226 for greenstone3/trunk/src/java

Timestamp:

2007-07-09T10:28:07+12:00 (17 years ago)

Author:

xiao

Message:

change getFirstChild() to getFirstElementChild() in case an extra line break or white space added before the first element child which might cause a cast exception.

Location:

greenstone3/trunk/src/java/org/greenstone/gsdl3/action

Files:

• AppletAction.java (modified) (1 diff)
• NoCollQueryAction.java (modified) (1 diff)

greenstone3/trunk/src/java/org/greenstone/gsdl3/action/AppletAction.java

@@ -63 +63 @@
         // get the applet data out and pass it back as is. 
         String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.APPLET_DATA_ELEM);
-        Element applet_info = (Element)GSXML.getNodeByPath(mr_response, path).getFirstChild();
+Element applet_info = GSXML.getFirstElementChild(GSXML.getNodeByPath(mr_response, path));
+        //Element applet_info = (Element)GSXML.getNodeByPath(mr_response, path).getFirstChild();
         return applet_info;
         

greenstone3/trunk/src/java/org/greenstone/gsdl3/action/NoCollQueryAction.java

@@ -153 +153 @@
     Document owner = result_list.getOwnerDocument();
     Node child = from_list.getFirstChild();
-    while (child != null) {
+    while (child != null && child.getNodeType() == Node.ELEMENT_NODE) {
         ((Element)child).setAttribute("collection", collection);
         result_list.appendChild(owner.importNode(child, true));