Changeset 3491

Timestamp:

2002-10-25T16:33:34+13:00 (22 years ago)

Author:

kjdon

Message:

actions all use cgi arg long names now, not short names

Location:

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

Files:

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

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

@@ -38 +38 @@
     HashMap params = GSXML.extractParams(cgi_paramList);
 
-    String collection = (String)params.get("c");
-    String service_name=(String)params.get("sn");
+    String collection = (String)params.get("collection");
+    String service_name=(String)params.get("serviceName");
     service_name+= "Applet";
     

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

@@ -52 +52 @@
     HashMap params = GSXML.extractParams(cgi_paramList);
 
-    String collection = (String)params.get("c");
+    String collection = (String)params.get("collection");
     if (collection == null || collection.equals("")) {
         return GSHTML.errorPage("classifierbrowse, need to specify a collection!");
@@ -83 +83 @@
 
     // if there is a cl field in the cgi params, get the classifier info
-    String node = (String)params.get("cl");
+    String node = (String)params.get("classifier");
 
     if (node==null|| node.equals("")) {

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

@@ -94 +94 @@
     protected String aboutPage(Element page, Element request) {
 
-    // get the params out
-    HashMap params = GSXML.extractParams((Element)GSXML.getNodeByPath(request, "paramList"));
-    String coll_name = (String)params.get("c");
+    // extract the params from the cgi-request, 
+    // first convert short to long names
+    Element cgi_paramList = (Element)GSXML.getChildByTagName(request, "paramList");
+    cgi_.toLong(cgi_paramList);
+    HashMap params = GSXML.extractParams(cgi_paramList);
+    
+    String coll_name = (String)params.get("collection");
     if (coll_name == null || coll_name.equals("")) {
-        coll_name = (String)params.get("sc"); // cluster name
+        coll_name = (String)params.get("serviceCluster"); // cluster name
     }
     if (coll_name == null || coll_name.equals("")) {

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

@@ -63 +63 @@
     HashMap params = GSXML.extractParams(cgi_paramList);
 
-    String collection = (String)params.get("c");
+    String collection = (String)params.get("collection");
     if (collection == null || collection.equals("")) {
         return GSHTML.errorPage("textquery, need to specify a colleciton!");
@@ -94 +94 @@
     else {
         System.out.println("pl name is "+pl.getNodeName());
-    }
-    Element imported_paramList = (Element)doc_.importNode(pl, true);
-    // convert the name to short
-    cgi_.addShortNames(imported_paramList);
-
-    description.appendChild(imported_paramList);
-    
-    // for each param in page_request, set the current value if present
-    //actually, prob dont need to know the default value, just which one to display - overwrite the default att?
-    
-    Element param = (Element)imported_paramList.getFirstChild();
-    while (param !=null) {
-        if (param.getNodeName().equals("param")) { // just in case
-        String name = param.getAttribute("name");
-        String current = (String)params.get(name);
-        if (current !=null && !current.equals("")) {
-            param.setAttribute("default", current);
+    
+        Element imported_paramList = (Element)doc_.importNode(pl, true);
+        // convert the name to short
+        cgi_.addShortNames(imported_paramList);
+
+        description.appendChild(imported_paramList);
+    
+        // for each param in page_request, set the current value if present
+        //actually, prob dont need to know the default value, just which one to display - overwrite the default att?
+        
+        Element param = (Element)imported_paramList.getFirstChild();
+        while (param !=null) {
+        if (param.getNodeName().equals("param")) { // just in case
+            String name = param.getAttribute("name");
+            String current = (String)params.get(name);
+            if (current !=null && !current.equals("")) {
+            param.setAttribute("default", current);
+            }
         }
+        param = (Element)param.getNextSibling();
         }
-        param = (Element)param.getNextSibling();
-    }
-    
+    }
     cgi_request.appendChild(description);
     
     // check the query string
-    String query = (String)params.get("q");
+    String query = (String)params.get("query");
 
     if (query==null|| query.equals("")) {

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

@@ -33 +33 @@
     HashMap params = GSXML.extractParams(cgi_paramList);
 
-    String resource_name = (String)params.get("r");
+    String resource_name = (String)params.get("resource");
     if (resource_name == null || resource_name.equals("")) {
         // no doc to show
@@ -56 +56 @@
     mr_request.setAttribute("type", "query");
     mr_request.setAttribute("resourceType", "core");
-    String to = (String)params.get("c"); // collection name
+    String to = (String)params.get("collection"); // collection name
     to = GSPath.appendLink(to, "ResourceRetrieve");
     mr_request.setAttribute("to", to);