Changeset 3868

Timestamp:

2003-03-12T16:53:58+13:00 (21 years ago)

Author:

kjdon

Message:

relects GSXML changes

Location:

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

Files:

• action/AppletAction.java (modified) (1 diff)
• action/BrowseAction.java (modified) (1 diff)
• action/DocumentAction.java (modified) (1 diff)
• action/PageAction.java (modified) (1 diff)
• action/ProcessAction.java (modified) (1 diff)
• action/QueryAction.java (modified) (1 diff)
• service/GS2Construct.java (modified) (4 diffs)
• service/GS2MGPPSearch.java (modified) (1 diff)
• service/GS2MGSearch.java (modified) (1 diff)
• service/PhindPhraseBrowse.java (modified) (1 diff)
• service/XSLTServices.java (modified) (4 diffs)

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

@@ -32 +32 @@
     // get the collection and service param
     Element cgi_param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    HashMap params = GSXML.extractParams(cgi_param_list);
+    HashMap params = GSXML.extractParams(cgi_param_list, false);
 
     // request_type is display (d) or request (r)

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

@@ -53 +53 @@
     // extract the params from the cgi-request, and check that we have a coll specified
     Element cgi_paramList = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    HashMap params = GSXML.extractParams(cgi_paramList);
+    HashMap params = GSXML.extractParams(cgi_paramList, false);
 
     String service_name = (String)params.get(GSCGI.SERVICE_ARG);

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

@@ -45 +45 @@
     Element request = (Element)GSXML.getChildByTagName(message, GSXML.REQUEST_ELEM);
     Element cgi_paramList = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    HashMap params = GSXML.extractParams(cgi_paramList);
+    HashMap params = GSXML.extractParams(cgi_paramList, false);
 
     String collection = (String) params.get(GSCGI.COLLECTION_ARG);

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

@@ -119 +119 @@
     // extract the params from the cgi-request, 
     Element cgi_paramList = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    HashMap params = GSXML.extractParams(cgi_paramList);
+    HashMap params = GSXML.extractParams(cgi_paramList, false);
     
     String coll_name = (String)params.get(GSCGI.COLLECTION_ARG);

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

@@ -26 +26 @@
     // get the param list
     Element cgi_param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    HashMap params = GSXML.extractParams(cgi_param_list);
+    HashMap params = GSXML.extractParams(cgi_param_list, false);
     String service_name = (String) params.get(GSCGI.SERVICE_ARG);
     String cluster_name = (String) params.get(GSCGI.CLUSTER_ARG);

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

@@ -56 +56 @@
     Element cgi_param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
     
-    HashMap params = GSXML.extractParams(cgi_param_list);
+    HashMap params = GSXML.extractParams(cgi_param_list, false);
     
     String request_type = (String)params.get(GSCGI.REQUEST_TYPE_ARG);

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2Construct.java

@@ -172 +172 @@
     Element status = (Element)GSXML.getChildByTagName(response, GSXML.STATUS_ELEM);
     Element param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    HashMap params = GSXML.extractParams(param_list);
+    HashMap params = GSXML.extractParams(param_list, false);
     String coll_name = (String) params.get(COL_PARAM);
     String lang = request.getAttribute(GSXML.LANG_ATT);
@@ -228 +228 @@
     
     Element param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    HashMap params = GSXML.extractParams(param_list);
+    HashMap params = GSXML.extractParams(param_list, false);
     
     boolean get_status_only = false;
@@ -279 +279 @@
     
     Element param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    HashMap params = GSXML.extractParams(param_list);
+    HashMap params = GSXML.extractParams(param_list, false);
     
     boolean get_status_only = false;
@@ -474 +474 @@
 
     Element param_list = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    HashMap params = GSXML.extractParams(param_list);
+    HashMap params = GSXML.extractParams(param_list, false);
 
     boolean get_status_only = false;

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGPPSearch.java

@@ -447 +447 @@
 
     // Process the request parameters
-    HashMap params = GSXML.extractParams(param_list);
+    HashMap params = GSXML.extractParams(param_list, false);
 
     // Make sure a query has been specified

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/GS2MGSearch.java

@@ -155 +155 @@
 
     // Process the request parameters
-    HashMap params = GSXML.extractParams(param_list);
+    HashMap params = GSXML.extractParams(param_list, false);
 
     // Make sure a query has been specified

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/PhindPhraseBrowse.java

@@ -108 +108 @@
     
     Element param_elem = (Element)GSXML.getChildByTagName(request, GSXML.PARAM_ELEM+GSXML.LIST_MODIFIER);
-    HashMap params = GSXML.extractParams(param_elem);
+    HashMap params = GSXML.extractParams(param_elem, false);
     
     long first_e = Long.parseLong((String)params.get("pfe"));

trunk/gsdl3/src/java/org/greenstone/gsdl3/service/XSLTServices.java

@@ -182 +182 @@
     // Documents are just the ids decoding using standard URL decoding
     
-    String []ids = GSXML.getDocumentNameList(content_elem);
+    Element doc_list = (Element)GSXML.getChildByTagName(content_elem, GSXML.DOCUMENT_ELEM+GSXML.LIST_MODIFIER);
+    String []ids = GSXML.getAttributeValuesFromList(doc_list, GSXML.NAME_ATT);
     for (int j=0; j<ids.length; j++) {
       String document = null;
@@ -191 +192 @@
       }
       // something funny with the doc - 
-      Element new_doc = GSXML.createDocumentElement(doc_, ids[j]);
+      Element new_doc = doc_.createElement(GSXML.DOCUMENT_ELEM);
+      new_doc.setAttribute(GSXML.NAME_ATT, ids[j]); //GSXML.createDocumentElement(doc_, ids[j]);
       GSXML.addDocText(doc_, new_doc, document);
       response.appendChild(new_doc);
@@ -213 +215 @@
 
     // extract the only parameter we care about
-    HashMap params = GSXML.extractParams(param_list);
+    HashMap params = GSXML.extractParams(param_list, false);
     String query = (String)params.get(QUERY_PARAM);
     
@@ -253 +255 @@
     transformer.transform(source,result);
     String id = writer.toString();
-    Node no = GSXML.createDocumentElement(doc_, id);
-    resource_list.appendChild(no);
+    Element e = doc_.createElement(GSXML.DOCUMENT_ELEM);
+    e.setAttribute(GSXML.NAME_ATT, id); 
+    //Node no = GSXML.createDocumentElement(doc_, id);
+    resource_list.appendChild(e);
       } catch (Throwable t) {
     GSXML.addError(doc_, response, "Error in XSLTServices finding results:" + t.toString());