Changeset 10194

Timestamp:

2005-06-30T09:24:40+12:00 (19 years ago)

Author:

kjdon

Message:

when doing a search, if teh result is not in the right format, now print the whole result in the error message, not just the first line

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/IViaSearch.java (modified) (1 diff)

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

@@ -127 +127 @@
     }
         
-    if (results_num.startsWith("Resources: ")) {
+    if (results_num.startsWith("Resources: ") && doc_ids.startsWith("Ids: ")) {
         results_num = results_num.substring(11);
+        doc_ids = doc_ids.substring(5).trim();
+
     } else {
-        System.err.println("IViaSearch.TextQuery Error: badly formatted results line: "+results_num);
-        GSXML.addError(this.doc, result, "Error: badly formatted result from IVia server: "+results_num);
-        return result;
-    }
-    if (doc_ids.startsWith("Ids: ")) {
-        doc_ids = doc_ids.substring(5).trim();
-    } else {
-        System.err.println("IViaSearch.TextQuery Error: badly formatted docs line: "+doc_ids);
-        GSXML.addError(this.doc, result, "Error: badly formatted result from IVia server: "+doc_ids);
+        System.err.println("IViaSearch.TextQuery Error: badly formatted results:");
+        StringBuffer result_string = new StringBuffer();
+        result_string.append("Error: badly formatted result from IVia server:\n ");
+        result_string.append(results_num);
+        result_string.append(doc_ids);
+        String line;
+        try {
+        while((line = reader.readLine()) != null) {
+            result_string.append(line);
+        }
+        } catch (Exception e) {
+        result_string.append("Exception: "+e);
+        }
+        GSXML.addError(this.doc, result, result_string.toString());
+        
         return result;
     }