Changeset 9813 for branches/ant-install-branch/gsdl3

Timestamp:

2005-05-04T16:12:38+12:00 (19 years ago)

Author:

kjdon

Message:

makeConnection moved to Misc, some methods now throw GSExceptions

File:

• branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/IViaRetrieve.java (modified) (7 diffs)

branches/ant-install-branch/gsdl3/src/java/org/greenstone/gsdl3/service/IViaRetrieve.java

@@ -2 +2 @@
 
 // Greenstone classes
+import org.greenstone.gsdl3.core.GSException;
 import org.greenstone.gsdl3.util.*;
 
@@ -60 +61 @@
         
     /** gets a document by sending a request to iVia, then processes it and creates a documentNode around the text */
-    protected Element getNodeContent(String doc_id) {
+    protected Element getNodeContent(String doc_id) 
+    throws GSException {
 
     String url_string = ivia_server_url+"/cgi-bin/view_record?theme=gsdl3&record_id="+doc_id;
@@ -66 +68 @@
     StringBuffer buffer = new StringBuffer();
     try {
-        BufferedReader reader = makeConnection(url_string);
+        BufferedReader reader = Misc.makeHttpConnection(url_string);
             String line;
         while((line = reader.readLine())!= null) {
         buffer.append(line);
         }
-    } catch (Exception e) {
-        System.err.println("IViaRetrieve Error:exception happened");
-        e.printStackTrace();
-    }
-    
+    } catch (java.net.MalformedURLException e) {
+        throw new GSException("Malformed URL: "+url_string, GSXML.ERROR_TYPE_SYSTEM);
+    } catch (java.io.IOException e) {
+        throw new GSException("IOException during connection to "+url_string+": "+e.toString(),GSXML.ERROR_TYPE_SYSTEM);
+    }
+
     String node_content = buffer.toString(); 
 
@@ -175 +178 @@
     }
 
-    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("IViaRetrieve: Malformed URL: "+url_string);
-    } catch (java.io.IOException e) {
-        System.err.println("IViaRetrieve Error: An error occurred during IO to url "+url_string);
-    }
-    return reader;
-    }
-
     protected String translateId(String oid){
     int p = oid.lastIndexOf('.');
@@ -221 +209 @@
     protected Element getMetadataList (String doc_id,
                        boolean all_metadata,
-                       ArrayList metadata_names){
+                       ArrayList metadata_names) 
+    throws GSException {
     
     Element meta_list = this.doc.createElement(GSXML.METADATA_ELEM+GSXML.LIST_MODIFIER);
@@ -242 +231 @@
     String url_string = ivia_server_url+"/cgi-bin/view_record_set?theme=gsdl3&record_id_list="+doc_id+"&field_list="+field_list.toString(); 
     try {
-        BufferedReader reader = makeConnection(url_string);
+        BufferedReader reader = Misc.makeHttpConnection(url_string);
         String line;
         while  ((line = reader.readLine()) != null) {
@@ -255 +244 @@
         GSXML.addMetadata(this.doc, meta_list, name, value);
         }
-    } catch (Exception e) {
-        System.err.println("IViaRetrieve Error:exception happened");
-        e.printStackTrace();
+    } catch (java.net.MalformedURLException e) {
+        throw new GSException("Malformed URL: "+url_string, GSXML.ERROR_TYPE_SYSTEM);
+    } catch (java.io.IOException e) {
+        throw new GSException("IOException: "+e.toString(), GSXML.ERROR_TYPE_SYSTEM);
     }
     return meta_list;