@iebh/polyglot 4.8.4 → 4.8.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -319,12 +319,12 @@ var _default = {
319
319
  buffer += 'NOT';
320
320
  break;
321
321
  case 'raw':
322
- console.log("Here1", buffer);
322
+ console.log("Here1", branch.content, engine, buffer);
323
323
  buffer += branch.content;
324
324
  break;
325
325
  case 'dollarOne':
326
326
  case 'template':
327
- console.log("Here2", buffer);
327
+ console.log("Here2", branch.content, engine, buffer);
328
328
  buffer += _tools["default"].resolveTemplate(branch.content, engine);
329
329
  break;
330
330
  case 'comment':
@@ -138,18 +138,20 @@ var parse = function parse(query, options) {
138
138
  while (q.length) {
139
139
  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)
140
140
  var match;
141
- if (match = /^\$1\b/.exec(q)) {
141
+ if (match = /\$1/.exec(q)) {
142
142
  // $1
143
143
  branch.nodes.push({
144
- type: 'dollarOne'
144
+ type: 'dollarOne',
145
+ content: match[1].toLowerCase()
145
146
  });
146
147
  offset += match[0].length;
147
148
  q = q.substr(match[0].length);
148
149
  cropString = false;
149
- } else if (match = /^\$[2-9]\b/.exec(q)) {
150
+ } else if (match = /\$[2-9]/.exec(q)) {
150
151
  // $2 to $9
151
152
  branch.nodes.push({
152
- type: 'dollarOtherNum'
153
+ type: 'dollarOtherNum',
154
+ content: match[1].toLowerCase()
153
155
  });
154
156
  offset += match[0].length;
155
157
  q = q.substr(match[0].length);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@iebh/polyglot",
3
- "version": "4.8.4",
3
+ "version": "4.8.6",
4
4
  "description": "IEBH-SRA tool to convert between different medical database search formats",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {