@iebh/polyglot 4.9.3 → 4.9.5

package/lib/modules/engines/generic.js

@@ -322,7 +322,6 @@ var _default = {
             buffer += branch.content;
             break;
           case 'dollarOne':
-            console.log("Here1", branch, engine, buffer);
             switch (engine) {
               case 'PubMed full':
               case 'PubMed abbreviation':
@@ -353,6 +352,38 @@ var _default = {
                 break;
             }
             break;
+          case 'dollarNum':
+            console.log("Here1", branch, engine, buffer);
+            switch (engine) {
+              case 'PubMed full':
+              case 'PubMed abbreviation':
+              case 'Lilacs':
+              case 'Scopus (basic search)':
+              case 'Scopus (advanced search)':
+              case 'International HTA Database':
+                buffer += '*';
+                break;
+              case 'Ovid MEDLINE':
+                buffer += branch.value;
+                break;
+              case 'Cochrane Library':
+              case 'PsycInfo (Ovid)':
+              case 'ProQuest Health and Medical':
+                buffer += '*';
+                break;
+              case 'Embase (Elsevier)':
+              case 'Web of Science':
+              case 'WoS Advanced':
+                buffer += '*';
+                break;
+              case 'CINAHL (Ebsco)':
+              case 'SPORTDiscus':
+              case 'Business Source Ultimate':
+              case 'PsycInfo (Ebsco)':
+                buffer += '*';
+                break;
+            }
+            break;
           case 'template':
             console.log("Here2", branch.content, engine, buffer);
             buffer += _tools["default"].resolveTemplate(branch.content, engine);

package/lib/modules/parse.js

@@ -138,47 +138,29 @@ 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 = /^(\$([2-9]+)) +(AND|OR|NOT)\s+/i.exec(q)) {
-      // $2 AND
+    if (match = /^(\$1)\b/i.exec(q)) {
+      // $1
       branch.nodes.push({
-        type: 'dollarOtherNum',
-        ref: [match[2]],
-        cond: '',
+        type: 'dollarOne',
+        ref: [match[0]],
+        cond: match[0] ? match[0].toUpperCase() : '',
         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;
+      offset += match[0].length;
+      q = q.substr(match[0].length);
       cropString = false;
+    } else if (match = /^(\$[2-9])\b/i.exec(q)) {
+      // $2, $3 ... $9
       branch.nodes.push({
-        type: 'dollarOtherNum',
-        ref: [match[3]],
-        cond: '',
+        type: 'dollarNum',
+        ref: [match[0]],
+        value: match[0],
+        cond: match[0] ? match[0].toUpperCase() : '',
         nodes: []
       });
-      offset += match[1].length;
-      q = q.substr(match[1].length);
+      offset += match[0].length;
+      q = q.substr(match[0].length);
+      cropString = false;
     } else if (/^\(/.test(q)) {
       var newGroup = {
         type: 'group',
@@ -575,20 +557,6 @@ var parse = function parse(query, options) {
       offset += match[0].length;
       q = q.substr(match[0].length);
       cropString = false;
-    } else if (match = /(\$1)\b/i.exec(q)) {
-      // $1
-      branch.nodes.push({
-        type: 'dollarOne',
-        ref: [match[2]],
-        cond: match[2] ? match[2].toUpperCase() : '',
-        nodes: []
-      });
-      var index = q.indexOf(match[0]);
-      if (index !== -1) {
-        offset += index + 2;
-        q = q.slice(0, index) + q.slice(index + 2);
-        cropString = false;
-      }
     }
     // }}}
     else {

package/package.json

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