Merge pull request #16 from AddSearch/new-setting-ignoreLogicalOperatorCase

add a new setting ignoreLogicalOperatorCase, default: false

Author: anttiai

.gitignore

@@ -0,0 +1,2 @@
+.idea
+node_modules

README.md

@@ -197,6 +197,14 @@ client.setFilterObject(filter);
 client.setResultType('organic');
 ```
 
+#### Set enableLogicalOperators
+```js
+// (default: false)
+// enableLogicalOperators(true) = Support user specified logical operators (and/or/not) in the search query like "cat and dog"
+// enableLogicalOperators(false) = Treat logical operators in the search query as literal strings
+client.enableLogicalOperators(true);
+```
+
 ### Facets
 ```js
 // Declare fields for faceting. Number of hits found from
@@ -525,4 +533,4 @@ Built bundle is saved under the *dist/* folder
 
 ## Support
 Feel free to send any questions, ideas, and suggestions at [support@addsearch.com](mailto:support@addsearch.com) or 
-visit [addsearch.com](https://www.addsearch.com/) for more information.
+visit [addsearch.com](https://www.addsearch.com/) for more information.

dist/addsearch-js-client.min.js

@@ -16,7 +16,7 @@ var executeApiFetch = function(apiHostname, sitekey, type, settings, cb, fuzzyRe
       return '&' + key + '=' + setting;
     }
     return '';
-  }
+  };
 
 
   // Validate query type
@@ -41,7 +41,9 @@ var executeApiFetch = function(apiHostname, sitekey, type, settings, cb, fuzzyRe
     kw = settings.keyword;
 
     // Boolean operators (AND, OR, NOT) uppercase
-    kw = kw.replace(/ and /g, ' AND ').replace(/ or /g, ' OR ').replace(/ not /g, ' NOT ');
+    kw = settings.enableLogicalOperators ?
+      kw.replace(/ and /g, ' AND ').replace(/ or /g, ' OR ').replace(/ not /g, ' NOT ') :
+      kw.replace(/ AND /g, ' and ').replace(/ OR /g, ' or ').replace(/ NOT /g, ' not ');
 
     // Escape
     kw = encodeURIComponent(kw);
@@ -173,4 +175,4 @@ var executeApiFetch = function(apiHostname, sitekey, type, settings, cb, fuzzyRe
     cb({error: {response: RESPONSE_SERVER_ERROR, message: 'invalid server response'}});
   });
 };
-module.exports = executeApiFetch;
+module.exports = executeApiFetch;

src/apifetch.js

@@ -159,6 +159,7 @@ var client = function(sitekey, privatekey) {
   this.setThrottleTime = function(delay) { API_THROTTLE_TIME_MS = delay; }
   this.setStatsSessionId = function(id) { this.sessionId = id; }
   this.getStatsSessionId = function() { return this.sessionId; }
+  this.enableLogicalOperators = function(enableLogicalOperators) { this.settings.enableLogicalOperators(enableLogicalOperators) }
 
   this.sendStatsEvent = function(type, keyword, data) {
     if (type === 'search') {
@@ -194,4 +195,4 @@ var client = function(sitekey, privatekey) {
   }
 }
 
-module.exports = client;
+module.exports = client;

src/index.js

@@ -17,7 +17,8 @@ var settings = function() {
     facetFields: [],
     autocomplete: {
       size: 10
-    }
+    },
+    enableLogicalOperators: false
   };
 
   this.getSettings = function() {
@@ -63,6 +64,10 @@ var settings = function() {
     this.settings.fuzzy = fuzzy;
   }
 
+  this.enableLogicalOperators = function(enableLogicalOperators) {
+    this.settings.enableLogicalOperators = enableLogicalOperators;
+  }
+
   this.setPostfixWildcard = function(wildcard) {
     this.settings.postfixWildcard = wildcard;
   }
@@ -200,4 +205,4 @@ var settings = function() {
   }
 }
 
-module.exports = settings;
+module.exports = settings;