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

fix(basic.gblib): Databases. #392 @othonlima.

Browse source
This commit is contained in:
Rodrigo Rodriguez 2023-11-30 13:47:04 -03:00
parent 4352cc88a1
commit 4c64bddea9
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/basic.gblib/services/KeywordsExpressions.ts
View file

@ -610,7 +610,7 @@ export class KeywordsExpressions {
]; ];
keywords[i++] = [ keywords[i++] = [
/^\s*(wait)\s*(\d+)/gim, /^\s*(wait)\s*(.*)/gim,
($0, $1, $2) => { ($0, $1, $2) => {
return `await sys.wait({pid: pid, seconds:${$2}})`; return `await sys.wait({pid: pid, seconds:${$2}})`;
} }

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

@ -1938,6 +1938,12 @@ export class SystemKeywords {
public async merge({ pid, file, data, key1, key2 }): Promise<any> { public async merge({ pid, file, data, key1, key2 }): Promise<any> {
GBLog.info(`BASIC: MERGE running on ${file} and key1: ${key1}, key2: ${key2}...`); GBLog.info(`BASIC: MERGE running on ${file} and key1: ${key1}, key2: ${key2}...`);
if (!data){
GBLog.info(`BASIC: MERGE running on ${file}: NO DATA.`);
return data;
}
const { min, user, params } = await DialogKeywords.getProcessInfo(pid); const { min, user, params } = await DialogKeywords.getProcessInfo(pid);
// Check if is a tree or flat object. // Check if is a tree or flat object.