Changeset 9806 for branches/ant-install-branch/gsdl3

Timestamp:

2005-05-04T15:34:14+12:00 (19 years ago)

Author:

kjdon

Message:

looks for error elements after a call to the message router. also check that previous params exist before trying to use one in highlight query terms

File:

• branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/action/DocumentAction.java (modified) (4 diffs)

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/action/DocumentAction.java

@@ -209 +209 @@
         // Process the document structure retrieve message
         Element ds_response_message = (Element) this.mr.process(ds_message);
-        
+        if (processErrorElements(ds_response_message, page_response)) {
+        return result;
+        }
+
         // get the info and print out
         String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
@@ -309 +312 @@
     doc_list.appendChild(doc_node);
     Element dm_response_message = (Element) this.mr.process(dm_message);
+    if (processErrorElements(dm_response_message, page_response)) {
+        return result;
+    }
 
     String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.DOC_NODE_ELEM+GSXML.LIST_MODIFIER);
@@ -348 +354 @@
     System.err.println("request = "+converter.getString(dc_message));
     Element dc_response_message = (Element) this.mr.process(dc_message);
+    if (processErrorElements(dc_response_message, page_response)) {
+        return result;
+    }
+
     Element dc_response_doc_list = (Element) GSXML.getNodeByPath(dc_response_message, path);
 
@@ -536 +546 @@
     HashMap params = GSXML.extractParams(cgi_param_list, false);
     
-    
-    String service_name = (String)((HashMap)params.get("p")).get(GSParams.SERVICE);
+    HashMap previous_params = (HashMap)params.get("p");
+    if (previous_params == null) {
+        return dc_response_doc_content;
+    }
+        String service_name = (String)previous_params.get(GSParams.SERVICE);
     if (service_name == null || !service_name.endsWith("Query")) { // hack for now - we only do highlighting if we were in a query last - ie not if we were in a browse thingy
         System.err.println("DocumentAction: invalid service, not doing highlighting");