Changeset 9874 for trunk/gsdl3/src/java/org/greenstone/gsdl3/service/IViaSearch.java

Timestamp:

2005-05-16T11:02:50+12:00 (19 years ago)

Author:

kjdon

Message:

merged from branch ant-install-branch: merge 1

File:

• trunk/gsdl3/src/java/org/greenstone/gsdl3/service/IViaSearch.java (modified) (6 diffs)

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

@@ -2 +2 @@
 
 // Greenstone classes
-import org.greenstone.gdbm.*;
 import org.greenstone.gsdl3.util.*;
 
@@ -14 +13 @@
 import java.util.HashMap;
 import java.io.File;
-import java.io.InputStream;
 import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URLConnection;
-import java.net.URL;
 import java.net.Authenticator;
-import java.net.MalformedURLException;
 
 /**
  *
  * @author <a href="mailto:[email protected]">Katherine Don</a>
- * @version $Revision$
- * Modified by <a href="mailto:[email protected]">Chi-Yu Huang</a>
+ * @author <a href="mailto:[email protected]">Chi-Yu Huang</a>
  */
 
@@ -109 +100 @@
     String results_num = null;
     String doc_ids = null;
+    BufferedReader reader = null;
     try {
         ///system.err.println("IViaSearch, sending "+url_string);
-        BufferedReader reader = makeConnection(url_string);
+        reader = Misc.makeHttpConnection(url_string);
         results_num = reader.readLine();
         doc_ids = reader.readLine();
-    } catch (Exception e) {
-        System.err.println("IViaSearch.TextQuery Error: exception happened during query");
-        e.printStackTrace();
+    } catch (java.net.MalformedURLException e) {
+        GSXML.addError(this.doc, result, "Malformed URL: "+url_string);
+        return result;
+    } catch (java.io.IOException e) {
+        GSXML.addError(this.doc, result, "IOException during connection to "+url_string+": "+e.toString());
         return result;
     }
@@ -124 +118 @@
     } 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;
     }
@@ -130 +125 @@
     } 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);
         return result;
     }
@@ -150 +146 @@
     }
      
-    protected BufferedReader makeConnection(String url_string) {
-    BufferedReader reader = null;
-    try {
-        URL url = new URL(url_string);
-        HttpURLConnection connection = (HttpURLConnection)url.openConnection();
-        InputStream input = connection.getInputStream();
-        reader = new BufferedReader(new InputStreamReader(input));  
-    } catch (java.net.MalformedURLException e) {
-        System.err.println("IViaSearch Error: Malformed URL: "+url_string);
-    } catch (java.io.IOException e) {
-        System.err.println("IViaSearch Error: An error occurred during IO to url "+url_string);
-    }
-    return reader;
-    }
 
     /**