From 47a78412d1aff55c8e5094dfb7ff4e9847d33de9 Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Tue, 8 Oct 2019 18:30:53 +0200
Subject: [PATCH] Fixed error where if no duplicate scan result on creation of
a new person could be found, the code tried to access .lenght...
Data_alias.aod: The auditSyncConfig was configured to audit itself which
resulted in an error. Fixed.
---
aliasDefinition/Data_alias/Data_alias.aod | 2 +-
entity/Person_entity/recordcontainers/db/onDBInsert.js | 3 +--
process/DuplicateScanner_lib/process.js | 4 +---
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index dbf98f33240..bb71cb6a737 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -7596,7 +7596,7 @@
<description></description>
<auditSyncConfig>
<name>auditSyncConfig</name>
- <auditMode v="2" />
+ <auditMode v="0" />
<syncActive v="false" />
<syncComplete v="true" />
<syncDirection v="1" />
diff --git a/entity/Person_entity/recordcontainers/db/onDBInsert.js b/entity/Person_entity/recordcontainers/db/onDBInsert.js
index 0a1ea849e45..29d0967acda 100644
--- a/entity/Person_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Person_entity/recordcontainers/db/onDBInsert.js
@@ -39,10 +39,9 @@ for (fieldname in entityModel.fields)
let scanResults = DuplicateScannerUtils.ScanForDuplicates("PersonDuplicates", targetEntity,
valuesToCheck, null);
-logging.log("scanResults.length -> " + scanResults.length);
//If we found duplicates, cache them
-if(scanResults.length > 0)
+if(scanResults != null && scanResults.length > 0)
{
let insertCount = DuplicateScannerUtils.CacheNewScanResults(contactId, scanResults, targetEntity);
logging.log("insertCount -> " + insertCount);
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 02ac88adb4f..10e41fa1b40 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -743,8 +743,6 @@ DuplicateScannerUtils.MergePerson = function(pSourceContactId, pTargetContactId)
DuplicateScannerUtils.DeleteCachedDuplicate(pSourceContactId);
- _DuplicateScannerUtils._ensureDataValidityAfterMergePerson(pTargetContactId);
-
return (affectedRowsCurrentAlias > 0 && deletedRows >= 2);
}
@@ -775,7 +773,7 @@ DuplicateScannerUtils.MergeOrganisation = function(pSourceContactId, pTargetCont
//logging.log("deleteStatements -> " + JSON.stringify(deleteStatements));
let affectedRowsCurrentAlias = db.updates(updateStatementsCurrentAlias);
- let affectedRowsSystemAlias = db.updates(updateStatementsSystemAlias, "_____SYSTEMALIAS");
+ let affectedRowsSystemAlias = db.updates(updateStatementsSystemAlias, SqlUtils.getSystemAlias());
let deletedRows = db.deletes(deleteStatements)
//logging.log("affectedRowsCurrentAlias -> " + affectedRowsCurrentAlias);
--
GitLab