Changeset 13975 for trunk

Timestamp:

2007-03-14T11:12:10+13:00 (17 years ago)

Author:

kjdon

Message:

check for null maxdocs param before converting to int

File:

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

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

@@ -478 +478 @@
         break;
     }
-
     
     // run the query
@@ -489 +488 @@
     Element metadata_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER); 
     result.appendChild(metadata_list);
-    
+
     // Add a metadata element specifying the number of matching documents
     long totalDocs = numDocsMatched(query_result);
@@ -502 +501 @@
     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);
+        String maxdocs_str = (String)params.get(MAXDOCS_PARAM);
+        if (maxdocs_str != null) {
+        int maxdocs = Integer.parseInt(maxdocs_str);
+        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);
@@ -517 +520 @@
         }
     }
+
     // Create a term list to store the term information, and add it
     Element term_list = this.doc.createElement(GSXML.TERM_ELEM+GSXML.LIST_MODIFIER);