From eeaa8bc5fd60cce69f761b9f53d02b3428feb4b6 Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Fri, 27 Sep 2019 13:17:11 +0200
Subject: [PATCH] Small refactorings
---
process/DuplicateScanner_lib/process.js | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index f2a7c37464..0eb625985d 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -298,6 +298,7 @@ pRecordsBlockSize, pFormatValuesConsumeWebserviceCallback)
let duplicateFieldsConfig = DuplicateScannerUtils.LoadIndexFieldsConfiguration(filterName, targetEntity);
let resultFields = DuplicateScannerUtils.LoadResultFields(filterName, targetEntity);
+ //load all entity fields used in the prefilter
let filterFieldConfigs = _DuplicateScannerUtils._getFieldConfigsFromFilterFields(pFilterName, pTargetEntity);
logging.log("filterFieldConfigs -> " + filterFieldConfigs);
@@ -305,6 +306,7 @@ pRecordsBlockSize, pFormatValuesConsumeWebserviceCallback)
logging.log("entityFieldsToLoad initial-> " + entityFieldsToLoad);
+ //If the fields from the prefilter aren't in the entity fields to load, add them manually
if(filterFieldConfigs.length > 0)
{
let INDEX_FILTER_FIELD_NAME = 0;
@@ -538,6 +540,7 @@ pFormatValuesConsumeWebserviceCallback)
let duplicateFieldsConfig = DuplicateScannerUtils.LoadIndexFieldsConfiguration(pFilterName, pTargetEntity);
let entityFieldsToLoad = _DuplicateScannerUtils._getEntityFieldNamesFromFieldsConfig(duplicateFieldsConfig);
+ //If the fields from the prefilter aren't in the entity fields to load, add them manually
let filterFieldConfigs = _DuplicateScannerUtils._getFieldConfigsFromFilterFields(pFilterName, pTargetEntity);
if(filterFieldConfigs.length > 0)
{
@@ -1292,7 +1295,7 @@ _DuplicateScannerUtils._insertValuesInFilterTemplate = function(pJsonRootNode, p
if(fieldValue == null)
{
- logging.show("Duplicate Scan: Requested value for field " + fieldName + " not present in the provided valueslist");
+ logging.log("Duplicate Scan: Requested value for field " + fieldName + " not present in the provided valueslist");
continue;
}
--
GitLab