Avoid the query object -> string -> hydrating -> string -> query obje…

…ct roundtrip and directly hydrate on the query object (#136)
o19s · Nov 15, 2023 · 5bd6be9 · 5bd6be9
1 parent f160eec
commit 5bd6be9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 20 deletions.
diff --git a/services/esSearcherPreprocessorSvc.js b/services/esSearcherPreprocessorSvc.js
@@ -23,13 +23,7 @@ angular.module('o19s.splainer-search')
             queryText = queryText.replace(/\\/g, '\\\\');
             queryText = queryText.replace(/"/g, '\\\"');
           }
-
-          var replaced  = angular.toJson(args, true);
-
-          replaced      = queryTemplateSvc.hydrate(replaced, queryText, {qOption: qOption, encodeURI: false, defaultKw: '\\"\\"'});
-          replaced      = angular.fromJson(replaced);
-
-          return replaced;
+          return queryTemplateSvc.hydrate(args, queryText, {qOption: qOption, encodeURI: false, defaultKw: '\\"\\"'});
         }
       };
 

diff --git a/services/searchApiSearcherPreprocessorSvc.js b/services/searchApiSearcherPreprocessorSvc.js
@@ -16,13 +16,7 @@ angular.module('o19s.splainer-search')
             queryText = queryText.replace(/\\/g, '\\\\');
             queryText = queryText.replace(/"/g, '\\\"');
           }
-
-          var replaced  = angular.toJson(args, true);
-
-          replaced      = queryTemplateSvc.hydrate(replaced, queryText, {qOption: qOption, encodeURI: false, defaultKw: '\\"\\"'});
-          replaced      = angular.fromJson(replaced);
-
-          return replaced;
+          return queryTemplateSvc.hydrate(args, queryText, {qOption: qOption, encodeURI: false, defaultKw: '\\"\\"'});
         }
       };
 

diff --git a/services/vectaraSearcherPreprocessorSvc.js b/services/vectaraSearcherPreprocessorSvc.js
@@ -11,12 +11,7 @@ angular.module('o19s.splainer-search')
             self.prepare  = prepare;
 
             const replaceQuery = function(qOption, args, queryText) {
-                var replaced  = angular.toJson(args, true);
-
-                replaced      = queryTemplateSvc.hydrate(replaced, queryText, {qOption: qOption, encodeURI: false, defaultKw: '\\"\\"'});
-                replaced      = angular.fromJson(replaced);
-
-                return replaced;
+                return queryTemplateSvc.hydrate(args, queryText, {qOption: qOption, encodeURI: false, defaultKw: '\\"\\"'});
             };
 
             var preparePostRequest = function (searcher) {