Changeset 13574

Timestamp:

2007-01-11T14:47:42+13:00 (17 years ago)

Author:

kjdon

Message:

if there is only one level, add level param as an invisible parameter just in case there is level info hanging around in the cached params which may not be valid. also, doc_returned, don't rely on docs.length - if we are doing paging in the indexer, then we are only returning a subset of the results available

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/AbstractGS2FieldSearch.java (modified) (2 diffs)

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

@@ -294 +294 @@
         // the first one is the default
         param = GSXML.createParameterDescription2(this.doc, LEVEL_PARAM, getTextString("param."+LEVEL_PARAM, lang), GSXML.PARAM_TYPE_ENUM_SINGLE, (String)level_ids.get(0), level_ids, level_names);
-        }
-        
+        } else {
+        // we need to set the level, but hidden, in case there is an invalid level saved
+        param = GSXML.createParameterDescription(this.doc, LEVEL_PARAM, "", GSXML.PARAM_TYPE_INVISIBLE, (String)level_ids.get(0), null, null);
+        }
     } else if (name.equals(RANK_PARAM)) {
         String [] vals1 = {RANK_PARAM_RANK, RANK_PARAM_NONE };
@@ -481 +483 @@
 
     // add a metadata item to specify docs returned
-    GSXML.addMetadata(this.doc, metadata_list, "numDocsReturned", ""+docs.length);
+    int docs_returned = docs.length;
+    if (does_paging) {
+        int maxdocs = Integer.parseInt((String)params.get(MAXDOCS_PARAM));
+        docs_returned = (maxdocs < (int)totalDocs ? maxdocs : (int)totalDocs);
+    }
+    GSXML.addMetadata(this.doc, metadata_list, "numDocsReturned", ""+docs_returned);
     // add a metadata item to specify what actual query was done - eg if stuff was stripped out etc. and then we can use the query later, cos we don't know which parameter was the query
     GSXML.addMetadata(this.doc, metadata_list, "query", query);