Changeset 2688

Timestamp:

03/13/13 10:55:16 (11 years ago)

Author:

oschonef

Message:

• fix "first record out of range" generated for empty result sets

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

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.getStartRecord() > 0) &&
-            (request.getStartRecord() > result.getTotalRecordCount())) {
-            throw new SRUException(SRUConstants.SRU_FIRST_RECORD_POSITION_OUT_OF_RANGE);
+            (request.getRawStartRecord() > 0) &&
+            (request.getRawStartRecord() > result.getTotalRecordCount())) {
+            throw new SRUException(
+                    SRUConstants.SRU_FIRST_RECORD_POSITION_OUT_OF_RANGE);
         }