Changeset 6049

Timestamp:

02/25/15 11:11:38 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. alpha 22: backup for corpora cache file + fix popup trigger

Location:

SRUAggregator/trunk

Files:

• aggregator.yml (modified) (1 diff)
• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java (modified) (4 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/app/AggregatorConfiguration.java (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/scan/ScanCrawlTask.java (modified) (5 diffs)
• src/main/resources/assets/js/components.js (modified) (2 diffs)
• src/main/resources/assets/js/components.jsx (modified) (2 diffs)
• src/main/resources/assets/js/main.js (modified) (1 diff)
• src/main/resources/assets/js/main.jsx (modified) (1 diff)
• src/main/resources/assets/js/search.js (modified) (1 diff)
• src/main/resources/assets/js/search.jsx (modified) (1 diff)

SRUAggregator/trunk/aggregator.yml

@@ -13 +13 @@
 
   # AGGREGATOR_FILE_PATH: /data/fcsAggregator/fcsAggregatorCorpora.json
+  # AGGREGATOR_FILE_PATH_BACKUP: /data/fcsAggregator/fcsAggregatorCorpora.backup.json
   AGGREGATOR_FILE_PATH: /Users/edima/fcsAggregatorCorpora.json
-
+  AGGREGATOR_FILE_PATH_BACKUP: /Users/edima/fcsAggregatorCorpora.backup.json
   SCAN_MAX_DEPTH: 1 # recommended 3
   SCAN_TASK_INITIAL_DELAY: 0

SRUAggregator/trunk/pom.xml

@@ -8 +8 @@
         <groupId>eu.clarin.sru.fcs</groupId>
         <artifactId>Aggregator2</artifactId>
-        <version>2.0.0-alpha-21</version>
+        <version>2.0.0-alpha-22</version>
         <name>FCS Aggregator</name>
 

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/Aggregator.java

@@ -88 +88 @@
  * @author edima
  *
- * TODO: Use weblicht with results
- *
- * TODO: disable popups easily
- * 
- * TODO: atomic replace of cached corpora (file)
- *
  * TODO: zoom into the results from a corpus, allow functionality only for
  * the view (search for next set of results)
  *
- * TODO: fix search bug after going to stats
+ * TODO: Use weblicht with results
  *
  * TODO: Export search results to personal workspace as csv, excel, tcf, plain
@@ -151 +145 @@
                 bootstrap.addBundle(new AssetsBundle("/assets", "/", "index.html", "static"));
         }
-
 
         @Override
@@ -221 +214 @@
 
                 File corporaCacheFile = new File(params.AGGREGATOR_FILE_PATH);
-                try {
-                        Corpora corpora = new ObjectMapper().readValue(corporaCacheFile, Corpora.class);
-                        scanCacheAtom.set(corpora);
-                        log.info("corpus list read from file; number of root corpora: " + scanCacheAtom.get().getCorpora().size());
-                } catch (Exception e) {
-                        log.error("Error while reading cached corpora:", e);
+                File corporaOldCacheFile = new File(params.AGGREGATOR_FILE_PATH_BACKUP);
+
+                // init corpora from file
+                {
+                        Corpora corpora = null;
+                        try {
+                                corpora = new ObjectMapper().readValue(corporaCacheFile, Corpora.class);
+                        } catch (Exception xc) {
+                                log.error("Failed to load cached corpora from primary file:", xc);
+                        }
+                        if (corpora == null) {
+                                try {
+                                        corpora = new ObjectMapper().readValue(corporaOldCacheFile, Corpora.class);
+                                } catch (Exception e) {
+                                        log.error("Failed to load cached corpora from backup file:", e);
+                                }
+                        }
+                        if (corpora != null) {
+                                scanCacheAtom.set(corpora);
+                                log.info("corpus list read from file; number of root corpora: " + scanCacheAtom.get().getCorpora().size());
+                        }
                 }
 
@@ -236 +244 @@
                                 params.CENTER_REGISTRY_URL, params.SCAN_MAX_DEPTH,
                                 params.additionalCQLEndpoints,
-                                null, scanCacheAtom, corporaCacheFile,
+                                null, scanCacheAtom, corporaCacheFile, corporaOldCacheFile,
                                 scanStatsAtom, searchStatsAtom);
                 scheduler.scheduleAtFixedRate(task, params.SCAN_TASK_INITIAL_DELAY,

SRUAggregator/trunk/src/main/java/eu/clarin/sru/fcs/aggregator/app/AggregatorConfiguration.java

@@ -25 +25 @@
                 @JsonProperty
                 String AGGREGATOR_FILE_PATH;
+
+                @NotEmpty
+                @JsonProperty
+                String AGGREGATOR_FILE_PATH_BACKUP;
 
                 @JsonProperty

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

@@ -24 +24 @@
         private AtomicReference<Corpora> corporaAtom;
         private File cachedCorpora;
+        private File oldCachedCorpora;
         private AtomicReference<Statistics> scanStatisticsAtom;
         private AtomicReference<Statistics> searchStatisticsAtom;
@@ -32 +33 @@
                         int cacheMaxDepth, List<URL> additionalCQLEndpoints,
                         EndpointFilter filter,
-                        AtomicReference<Corpora> corporaAtom, File cachedCorpora,
+                        AtomicReference<Corpora> corporaAtom,
+                        File cachedCorpora, File oldCachedCorpora,
                         AtomicReference<Statistics> scanStatisticsAtom,
                         AtomicReference<Statistics> searchStatisticsAtom
-                        ) {
+        ) {
                 this.sruClient = sruClient;
                 this.centerRegistryUrl = centerRegistryUrl;
@@ -43 +45 @@
                 this.corporaAtom = corporaAtom;
                 this.cachedCorpora = cachedCorpora;
+                this.oldCachedCorpora = oldCachedCorpora;
                 this.scanStatisticsAtom = scanStatisticsAtom;
                 this.searchStatisticsAtom = searchStatisticsAtom;
@@ -83 +86 @@
                                 log.warn("ScanCrawlTask: Skipped writing to disk (no corpora). Finished.");
                         } else {
-                                ObjectMapper mapper = new ObjectMapper();
-                                mapper.writerWithDefaultPrettyPrinter().writeValue(cachedCorpora, corpora);
+                                dump(corpora, cachedCorpora, oldCachedCorpora);
                                 log.info("ScanCrawlTask: wrote to disk, finished");
                         }
@@ -94 +96 @@
                 }
         }
