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

Timestamp:

02/13/15 11:45:30 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. alpha 20: routing and direct links, improved UI for statistics, bugfixes

File:

• SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/search/Search.java (modified) (2 diffs)

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

@@ -6 +6 @@
 import eu.clarin.sru.client.SRUSearchRetrieveRequest;
 import eu.clarin.sru.client.SRUSearchRetrieveResponse;
+import eu.clarin.sru.client.fcs.ClarinFCSRecordData;
 import eu.clarin.sru.fcs.aggregator.client.ThrottledClient;
 import eu.clarin.sru.fcs.aggregator.scan.Corpus;
@@ -63 +64 @@
                 searchRequest.setVersion(version);
                 searchRequest.setMaximumRecords(maxRecords);
-                FCSProtocolVersion fcsVersion = corpus.getEndpoint().getProtocol();
-//              searchRequest.setRecordSchema(
-//                              fcsVersion.equals(FCSProtocolVersion.LEGACY)
-//                                              ? ClarinFCSRecordData.LEGACY_RECORD_SCHEMA
-//                                              : ClarinFCSRecordData.RECORD_SCHEMA);
+                boolean legacy = corpus.getEndpoint().getProtocol().equals(FCSProtocolVersion.LEGACY);
+                searchRequest.setRecordSchema(legacy
+                                ? ClarinFCSRecordData.LEGACY_RECORD_SCHEMA
+                                : ClarinFCSRecordData.RECORD_SCHEMA);
                 searchRequest.setQuery("\"" + searchString + "\"");
                 searchRequest.setStartRecord(startRecord);
                 if (corpus.getHandle() != null) {
-                        searchRequest.setExtraRequestData(
-                                        fcsVersion.equals(FCSProtocolVersion.LEGACY)
-                                                        ? SRUCQL.SEARCH_CORPUS_HANDLE_LEGACY_PARAMETER
-                                                        : SRUCQL.SEARCH_CORPUS_HANDLE_PARAMETER,
+                        searchRequest.setExtraRequestData(legacy
+                                        ? SRUCQL.SEARCH_CORPUS_HANDLE_LEGACY_PARAMETER
+                                        : SRUCQL.SEARCH_CORPUS_HANDLE_PARAMETER,
                                         corpus.getHandle());
                 }