Changeset 5954 for SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/search/Result.java

Timestamp:

01/26/15 15:12:46 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. alpha14: collections view stable sorting, better filtering; upfront diagnostic messages for search

File:

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

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

@@ -2 +2 @@
 
 import eu.clarin.sru.client.SRUClientException;
+import eu.clarin.sru.client.SRUDiagnostic;
 import eu.clarin.sru.client.SRURecord;
+import eu.clarin.sru.client.SRUSearchRetrieveRequest;
 import eu.clarin.sru.fcs.aggregator.scan.Corpus;
 import eu.clarin.sru.client.SRUSearchRetrieveResponse;
@@ -12 +14 @@
 import eu.clarin.sru.client.fcs.DataViewHits;
 import eu.clarin.sru.client.fcs.Resource;
+import eu.clarin.sru.fcs.aggregator.scan.Diagnostic;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.w3c.dom.Node;
@@ -32 +36 @@
         private List<Kwic> kwics = new ArrayList<Kwic>();
         private SRUClientException exception;
+        private List<Diagnostic> diagnostics = new ArrayList<Diagnostic>();
 
         public List<Kwic> getKwics() {
@@ -44 +49 @@
                         setResponse(response);
                 }
+                if (response != null && response.hasDiagnostics()) {
+                        setDiagnostics(response);
+                }
         }
 
-        public void setResponse(SRUSearchRetrieveResponse response) {
+        void setResponse(SRUSearchRetrieveResponse response) {
                 for (SRURecord record : response.getRecords()) {
                         if (record.isRecordSchema(ClarinFCSRecordData.RECORD_SCHEMA)) {
@@ -61 +69 @@
                                 log.info("Unsupported schema: {0}", record.getRecordSchema());
                         }
+                }
+        }
+
+        void setDiagnostics(SRUSearchRetrieveResponse response) {
+                for (SRUDiagnostic d : response.getDiagnostics()) {
+                        SRUSearchRetrieveRequest srurequest = response.getRequest();
+                        diagnostics.add(new Diagnostic(srurequest.getBaseURI().toString(),
+                                        srurequest.getQuery(),
+                                        d.getURI(), d.getMessage(), d.getDetails()));
                 }
         }
@@ -111 +128 @@
         }
 
+        public List<Diagnostic> getDiagnostics() {
+                return Collections.unmodifiableList(diagnostics);
+        }
+
         public int getStartRecord() {
                 return request.getStartRecord();
@@ -126 +147 @@
                 return request.getSearchString();
         }
-
 }