+
+        private static void dump(Corpora corpora,
+                        File cachedCorpora, File oldCachedCorpora) throws IOException {
+                if (cachedCorpora.exists()) {
+                        try {
+                                oldCachedCorpora.delete();
+                        } catch (Throwable txc) {
+                                //ignore
+                        }
+                        try {
+                                cachedCorpora.renameTo(oldCachedCorpora);
+                        } catch (Throwable txc) {
+                                // ignore
+                        }
+                }
+                ObjectMapper mapper = new ObjectMapper();
+                mapper.writerWithDefaultPrettyPrinter().writeValue(cachedCorpora, corpora);
+        }
 }

SRUAggregator/trunk/src/main/resources/assets/js/components.js

@@ -122 +122 @@
 
         refresh: function() {
+                console.log("popover refresh", this.props.title);
                 $(this.getDOMNode()).popover('destroy');
 
                 var content;
                 if (Array.isArray(this.props.children))
-                        content = this.props.children.map(React.renderToString).join(" ");
+                        content = this.props.children.map(React.renderToString).join("");
                 else 
                         content = React.renderToString(this.props.children);
@@ -136 +137 @@
                         placement: this.props.placement,
                         title: this.props.title,
-                        trigger: 'click',
+                        trigger: 'focus',
                         html: true,
                 });

SRUAggregator/trunk/src/main/resources/assets/js/components.jsx

@@ -126 +126 @@
                 var content;
                 if (Array.isArray(this.props.children))
-                        content = this.props.children.map(React.renderToString).join(" ");
+                        content = this.props.children.map(React.renderToString).join("");
                 else 
                         content = React.renderToString(this.props.children);
@@ -136 +136 @@
                         placement: this.props.placement,
                         title: this.props.title,
-                        trigger: 'click',
+                        trigger: 'focus',
                         html: true,
                 });

SRUAggregator/trunk/src/main/resources/assets/js/main.js

@@ -3 +3 @@
 "use strict";
 
-var VERSION = "VERSION 2.0.0.α21";
+var VERSION = "VERSION 2.0.0.α22";
 var URLROOT = "/Aggregator-testing";
 

SRUAggregator/trunk/src/main/resources/assets/js/main.jsx

@@ -3 +3 @@
 "use strict";
 
-var VERSION = "VERSION 2.0.0.α21";
+var VERSION = "VERSION 2.0.0.α22";
 var URLROOT = "/Aggregator-testing";
 

SRUAggregator/trunk/src/main/resources/assets/js/search.js

@@ -604 +604 @@
         renderDiagnostic: function(d) {
                 return  React.createElement("div", {className: "alert alert-warning"}, 
-                                        React.createElement("div", null, "Diagnostic: ", d.diagnostic.message)
+                                        React.createElement("div", null, "Diagnostic: ", d.message)
                                 ); 
         },

SRUAggregator/trunk/src/main/resources/assets/js/search.jsx

@@ -604 +604 @@
         renderDiagnostic: function(d) {
                 return  <div className="alert alert-warning"> 
-                                        <div>Diagnostic: {d.diagnostic.message}</div>
+                                        <div>Diagnostic: {d.message}</div>
                                 </div>; 
         },