Changeset 6154 for SRUAggregator

Timestamp:

04/22/15 08:25:01 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. beta-40: fixed bug in build script; improved 'more results' behavior

Location:

SRUAggregator/trunk

Files:

• aggregator.yml (modified) (1 diff)
• aggregator_devel.yml (modified) (1 diff)
• build.sh (modified) (2 diffs)
• pom.xml (modified) (1 diff)
• src/main/java/eu/clarin/sru/fcs/aggregator/search/Result.java (modified) (4 diffs)
• src/main/java/eu/clarin/sru/fcs/aggregator/search/Search.java (modified) (1 diff)
• 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) (3 diffs)
• src/main/resources/assets/js/search.jsx (modified) (3 diffs)

SRUAggregator/trunk/aggregator.yml

@@ -14 +14 @@
 
   SEARCH_MAX_CONCURRENT_REQUESTS_PER_ENDPOINT: 4
-  SEARCH_MAX_CONCURRENT_REQUESTS_PER_SLOW_ENDPOINT: 2
+  SEARCH_MAX_CONCURRENT_REQUESTS_PER_SLOW_ENDPOINT: 1
   slowEndpoints:
     - http://cqlservlet.mpi.nl/
 
-  ENDPOINTS_SCAN_TIMEOUT_MS: 60000
+  ENDPOINTS_SCAN_TIMEOUT_MS: 600000
   ENDPOINTS_SEARCH_TIMEOUT_MS: 30000
   EXECUTOR_SHUTDOWN_TIMEOUT_MS: 1000

SRUAggregator/trunk/aggregator_devel.yml

@@ -14 +14 @@
 
   SEARCH_MAX_CONCURRENT_REQUESTS_PER_ENDPOINT: 4
-  SEARCH_MAX_CONCURRENT_REQUESTS_PER_SLOW_ENDPOINT: 2
+  SEARCH_MAX_CONCURRENT_REQUESTS_PER_SLOW_ENDPOINT: 1
   slowEndpoints:
     - http://cqlservlet.mpi.nl/

SRUAggregator/trunk/build.sh

@@ -80 +80 @@
 then
         echo; echo "---- run devel"
-        JAR=`find target -iname 'Aggregator2-*.jar'`
-        echo java -cp src/main/resources:$JAR eu.clarin.sru.fcs.aggregator.app.Aggregator server aggregator_development.yml
-        java -cp src/main/resources:$JAR eu.clarin.sru.fcs.aggregator.app.Aggregator server aggregator_development.yml
+        JAR=`find target -iname 'aggregator-*.jar'`
+        echo java -cp src/main/resources:$JAR eu.clarin.sru.fcs.aggregator.app.Aggregator server aggregator_devel.yml
+        java -cp src/main/resources:$JAR eu.clarin.sru.fcs.aggregator.app.Aggregator server aggregator_devel.yml
 fi
 
@@ -88 +88 @@
 then
         echo; echo "---- run production"
-        JAR=`find target -iname 'Aggregator2-*.jar'`
+        JAR=`find target -iname 'aggregator-*.jar'`
         echo java -jar $JAR server aggregator.yml
         java -jar $JAR server aggregator.yml

SRUAggregator/trunk/pom.xml

@@ -8 +8 @@
         <groupId>eu.clarin.sru.fcs</groupId>
         <artifactId>aggregator</artifactId>
-        <version>2.0.0-beta-39</version>
+        <version>2.0.0-beta-40</version>
         <name>FCS Aggregator</name>
 

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

@@ -3 +3 @@
 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;
@@ -37 +36 @@
         private final Corpus corpus;
         private AtomicBoolean inProgress = new AtomicBoolean(true);
-        private AtomicInteger endpointReturnedRecords = new AtomicInteger();
+        private AtomicInteger nextRecordPosition = new AtomicInteger(1);
         private AtomicReference<JsonException> exception = new AtomicReference<JsonException>();
         private List<Diagnostic> diagnostics = Collections.synchronizedList(new ArrayList<Diagnostic>());
