Changeset 2644

Timestamp:

03/01/13 11:28:45 (11 years ago)

Author:

oschonef

Message:

• fix off-by-one when checking for out of range "startRecord" parameter (spotted by Hanna)
• updated JavaDoc? for getTotalRecords

Location:

SRUServer/trunk/src/main/java/eu/clarin/sru/server

Files:

• SRUSearchResultSet.java (modified) (1 diff)
• SRUServer.java (modified) (1 diff)

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUSearchResultSet.java

@@ -58 +58 @@
     /**
      * The number of records matched by the query. If the query fails this must
-     * be 0.
+     * be 0. If the search engine cannot determine the total number of matched
+     * by a query, it must return -1.
      *
-     * @return the total number of results or 0 if the query failed
+     * @return the total number of results or 0 if the query failed or -1 if the
+     *         search engine cannot determine the total number of results
      */
     public abstract int getTotalRecordCount();

SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUServer.java

@@ -352 +352 @@
 
         // check, of startRecord position is greater than total record set
-        if ((result.getTotalRecordCount() > 0) && (request.getStartRecord() > 0) &&
-                (request.getStartRecord() > result.getTotalRecordCount())) {
+        if ((result.getTotalRecordCount() >= 0) &&
+            (request.getStartRecord() > 0) &&
+            (request.getStartRecord() > result.getTotalRecordCount())) {
             throw new SRUException(SRUConstants.SRU_FIRST_RECORD_POSITION_OUT_OF_RANGE);
         }