From: Jakub Skoczen <jakub@indexdata.dk>
Date: Thu, 15 Apr 2010 10:17:43 +0000 (+0200)
Subject: Rename getSize => getHitCount
X-Git-Tag: v1.2~3
X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=06909ae14ede94b3b40dd64fbbc3aec3c6727796;p=yaz4j-moved-to-github.git

Rename getSize => getHitCount

The old name is confusing and may be understood as the size
of local result set.
---

diff --git a/examples/zgate/src/main/java/com/indexdata/zgate/ZgateServlet.java b/examples/zgate/src/main/java/com/indexdata/zgate/ZgateServlet.java
index 13b1a07..d7f2130 100644
--- a/examples/zgate/src/main/java/com/indexdata/zgate/ZgateServlet.java
+++ b/examples/zgate/src/main/java/com/indexdata/zgate/ZgateServlet.java
@@ -66,10 +66,11 @@ public class ZgateServlet extends HttpServlet {
     try {
       con.connect();
       ResultSet set = con.search(query, Connection.QueryType.PrefixQuery);
-      response.getWriter().println("Showing " + maxrecs + " of " +set.getSize());
+      response.getWriter().println("Showing " + maxrecs + " of " +set.getHitCount());
       response.getWriter().println();
-      for(int i=0; i<set.getSize() && i<maxrecs; i++) {
+      for(int i=0; i<set.getHitCount() && i<maxrecs; i++) {
         Record rec = set.getRecord(i);
+        if (rec == null) continue;
         response.getWriter().print(rec.render());
       }
     } catch (ZoomException ze) {
diff --git a/src/main/java/org/yaz4j/ResultSet.java b/src/main/java/org/yaz4j/ResultSet.java
index fd55c1b..75bdc85 100644
--- a/src/main/java/org/yaz4j/ResultSet.java
+++ b/src/main/java/org/yaz4j/ResultSet.java
@@ -55,7 +55,7 @@ public class ResultSet {
       return new Record(record, this);
     }
 
-    public long getSize() {
+    public long getHitCount() {
         return size;
     }
 
diff --git a/src/test/org/yaz4j/ConnectionTest.java b/src/test/org/yaz4j/ConnectionTest.java
index f7ea9ee..cb2cab9 100644
--- a/src/test/org/yaz4j/ConnectionTest.java
+++ b/src/test/org/yaz4j/ConnectionTest.java
@@ -17,7 +17,7 @@ public class ConnectionTest {
           ResultSet s = con.search("@attr 1=4 utah", Connection.QueryType.PrefixQuery);
           System.out.println("Search for 'utah'...");
           assertNotNull(s);
-          assertEquals(s.getSize(), 9);
+          assertEquals(s.getHitCount(), 9);
           Record rec = s.getRecord(0);
           assertNotNull(rec);
           byte[] content = rec.getContent();
@@ -43,7 +43,7 @@ public class ConnectionTest {
         con.connect();
         System.out.println("Search for something that exists...");
         ResultSet set = con.search("@attr 1=7 0253333490", Connection.QueryType.PrefixQuery);
-        System.out.println("Result set size: " + set.getSize());
+        System.out.println("Result set size: " + set.getHitCount());
         System.out.println("Get the first record...");
         Record rec = set.getRecord(0);
         if (rec == null) {
@@ -71,7 +71,7 @@ public class ConnectionTest {
           con.connect();
           ResultSet s = con.search("100", Connection.QueryType.PrefixQuery);
           assertNotNull(s);
-          assertEquals(s.getSize(), 100);
+          assertEquals(s.getHitCount(), 100);
           Record rec = s.getRecord(0);
           fail("We should never get here and get ZoomeException instead");
         } catch (ZoomException ze) {