From 85414b4de0bdd8180b86b4581a2cb2d57254b342 Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Tue, 24 Sep 2019 16:35:28 +0200
Subject: [PATCH] The possibility to configure an external duplicate has been
removed from the views because no default external service integration
exists. Reactivate later maybe..
---
.../rebuildpersonduplicatescache/onActionProcess.js | 1 +
.../DuplicateScannerEdit_view.aod | 9 ---------
.../DuplicateScannerFilter_view.aod | 4 ----
process/DuplicateScanner_lib/process.js | 2 +-
4 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js b/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js
index 15809830cd..13a13f7926 100644
--- a/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js
+++ b/entity/DuplicateScanner_entity/entityfields/runactiongroup/children/rebuildpersonduplicatescache/onActionProcess.js
@@ -16,6 +16,7 @@ logging.log("querySelectFields -> " + querySelectFields);
let queryPersonFieldData = "select " + querySelectFields + " from CONTACT"
+ " join PERSON on PERSONID = PERSON_ID"
+ " left join ADDRESS on ADDRESS.CONTACT_ID = CONTACT.CONTACTID";
+ //+ " join COMMUNICATION on COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID";
logging.log("Löschen von PERSON Dubletten -> ");
DuplicateScannerUtils.DeleteDuplicateClustersByTargetEntity(targetEntity);
diff --git a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
index 8de67abe4e..51be866e59 100644
--- a/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
+++ b/neonView/DuplicateScannerEdit_view/DuplicateScannerEdit_view.aod
@@ -23,10 +23,6 @@
<name>c021711c-9f3e-454d-964c-1339e3463329</name>
<entityField>ENTITY_TO_SCAN_NAME</entityField>
</entityFieldLink>
- <entityFieldLink>
- <name>e8236833-ddb7-45a0-be51-cb56013f7b4b</name>
- <entityField>EXTERNAL_SERVICE_USAGE_ALLOWED</entityField>
- </entityFieldLink>
</fields>
</genericViewTemplate>
<neonViewReference>
@@ -39,10 +35,5 @@
<entityField>ScannerIndexConfigs_Consumer</entityField>
<view>DuplicateScannerIndexConfigEdit_view</view>
</neonViewReference>
- <neonViewReference>
- <name>88257173-a722-45a4-88be-790c9ce575cd</name>
- <entityField>ScannerResultFieldsConfig_Consumer</entityField>
- <view>DuplicateScannerResultFieldConfigEdit_view</view>
- </neonViewReference>
</children>
</neonView>
diff --git a/neonView/DuplicateScannerFilter_view/DuplicateScannerFilter_view.aod b/neonView/DuplicateScannerFilter_view/DuplicateScannerFilter_view.aod
index fcfd2a13c4..6aa1ceac2a 100644
--- a/neonView/DuplicateScannerFilter_view/DuplicateScannerFilter_view.aod
+++ b/neonView/DuplicateScannerFilter_view/DuplicateScannerFilter_view.aod
@@ -25,10 +25,6 @@
<name>8615259b-de5b-493a-9c9d-2ff934ae1b8c</name>
<entityField>ENTITY_TO_SCAN_NAME</entityField>
</neonTableColumn>
- <neonTableColumn>
- <name>d43d6a6d-738a-4543-9a66-2e09114e212c</name>
- <entityField>EXTERNAL_SERVICE_USAGE_ALLOWED</entityField>
- </neonTableColumn>
</columns>
</tableViewTemplate>
</children>
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index 8ac974b868..908a03614a 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -1203,7 +1203,7 @@ _DuplicateScannerUtils._insertValuesInFilterTemplate = function(pJsonRootNode, p
if(fieldValue == null)
{
logging.show("Duplicate Scan: Requested value for field " + fieldName + " not present in the provided valueslist");
- return pJsonRootNode;
+ continue;
}
if(_DuplicateScannerUtils._isNotNullAndANumber(pCountCharsOfValueToUse)
--
GitLab