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

Timestamp:

02/12/15 13:09:57 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. alpha 19: better UI for statistics, misc bugfixes

File:

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

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

@@ -8 +8 @@
 import eu.clarin.sru.fcs.aggregator.client.ThrottledClient;
 import eu.clarin.sru.fcs.aggregator.scan.Corpus;
+import eu.clarin.sru.fcs.aggregator.scan.Diagnostic;
+import eu.clarin.sru.fcs.aggregator.scan.FCSProtocolVersion;
 import eu.clarin.sru.fcs.aggregator.scan.Statistics;
 import eu.clarin.sru.fcs.aggregator.util.SRUCQL;
@@ -61 +63 @@
                 searchRequest.setVersion(version);
                 searchRequest.setMaximumRecords(maxRecords);
+                FCSProtocolVersion fcsVersion = corpus.getEndpoint().getProtocol();
 //              searchRequest.setRecordSchema(
-//                              corpus.getEndpoint().getProtocol().equals(FCSProtocolVersion.LEGACY)
+//                              fcsVersion.equals(FCSProtocolVersion.LEGACY)
 //                                              ? ClarinFCSRecordData.LEGACY_RECORD_SCHEMA
 //                                              : ClarinFCSRecordData.RECORD_SCHEMA);
@@ -68 +71 @@
                 searchRequest.setStartRecord(startRecord);
                 if (corpus.getHandle() != null) {
-                        searchRequest.setExtraRequestData(SRUCQL.SEARCH_CORPUS_HANDLE_PARAMETER, corpus.getHandle());
+                        searchRequest.setExtraRequestData(
+                                        fcsVersion.equals(FCSProtocolVersion.LEGACY)
+                                                        ? SRUCQL.SEARCH_CORPUS_HANDLE_LEGACY_PARAMETER
+                                                        : SRUCQL.SEARCH_CORPUS_HANDLE_PARAMETER,
+                                        corpus.getHandle());
                 }
                 requests.add(request);
+
+                String url = null;
+                try {
+                        url = searchRequest.makeURI(SRUVersion.VERSION_1_2).toString();
+                } catch (SRUClientException ex) {
+                }
+                final String fullRequestUrl = url;
 
                 try {
@@ -81 +95 @@
                                                 results.add(result);
                                                 requests.remove(request);
-                                                if (!result.getDiagnostics().isEmpty()) {
-                                                        statistics.addEndpointDiagnostic(corpus.getInstitution(), corpus.getEndpoint(), null);
+                                                List<Diagnostic> diagnostics = result.getDiagnostics();
+                                                if (diagnostics != null && !diagnostics.isEmpty()) {
+                                                        log.error("diagnostic for url: " + response.getRequest().makeURI(SRUVersion.VERSION_1_2));
+                                                        for (Diagnostic diagnostic : diagnostics) {
+                                                                statistics.addEndpointDiagnostic(corpus.getInstitution(), corpus.getEndpoint(), diagnostic, fullRequestUrl);
+                                                        }
                                                 }
                                         } catch (Throwable xc) {
@@ -93 +111 @@
                                         try {
                                                 statistics.addEndpointDatapoint(corpus.getInstitution(), corpus.getEndpoint(), stats.getQueueTime(), stats.getExecutionTime());
-                                                statistics.addErrorDatapoint(corpus.getInstitution(), corpus.getEndpoint(), xc);
+                                                statistics.addErrorDatapoint(corpus.getInstitution(), corpus.getEndpoint(), xc, fullRequestUrl);
                                                 results.add(new Result(request, null, xc));
                                                 requests.remove(request);
+                                                log.error("search.onError: ", xc);
                                         } catch (Throwable xxc) {
                                                 log.error("search.onError exception:", xxc);