Changeset 15191 for greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/action/QueryAction.java

Timestamp:

2008-04-14T16:20:45+12:00 (16 years ago)

Author:

dmn

Message:

updating branch from trunk

File:

• greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/action/QueryAction.java (modified) (3 diffs)

greenstone3/branches/customizingGreenstone3/src/java/org/greenstone/gsdl3/action/QueryAction.java

@@ -107 +107 @@
     mr_query_message.appendChild(format_request);
 
+    logger.info(GSXML.xmlNodeToString(mr_query_message));
+
     // do the query
         Element mr_query_response = (Element)this.mr.process(mr_query_message);
@@ -207 +209 @@
     // check the hits_per_page param - is it a service param??
     String hits_pp = (String) service_params.get("hitsPerPage");
-    if (hits_pp != null) {
-        // the service is doing the paging, so we want to display all of the returned docs
-        return (Element)this.doc.importNode(orig_doc_list, true);
-    }
-    
-    hits_pp = (String)params.get("hitsPerPage");
+    if (hits_pp == null) {
+        // the service is doing the paging, so we want to display all of the returned docs(???)
+    //    return (Element)this.doc.importNode(orig_doc_list, true);
+    // try hitsPerPage in the globle param
+         hits_pp = (String)params.get("hitsPerPage");
+        }
+    
     int hits = 20;
     if (hits_pp != null && !hits_pp.equals("")) {
@@ -235 +238 @@
     // now we need our own doc list
     Element result_list = this.doc.createElement(GSXML.DOC_NODE_ELEM + GSXML.LIST_MODIFIER);
-    String start_p = (String)params.get("startPage");
+    
+    String start_p = (String) service_params.get("startPage");
+    if(start_p == null){
+        start_p = (String)params.get("startPage");
+    }
+
     int start = 1;
     if (start_p != null && !start_p.equals("")) {