Changeset 6843

Timestamp:

11/25/15 10:28:27 (8 years ago)

Author:

Oliver Schonefeld

Message:

• sync with changes in SRUServer

File:

• FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/FCSQueryParser.java (modified) (5 diffs)

FCSSimpleEndpoint/trunk/src/main/java/eu/clarin/sru/server/fcs/FCSQueryParser.java

@@ -15 +15 @@
 import eu.clarin.sru.server.SRUDiagnosticList;
 import eu.clarin.sru.server.SRUQuery;
+import eu.clarin.sru.server.SRUQueryBase;
 import eu.clarin.sru.server.SRUQueryParser;
 import eu.clarin.sru.server.SRUVersion;
@@ -28 +29 @@
     }
 
+
+    @Override
+    public boolean supportsVersion(SRUVersion version) {
+        if (version == null) {
+            throw new NullPointerException("version == null");
+        }
+        /*
+         * CQL is supported by all SRU versions ...
+         */
+        return version.compareTo(SRUVersion.VERSION_2_0) >= 0;
+    }
+
+
     @Override
     public String getQueryTypeDefintion() {
@@ -33 +47 @@
     }
 
+
     @Override
     public List<String> getQueryParameterNames() {
         return QUERY_PARAMETER_NAMES;
     }
+
 
     @Override
@@ -65 +81 @@
 
 
-    public static final class FCSQuery implements SRUQuery<ParseTree> {
-        private final String rawQuery;
-        private final ParseTree parsedQuery;
+    public static final class FCSQuery extends SRUQueryBase<ParseTree> {
 
 
         private FCSQuery(String rawQuery, ParseTree parsedQuery) {
-            this.rawQuery    = rawQuery;
-            this.parsedQuery = parsedQuery;
+            super(rawQuery, parsedQuery);
         }
 
@@ -80 +93 @@
             return Constants.FCS_QUERY_TYPE;
         }
-
-
-        @Override
-        public String getRawQuery() {
-            return rawQuery;
-        }
-
-
-        @Override
-        public ParseTree getParsedQuery() {
-            return parsedQuery;
-        }
     }