Merge pull request #648 from telefonicaid/fix/preseelct

fix keep preselect if not insert (hotfix: master)
telefonicaid · Mar 16, 2022 · 4088e86 · 4088e86
2 parents ef4174c + c36b2f0
commit 4088e86
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 4 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -0,0 +1 @@
+- Fix: preselect in ruleWithContext (#630)
diff --git a/lib/myutils.js b/lib/myutils.js
@@ -321,8 +321,15 @@ function ruleWithContext(rule) {
     const ruleText = removeCRLFchars(rule.text);
     // PreContext
     const preSelectMatch = ruleText.match(/.+?(?=\bselect )/i);
-    const preInsertMatch = preSelectMatch ? preSelectMatch[0].match(/.+?(?=\insert )/i) : null;
-    const insertionPreContext = preInsertMatch ? preInsertMatch[0] : '';
+    var preInsertMatch;
+    var insertionPreContext;
+    if (preSelectMatch) {
+        preInsertMatch = preSelectMatch[0].match(/.+?(?=\insert )/i);
+        insertionPreContext = preInsertMatch ? preInsertMatch[0] : preSelectMatch[0];
+    } else {
+        preInsertMatch = null;
+        insertionPreContext = '';
+    }
     // PostContext
     const InsertMatch = ruleText.match(/\binsert .*/i);
     var insertionPostContext;
@@ -341,8 +348,15 @@ function ruleWithContextTimedRule(rule) {
     const ruleText = removeCRLFchars(rule.text);
     // PreContext
     const preSelectMatch = ruleText.match(/.+?(?=\bselect )/i);
-    const preInsertMatch = preSelectMatch ? preSelectMatch[0].match(/.+?(?=\insert )/i) : null;
-    const insertionPreContext = preInsertMatch ? preInsertMatch[0] : '';
+    var preInsertMatch;
+    var insertionPreContext;
+    if (preSelectMatch) {
+        preInsertMatch = preSelectMatch[0].match(/.+?(?=\insert )/i);
+        insertionPreContext = preInsertMatch ? preInsertMatch[0] : preSelectMatch[0];
+    } else {
+        preInsertMatch = null;
+        insertionPreContext = '';
+    }
     // PostContext
     const InsertMatch = ruleText.match(/\binsert .*/i);
     var insertionPostContext;