Changeset 2692

Timestamp:

03/13/13 11:05:15 (11 years ago)

Author:

oschonef

Message:

• fix "first record out of range" generated for empty result sets (second attempt; this time be a little less restrictive)

Location:

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

Files:

• SRURequestImpl.java (modified) (6 diffs)
• SRUServer.java (modified) (1 diff)

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

@@ -66 +66 @@
     private CQLNode query;
     private String rawQuery;
-    private int startRecord = -1;
+    private int startRecord = DEFAULT_START_RECORD;
     private int maximumRecords = -1;
     private String recordSchemaName;
@@ -76 +76 @@
     private CQLNode scanClause;
     private String rawScanClause;
-    private int responsePosition = -1;
+    private int responsePosition = DEFAULT_RESPONSE_POSITION;
     private int maximumTerms = -1;
 
@@ -411 +411 @@
 
 
-    int getRawStartRecord() {
-        return startRecord;
-    }
-
-
     int getRawMaximumRecords() {
         return maximumRecords;
@@ -423 +418 @@
     String getRawScanClause() {
         return rawScanClause;
-    }
-
-
-    int getRawResponsePosition() {
-        return responsePosition;
     }
 
@@ -503 +493 @@
     @Override
     public int getStartRecord() {
-        return (startRecord > 0) ? startRecord : DEFAULT_START_RECORD;
+        return startRecord;
     }
 
@@ -563 +553 @@
     @Override
     public int getResponsePosition() {
-        return (responsePosition >= 0)
-                ? responsePosition : DEFAULT_RESPONSE_POSITION;
+        return responsePosition;
     }
 

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

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