Changeset 3645 for trunk/gsdl3/src/java/org/greenstone/gsdl3/action/QueryAction.java

Timestamp:

2003-01-06T15:23:47+13:00 (21 years ago)

Author:

kjdon

Message:

actions tidied up a bit, ResourceAction changed to DocumentAction, BuildAction removed, more general ProcessAction added

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/action/QueryAction.java (modified) (6 diffs)

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

@@ -59 +59 @@
     HashMap params = GSXML.extractParams(cgi_param_list);
 
-    String collection = (String)params.get("collection");
+    String collection = (String)params.get(GSCGI.COLLECTION_ARG);
     if (collection == null || collection.equals("")) {
         System.err.println("QueryAction Error: no collection was specified!");
@@ -77 +77 @@
 
     Element mr_info_response = (Element) mr_.process(mr_info_message);
-    System.out.println("describe response from query=");
-    System.out.println(converter_.getString(mr_info_response));
     String path = GSXML.RESPONSE_ELEM;
     path = GSPath.appendLink(path, GSXML.SERVICE_ELEM);
@@ -87 +85 @@
         System.out.println("adding shortnames");
         // add short names to the params in the param list
-        cgi_.addShortNames(pl);
+        cgi_.paramListAddShortNames(pl);
         // for each param in the description, overwrite teh default value with the currently set value if present 
         Element param = (Element)pl.getFirstChild();
@@ -116 +114 @@
         }
     }
-    System.out.println(converter_.getString(pl));
     
     // part of the data for the description is the cgi-params
@@ -148 +145 @@
     // for now, just create a whole new request
     
-    // check that there are some resources - for now check the list, but later should use a numdocs metadata elem
+    // check that there are some documents - for now check the list, but later should use a numdocs metadata elem
     path = GSXML.RESPONSE_ELEM;
     path = GSPath.appendLink(path, GSXML.CONTENT_ELEM);
-    path = GSPath.appendLink(path, GSXML.RESOURCE_ELEM+GSXML.LIST_MODIFIER);
-    
-    Element resource_list = (Element)GSXML.getNodeByPath(mr_query_response,
-                                 path); // resourceList not present if no docs found
-    if (resource_list == null) {
+    path = GSPath.appendLink(path, GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
+    
+    Element document_list = (Element)GSXML.getNodeByPath(mr_query_response,
+                                 path); // documentList not present if no docs found
+    if (document_list == null) {
         
         Element result_response = (Element)GSXML.getChildByTagName(mr_query_response, GSXML.RESPONSE_ELEM);
@@ -182 +179 @@
     
     // the first part of the content is the doc list
-    meta_content.appendChild(doc_.importNode(resource_list, true));
+    meta_content.appendChild(doc_.importNode(document_list, true));
     
     // the second part of the content is the metadata list