Changeset 9874 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action/Action.java

Timestamp:

2005-05-16T11:02:50+12:00 (19 years ago)

Author:

kjdon

Message:

merged from branch ant-install-branch: merge 1

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/Action.java (modified) (2 diffs)

trunk/gsdl3/src/java/org/greenstone/gsdl3/action/Action.java

@@ -52 +52 @@
     public String process(String xml_in) {
        
-    Element message = this.converter.getDOM(xml_in).getDocumentElement();
-    
-    Element result = process(message);
+    Document message_doc = this.converter.getDOM(xml_in);
+    if (message_doc == null) {
+        System.err.println("Action.process(String) Error: Couldn't parse request");
+        System.err.println(xml_in);
+        return null;
+    }
+    Element result = process(message_doc.getDocumentElement());
     return this.converter.getString(result);
     }
@@ -115 +119 @@
     }
 
+    protected boolean processErrorElements(Element message, Element page) {
+    NodeList error_nodes = message.getElementsByTagName(GSXML.ERROR_ELEM);
+    if (error_nodes.getLength()==0) {
+        return false;
+    }
+    Document owner = page.getOwnerDocument();
+    for (int i=0; i<error_nodes.getLength(); i++) {
+        page.appendChild(owner.importNode(error_nodes.item(i), true));
+    }
+    return true;
+    }
 }