Changeset 5401 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action

Timestamp:

2003-09-01T15:44:22+12:00 (21 years ago)

Author:

kjdon

Message:

tidying up println stuff

Location:

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

Files:

• Action.java (modified) (2 diffs)
• BrowseAction.java (modified) (1 diff)
• DocumentAction.java (modified) (1 diff)
• GS2BrowseAction.java (modified) (7 diffs)
• QueryAction.java (modified) (1 diff)

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

@@ -72 +72 @@
         for (int i=0; i<nodes.getLength(); i++) {
         String name = ((Element)nodes.item(i)).getAttribute("name");
-        System.out.println("found a metadata name="+name);
         String select = ((Element)nodes.item(i)).getAttribute("select");
         if (select.equals("parent")) {
@@ -98 +97 @@
     
     }
-    System.out.println("metadata list = "+this.converter.getString(param_list));
     return param_list;
     }

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

@@ -276 +276 @@
         
 
-    System.out.println("(BrowseAction) Page:\n" + this.converter.getPrettyString(page_response));
+    ///ystem.out.println("(BrowseAction) Page:\n" + this.converter.getPrettyString(page_response));
     return page_response;
     }

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

@@ -301 +301 @@
         // now we can modifiy the response doc if needed
         String enrich_service = (String)params.get(GSParams.SERVICE);
-        System.out.println("enrich service is "+enrich_service);
         // send a message to the service
         Element enrich_message = this.doc.createElement(GSXML.MESSAGE_ELEM);

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

@@ -18 +18 @@
     
     public static final String CLASSIFIER_ARG = "cl";
-    //public static final String SIBLING_ARG = "sib";
-    // public static final String HORIZ_AT_TOP_ARG = "hat";
     
     /** process the request */
@@ -51 +49 @@
     }
     
-//      boolean horizontal_at_top = false;
-//      String hat = (String) params.get(HORIZ_AT_TOP_ARG);
-//      if (hat != null && hat.equals("1")) {
-//          horizontal_at_top = true;
-//      }
-    //whether to retrieve siblings or not
-//      boolean get_siblings = false;
-//      String sibs = (String) params.get(SIBLING_ARG);
-//      if (sibs != null && sibs.equals("1")) {
-//          get_siblings = true;
-//      }
-
     String lang = request.getAttribute(GSXML.LANG_ATT);
     String to = GSPath.appendLink(collection, service_name);
@@ -122 +108 @@
         Element new_format = GSXML.duplicateWithNewName(this.doc, this_format, GSXML.FORMAT_ELEM, false);
         extractMetadataNames(new_format, doc_meta_names, class_meta_names);
-        // set teh format type
+        // set the format type
         new_format.setAttribute(GSXML.TYPE_ATT, "browse");
 
@@ -159 +145 @@
     param.setAttribute(GSXML.NAME_ATT, "structure");
     param.setAttribute(GSXML.VALUE_ATT, "children");
-//      if (get_siblings) {
-//          param = this.doc.createElement(GSXML.PARAM_ELEM);
-//          param_list.appendChild(param);
-//          param.setAttribute(GSXML.NAME_ATT, "structure");
-//          param.setAttribute(GSXML.VALUE_ATT, "siblings");
-//      }
 
     // put the classifier node into a classifier node list
@@ -174 +154 @@
         
     if (horizontal_at_top && !classifier_node.equals(top_id)) {
-        // also put the top id in, to get teh persistant horizontal info
+        // also put the top id in, to get the persistant horizontal info
         classifier = this.doc.createElement(GSXML.CLASS_NODE_ELEM);
         classifier.setAttribute(GSXML.NODE_ID_ATT, top_id);
         classifier_list.appendChild(classifier);
-        System.out.println("GS2Browse:adding in the top node");
     }
     // process the request
     Element classify_response = (Element)this.mr.process(classify_message);
-    System.out.println("GS2Browse: classify response***********");
-    System.out.println(this.converter.getPrettyString(classify_response));
-    // get the structure element
-    //String [] links = {GSXML.MESSAGE_ELEM, GSXML.RESPONSE_ELEM, GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER};
-    //String path = GSPath.createPath(links);
     String path = GSPath.appendLink(GSXML.RESPONSE_ELEM, GSXML.CLASS_NODE_ELEM+GSXML.LIST_MODIFIER);
     Element class_node_list = (Element)GSXML.getNodeByPath(classify_response, path);
     
-    //path = GSPath.appendLink(path, GSXML.CLASS_NODE_ELEM);
     path = GSPath.appendLink(GSXML.CLASS_NODE_ELEM, GSXML.NODE_STRUCTURE_ELEM);
     // assume that we always get back the top level CL1 node - this becomes the page_classifier node
@@ -204 +177 @@
     if (horizontal_at_top && !classifier_node.equals(top_id)) {
         // get the info for the top node
-        //NodeList class_nodes = class_node_list.getElementsByTagName(GSXML.CLASSIFIER_ELEM);
-        
         Element top_node = GSXML.getNamedElement(class_node_list, GSXML.CLASS_NODE_ELEM, GSXML.NODE_ID_ATT, top_id);
         if (top_node !=null) {
@@ -332 +303 @@
         
 
-    System.out.println("(GS2BrowseAction) Page:\n" + this.converter.getPrettyString(page_response));
+    ///ystem.out.println("(GS2BrowseAction) Page:\n" + this.converter.getPrettyString(page_response));
     return page_response;
     }

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

@@ -177 +177 @@
     }
 
-    // System.out.println("Query page:\n" + converter_.getPrettyString(page_response));
+    ///ystem.out.println("Query page:\n" + converter_.getPrettyString(page_response));
     return page_response;
     }