Changeset 5959 for SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/scan/ScanCrawlTask.java

Timestamp:

01/28/15 14:47:04 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. alpha16: added version page and better statistics

File:

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

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

@@ -21 +21 @@
         private AtomicReference<Corpora> corporaAtom;
         private File cachedCorpora;
-        private AtomicReference<Statistics> statisticsAtom;
+        private AtomicReference<Statistics> scanStatisticsAtom;
+        private AtomicReference<Statistics> searchStatisticsAtom;
         private String centerRegistryUrl;
 
@@ -27 +28 @@
                         int cacheMaxDepth, EndpointFilter filter,
                         AtomicReference<Corpora> corporaAtom, File cachedCorpora,
-                        AtomicReference<Statistics> statisticsAtom
-        ) {
+                        AtomicReference<Statistics> scanStatisticsAtom,
+                        AtomicReference<Statistics> searchStatisticsAtom
+                        ) {
                 this.sruClient = sruClient;
                 this.centerRegistryUrl = centerRegistryUrl;
@@ -35 +37 @@
                 this.corporaAtom = corporaAtom;
                 this.cachedCorpora = cachedCorpora;
-                this.statisticsAtom = statisticsAtom;
+                this.scanStatisticsAtom = scanStatisticsAtom;
+                this.searchStatisticsAtom = searchStatisticsAtom;
         }
 
@@ -45 +48 @@
                         log.info("ScanCrawlTask: Initiating crawl");
                         CenterRegistry centerRegistry = new CenterRegistryLive(centerRegistryUrl, filter);
-                        centerRegistry.getCQLInstitutions().add(0,
-                                        new Institution("test_IDS", null) {
-                                                {
-                                                        addEndpoint("https://clarin.ids-mannheim.de/digibibsru-new");
-                                                }
-                                        });
+//                      centerRegistry.getCQLInstitutions().add(0,
+//                                      new Institution("test_IDS", null) {
+//                                              {
+//                                                      addEndpoint("https://clarin.ids-mannheim.de/digibibsru-new");
+//                                              }
+//                                      });
 //                      CenterRegistry centerRegistry = new CenterRegistryForTesting();
                         ScanCrawler scanCrawler = new ScanCrawler(centerRegistry, sruClient, cacheMaxDepth);
@@ -58 +61 @@
 
                         corporaAtom.set(corpora);
-                        statisticsAtom.set(scanCrawler.getStatistics());
+                        scanStatisticsAtom.set(scanCrawler.getStatistics());
+                        searchStatisticsAtom.set(new Statistics()); // reset search stats
                         long time = System.currentTimeMillis() - time0;