Changeset 7042 for SRUAggregator

Timestamp:

07/27/16 12:43:50 (8 years ago)

Author:

Leif-Jöran

Message:

Some cleanup of queryType and queryTypeId and clearer distinction in relation to layers.

File:

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

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

@@ -21 +21 @@
 var multipleLanguageCode = "mul"; // see ISO-693-3
 
-//var queryTypes = [
-var layers = [
+var queryTypes = [
         {
                 id: "cql",
@@ -41 +40 @@
 ];
 
-var layerMap = {
-        cql: layers[0],
-        fcs: layers[1],
+var queryTypeMap = {
+        cql: queryTypes[0],
+        fcs: queryTypes[1],
 };
+
 // var layers = [
 //      {
 //              id: "text",
-//              name: "Text Resources",
+//              name: "Text",
 //              searchPlaceholder: "Elephant",
 //              searchLabel: "Search text",
@@ -177 +177 @@
 };
 
-Corpora.prototype.isCorpusVisible = function(corpus, layerId, languageCode) {
-        //if (layerId !== "text") {
+Corpora.prototype.isCorpusVisible = function(corpus, queryTypeId, languageCode) {
+        //if (queryTypeId !== "text") {
         //      return false;
         //}
@@ -202 +202 @@
 };
 
-Corpora.prototype.setVisibility = function(layerId, languageCode) {
+Corpora.prototype.setVisibility = function(queryTypeId, languageCode) {
         // top level
         this.corpora.forEach(function(corpus) {
-                corpus.visible = this.isCorpusVisible(corpus, layerId, languageCode);
+                corpus.visible = this.isCorpusVisible(corpus, queryTypeId, languageCode);
                 this.recurseCorpora(corpus.subCorpora, function(c) { c.visible = corpus.visible; });
         }.bind(this));
@@ -285 +285 @@
                         languageMap: {},
                         weblichtLanguages: [],
-                        queryType: getQueryVariable('queryType') || 'cql',
+                        queryTypeId: getQueryVariable('queryType') || 'cql',
                         query: getQueryVariable('query') || '',
                         language: this.anyLanguage,
                         languageFilter: 'byMeta',
-                        //fixme!
-                        searchLayerId: getQueryVariable('queryType') || 'cql',
                         numberOfResults: 10,
 
@@ -346 +344 @@
         search: function() {
                 var query = this.state.query;
-                var queryType = this.state.searchLayerId;
+                var queryType = this.state.queryTypeId;
                 if (!query || this.props.embedded) {
                         this.setState({ hits: this.nohits, searchId: null });
@@ -363 +361 @@
                         type: "POST",
                         data: {
-                                layer: this.state.searchLayerId,
+                                query: query,
+                                queryType: queryType,
                                 language: this.state.language[0],
-                                queryType: queryType,
-                                query: query,
                                 numberOfResults: this.state.numberOfResults,
                                 corporaIds: selectedIds,
@@ -452 +449 @@
 
         setLanguageAndFilter: function(languageObj, languageFilter) {
-                this.state.corpora.setVisibility(this.state.searchLayerId,
+                this.state.corpora.setVisibility(this.state.queryTypeId,
                         languageFilter === 'byGuess' ? multipleLanguageCode : languageObj[0]);
                 this.setState({
@@ -461 +458 @@
         },
 
-        setLayer: function(layerId) {
-                this.state.corpora.setVisibility(layerId, this.state.language[0]);
+        setQueryType: function(queryTypeId) {
+                this.state.corpora.setVisibility(queryTypeId, this.state.language[0]);
                 this.setState({
-                        searchLayerId: layerId,
-                        queryType: layerId,
+                        queryTypeId: queryTypeId,
                         hits: this.nohits,
                         searchId: null,
-                        displayADV: layerId == "fcs" ? true : false,
+                        displayADV: queryTypeId == "fcs" ? true : false,
                         corpora: this.state.corpora, // === this.state.corpora.update();
                 });
@@ -573 +569 @@
                 if (this.props.embedded) {
                         var query = this.state.query;
-                        var queryType = this.state.queryType;
+                        var queryType = this.state.queryTypeId;
                         var newurl = !query ? "#" :
                                 (window.MyAggregator.URLROOT + "?" + encodeQueryData({queryType:queryType, query:query, mode:'search'}));
@@ -591 +587 @@
 
         render: function() {
-                var layer = layerMap[this.state.searchLayerId];
+                var queryType = queryTypeMap[this.state.queryTypeId];
                 return  (
                         <div className="top-gap">
@@ -597 +593 @@
                                         <div className="aligncenter" style={{marginLeft:16, marginRight:16}}>
                                                 <div className="input-group">
-                                                        <span className="input-group-addon" style={{backgroundColor:layer.searchLabelBkColor}}>
-                                                                {layer.searchLabel}
+                                                        <span className="input-group-addon" style={{backgroundColor:queryType.searchLabelBkColor}}>
+                                                                {queryType.searchLabel}
                                                         </span>
 
@@ -627 +623 @@
                                                                 </div>
                                                                 <div className="input-group-btn hidden-xxs">
-                                                                        <ul ref="layerDropdownMenu" className="dropdown-menu">
-                                                                                {       layers.map(function(l) {
+                                                                        <ul ref="queryTypeDropdownMenu" className="dropdown-menu">
+                                                                                {       queryTypes.map(function(l) {
                                                                                                 var cls = l.disabled ? 'disabled':'';
-                                                                                                var handler = function() { if (!l.disabled) this.setLayer(l.id); }.bind(this);
+                                                                                                var handler = function() { if (!l.disabled) this.setQueryType(l.id); }.bind(this);
                                                                                                 return <li key={l.id} className={cls}> <a tabIndex="-1" href="#"
                                                                                                         onClick={handler}> {l.name} </a></li>;
@@ -638 +634 @@
                                                                         <button className="form-control btn btn-default"
                                                                                         aria-expanded="false" data-toggle="dropdown" >
-                                                                                {layer.name} <span className="caret"/>
+                                                                                {queryType.name} <span className="caret"/>
                                                                         </button>
                                                                 </div>
@@ -686 +682 @@
                                                                   weblichtLanguages={this.state.weblichtLanguages}
                                                                   languageMap={this.state.languageMap} 
-                                                                  queryType={this.state.queryType} />
+                                                                  queryTypeId={this.state.queryTypeId} />
                                 </Modal>
 
@@ -695 +691 @@
                                                          getToWeblichtLink={this.getToWeblichtLink}
                                                          searchedLanguage={this.state.language}
-                                                         queryType={this.state.queryType}/>
+                                                         queryTypeId={this.state.queryTypeId}/>
                                 </div>
                         </div>
@@ -994 +990 @@
                 getDownloadLink: PT.func.isRequired,
                 getToWeblichtLink: PT.func.isRequired,
-                queryType: PT.string.isRequired,
+                queryTypeId: PT.string.isRequired,
         },
         mixins: [ResultMixin],
@@ -1073 +1069 @@
                                                                 <div>
                                                                         {this.renderDisplayKWIC()}
-                                                                    {this.props.queryType !== "fcs" ? "" : this.renderDisplayADV()}
+                                                                    {this.props.queryTypeId !== "fcs" ? "" : this.renderDisplayADV()}
                                                                         <div className="inline"> {this.renderDownloadLinks(corpusHit.corpus.id)} </div>
                                                                         <div className="inline"> {this.renderToWeblichtLinks(corpus.id, forceLanguage, wlerror)} </div>
@@ -1100 +1096 @@
                 getDownloadLink: PT.func.isRequired,
                 getToWeblichtLink: PT.func.isRequired,
-                queryType: PT.string.isRequired, 
+                queryTypeId: PT.string.isRequired, 
         },
         mixins: [ResultMixin],
@@ -1170 +1166 @@
                                                                         <div>
                                                                                 {this.renderDisplayKWIC()}
-                                                                            {this.props.queryType !== "fcs" ? "" : this.renderDisplayADV()}
+                                                                            {this.props.queryTypeId !== "fcs" ? "" : this.renderDisplayADV()}
                                                                                 { collhits.inProgress === 0 ?
                                                                                         <div className="inline"> {this.renderDownloadLinks()} </div>