X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fyaz4j%2FConnection.java;h=1bd52fc345a94694d536d4b7e58b6676522bdde2;hb=51cc88d374e72f4c93a4721c2094e028a6ffae85;hp=680dabc7121ed68c27ce3228322ac9f243829329;hpb=1182e040f5a025caff6565e6e37a3a669e9354fb;p=yaz4j-moved-to-github.git

diff --git a/src/main/java/org/yaz4j/Connection.java b/src/main/java/org/yaz4j/Connection.java
index 680dabc..1bd52fc 100644
--- a/src/main/java/org/yaz4j/Connection.java
+++ b/src/main/java/org/yaz4j/Connection.java
@@ -1,22 +1,34 @@
 package org.yaz4j;
 
+import org.yaz4j.exception.ZoomImplementationException;
+import org.yaz4j.exception.ConnectionTimeoutException;
+import org.yaz4j.exception.InitRejectedException;
+import org.yaz4j.exception.Bib1Exception;
+import org.yaz4j.exception.InvalidQueryException;
+import org.yaz4j.exception.Bib1Diagnostic;
+import org.yaz4j.exception.ConnectionUnavailableException;
+import org.yaz4j.exception.ZoomException;
 import org.yaz4j.jni.SWIGTYPE_p_ZOOM_connection_p;
 import org.yaz4j.jni.SWIGTYPE_p_ZOOM_query_p;
 import org.yaz4j.jni.SWIGTYPE_p_ZOOM_resultset_p;
 import org.yaz4j.jni.SWIGTYPE_p_ZOOM_scanset_p;
