X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fyaz4j%2FResultSet.java;h=ab3af1a04498e69d3c2250169c397c70d2e3fa37;hb=04a60ffa2d97a96191fcad999557818c7c95a5f9;hp=74903c92e82a701160fd746bd00a270d3f3c6d8b;hpb=496f28319f27feab3b9dea32768c59a401b9608a;p=yaz4j-moved-to-github.git

diff --git a/src/main/java/org/yaz4j/ResultSet.java b/src/main/java/org/yaz4j/ResultSet.java
index 74903c9..ab3af1a 100644
--- a/src/main/java/org/yaz4j/ResultSet.java
+++ b/src/main/java/org/yaz4j/ResultSet.java
@@ -1,47 +1,73 @@
 package org.yaz4j;
 
-import org.yaz4j.jni.SWIGTYPE_p_ZOOM_connection_p;
+import org.yaz4j.exception.ZoomException;
 import org.yaz4j.jni.SWIGTYPE_p_ZOOM_record_p;
 import org.yaz4j.jni.SWIGTYPE_p_ZOOM_resultset_p;
 import org.yaz4j.jni.yaz4jlib;
 
 public class ResultSet {
+  //for GC refcount
 
-    private SWIGTYPE_p_ZOOM_resultset_p resultSet;
-    private SWIGTYPE_p_ZOOM_connection_p connection;
-    private long size = 0;
-    private boolean disposed = false;
+  private Connection conn;
+  private SWIGTYPE_p_ZOOM_resultset_p resultSet;
+  private long size = 0;
+  private boolean disposed = false;
 
-    ResultSet(SWIGTYPE_p_ZOOM_resultset_p resultSet, SWIGTYPE_p_ZOOM_connection_p connection) {
-        this.resultSet = resultSet;
-        this.connection = connection;
-        size = yaz4jlib.ZOOM_resultset_size(this.resultSet);
-    }
+  ResultSet(SWIGTYPE_p_ZOOM_resultset_p resultSet, Connection conn) {
+    this.resultSet = resultSet;
+    size = yaz4jlib.ZOOM_resultset_size(this.resultSet);
+    this.conn = conn;
+  }
 
-    @Override
-    public void finalize() {
-        this._dispose();
-    }
+  @Override
+  public void finalize() {
+    this._dispose();
+  }
 
-    ResultSetOptionsCollection getResultSetOptions() {
-        return new ResultSetOptionsCollection(resultSet);
-    }
+  /**
+   * Read option by name.
+   * @param name option name
+   * @return option value
+   */
+  public String option(String name) {
+    return yaz4jlib.ZOOM_resultset_option_get(resultSet, name);
+  }
 
-    public Record getRecord(int index) {
-      SWIGTYPE_p_ZOOM_record_p recordTemp = yaz4jlib.ZOOM_resultset_record(resultSet, index);
-      return new Record(recordTemp, this);
-    }
+  /**
+   * Write option with a given name.
+   * @param name option name
+   * @param value option value
+   * @return result set (self) for chainability
+   */
+  public ResultSet option(String name, String value) {
+    yaz4jlib.ZOOM_resultset_option_set(resultSet, name, value);
+    return this;
+  }
 
-    public long getSize() {
-        return size;
+  public Record getRecord(int index) throws ZoomException {
+    SWIGTYPE_p_ZOOM_record_p record =
+      yaz4jlib.ZOOM_resultset_record(resultSet, index);
+    //may be out of range or unsupported syntax
+    if (record == null) {
+      return null;
+    }
+    int errorCode = yaz4jlib.ZOOM_record_error(record, null, null, null);
+    if (errorCode != 0) {
+      throw new ZoomException("Record excpetion, code " + errorCode);
     }
+    return new Record(record, this);
+  }
+
+  public long getHitCount() {
+    return size;
+  }
 
-    void _dispose() {
-        if (!disposed) {
-            yaz4jlib.ZOOM_resultset_destroy(resultSet);
-            connection = null;
-            resultSet = null;
-            disposed = true;
-        }
+  void _dispose() {
+    if (!disposed) {
+      yaz4jlib.ZOOM_resultset_destroy(resultSet);
+      resultSet = null;
+      conn = null;
+      disposed = true;
     }
+  }
 }