Changeset 2179 for SRUCQIBridge

Timestamp:

08/30/12 13:12:47 (12 years ago)

Author:

akislev

Message:

Updated to use a separately packaged CQI Client

Location:

SRUCQIBridge

Files:

• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/sru/cqibridge/CqiClient.java (deleted)
• src/main/java/eu/clarin/sru/cqibridge/CqiClientException.java (deleted)
• src/main/java/eu/clarin/sru/cqibridge/CqiResult.java (deleted)
• src/main/java/eu/clarin/sru/cqibridge/CqiSRUSearchEngine.java (modified) (7 diffs)
• src/main/webapp/META-INF/context.xml (modified) (1 diff)

SRUCQIBridge/pom.xml

@@ -18 +18 @@
             <artifactId>sru-server</artifactId>
             <version>0.6.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>eu.clarin.cqi</groupId>
+            <artifactId>cqi-client</artifactId>
+            <version>1.0-SNAPSHOT</version>
         </dependency>
     </dependencies>

SRUCQIBridge/src/main/java/eu/clarin/sru/cqibridge/CqiSRUSearchEngine.java

@@ -16 +16 @@
 package eu.clarin.sru.cqibridge;
 
+import eu.clarin.cqi.client.CqiClient;
+import eu.clarin.cqi.client.CqiClientException;
+import eu.clarin.cqi.client.CqiResult;
 import eu.clarin.sru.server.*;
 import eu.clarin.sru.server.utils.SRUSearchEngineBase;
@@ -55 +58 @@
     private static final Pattern SPACE_PATTERN = Pattern.compile("\\s+");
     private static final String WORD_POSITIONAL_ATTRIBUTE = "word";
+    private static final String CONTEXT_STRUCTURAL_ATTRIBUTE = "s";
     private static final Logger logger =
             LoggerFactory.getLogger(CqiSRUSearchEngine.class);
@@ -158 +162 @@
                 new Object[]{cqpQuery, startRecord, maximumRecords});
         try {
-            final CqiResult result = client.cqpQuery(defaultCorpusName, cqpQuery);
-            if (!result.absolute(startRecord)) {
+            final CqiResult result = client.query(defaultCorpusName, cqpQuery, CONTEXT_STRUCTURAL_ATTRIBUTE);
+            if ((result.size() > 0 && !result.absolute(startRecord)) || (result.size() == 0 && startRecord > 0)) {
                 diagnostics.addDiagnostic(SRUConstants.SRU_FIRST_RECORD_POSITION_OUT_OF_RANGE, Integer.toString(startRecord + 1), null);
             }
@@ -204 +208 @@
                 public void writeRecord(XMLStreamWriter writer)
                         throws XMLStreamException {
-                    final CqiResult.Range context;
-                    try {
-                        context = result.getRange(CqiResult.Field.CONTEXT);
-                    } catch (CqiClientException e) {
-                        throw new XMLStreamException("can't obtain the context range", e);
-                    }
-                    final CqiResult.Range match;
-                    try {
-                        match = result.getRange(CqiResult.Field.MATCH);
-                    } catch (CqiClientException e) {
-                        throw new XMLStreamException("can't obtain the match range", e);
-                    }
-                    int matchStart = match.getStart() - context.getStart();
-                    int matchEnd = match.getEnd() - context.getStart() + 1;
-                    int contextEnd = context.getEnd() - context.getStart() + 1;
+                    final int contextStart = result.getContextStart();
+                    final int contextEnd = result.getContextEnd();
+                    final int matchStart = result.getMatchStart();
+                    final int matchEnd = result.getMatchEnd();
+                    final int relMatchStart = matchStart - contextStart;
+                    final int relMatchEnd = matchEnd - contextStart + 1;
+                    final int relContextEnd = contextEnd - contextStart + 1;
                     final StringBuilder leftContext = new StringBuilder();
                     final StringBuilder keyWord = new StringBuilder();
@@ -224 +220 @@
                     String[] words;
                     try {
-                        words = context.getValues(WORD_POSITIONAL_ATTRIBUTE);
+                        words = result.getValues(WORD_POSITIONAL_ATTRIBUTE, contextStart, contextEnd);
                     } catch (CqiClientException e) {
                         throw new XMLStreamException("can't obtain the values of the positional attribute '" + WORD_POSITIONAL_ATTRIBUTE + "'", e);
                     }
                     boolean isFirst = true;
-                    for (int i = 0; i < matchStart; i++) {
+                    for (int i = 0; i < relMatchStart; i++) {
                         if (isFirst) {
                             isFirst = false;
@@ -238 +234 @@
                     }
                     isFirst = true;
-                    for (int i = matchStart; i < matchEnd; i++) {
+                    for (int i = relMatchStart; i < relMatchEnd; i++) {
                         if (isFirst) {
                             isFirst = false;
@@ -247 +243 @@
                     }
                     isFirst = true;
-                    for (int i = matchEnd; i < contextEnd; i++) {
+                    for (int i = relMatchEnd; i < relContextEnd; i++) {
                         if (isFirst) {
                             isFirst = false;

SRUCQIBridge/src/main/webapp/META-INF/context.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context antiJARLocking="true" path="/SRUCQIBridge"/>
+<Context antiJARLocking="true" path="/sru"/>