Changeset 6826

Timestamp:

11/18/15 00:20:05 (9 years ago)

Author:

Oliver Schonefeld

Message:

• initial support for FCS 2.0 query language
• update some dependencies

Location:

FCSSimpleEndpoint/trunk

Files:

• pom.xml (modified) (4 diffs)
• src/main/java/eu/clarin/sru/server/fcs/Constants.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/server/fcs/FCSQueryParser.java (added)
• src/main/java/eu/clarin/sru/server/fcs/SimpleEndpointSearchEngineBase.java (modified) (4 diffs)

FCSSimpleEndpoint/trunk/pom.xml

@@ -1 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
@@ -18 +20 @@
         <maven.compiler.target>1.6</maven.compiler.target>
         <!-- versions of common dependencies -->
-        <slf4j.version>1.7.7</slf4j.version>
+        <slf4j.version>1.7.12</slf4j.version>
     </properties>
 
@@ -38 +40 @@
             <groupId>eu.clarin.sru</groupId>
             <artifactId>sru-server</artifactId>
-            <version>1.7.0</version>
+            <version>1.8.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>eu.clarin.sru.fcs</groupId>
+            <artifactId>fcs-ql</artifactId>
+            <version>0.1-SNAPSHOT</version>
         </dependency>
         
@@ -44 +52 @@
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>woodstox-core-lgpl</artifactId>
-            <version>4.1.3</version>
+            <version>4.4.1</version>
                         <exclusions>
                                 <!-- StAX comes with Java 1.6 -->

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

@@ -20 +20 @@
 
 
+    public static final String FCS_QUERY_TYPE = "fcs";
+
+
     /* hide constructor */
     private Constants() {

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

@@ -19 +19 @@
 import eu.clarin.sru.server.SRUException;
 import eu.clarin.sru.server.SRUExplainResult;
+import eu.clarin.sru.server.SRUQueryParserRegistry;
 import eu.clarin.sru.server.SRURequest;
 import eu.clarin.sru.server.SRUScanResultSet;
@@ -52 +53 @@
      */
     @Override
-    public final void init(ServletContext context, SRUServerConfig config,
+    public final void init(ServletContext context,
+            SRUServerConfig config,
+            SRUQueryParserRegistry queryParsers,
             Map<String, String> params) throws SRUConfigException {
         logger.debug("initializing");
-        super.init(context, config, params);
+        super.init(context, config, queryParsers, params);
+
+        queryParsers.registerQueryParser(new FCSQueryParser());
 
         logger.debug("initializing search engine implementation");
-        doInit(context, config, params);
+        doInit(context, config, queryParsers, params);
 
         logger.debug("initizalizing endpoint description");
@@ -146 +151 @@
      * @param config
      *            the {@link SRUServerConfig} object for this search engine
+     * @param queryParsers
+     *            the {@link SRUQueryParserRegistry} object for this search
+     *            engine
      * @param params
      *            additional parameters gathered from the Servlet configuration
@@ -153 +161 @@
      */
     protected abstract void doInit(ServletContext context,
-            SRUServerConfig config, Map<String, String> params)
-            throws SRUConfigException;
+            SRUServerConfig config,
+            SRUQueryParserRegistry queryParsers,
+            Map<String, String> params) throws SRUConfigException;