Changeset 3944

Timestamp:

2003-03-20T14:24:23+12:00 (21 years ago)

Author:

kjdon

Message:

tidied up error messages a bit

Location:

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

Files:

• Action.java (modified) (3 diffs)
• BrowseAction.java (modified) (2 diffs)
• DocumentAction.java (modified) (1 diff)
• PageAction.java (modified) (1 diff)
• QueryAction.java (modified) (3 diffs)

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

@@ -72 +72 @@
     abstract public Element process(Element xml_in);
 
+    /** locates the format element, transforms it with config_format.xsl, then
+     * returns the transformed element */
     protected Element getAndTransformFormat(Element format_response) {
     
@@ -78 +80 @@
         return null;
     }
-    System.out.println("old format="+converter_.getString(format_elem));
     // transform it to proper xsl
     String stylesheet_file = GSFile.stylesheetFile(config_, "config_format.xsl");
@@ -84 +85 @@
     Element new_format = (Element)transformer_.transform(stylesheet, format_elem);
 
-    System.out.println("new format="+converter_.getString(new_format));
     return new_format;
 

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

@@ -85 +85 @@
     Element info_response = (Element) mr_.process(info_message);
 
-    System.out.println("getting format and description, response=\n"+converter_.getString(info_response));
     // get out the description
     String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.SERVICE_ELEM);
@@ -156 +155 @@
                                 path);
     if (cl_structure ==null) {
-        System.out.println("BrowseAction: classifier structure request returned no structure");
+        System.err.println("BrowseAction: classifier structure request returned no structure");
         
         // return the page so far

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

@@ -224 +224 @@
     page.appendChild(response);
     response.appendChild(the_document);
-    
-     System.out.println("doc action: Finished page: " + converter_.getString(page));
-    
-    
+        
     // Finally, process using the stylesheet, and return
     String stylesheet = GSFile.stylesheetFile(config_, "document.xsl");

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

@@ -73 +73 @@
         metadata_message.appendChild(metadata_request);
     }
-    System.out.println("PageAction: getting metadata for each collection.");
+
     Element metadata_response = (Element)mr_.process(metadata_message);
 

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

@@ -146 +146 @@
     mr_query_request.appendChild(query_param_list);
         
-        
-    //System.out.println("Query request: " + converter_.getString(mr_query_request));
     Element mr_query_response = (Element)mr_.process(mr_query_message);
-    //System.out.println("Query response: " + converter_.getString(mr_query_response));
-
-    Element query_result_metadata_list = (Element) GSXML.getNodeByPath(mr_query_response, "response/metadataList");
+
+    path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
+    Element query_result_metadata_list = (Element) GSXML.getNodeByPath(mr_query_response, path);
     if (query_result_metadata_list == null) {
-        System.err.println("Warning: No query result metadata.\n");
-    }
-
-    Element query_term_info_list = (Element) GSXML.getNodeByPath(mr_query_response, "response/termList");
+        System.err.println("QueryAction: Warning: No query result metadata.\n");
+    }
+    path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);
+    Element query_term_info_list = (Element) GSXML.getNodeByPath(mr_query_response, path);
     if (query_term_info_list == null) {
-        System.err.println("Warning: No query term information.\n");
-    }
-    System.out.println("Query term info:\n" + converter_.getString(query_term_info_list));
+        System.err.println("QueryAction: Warning: No query term information.\n");
+    }
 
     // this result is the list of docs.
@@ -211 +208 @@
 
     mr_metadata_request.appendChild(doc_.importNode(document_list, true));
-    // System.out.println("Metadata request: " + converter_.getString(mr_metadata_message));
-    Element mr_metadata_response = (Element)mr_.process(mr_metadata_message);
-    
+    Element mr_metadata_response = (Element)mr_.process(mr_metadata_message);   
     Element result_response = (Element)GSXML.getChildByTagName(mr_metadata_response, GSXML.RESPONSE_ELEM);
     
@@ -226 +221 @@
 
     page.appendChild(doc_.importNode(result_response, true));
-    
-    System.out.println("Query XMLTransformer input:\n " + converter_.getString(page));
     
     // output the page