Changeset 2867 for SRUServer

Timestamp:

05/06/13 18:49:08 (11 years ago)

Author:

oschonef

Message:

• save a few bytes of memory

File:

• SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRURequestImpl.java (modified) (8 diffs)

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

@@ -65 +65 @@
     private SRURecordPacking recordPacking;
     private CQLNode query;
-    private String rawQuery;
     private int startRecord = DEFAULT_START_RECORD;
     private int maximumRecords = -1;
     private String recordSchemaIdentifier;
-    private String rawRecordSchemaIdentifier;
     private String stylesheet;
     private String recordXPath;
@@ -75 +73 @@
     private String sortKeys;
     private CQLNode scanClause;
-    private String rawScanClause;
     private int responsePosition = DEFAULT_RESPONSE_POSITION;
     private int maximumTerms = -1;
@@ -294 +291 @@
                     case QUERY:
                         query = parseCQLParameter(parameter.getName(), value);
-                        if (query != null) {
-                            rawQuery = value;
-                        }
                         break;
                     case START_RECORD:
@@ -330 +324 @@
                                         "\" is not supported  for retrieval.");
                             }
-
-                            // always save submitted parameter
-                            rawRecordSchemaIdentifier = value;
                         }
                         break;
@@ -348 +339 @@
                         scanClause = parseCQLParameter(
                                 parameter.getName(), value);
-                        if (scanClause != null) {
-                            rawScanClause = value;
-                        }
                         break;
                     case RESPONSE_POSITION:
@@ -412 +400 @@
 
     String getRawRecordSchemaIdentifier() {
-        return rawRecordSchemaIdentifier;
+        return getRawParameter(PARAM_RECORD_SCHEMA);
     }
 
 
     String getRawQuery() {
-        return rawQuery;
+        return getRawParameter(PARAM_QUERY);
     }
 
@@ -427 +415 @@
 
     String getRawScanClause() {
-        return rawScanClause;
+        return getRawParameter(PARAM_SCAN_CLAUSE);
     }
 
@@ -675 +663 @@
 
 
+    private String getRawParameter(String name) {
+        String s = request.getParameter(name);
+        if (s != null) {
+            s = s.trim();
+            if (s.isEmpty()) {
+                s = null;
+            }
+        }
+        return s;
+    }
+
+
     private void parseAndCheckVersionParameter() {
         final String v = getParameter(PARAM_VERSION, true);