Changeset 6821 for SRUServer/trunk/src/main/java/eu/clarin/sru/server/SRUServerConfig.java

Timestamp:

11/17/15 17:14:53 (9 years ago)

Author:

Oliver Schonefeld

Message:

• implement basic SRU 2.0 query handling ... kind of ...

File:

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

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

@@ -637 +637 @@
     private final IndexInfo indexInfo;
     private final List<SchemaInfo> schemaInfo;
+    private final List<SRUQueryParser<?>> queryParsers;
 
 
@@ -659 +660 @@
             DatabaseInfo databaseinfo,
             IndexInfo indexInfo,
-            List<SchemaInfo> schemaInfo) {
+            List<SchemaInfo> schemaInfo,
+            List<SRUQueryParser<?>> queryParsers) {
         this.minVersion                  = minVersion;
         this.maxVersion                  = maxVersion;
@@ -685 +687 @@
             this.schemaInfo = null;
         }
+        this.queryParsers = Collections.unmodifiableList(queryParsers);
 
         // build baseUrl
@@ -853 +856 @@
                         return schema;
                     }
+                }
+            }
+        }
+        return null;
+    }
+
+
+    public SRUQueryParser<?> findQueryParser(String queryType) {
+        if (queryType != null) {
+            for (SRUQueryParser<?> queryParser : queryParsers) {
+                if (queryParser.getQueryType().equals(queryType)) {
+                    return queryParser;
                 }
             }
@@ -1079 +1094 @@
                     SRU_RESPONSE_BUFFER_SIZE, false,
                     DEFAULT_RESPONSE_BUFFER_SIZE, 0, -1);
+
+            /*
+             * FIXME: add interface to register additional query parsers
+             */
+            List<SRUQueryParser<?>> queryParsers =
+                    new ArrayList<SRUQueryParser<?>>();
+            queryParsers.add(new CQLQueryParser());
 
             return new SRUServerConfig(minVersion,
@@ -1100 +1122 @@
                     databaseInfo,
                     indexInfo,
-                    schemaInfo);
+                    schemaInfo,
+                    queryParsers);
         } catch (IOException e) {
             throw new SRUConfigException("error reading configuration file", e);