-import org.yaz4j.jni.SWIGTYPE_p_p_char;
+import org.yaz4j.jni.SWIGTYPE_p_ZOOM_options_p;
 import org.yaz4j.jni.yaz4jlib;
 import org.yaz4j.jni.yaz4jlibConstants;
 
 public class Connection {
-
     private String host;
     private int port;
-    private ConnectionOptionsCollection options = null;
-    protected SWIGTYPE_p_ZOOM_connection_p zoomConnection = null;
-    private boolean connected = false;
+    final private SWIGTYPE_p_ZOOM_options_p options;
+    protected SWIGTYPE_p_ZOOM_connection_p zoomConnection;
+    //connection is initially closed
+    protected boolean closed = true;
     private boolean disposed = false;
 
+    public enum QueryType {
+        CQLQuery, PrefixQuery
+    };
+
     static {
         // on Linux   'yaz4j' maps to 'libyaz4j.so' (i.e. 'lib' prefix & '.so'  extension)
         // on Windows 'yaz4j' maps to 'yaz4j.dll'   (i.e.                '.dll' extension)
@@ -24,7 +36,7 @@ public class Connection {
         try {
             // System.err.println( "Loading library '"+ System.mapLibraryName( libName ) + "'" );
             System.loadLibrary(libName);
-        } catch (Throwable e) {
+        } catch (AbstractMethodError e) {
             System.err.println("Fatal Error: Failed to load library '" + System.mapLibraryName(libName) + "'");
             e.printStackTrace();
         }
@@ -33,62 +45,15 @@ public class Connection {
     public Connection(String host, int port) {
         this.host = host;
         this.port = port;
-
-        options = new ConnectionOptionsCollection();
-        zoomConnection = yaz4jlib.ZOOM_connection_create(options.zoomOptions);
-
-        SWIGTYPE_p_p_char cp = null;
-        SWIGTYPE_p_p_char addinfo = null;
-        int errorCode = yaz4jlib.ZOOM_connection_error(zoomConnection, cp, addinfo);
-        CheckErrorCodeAndThrow(errorCode);
+        options = yaz4jlib.ZOOM_options_create();
     }
 
     public void finalize() {
-        Dispose();
-    }
-
-    private void CheckErrorCodeAndThrow(int errorCode) {
-        String message;
-
-        if (errorCode == yaz4jlibConstants.ZOOM_ERROR_NONE) {
-            return;
-        } else if (errorCode == yaz4jlib.ZOOM_ERROR_CONNECT) {
-            message = String.format("Connection could not be made to %s:%d", host, port);
-            throw new ConnectionUnavailableException(message);
-        } else if (errorCode == yaz4jlib.ZOOM_ERROR_INVALID_QUERY) {
-            message = String.format("The query requested is not valid or not supported");
-            throw new InvalidQueryException(message);
-        } else if (errorCode == yaz4jlib.ZOOM_ERROR_INIT) {
-            message = String.format("Server %s:%d rejected our init request", host, port);
-            throw new InitRejectedException(message);
-        } else if (errorCode == yaz4jlib.ZOOM_ERROR_TIMEOUT) {
-            message = String.format("Server %s:%d timed out handling our request", host, port);
-            throw new ConnectionTimeoutException(message);
-        } else if ((errorCode == yaz4jlib.ZOOM_ERROR_MEMORY) || (errorCode == yaz4jlib.ZOOM_ERROR_ENCODE) || (errorCode == yaz4jlib.ZOOM_ERROR_DECODE) || (errorCode == yaz4jlib.ZOOM_ERROR_CONNECTION_LOST) || (errorCode == yaz4jlib.ZOOM_ERROR_INTERNAL) || (errorCode == yaz4jlib.ZOOM_ERROR_UNSUPPORTED_PROTOCOL) || (errorCode == yaz4jlib.ZOOM_ERROR_UNSUPPORTED_QUERY)) {
-            message = yaz4jlib.ZOOM_connection_errmsg(zoomConnection);
-            throw new ZoomImplementationException("A fatal error occurred in Yaz: " + errorCode + " - " + message);
-        } else {
-            String errMsgBib1 = "Bib1Exception: Error Code = " + errorCode + " (" + Bib1Diagnostic.GetError(errorCode) + ")";
-            throw new Bib1Exception(errMsgBib1);
-        }
+        _dispose();
     }
 
-    private enum QueryType {
-
-        CQLQuery, PrefixQuery
-    };
-
-    public ResultSet Search(PrefixQuery query) {
-        return Search(query.getQueryString(), QueryType.PrefixQuery);
-    }
-
-    public ResultSet Search(CQLQuery query) {
-        return Search(query.getQueryString(), QueryType.CQLQuery);
-    }
-
-    private ResultSet Search(String query, QueryType queryType) {
-        EnsureConnected();
-
+    public ResultSet search(String query, QueryType queryType) throws ZoomException {
+      if (closed) throw new IllegalStateException("Connection is closed.");
         SWIGTYPE_p_ZOOM_query_p yazQuery = yaz4jlib.ZOOM_query_create();
         ResultSet resultSet = null;
 
@@ -107,7 +72,7 @@ public class Connection {
             if (errorCode != yaz4jlib.ZOOM_ERROR_NONE) {
                 yaz4jlib.ZOOM_resultset_destroy(yazResultSet);
             }
-            CheckErrorCodeAndThrow(errorCode);
+            checkErrorCodeAndThrow(errorCode);
 
             resultSet = new ResultSet(yazResultSet, zoomConnection);
         } finally {
@@ -117,74 +82,130 @@ public class Connection {
         return resultSet;
     }
 
-    public ScanSet Scan(String query) {
-        EnsureConnected();
+    public ScanSet scan(String query) throws ZoomException {
+      if (closed) throw new IllegalStateException("Connection is closed.");
         SWIGTYPE_p_ZOOM_scanset_p yazScanSet = yaz4jlib.ZOOM_connection_scan(zoomConnection, query);
 
         int errorCode = yaz4jlib.ZOOM_connection_errcode(zoomConnection);
         if (errorCode != yaz4jlib.ZOOM_ERROR_NONE) {
             yaz4jlib.ZOOM_scanset_destroy(yazScanSet);
         }
-        CheckErrorCodeAndThrow(errorCode);
+        checkErrorCodeAndThrow(errorCode);
 
         ScanSet scanSet = new ScanSet(yazScanSet, this);
         return scanSet;
     }
 
-    public ConnectionOptionsCollection getOptions() {
-        return options;
-    }
+    /**
+     * Initiates the connection
+     */
+    public void connect() throws ZoomException {
+      //this is temporary before ZOOM-C has proper close method, right now
+      // simply recreate connection
+      if (closed)
+        zoomConnection = yaz4jlib.ZOOM_connection_create(options);
+      yaz4jlib.ZOOM_connection_connect(zoomConnection, host, port);
+      int errorCode = yaz4jlib.ZOOM_connection_errcode(zoomConnection);
+      checkErrorCodeAndThrow(errorCode);
+      closed = false;
+    }
+
+    /**
+     * Closes the connection.
+     */
+    public void close() {
+      if (!closed) {
+        yaz4jlib.ZOOM_connection_destroy(zoomConnection);
+        zoomConnection = null;
+        closed = true;
+      }
+    }
+
+    private void checkErrorCodeAndThrow(int errorCode) throws ZoomException {
+        String message;
 
-    protected void EnsureConnected() {
-        if (!connected) {
-            Connect();
+        if (errorCode == yaz4jlibConstants.ZOOM_ERROR_NONE) {
+            return;
+        } else if (errorCode == yaz4jlib.ZOOM_ERROR_CONNECT) {
+            message = String.format("Connection could not be made to %s:%d", host, port);
+            throw new ConnectionUnavailableException(message);
+        } else if (errorCode == yaz4jlib.ZOOM_ERROR_INVALID_QUERY) {
+            message = String.format("The query requested is not valid or not supported");
+            throw new InvalidQueryException(message);
+        } else if (errorCode == yaz4jlib.ZOOM_ERROR_INIT) {
+            message = String.format("Server %s:%d rejected our init request", host, port);
+            throw new InitRejectedException(message);
+        } else if (errorCode == yaz4jlib.ZOOM_ERROR_TIMEOUT) {
+            message = String.format("Server %s:%d timed out handling our request", host, port);
+            throw new ConnectionTimeoutException(message);
+        } else if ((errorCode == yaz4jlib.ZOOM_ERROR_MEMORY) || (errorCode == yaz4jlib.ZOOM_ERROR_ENCODE) || (errorCode == yaz4jlib.ZOOM_ERROR_DECODE) || (errorCode == yaz4jlib.ZOOM_ERROR_CONNECTION_LOST) || (errorCode == yaz4jlib.ZOOM_ERROR_INTERNAL) || (errorCode == yaz4jlib.ZOOM_ERROR_UNSUPPORTED_PROTOCOL) || (errorCode == yaz4jlib.ZOOM_ERROR_UNSUPPORTED_QUERY)) {
+            message = yaz4jlib.ZOOM_connection_errmsg(zoomConnection);
+            throw new ZoomImplementationException("A fatal error occurred in Yaz: " + errorCode + " - " + message);
+        } else {
+            String errMsgBib1 = "Bib1Exception: Error Code = " + errorCode + " (" + Bib1Diagnostic.getError(errorCode) + ")";
+            throw new Bib1Exception(errMsgBib1);
         }
     }
 
-    public void Connect() {
-        yaz4jlib.ZOOM_connection_connect(zoomConnection, host, port);
-        int errorCode = yaz4jlib.ZOOM_connection_errcode(zoomConnection);
-        CheckErrorCodeAndThrow(errorCode);
-        connected = true;
+    /**
+     * Write option with a given name.
+     * @param name option name
+     * @param value option value
+     * @return connection (self) for chainability
+     */
+    public Connection option(String name, String value) {
+      yaz4jlib.ZOOM_options_set(options, name, value);
+      return this;
     }
 
-    public void Dispose() {
-        if (!disposed) {
-            yaz4jlib.ZOOM_connection_destroy(zoomConnection);
-            zoomConnection = null;
-            disposed = true;
-        }
+    /**
+     * Read option with a given name
+     * @param name option name
+     * @return option value
+     */
+    public String option(String name) {
+      return yaz4jlib.ZOOM_options_get(options, name);
     }
 
     public String getSyntax() {
-        return options.get("preferredRecordSyntax");
+        return option("preferredRecordSyntax");
     }
 
     public void setSyntax(String value) {
-        options.set("preferredRecordSyntax", value);
+        option("preferredRecordSyntax", value);
     }
 
     public String getDatabaseName() {
-        return options.get("databaseName");
+        return option("databaseName");
     }
 
     public void setDatabaseName(String value) {
-        options.set("databaseName", value);
+        option("databaseName", value);
     }
 
     public String getUsername() {
-        return options.get("user");
+        return option("user");
     }
 
     public void setUsername(String value) {
-        options.set("user", value);
+        option("user", value);
     }
 
     public String getPassword() {
-        return options.get("password");
+        return option("password");
     }
 
     public void setPassword(String value) {
-        options.set("password", value);
+        option("password", value);
+    }
+
+    /**
+     * INTERNAL, GC-ONLY
+     */
+    void _dispose() {
+        if (!disposed) {
+          close();
+          disposed = true;
+        }
     }
 }