Changeset 7016

Timestamp:

06/07/16 11:00:00 (8 years ago)

Author:

Leif-Jöran

Message:

Intermediate step adding initial support for SRU2.0 and FCS2.0 libraries for endpoints supporting SRU2.0. No ADV results or so.

Location:

SRUAggregator/trunk

Files:

• pom.xml (modified) (3 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/search/Search.java (modified) (2 diffs)
• src/main/resources/assets/js/main.jsx (modified) (2 diffs)

SRUAggregator/trunk/pom.xml

@@ -8 +8 @@
         <groupId>eu.clarin.sru.fcs</groupId>
         <artifactId>aggregator</artifactId>
-        <version>2.0.0-beta-53</version>
+        <version>2.0.0-beta-54</version>
         <name>FCS Aggregator</name>
 
@@ -56 +56 @@
                         <groupId>eu.clarin.sru</groupId>
                         <artifactId>sru-client</artifactId>
-                        <version>0.9.5</version>
+                        <version>1.8.0</version>
                         <exclusions>
                                 <exclusion>
@@ -68 +68 @@
                         </exclusions>
                 </dependency>
-
+                <dependency>
+                        <groupId>eu.clarin.sru.fcs</groupId>
+                        <artifactId>fcs-simple-client</artifactId>
+                        <version>1.3.0</version>
+                        <exclusions>
+                                <exclusion>
+                                        <groupId>org.slf4j</groupId>
+                                        <artifactId>slf4j-api</artifactId>
+                                </exclusion>
+                                <exclusion>
+                                        <groupId>commons-codec</groupId>
+                                        <artifactId>commons-codec</artifactId>
+                                </exclusion>
+                        </exclusions>
+                </dependency>
                 <dependency>
                         <groupId>eu.clarin.weblicht</groupId>

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/search/Search.java

@@ -1 +1 @@
 package eu.clarin.sru.fcs.aggregator.search;
 
-import eu.clarin.sru.client.SRUVersion;
 import java.util.List;
+import eu.clarin.sru.client.SRUClientConstants;
 import eu.clarin.sru.client.SRUClientException;
 import eu.clarin.sru.client.SRUSearchRetrieveRequest;
 import eu.clarin.sru.client.SRUSearchRetrieveResponse;
+import eu.clarin.sru.client.SRUVersion;
 import eu.clarin.sru.client.fcs.ClarinFCSRecordData;
 import eu.clarin.sru.fcs.aggregator.client.ThrottledClient;
@@ -88 +89 @@
                                 ? ClarinFCSRecordData.LEGACY_RECORD_SCHEMA
                                 : ClarinFCSRecordData.RECORD_SCHEMA);
-                searchRequest.setQuery(searchString);
+                searchRequest.setQuery((legacy || version != SRUVersion.VERSION_2_0) ? SRUClientConstants.QUERY_TYPE_CQL : "fcs", searchString);
                 if (corpus.getHandle() != null) {
                         searchRequest.setExtraRequestData(legacy

SRUAggregator/trunk/src/main/resources/assets/js/main.jsx

@@ -3 +3 @@
 "use strict";
 
-var VERSION = window.MyAggregator.VERSION = "v.2.0.0-beta-53";
+var VERSION = window.MyAggregator.VERSION = "v.2.0.0-beta-54";
 
 var URLROOT = window.MyAggregator.URLROOT =
@@ -464 +464 @@
                                                 <ul>
                                                         <li>Emanuel Dima</li>
+                                                        <li>Leif-Jöran Olsson</li> 
                                                         <li>Yana Panchenko</li>
                                                         <li>Oliver Schonefeld</li>