@iebh/polyglot 4.8.8 → 4.8.9

package/lib/modules/engines/generic.js

@@ -319,10 +319,10 @@ var _default = {
             buffer += 'NOT';
             break;
           case 'raw':
-            console.log("Here1", branch.content, engine, buffer);
             buffer += branch.content;
             break;
           case 'dollarOne':
+            console.log("Here1", branch, engine, buffer);
             switch (engine) {
               case 'PubMed full':
               case 'PubMed abbreviation':

package/lib/modules/parse.js

@@ -138,20 +138,65 @@ 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 (match = /\$1/.exec(q)) {
-      // $1
+    if (match = /^(\$([2-9]+)) +(AND|OR|NOT)\s+/i.exec(q)) {
+      // $2 AND
+      branch.nodes.push({
+        type: 'dollarOtherNum',
+        ref: [match[2]],
+        cond: '',
+        nodes: []
+      });
+      offset += match[1].length;
+      q = q.substr(match[1].length);
+      cropString = false;
+    } else if (match = /^(AND|OR|NOT) +\$([2-9]+)\b/i.exec(q)) {
+      // AND 2$...
+      trimLastLeaf();
+      switch (match[2].toLowerCase()) {
+        case "and":
+          branch.nodes.push({
+            type: 'joinAnd'
+          });
+          break;
+        case "or":
+          branch.nodes.push({
+            type: 'joinOr'
+          });
+          break;
+        case "not":
+          branch.nodes.push({
+            type: 'joinNot'
+          });
+          break;
+      }
+      leaf = undefined;
+      cropString = false;
+      branch.nodes.push({
+        type: 'dollarOtherNum',
+        ref: [match[3]],
+        cond: '',
+        nodes: []
+      });
+      offset += match[1].length;
+      q = q.substr(match[1].length);
+    } else if (match = /^(\$1)(?:\s+(AND|OR|NOT))?/i.exec(q)) {
+      // $1/ $1 AND
       branch.nodes.push({
         type: 'dollarOne',
-        content: match[0].toLowerCase()
+        ref: [match[2]],
+        cond: match[2] ? match[2].toUpperCase() : '',
+        nodes: []
       });
       offset += match[0].length;
       q = q.substr(match[0].length);
       cropString = false;
-    } else if (match = /\$[2-9]/.exec(q)) {
-      // $2 to $9
+    } else if (match = /^(AND|OR|NOT)\s+(\$1)/i.exec(q)) {
+      // AND 1$
       branch.nodes.push({
-        type: 'dollarOtherNum',
-        content: match[0].toLowerCase()
+        type: 'dollarOne',
+        ref: [match[2]],
+        cond: match[1].toUpperCase(),
+        nodes: []
       });
       offset += match[0].length;
       q = q.substr(match[0].length);

package/package.json

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