Changeset 5954 for SRUAggregator/trunk/src/main/resources/assets/js/search.jsx

Timestamp:

01/26/15 15:12:46 (9 years ago)

Author:

emanuel.dima@uni-tuebingen.de

Message:

22. alpha14: collections view stable sorting, better filtering; upfront diagnostic messages for search

File:

• SRUAggregator/trunk/src/main/resources/assets/js/search.jsx (modified) (7 diffs)

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

@@ -65 +65 @@
                 corpus.expanded = false; // not expanded in the corpus view
                 corpus.priority = 1; // priority in corpus view
-                corpus.index = index;
+                corpus.index = index; // original order, used for stable sort
         });
 }
@@ -79 +79 @@
 Corpora.prototype.recurseCorpora = function(corpora, fn) {
         var recfn = function(corpus, index){
-                if (false === fn(corpus)) {
+                if (false === fn(corpus, index)) {
                         // no recursion
                 } else {
@@ -284 +284 @@
 
         stop: function(e) {
-                e.preventDefault();
                 e.stopPropagation();
         },
@@ -296 +295 @@
                                 endRecord: corpusHit.endRecord,
                                 exception: corpusHit.exception,
+                                diagnostics: corpusHit.diagnostics,
                                 searchString: corpusHit.searchString,
                                 kwics: corpusHit.kwics.filter(function(kwic){
@@ -379 +379 @@
                                                                 <span className="input-group-addon nobkg">and show up to</span>
                                                                 <div className="input-group-btn">
-                                                                        <input type="number" className="form-control input" min="10" max="250" step="5"
-                                                                                style={{width:54}}
+                                                                        <input type="number" className="form-control input" min="10" max="250"
+                                                                                style={{width:60}}
                                                                                 onChange={this.setNumberOfResults} value={this.state.numberOfResults} 
                                                                                 onKeyPress={this.stop}/>
@@ -556 +556 @@
 
         renderRowLanguage: function(hit) {
-                return <span style={{fontFace:"Courier",color:"black"}}>{hit.language} </span> ;
+                return false; //<span style={{fontFace:"Courier",color:"black"}}>{hit.language} </span> ;
         },
 
@@ -619 +619 @@
         },
 
+        renderDiagnostics: function(corpusHit) {
+                if (!corpusHit.diagnostics || corpusHit.diagnostics.length === 0) {
+                        return false;
+                }
+
+                return corpusHit.diagnostics.map(function(d) {
+                        return  <div className="alert alert-danger" role="alert">
+                                                {d.dgnMessage}{": "}{d.dgnDiagnostic}
+                                        </div>;
+                });
+        },
+
         renderPanelBody: function(corpusHit) {
-                var fulllength = {width:"100%"};                
+                var fulllength = {width:"100%"};
                 if (this.state.displayKwic) {
-                        return  <table className="table table-condensed table-hover" style={fulllength}>
-                                                <tbody>{corpusHit.kwics.map(this.renderRowsAsKwic)}</tbody>
-                                        </table>;
+                        return  <div>
+                                                {this.renderDiagnostics(corpusHit)}
+                                                <table className="table table-condensed table-hover" style={fulllength}>
+                                                        <tbody>{corpusHit.kwics.map(this.renderRowsAsKwic)}</tbody>
+                                                </table>
+                                        </div>;
                 } else {
-                        return  <div>{corpusHit.kwics.map(this.renderRowsAsHits)}</div>;
+                        return  <div>
+                                                {this.renderDiagnostics(corpusHit)}
+                                                {corpusHit.kwics.map(this.renderRowsAsHits)}
+                                        </div>;
                 }
         },
 
         renderResultPanels: function(corpusHit) {
-                if (corpusHit.kwics.length === 0) {
+                if (corpusHit.kwics.length === 0 &&
+                        corpusHit.diagnostics.length === 0) {
                         return false;
                 }