GeneralBots/botserver
2
1
Fork 0
Code Issues Pull requests 1 Projects Releases 323 Packages Wiki Activity Actions

fix(all): Comparison of strings in FIND operators.

Browse source
This commit is contained in:
Rodrigo Rodriguez(pragmatismo.io) 2021-10-28 15:52:18 -03:00
parent 1899b1c755
commit 47d553f8f0
1 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
packages/basic.gblib/services/SystemKeywords.ts
View file

@ -445,15 +445,15 @@ export class SystemKeywords {
await CollectionUtil.asyncForEach(filters, async filter => {
let result = results.text[foundIndex][filter.columnIndex];
let wholeWord = true;
if (this.dk.user && this.dk.user.basicOptions && this.dk.user.basicOptions.wholeWord) {
wholeWord = this.dk.user.basicOptions.wholeWord;
}
switch (filter.dataType) {
case 'string':
switch (filter.operator) {
case '=':
let wholeWord = true;
if (this.dk.user && this.dk.user.basicOptions && this.dk.user.basicOptions.wholeWord) {
wholeWord = this.dk.user.basicOptions.wholeWord;
}
if (wholeWord) {
if (result && result.toLowerCase().trim() === filter.value.toLowerCase().trim()) {
filterAcceptCount++;
@ -466,13 +466,27 @@ export class SystemKeywords {
}
break;
case 'not in':
if (filter.value.indexOf(result) === -1) {
filterAcceptCount++;
if (wholeWord) {
if (result && result.toLowerCase().trim() !== filter.value.toLowerCase().trim()) {
filterAcceptCount++;
}
}
else {
if (result && result.toLowerCase().trim().indexOf(filter.value.toLowerCase().trim()) === -1) {
filterAcceptCount++;
}
}
break;
case 'in':
if (filter.value.indexOf(result) !== -1) {
filterAcceptCount++;
if (wholeWord) {
if (result && result.toLowerCase().trim() === filter.value.toLowerCase().trim()) {
filterAcceptCount++;
}
}
else {
if (result && result.toLowerCase().trim().indexOf(filter.value.toLowerCase().trim()) > -1) {
filterAcceptCount++;
}
}
break;
}