Changeset 2680

Timestamp:

03/12/13 17:12:42 (11 years ago)

Author:

oschonef

Message:

• if client did not provide values for parameters "startRecord" or "maximumTerms" set them to the defaults defined in SRU specification

Location:

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

Files:

• SRURequest.java (modified) (2 diffs)
• SRURequestImpl.java (modified) (3 diffs)

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

@@ -102 +102 @@
     /**
      * Get the <em>startRecord</em> parameter of this request. Only available
-     * for <em>searchRetrieve</em> requests.
-     *
-     * @return the number of the start record or <code>-1</code> if no value was
-     *         supplied for this request
+     * for <em>searchRetrieve</em> requests. If the client did not provide
+     * a value for the request, it is set to <code>1</code>.
+     *
+     * @return the number of the start record
      */
     public int getStartRecord();
@@ -185 +185 @@
     /**
      * Get the <em>responsePosition</em> parameter of this request. Only
-     * available for <em>scan</em> requests.
-     *
-     * @return the response position or <code>-1</code> if no value was supplied
-     *         for this request
+     * available for <em>scan</em> requests. If the client did not provide
+     * a value for the request, it is set to <code>1</code>.
+     *
+     * @return the response position
      */
     public int getResponsePosition();

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

@@ -55 +55 @@
     private static final String X_UNLIMITED_RESULTSET   = "x-unlimited-resultset";
     private static final String X_INDENT_RESPONSE       = "x-indent-response";
+    private static final int DEFAULT_START_RECORD       = 1;
+    private static final int DEFAULT_RESPONSE_POSITION  = 1;
     private final SRUServerConfig config;
     private final HttpServletRequest request;
@@ -63 +65 @@
     private CQLNode query;
     private String rawQuery;
-    private int startRecord    = -1;
+    private int startRecord = DEFAULT_START_RECORD;
     private int maximumRecords = -1;
     private String recordSchemaName;
@@ -69 +71 @@
     private String stylesheet;
     private String recordXPath;
-    private int resultSetTTL   = -1;
+    private int resultSetTTL = -1;
     private String sortKeys;
     private CQLNode scanClause;
     private String rawScanClause;
-    private int responsePosition = -1;
+    private int responsePosition = DEFAULT_RESPONSE_POSITION;
     private int maximumTerms = -1;