Changeset 2873

Timestamp:

05/07/13 07:55:20 (11 years ago)

Author:

oschonef

Message:

• generalize and simplify

File:

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

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

@@ -197 +197 @@
     boolean checkParameters() {
         // parse mandatory operation parameter
-        final String op = getParameter(PARAM_OPERATION, false);
+        final String op = getParameter(PARAM_OPERATION, false, false);
         if (op != null) {
             if (!op.isEmpty()) {
@@ -257 +257 @@
             // check parameters ...
             for (ParameterInfo parameter : parameters) {
-                String value = getParameter(parameter.getName(), true);
+                String value = getParameter(parameter.getName(), true, true);
                 if (value != null) {
                     // remove supported parameter from list
@@ -400 +400 @@
 
     String getRawRecordSchemaIdentifier() {
-        return getRawParameter(PARAM_RECORD_SCHEMA);
+        return getParameter(PARAM_RECORD_SCHEMA, true, false);
     }
 
 
     String getRawQuery() {
-        return getRawParameter(PARAM_QUERY);
+        return getParameter(PARAM_QUERY, true, false);
     }
 
@@ -415 +415 @@
 
     String getRawScanClause() {
-        return getRawParameter(PARAM_SCAN_CLAUSE);
+        return getParameter(PARAM_SCAN_CLAUSE, true, false);
     }
 
@@ -648 +648 @@
 
 
-    private String getParameter(String name, boolean nullify) {
+    private String getParameter(String name, boolean nullify,
+            boolean diagnosticIfEmpty) {
         String s = request.getParameter(name);
         if (s != null) {
             s = s.trim();
             if (nullify && s.isEmpty()) {
-                addDiagnostic(SRUConstants.SRU_UNSUPPORTED_PARAMETER_VALUE,
-                        name, "An empty parameter \"" + PARAM_OPERATION +
-                                "\" is not supported.");
                 s = null;
+                if (diagnosticIfEmpty) {
+                    addDiagnostic(SRUConstants.SRU_UNSUPPORTED_PARAMETER_VALUE,
+                            name, "An empty parameter \"" + PARAM_OPERATION +
+                            "\" is not supported.");
+                }
             }
         }
@@ -663 +666 @@
 
 
-    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);
+        final String v = getParameter(PARAM_VERSION, true, true);
         if (v != null) {
             if (v.equals(VERSION_1_1)) {