@iebh/polyglot 4.7.1 → 4.7.2

package/lib/modules/parse.js

@@ -347,7 +347,8 @@ var parse = function parse(query, options) {
       // Mesh term - PubMed syntax
       leaf.type = 'mesh';
       leaf.field = match[2] ? 'Mesh search (Not exploded)' : 'Mesh search (exploded)';
-      if (/^["“”].*["“”]$/.test(leaf.content)) leaf.content = leaf.content.substr(1, leaf.content.length - 2); // Remove wrapping '"' characters
+      // if (/^["“”].*["“”]$/.test(leaf.content)) leaf.content = leaf.content.substr(1, leaf.content.length - 2); // Remove wrapping '"' characters
+      if (/^["“”'‘’].*["“”'‘’]$/.test(leaf.content) && ['"', '“', '”', "'", '‘', '’'].includes(leaf.content[0]) && ['"', '“', '”', "'", '‘', '’'].includes(leaf.content.slice(-1))) leaf.content = leaf.content.slice(1, -1);
       offset += match[0].length;
       q = q.substr(match[0].length);
       cropString = false;
@@ -360,7 +361,8 @@ var parse = function parse(query, options) {
         newLeaf.heading = match[2];
       }
       newLeaf.field = match[4] ? 'MeSH Major Topic search (Not exploded)' : 'MeSH Major Topic search (exploded)';
-      if (/^["“”].*["“”]$/.test(newLeaf.content)) newLeaf.content = newLeaf.content.substr(1, newLeaf.content.length - 2); // Remove wrapping '"' characters
+      // if (/^["“”].*["“”]$/.test(newLeaf.content)) newLeaf.content = newLeaf.content.substr(1, newLeaf.content.length - 2); // Remove wrapping '"' characters
+      if (/^["“”'‘’].*["“”'‘’]$/.test(leaf.content) && ['"', '“', '”', "'", '‘', '’'].includes(leaf.content[0]) && ['"', '“', '”', "'", '‘', '’'].includes(leaf.content.slice(-1))) leaf.content = leaf.content.slice(1, -1);
       branch.nodes.push(newLeaf);
       offset += match[0].length;
       q = q.substr(match[0].length);
@@ -374,7 +376,8 @@ var parse = function parse(query, options) {
         newLeaf.heading = match[2];
       }
       newLeaf.field = match[4] ? 'MeSH Major Topic search (Not exploded)' : 'MeSH Major Topic search (exploded)';
-      if (/^["“”].*["“”]$/.test(newLeaf.content)) newLeaf.content = newLeaf.content.substr(1, newLeaf.content.length - 2); // Remove wrapping '"' characters
+      // if (/^["“”].*["“”]$/.test(newLeaf.content)) newLeaf.content = newLeaf.content.substr(1, newLeaf.content.length - 2); // Remove wrapping '"' characters
+      if (/^["“”'‘’].*["“”'‘’]$/.test(leaf.content) && ['"', '“', '”', "'", '‘', '’'].includes(leaf.content[0]) && ['"', '“', '”', "'", '‘', '’'].includes(leaf.content.slice(-1))) leaf.content = leaf.content.slice(1, -1);
       branch.nodes.push(newLeaf);
       offset += match[0].length;
       q = q.substr(match[0].length);
@@ -383,7 +386,8 @@ var parse = function parse(query, options) {
       // Mesh subheading search - PubMed syntax
       leaf.type = 'mesh';
       leaf.field = 'MeSH subheading search';
-      if (/^["“”].*["“”]$/.test(leaf.content)) leaf.content = leaf.content.substr(1, leaf.content.length - 2); // Remove wrapping '"' characters
+      // if (/^["“”].*["“”]$/.test(leaf.content)) leaf.content = leaf.content.substr(1, leaf.content.length - 2); // Remove wrapping '"' characters
+      if (/^["“”'‘’].*["“”'‘’]$/.test(leaf.content) && ['"', '“', '”', "'", '‘', '’'].includes(leaf.content[0]) && ['"', '“', '”', "'", '‘', '’'].includes(leaf.content.slice(-1))) leaf.content = leaf.content.slice(1, -1);
       offset += match[0].length;
       q = q.substr(match[0].length);
       cropString = false;
@@ -397,7 +401,8 @@ var parse = function parse(query, options) {
       }
       leaf.type = 'mesh';
       useLeaf.field = 'MeSH subheading search';
-      if (/^["“”].*["“”]$/.test(leaf.content)) leaf.content = leaf.content.substr(1, leaf.content.length - 2); // Remove wrapping '"' characters
+      // if (/^["“”].*["“”]$/.test(leaf.content)) leaf.content = leaf.content.substr(1, leaf.content.length - 2); // Remove wrapping '"' characters
+      if (/^["“”'‘’].*["“”'‘’]$/.test(leaf.content) && ['"', '“', '”', "'", '‘', '’'].includes(leaf.content[0]) && ['"', '“', '”', "'", '‘', '’'].includes(leaf.content.slice(-1))) leaf.content = leaf.content.slice(1, -1);
       offset += match[0].length;
       q = q.substr(match[0].length);
       cropString = false;
@@ -411,7 +416,8 @@ var parse = function parse(query, options) {
       }
       leaf.type = 'mesh';
       useLeaf.field = match[1] === "xm" ? 'Mesh search (exploded)' : 'Mesh search (Not exploded)';
-      if (/^["“”].*["“”]$/.test(leaf.content)) leaf.content = leaf.content.substr(1, leaf.content.length - 2); // Remove wrapping '"' characters
+      // if (/^["“”].*["“”]$/.test(leaf.content)) leaf.content = leaf.content.substr(1, leaf.content.length - 2); // Remove wrapping '"' characters
+      if (/^["“”'‘’].*["“”'‘’]$/.test(leaf.content) && ['"', '“', '”', "'", '‘', '’'].includes(leaf.content[0]) && ['"', '“', '”', "'", '‘', '’'].includes(leaf.content.slice(-1))) leaf.content = leaf.content.slice(1, -1);
       offset += match[0].length;
       q = q.substr(match[0].length);
       cropString = false;
@@ -527,8 +533,8 @@ var parse = function parse(query, options) {
       var nextChar = q.substr(0, 1);
       if ((_lodash["default"].isUndefined(leaf) || _lodash["default"].isArray(leaf)) && nextChar != ' ') {
         // Leaf pointing to array entity - probably not created fallback leaf to append to
-        if (/^["“”]$/.test(nextChar) && (match = /^["“”](.*?)["“”]/.exec(q))) {
-          // First character is a speachmark - slurp until we see the next one
+        // if (/^["“”]$/.test(nextChar) && (match = /^["“”](.*?)["“”]/.exec(q))) { // First character is a speachmark - slurp until we see the next one
+        if (/^["“”'‘’]$/.test(nextChar) && (match = /^["“”'‘’](.*?)["“”'‘’]/.exec(q))) {
           leaf = {
             type: 'phrase',
             content: match[1],

package/package.json

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