From 08d2e107e69ce73dee04c67fd56c7e1adfd8ce1a Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Thu, 22 Feb 2024 11:31:25 -0300 Subject: [PATCH] new(basic.gblib): REPORT AND RESET REPORT new keywords @othonlima --- packages/basic.gblib/services/GBVMService.ts | 2 +- packages/basic.gblib/services/SystemKeywords.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/basic.gblib/services/GBVMService.ts b/packages/basic.gblib/services/GBVMService.ts index 824c9797..4d7f266e 100644 --- a/packages/basic.gblib/services/GBVMService.ts +++ b/packages/basic.gblib/services/GBVMService.ts @@ -635,7 +635,7 @@ export class GBVMService extends GBService { let __reportMerge = {adds: 0, updates: 0, skipped: 0}; let __report = () => { - return 'Adds: ' + __reportMerge.adds + '. Updates: ' + __reportMerge.updates + '. Skipped: ' + __reportMerge.skipped + '.'; + return __reportMerge.title + ' adds: ' + __reportMerge.adds + ', updates: ' + __reportMerge.updates + ' and skipped: ' + __reportMerge.skipped + '.'; }; let REPORT = 'No report yet'; diff --git a/packages/basic.gblib/services/SystemKeywords.ts b/packages/basic.gblib/services/SystemKeywords.ts index c3a4d40f..6fc22268 100644 --- a/packages/basic.gblib/services/SystemKeywords.ts +++ b/packages/basic.gblib/services/SystemKeywords.ts @@ -2327,7 +2327,7 @@ export class SystemKeywords { key2Index = _.invertBy(table, key2); } - let merges = 0, + let updates = 0, adds = 0, skipped = 0; // Scans all items in incoming data. @@ -2422,7 +2422,7 @@ export class SystemKeywords { } - merge ? merges++ : skipped++; + merge ? updates++ : skipped++; } else { @@ -2478,8 +2478,8 @@ export class SystemKeywords { await this.saveToStorageBatch({ pid, table: file, rows: fieldsValuesList }); } - GBLog.info(`BASIC: MERGE results: merges:${merges}, additions:${adds}, skipped: ${skipped}.`); - return { merges, adds, skipped }; + GBLog.info(`BASIC: MERGE results: adds:${adds}, updates:${updates} , skipped: ${skipped}.`); + return { title:file, adds, updates, skipped }; } /**