Changeset 13570

Timestamp:

2007-01-11T14:40:49+13:00 (17 years ago)

Author:

kjdon

Message:

catch unforseen exceptions, and check for null sort_field and start_results<1

Location:

trunk

Files:

• gsdl/src/java/org/nzdl/gsdl/LuceneWrap/GS2LuceneQuery.java (modified) (4 diffs)
• indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneQuery.java (modified) (4 diffs)

trunk/gsdl/src/java/org/nzdl/gsdl/LuceneWrap/GS2LuceneQuery.java

@@ -157 +157 @@
         }
         }
-
+        
         // do the query
         // Simple case for getting all the matching documents
@@ -202 +202 @@
         exception.printStackTrace();
     }
-
+    catch (Exception exception) {
+        lucene_query_result.setError(LuceneQueryResult.OTHER_ERROR);
+        exception.printStackTrace();
+    }
     return lucene_query_result;
     }
@@ -253 +256 @@
     public void setSortField(String sort_field) {
     this.sort_field = sort_field;
-    this.sorter = new Sort(sort_field);
+    if (sort_field == null) {
+        this.sorter = new Sort();
+    } else {
+        this.sorter = new Sort(sort_field);
+    }
     }
     public String getSortField() {
@@ -260 +267 @@
         
     public void setStartResults(int start_results) {
+    if (start_results < 1) {
+        start_results = 1;
+    }
     this.start_results = start_results;
     }

trunk/indexers/lucene-gs/src/org/greenstone/LuceneWrapper/GS2LuceneQuery.java

@@ -157 +157 @@
         }
         }
-
+        
         // do the query
         // Simple case for getting all the matching documents
@@ -202 +202 @@
         exception.printStackTrace();
     }
-
+    catch (Exception exception) {
+        lucene_query_result.setError(LuceneQueryResult.OTHER_ERROR);
+        exception.printStackTrace();
+    }
     return lucene_query_result;
     }
@@ -253 +256 @@
     public void setSortField(String sort_field) {
     this.sort_field = sort_field;
-    this.sorter = new Sort(sort_field);
+    if (sort_field == null) {
+        this.sorter = new Sort();
+    } else {
+        this.sorter = new Sort(sort_field);
+    }
     }
     public String getSortField() {
@@ -260 +267 @@
         
     public void setStartResults(int start_results) {
+    if (start_results < 1) {
+        start_results = 1;
+    }
     this.start_results = start_results;
     }