Changeset 6092 for SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/scan/ScanCrawler.java

Timestamp:

03/10/15 14:16:28 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. beta-27: more results, bug fixes

File:

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

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/scan/ScanCrawler.java

@@ -225 +225 @@
                 final Corpora corpora;
                 final int depth;
-                String fullRequestUrl;
 
                 ScanTask(final Institution institution, final Endpoint endpoint,
@@ -248 +247 @@
                                 scanRequest.setExtraRequestData(SRUCQL.SCAN_RESOURCE_INFO_PARAMETER,
                                                 SRUCQL.SCAN_RESOURCE_INFO_PARAMETER_DEFAULT_VALUE);
-                                fullRequestUrl = scanRequest.getRequestedURI().toString();
                         } catch (Throwable ex) {
                                 log.error("Exception creating scan request for {}: {}", endpoint.getUrl(), ex.getMessage());
@@ -285 +283 @@
                                         for (SRUDiagnostic d : response.getDiagnostics()) {
                                                 Diagnostic diag = new Diagnostic(d.getURI(), d.getMessage(), d.getDetails());
-                                                statistics.addEndpointDiagnostic(institution, endpoint, diag, fullRequestUrl);
-                                                log.info("Diagnostic: {}: {}", fullRequestUrl, diag.message);
+                                                statistics.addEndpointDiagnostic(institution, endpoint, diag, response.getRequest().getRequestedURI().toString());
+                                                log.info("Diagnostic: {}: {}", response.getRequest().getRequestedURI().toString(), diag.message);
                                         }
                                 }
@@ -294 +292 @@
                                 log.error("{} Exception in scan callback {}#{}", latch.get(), endpoint.getUrl(), normalizeHandle(parentCorpus));
                                 log.error("--> ", xc);
-                                statistics.addErrorDatapoint(institution, endpoint, xc, fullRequestUrl);
+                                statistics.addErrorDatapoint(institution, endpoint, xc, response.getRequest().getRequestedURI().toString());
                         } finally {
                                 latch.decrement();
@@ -305 +303 @@
                                 log.error("{} Error while scanning {}#{}: {}", latch.get(), endpoint.getUrl(), normalizeHandle(parentCorpus), error.getMessage());
                                 statistics.addEndpointDatapoint(institution, endpoint, stats.getQueueTime(), stats.getExecutionTime());
-                                statistics.addErrorDatapoint(institution, endpoint, error, fullRequestUrl);
+                                statistics.addErrorDatapoint(institution, endpoint, error, request.getRequestedURI().toString());
                                 if (Throw.isCausedBy(error, SocketTimeoutException.class)) {
                                         return;