From 2dfe92c46d36e98df17a90080c9d12f3505463a9 Mon Sep 17 00:00:00 2001
From: "d.buechler" <d.buechler@adito.de>
Date: Fri, 19 Jul 2019 18:47:40 +0200
Subject: [PATCH] =?UTF-8?q?Neues=20Feld,=20damit=20soll=20pro=20Stufe=20di?=
=?UTF-8?q?e=20maximal=20erlaubte=20Ergebnismenge=20zur=C3=BCckgegeben=20w?=
=?UTF-8?q?erden.Funktionalit=C3=A4t=20noch=20nicht=20implementiert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../create_duplicateScanConditionConfig.xml | 1 +
aliasDefinition/Data_alias/Data_alias.aod | 42 ++++++++++++-------
.../DuplicateScanConditionConfig_entity.aod | 7 ++++
.../testduplicatescan/onActionProcess.js | 2 +-
.../DuplicateEdit_view/DuplicateEdit_view.aod | 4 ++
process/DuplicateScanner_lib/process.js | 2 +-
6 files changed, 42 insertions(+), 16 deletions(-)
diff --git a/.liquibase/Data_alias/basic/2019.1.4/DuplicateScan/create_duplicateScanConditionConfig.xml b/.liquibase/Data_alias/basic/2019.1.4/DuplicateScan/create_duplicateScanConditionConfig.xml
index ce8b64ac5f..61202f06f5 100644
--- a/.liquibase/Data_alias/basic/2019.1.4/DuplicateScan/create_duplicateScanConditionConfig.xml
+++ b/.liquibase/Data_alias/basic/2019.1.4/DuplicateScan/create_duplicateScanConditionConfig.xml
@@ -10,6 +10,7 @@
</column>
<column name="CONDITION" type="CLOB" />
<column name="COUNT_CHARACTERS_TO_USE" type="INTEGER" />
+ <column name="MAX_RESULTS_THRESHOLD" type="INTEGER" />
<column name="CONDITION_CONFIG_NAME" type="NVARCHAR(200)"/>
<column name="USER_NEW" type="NVARCHAR(50)">
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index 6d82073678..462fc44014 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -10483,20 +10483,6 @@
<title></title>
<description></description>
</entityFieldDb>
- <entityFieldDb>
- <name>DESCRIPTION</name>
- <dbName></dbName>
- <primaryKey v="false" />
- <columnType v="12" />
- <size v="500" />
- <scale v="0" />
- <notNull v="false" />
- <isUnique v="false" />
- <index v="false" />
- <documentation></documentation>
- <title></title>
- <description></description>
- </entityFieldDb>
<entityFieldDb>
<name>DATE_EDIT</name>
<dbName></dbName>
@@ -10795,6 +10781,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>DESCRIPTION</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="12" />
+ <size v="500" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
@@ -10941,6 +10941,20 @@
<title></title>
<description></description>
</entityFieldDb>
+ <entityFieldDb>
+ <name>MAX_RESULTS_THRESHOLD</name>
+ <dbName></dbName>
+ <primaryKey v="false" />
+ <columnType v="4" />
+ <size v="10" />
+ <scale v="0" />
+ <notNull v="false" />
+ <isUnique v="false" />
+ <index v="false" />
+ <documentation></documentation>
+ <title></title>
+ <description></description>
+ </entityFieldDb>
</entityFields>
</entityDb>
<entityDb>
diff --git a/entity/DuplicateScanConditionConfig_entity/DuplicateScanConditionConfig_entity.aod b/entity/DuplicateScanConditionConfig_entity/DuplicateScanConditionConfig_entity.aod
index dd41eac070..456a0f924d 100644
--- a/entity/DuplicateScanConditionConfig_entity/DuplicateScanConditionConfig_entity.aod
+++ b/entity/DuplicateScanConditionConfig_entity/DuplicateScanConditionConfig_entity.aod
@@ -80,6 +80,9 @@
<name>USER_EDIT</name>
<valueProcess>%aditoprj%/entity/DuplicateScanConditionConfig_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
+ <entityField>
+ <name>MAX_RESULTS_THRESHOLD</name>
+ </entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
@@ -132,6 +135,10 @@
<name>USER_NEW.value</name>
<recordfield>DUPLICATESCANCONDITIONCONFIG.USER_NEW</recordfield>
</dbRecordFieldMapping>
+ <dbRecordFieldMapping>
+ <name>MAX_RESULTS_THRESHOLD.value</name>
+ <recordfield>DUPLICATESCANCONDITIONCONFIG.MAX_RESULTS_THRESHOLD</recordfield>
+ </dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
diff --git a/entity/DuplicateScan_entity/entityfields/testactiongroup/children/testduplicatescan/onActionProcess.js b/entity/DuplicateScan_entity/entityfields/testactiongroup/children/testduplicatescan/onActionProcess.js
index 94ac7b62f2..a8dd5a5a39 100644
--- a/entity/DuplicateScan_entity/entityfields/testactiongroup/children/testduplicatescan/onActionProcess.js
+++ b/entity/DuplicateScan_entity/entityfields/testactiongroup/children/testduplicatescan/onActionProcess.js
@@ -1,7 +1,7 @@
import("system.logging");
import("DuplicateScanner_lib");
-var filterName = "FilterName";
+var filterName = "PersonenDubletten";
var targetEntity = "Person_entity";
var values = {FIRSTNAME: "Anja", LASTNAME: "Lindner", GENDER: "f"};
var resultFields = ["PERSONID", "LASTNAME", "FIRSTNAME"];
diff --git a/neonView/DuplicateEdit_view/DuplicateEdit_view.aod b/neonView/DuplicateEdit_view/DuplicateEdit_view.aod
index f413f58f3d..df90359285 100644
--- a/neonView/DuplicateEdit_view/DuplicateEdit_view.aod
+++ b/neonView/DuplicateEdit_view/DuplicateEdit_view.aod
@@ -21,6 +21,10 @@
<name>1b14133f-3152-44e0-b555-58b8e909561a</name>
<entityField>COUNT_CHARACTERS_TO_USE</entityField>
</neonTableColumn>
+ <neonTableColumn>
+ <name>22120b0a-d76b-4172-b274-fac1e7940c3d</name>
+ <entityField>MAX_RESULTS_THRESHOLD</entityField>
+ </neonTableColumn>
<neonTableColumn>
<name>b07a0cb4-0385-4dac-a6d6-40e985601b00</name>
<entityField>CONDITION</entityField>
diff --git a/process/DuplicateScanner_lib/process.js b/process/DuplicateScanner_lib/process.js
index e2545cb8f3..a4c5ebc5a5 100644
--- a/process/DuplicateScanner_lib/process.js
+++ b/process/DuplicateScanner_lib/process.js
@@ -117,7 +117,7 @@ _DuplicateScannerUtils._loadFilters = function(pFilterName, pTargetEntity)
+ " where FILTER_NAME = '" + pFilterName + "'"
+ " and ENTITY_TO_SCAN_NAME = '" + pTargetEntity + "'";
-// logging.log("_loadFilters query -> " + query);
+ logging.log("_loadFilters query -> " + query);
return db.table(query);
}
--
GitLab