@iebh/polyglot 4.8.3 → 4.8.5

package/lib/modules/engines/generic.js

@@ -319,12 +319,12 @@ var _default = {
             buffer += 'NOT';
             break;
           case 'raw':
-            console.log("Here1", buffer);
+            console.log("Here1", branch.content, engine, buffer);
             buffer += branch.content;
             break;
           case 'dollarOne':
           case 'template':
-            console.log("Here2", buffer);
+            console.log("Here2", branch.content, engine, buffer);
             buffer += _tools["default"].resolveTemplate(branch.content, engine);
             break;
           case 'comment':

package/lib/modules/parse.js

@@ -138,7 +138,23 @@ var parse = function parse(query, options) {
   while (q.length) {
     var cropString = true; // Whether to remove one charcater from the beginning of the string (set to false if the lexical match handles this behaviour itself)
     var match;
-    if (/^\(/.test(q)) {
+    if (match = /\$1/.exec(q)) {
+      // $1
+      branch.nodes.push({
+        type: 'dollarOne'
+      });
+      offset += match[0].length;
+      q = q.substr(match[0].length);
+      cropString = false;
+    } else if (match = /\$[2-9]/.exec(q)) {
+      // $2 to $9
+      branch.nodes.push({
+        type: 'dollarOtherNum'
+      });
+      offset += match[0].length;
+      q = q.substr(match[0].length);
+      cropString = false;
+    } else if (/^\(/.test(q)) {
       var newGroup = {
         type: 'group',
         nodes: []
@@ -156,22 +172,6 @@ var parse = function parse(query, options) {
         // branch.msg = "Extra closing bracket removed after term"
       }
       leaf = branch.nodes;
-    } else if (match = /^\$1\b/.exec(q)) {
-      // $1
-      branch.nodes.push({
-        type: 'dollarOne'
-      });
-      offset += match[0].length;
-      q = q.substr(match[0].length);
-      cropString = false;
-    } else if (match = /^\$[2-9]\b/.exec(q)) {
-      // $2 to $9
-      branch.nodes.push({
-        type: 'dollarOtherNum'
-      });
-      offset += match[0].length;
-      q = q.substr(match[0].length);
-      cropString = false;
     } else if (match = /^([0-9]+)\s*[‐\-]\s*([0-9]+)(?:\/(AND|OR|NOT))/i.exec(q)) {
       // 1-7/OR
       branch.nodes.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iebh/polyglot",
-  "version": "4.8.3",
+  "version": "4.8.5",
   "description": "IEBH-SRA tool to convert between different medical database search formats",
   "main": "lib/index.js",
   "scripts": {