Changeset 7026

Timestamp:

06/30/16 00:57:49 (8 years ago)

Author:

Leif-Jöran

Message:

Correctly switch between cql and fcs queryType on toggle of selection.

Location:

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

Files:

• search.js (modified) (3 diffs)
• search.jsx (modified) (2 diffs)

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

@@ -286 +286 @@
                         languageMap: {},
                         weblichtLanguages: [],
-                        queryType: getQueryVariable('queryType') ||'cql',
+                        queryType: getQueryVariable('queryType') || 'cql',
                         query: getQueryVariable('query') || '',
                         language: this.anyLanguage,
                         languageFilter: 'byMeta',
                         //fixme!
-                        searchLayerId: getQueryVariable('queryType') ||'cql',
+                        searchLayerId: getQueryVariable('queryType') || 'cql',
                         numberOfResults: 10,
 
@@ -347 +347 @@
         search: function() {
                 var query = this.state.query;
-                var queryType = this.state.queryType;
+                var queryType = this.state.searchLayerId;
                 if (!query || this.props.embedded) {
                         this.setState({ hits: this.nohits, searchId: null });
@@ -359 +359 @@
 
                 // console.log("searching in the following corpora:", selectedIds);
-                console.log("searching with queryType:", queryType);
+                // console.log("searching with queryType:", queryType);
                 this.props.ajax({
                         url: 'rest/search',

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

@@ -286 +286 @@
                         languageMap: {},
                         weblichtLanguages: [],
-                        queryType: getQueryVariable('queryType') ||'cql',
+                        queryType: getQueryVariable('queryType') || 'cql',
                         query: getQueryVariable('query') || '',
                         language: this.anyLanguage,
                         languageFilter: 'byMeta',
                         //fixme!
-                        searchLayerId: getQueryVariable('queryType') ||'cql',
+                        searchLayerId: getQueryVariable('queryType') || 'cql',
                         numberOfResults: 10,
 
@@ -347 +347 @@
         search: function() {
                 var query = this.state.query;
-                var queryType = this.state.queryType;
+                var queryType = this.state.searchLayerId;
                 if (!query || this.props.embedded) {
                         this.setState({ hits: this.nohits, searchId: null });