X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fyaz4j%2FConnection.java;h=3f8dc25293f20481a232c34a2b011d9da08553cd;hb=95873c80a22cbcb609b5a0260d624359500dcf19;hp=57b7a9fcdb1cbfb3bfea8914ea884c6dfe04fddc;hpb=c2b35d04750f2eace124d9c5fc86e68dc7079613;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 57b7a9f..3f8dc25 100644 --- a/src/main/java/org/yaz4j/Connection.java +++ b/src/main/java/org/yaz4j/Connection.java @@ -1,25 +1,15 @@ 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_ZOOM_options_p; import org.yaz4j.jni.yaz4jlib; -import org.yaz4j.jni.yaz4jlibConstants; public class Connection { private String host; private int port; - final private SWIGTYPE_p_ZOOM_options_p options; protected SWIGTYPE_p_ZOOM_connection_p zoomConnection; //connection is initially closed protected boolean closed = true; @@ -33,19 +23,13 @@ public class Connection { // on Linux 'yaz4j' maps to 'libyaz4j.so' (i.e. 'lib' prefix & '.so' extension) // on Windows 'yaz4j' maps to 'yaz4j.dll' (i.e. '.dll' extension) String libName = "yaz4j"; - try { - // System.err.println( "Loading library '"+ System.mapLibraryName( libName ) + "'" ); - System.loadLibrary(libName); - } catch (AbstractMethodError e) { - System.err.println("Fatal Error: Failed to load library '" + System.mapLibraryName(libName) + "'"); - e.printStackTrace(); - } + System.loadLibrary(libName); } public Connection(String host, int port) { this.host = host; this.port = port; - options = yaz4jlib.ZOOM_options_create(); + zoomConnection = yaz4jlib.ZOOM_connection_create(null); } public void finalize() { @@ -54,44 +38,33 @@ public class Connection { 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; - - try { - if (queryType == QueryType.CQLQuery) { - yaz4jlib.ZOOM_query_cql(yazQuery, query); - } else if (queryType == QueryType.PrefixQuery) { - yaz4jlib.ZOOM_query_prefix(yazQuery, query); - } else { - throw new InvalidQueryException("queryType"); - } - - SWIGTYPE_p_ZOOM_resultset_p yazResultSet = yaz4jlib.ZOOM_connection_search(zoomConnection, yazQuery); - - int errorCode = yaz4jlib.ZOOM_connection_errcode(zoomConnection); - if (errorCode != yaz4jlib.ZOOM_ERROR_NONE) { - yaz4jlib.ZOOM_resultset_destroy(yazResultSet); - } - checkErrorCodeAndThrow(errorCode); - - resultSet = new ResultSet(yazResultSet, this); - } finally { - yaz4jlib.ZOOM_query_destroy(yazQuery); // deallocate yazQuery also when exceptions - yazQuery = null; - } - return resultSet; + SWIGTYPE_p_ZOOM_query_p yazQuery = null; + if (queryType == QueryType.CQLQuery) { + yazQuery = yaz4jlib.ZOOM_query_create(); + yaz4jlib.ZOOM_query_cql(yazQuery, query); + } else if (queryType == QueryType.PrefixQuery) { + yazQuery = yaz4jlib.ZOOM_query_create(); + yaz4jlib.ZOOM_query_prefix(yazQuery, query); + } + SWIGTYPE_p_ZOOM_resultset_p yazResultSet = yaz4jlib.ZOOM_connection_search(zoomConnection, yazQuery); + ZoomException err = ExceptionUtil.getError(zoomConnection, host, + port); + if (err != null) { + yaz4jlib.ZOOM_resultset_destroy(yazResultSet); + yaz4jlib.ZOOM_query_destroy(yazQuery); + throw err; + } + return new ResultSet(yazResultSet, this); } 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) { + ZoomException err = ExceptionUtil.getError(zoomConnection, host, port); + if (err != null) { yaz4jlib.ZOOM_scanset_destroy(yazScanSet); + throw err; } - checkErrorCodeAndThrow(errorCode); - ScanSet scanSet = new ScanSet(yazScanSet, this); return scanSet; } @@ -100,13 +73,9 @@ public class Connection { * 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); + ZoomException err = ExceptionUtil.getError(zoomConnection, host, port); + if (err != null) throw err; closed = false; } @@ -114,37 +83,8 @@ public class Connection { * 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; - - 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); - } + yaz4jlib.ZOOM_connection_close(zoomConnection); + closed = true; } /** @@ -154,7 +94,7 @@ public class Connection { * @return connection (self) for chainability */ public Connection option(String name, String value) { - yaz4jlib.ZOOM_options_set(options, name, value); + yaz4jlib.ZOOM_connection_option_set(zoomConnection, name, value); return this; } @@ -164,7 +104,7 @@ public class Connection { * @return option value */ public String option(String name) { - return yaz4jlib.ZOOM_options_get(options, name); + return yaz4jlib.ZOOM_connection_option_get(zoomConnection, name); } public String getSyntax() { @@ -204,7 +144,8 @@ public class Connection { */ void _dispose() { if (!disposed) { - close(); + yaz4jlib.ZOOM_connection_destroy(zoomConnection); + zoomConnection = null; disposed = true; } }