@@ -69 +68 @@
                         }
                 }
+                if (response.getNextRecordPosition() > 0) {
+                        nextRecordPosition.set(response.getNextRecordPosition());
+                }
         }
 
         void addRecord(SRURecord record) {
-//              TODO(edima): use response.getNextRecordPosition()
-                endpointReturnedRecords.getAndIncrement();
+                nextRecordPosition.incrementAndGet();
                 if (record.isRecordSchema(ClarinFCSRecordData.RECORD_SCHEMA)) {
                         ClarinFCSRecordData rd = (ClarinFCSRecordData) record.getRecordData();
@@ -144 +145 @@
         }
 
-        public int getEndpointReturnedRecords() {
-                return endpointReturnedRecords.get();
+        public int getNextRecordPosition() {
+                return nextRecordPosition.get();
         }
 

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

@@ -63 +63 @@
                 for (Result r : results) {
                         if (r.getCorpus().getId().equals(corpusId)) {
-                                executeSearch(r, query, r.getEndpointReturnedRecords() + 1, maxRecords);
+                                executeSearch(r, query, r.getNextRecordPosition(), maxRecords);
                                 return true;
                         }

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

@@ -3 +3 @@
 "use strict";
 
-var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-38";
+var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-40";
 
 var URLROOT = window.MyAggregator.URLROOT =

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

@@ -3 +3 @@
 "use strict";
 
-var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-39";
+var VERSION = window.MyAggregator.VERSION = "VERSION 2.0.0-beta-40";
 
 var URLROOT = window.MyAggregator.URLROOT =

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

@@ -763 +763 @@
                 }
                 return  React.createElement("div", {className: "alert alert-warning", key: key}, 
-                                        React.createElement("div", null, "Diagnostic: ", d.message)
+                                        React.createElement("div", null, d.message)
                                 );
         },
@@ -878 +878 @@
         getInitialState: function() {
                 return {
-                        inProgress: false,
+                        forceUpdate: 1, // hack to force an update, used when searching for next results
                 };
         },
 
-        componentWillReceiveProps: function() {
-                this.setState({inProgress: false});
-        },
-
         nextResults: function(e) {
-                this.setState({inProgress: true});
+                this.props.corpusHit.inProgress = true;
+                this.setState({forceUpdate: this.state.forceUpdate+1});
                 this.props.nextResults(this.props.corpusHit.corpus.id);
         },
@@ -899 +896 @@
 
         renderMoreResults:function(){
-                if (this.state.inProgress || this.props.corpusHit.inProgress)
+                if (this.props.corpusHit.inProgress)
                         return React.createElement("span", {style: {fontStyle:'italic'}}, "Retrieving results, please wait...");
 

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

@@ -763 +763 @@
                 }
                 return  <div className="alert alert-warning" key={key}>
-                                        <div>Diagnostic: {d.message}</div>
+                                        <div>{d.message}</div>
                                 </div>;
         },
@@ -878 +878 @@
         getInitialState: function() {
                 return {
-                        inProgress: false,
+                        forceUpdate: 1, // hack to force an update, used when searching for next results
                 };
         },
 
-        componentWillReceiveProps: function() {
-                this.setState({inProgress: false});
-        },
-
         nextResults: function(e) {
-                this.setState({inProgress: true});
+                this.props.corpusHit.inProgress = true;
+                this.setState({forceUpdate: this.state.forceUpdate+1});
                 this.props.nextResults(this.props.corpusHit.corpus.id);
         },
@@ -899 +896 @@
 
         renderMoreResults:function(){
-                if (this.state.inProgress || this.props.corpusHit.inProgress)
+                if (this.props.corpusHit.inProgress)
                         return <span style={{fontStyle:'italic'}}>Retrieving results, please wait...</span>;