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

Timestamp:

2002-08-23T10:09:38+12:00 (22 years ago)

Author:

kjdon

Message:

tidying

Location:

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

Files:

• BrowseAction.java (modified) (1 diff)
• PageAction.java (modified) (2 diffs)
• QueryAction.java (modified) (7 diffs)

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

@@ -16 +16 @@
     
     String info = request.getAttribute("info");
-    // remove the q/ bit
+    // remove the b/ bit
     info = GSPath.removeFirstLink(info);
-    String query_type = GSPath.getFirstLink(info);
+    String browse_type = GSPath.getFirstLink(info);
     
-    if (query_type.equals("")) {
-        query_type = "text";
-    }
-
-    if (query_type.equals("text")) {
-        return textQuery(request);
-    }
-    if (query_type.equals("field")) {
-        return fieldQuery(request);
-    }
-    return unknownQuery(request);
+    return unknownBrowse(request, browse_type);
 
     
     }
     
-    protected String textQuery(Element request) {
-    return GSHTML.errorPage("text query");
 
-    }
+    protected String unknownBrowse(Element request, String browse_type) {
 
-    protected String fieldQuery(Element request) {
-    return GSHTML.errorPage("field query");
-
-
-    }
-    protected String unknownQuery(Element request) {
-
-    return GSHTML.errorPage("unknown query subtype");
+    return GSHTML.errorPage("unknown browse subtype: "+browse_type);
     }
 }

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

@@ -58 +58 @@
     }
     
-    System.out.println("the initial xml response is");
-    System.out.println(converter_.getString(coll_list_response));
-
     // second, get the metadata for each collection
     NodeList colls = coll_list_response.getElementsByTagName("collection");
@@ -79 +76 @@
         GSXML.mergeMetadataLists(c, coll); // add the metadata to the original response
     }
-
-    System.out.println("the second xml response is");
-    System.out.println(converter_.getString(coll_list_response));
 
     //now the full response is in coll_list_response

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

@@ -97 +97 @@
     }
     Element imported_paramList = (Element)doc_.importNode(pl, true);
-    System.out.println("imported param list=");
-    System.out.println(converter_.getString(imported_paramList));
     // convert the name to short
     cgi_.addShortNames(imported_paramList);
-    System.out.println("converted param list=");
-    System.out.println(converter_.getString(imported_paramList));
 
     description.appendChild(imported_paramList);
@@ -114 +110 @@
         String name = param.getAttribute("name");
         String current = (String)params.get(name);
-        System.out.println("name="+name+", current="+current);
         if (current !=null && !current.equals("")) {
             param.setAttribute("default", current);
@@ -121 +116 @@
         param = (Element)param.getNextSibling();
     }
-    System.out.println("adapted param list=");
-    System.out.println(converter_.getString(imported_paramList));
     
     cgi_request.appendChild(description);
@@ -131 +124 @@
     if (query==null|| query.equals("")) {
         // if there is no q set, just output the search form
-        System.out.println("the plain page with no query data");
-        System.out.println(converter_.getString(page));
         return transformer_.transform(stylesheet, page);       
     }
@@ -182 +173 @@
         
         page.appendChild(doc_.importNode(result_response, true));
-        System.out.println("the page with empty response");
-        System.out.println(converter_.getString(page));     
         return transformer_.transform(stylesheet, page);
     }
@@ -211 +200 @@
     meta_content.appendChild(metadata_list);
 
-    System.out.println("the metadata request to mr");
-    System.out.println(converter_.getString(mr_metadata_message));
-
     Element mr_metadata_response = (Element)mr_.process(mr_metadata_message);
     
@@ -220 +206 @@
     page.appendChild(doc_.importNode(result_response, true));
     
-    System.out.println("the page with full response");
-    System.out.println(converter_.getString(page));     
-
     return transformer_.transform(stylesheet, page);