Skip to content
Snippets Groups Projects
Commit f2bc3d77 authored by David Büchler's avatar David Büchler
Browse files

Merge branch 'Dubletten_Test_Temporär' into #1040035-Dublettenermittlung

# Conflicts:
#	entity/DuplicateScannerIndexConfig_entity/DuplicateScannerIndexConfig_entity.aod
#	entity/DuplicateScannerPrefilterConfig_entity/DuplicateScannerPrefilterConfig_entity.aod
#	neonContext/DuplicateScannerIndexConfig/DuplicateScannerIndexConfig.aod
#	neonContext/DuplicateScannerPrefilterConfig/DuplicateScannerPrefilterConfig.aod
#	process/DuplicateScanner_lib/process.js
parents 596decdd cea307a0
No related branches found
No related tags found
No related merge requests found
Showing
with 2 additions and 431 deletions
......@@ -14,6 +14,8 @@
<column name="EXTERNAL_SERVICE_USAGE_ALLOWED" type="INTEGER" >
<constraints nullable="false"/>
</column>
<column name="ID_FIELD_NAME" type="NVARCHAR(100)" />
<column name="SCAN_PATTERN" type="NVARCHAR(4000)" />
<column name="USER_NEW" type="NVARCHAR(50)">
<constraints nullable="false"/>
</column>
......
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="d.buechler" id="1c532327-8b0f-4f0d-b160-dd75db93cecb">
<createTable tableName="DUPLICATESCANNERINDEXCONFIG">
<column name="ID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_DUPLICATESCANNERINDEXCONFIG_ID"/>
</column>
<column name="DUPLICATESCANNER_ID" type="CHAR(36)">
<constraints nullable="false" />
</column>
<column name="ENTITY_FIELD_NAME" type="NVARCHAR(100)" />
<column name="IS_ID_FIELD" type="INTEGER" >
<constraints nullable="false"/>
</column>
<column name="USE_FOR_INDEX_DUPLICATE_SEARCH" type="INTEGER" >
<constraints nullable="false"/>
</column>
<column name="USER_NEW" type="NVARCHAR(50)">
<constraints nullable="false"/>
</column>
<column name="DATE_NEW" type="DATE">
<constraints nullable="false"/>
</column>
<column name="USER_EDIT" type="NVARCHAR(50)" />
<column name="DATE_EDIT" type="DATE"/>
</createTable>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.6.xsd">
<changeSet author="d.buechler" id="cf165521-f2bb-4941-82ee-c4a5812ea8b8">
<createTable tableName="DUPLICATESCANNERPREFILTERCONFIG">
<column name="ID" type="CHAR(36)">
<constraints primaryKey="true" primaryKeyName="PK_DUPLICATESCANNERPREFILTERCONFIG_ID"/>
</column>
<column name="DUPLICATESCANNER_ID" type="CHAR(36)">
<constraints nullable="false" />
</column>
<column name="FILTER_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)">
<constraints nullable="false"/>
</column>
<column name="DATE_NEW" type="DATE">
<constraints nullable="false"/>
</column>
<column name="USER_EDIT" type="NVARCHAR(50)" />
<column name="DATE_EDIT" type="DATE"/>
</createTable>
</changeSet>
</databaseChangeLog>
\ No newline at end of file
......@@ -14,8 +14,6 @@
<include relativeToChangelogFile="true" file="Duplicates/create_duplicateClusters.xml"/>
<include relativeToChangelogFile="true" file="Duplicates/create_duplicateScanner.xml"/>
<include relativeToChangelogFile="true" file="Duplicates/create_duplicateScannerPrefilterConfig.xml"/>
<include relativeToChangelogFile="true" file="Duplicates/create_duplicateScannerIndexConfig.xml"/>
<include relativeToChangelogFile="true" file="Duplicates/create_duplicateScannerResultFieldsConfig.xml"/>
<include relativeToChangelogFile="true" file="Duplicates/create_unrelatedDuplicates.xml"/>
</databaseChangeLog>
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.12" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.12">
<name>DuplicateScannerIndexConfig_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<recordContainer>recordContainer</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityField>
<name>ENTITY_FIELD_NAME</name>
<title>Entity field name</title>
<dropDownProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/entity_field_name/dropDownProcess.js</dropDownProcess>
</entityField>
<entityProvider>
<name>ScannerIndexConfigProvider</name>
<dependencies>
<entityDependency>
<name>031ba527-13cf-4b28-9db4-8f666f81bc8e</name>
<entityName>DuplicateScanner_entity</entityName>
<fieldName>ScannerIndexConfigs_Consumer</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityField>
<name>UID</name>
</entityField>
<entityField>
<name>DUPLICATESCANNER_ID</name>
<valueProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/duplicatescanner_id/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>DuplicateScannerId_param</name>
<expose v="true" />
<mandatory v="true" />
</entityParameter>
<entityField>
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<valueProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
<valueProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
<valueProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USE_FOR_INDEX_DUPLICATE_SEARCH</name>
<title>Use for duplicate search</title>
<contentType>BOOLEAN</contentType>
<valueProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/use_for_index_duplicate_search/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>IS_ID_FIELD</name>
<title>Is ID field</title>
<contentType>BOOLEAN</contentType>
<valueProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/entityfields/is_id_field/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>ScannerEntity_param</name>
<expose v="true" />
<mandatory v="true" />
</entityParameter>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>recordContainer</name>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/DuplicateScannerIndexConfig_entity/recordcontainers/recordcontainer/conditionProcess.js</conditionProcess>
<linkInformation>
<linkInformation>
<name>20b6821f-5de0-4fd6-b30f-38749dd075e8</name>
<tableName>DUPLICATESCANNERINDEXCONFIG</tableName>
<primaryKey>ID</primaryKey>
<isUIDTable v="false" />
<readonly v="false" />
</linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
<recordfield>DUPLICATESCANNERINDEXCONFIG.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_NEW.value</name>
<recordfield>DUPLICATESCANNERINDEXCONFIG.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DUPLICATESCANNER_ID.value</name>
<recordfield>DUPLICATESCANNERINDEXCONFIG.DUPLICATESCANNER_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>ENTITY_FIELD_NAME.value</name>
<recordfield>DUPLICATESCANNERINDEXCONFIG.ENTITY_FIELD_NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>IS_ID_FIELD.value</name>
<recordfield>DUPLICATESCANNERINDEXCONFIG.IS_ID_FIELD</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>UID.value</name>
<recordfield>DUPLICATESCANNERINDEXCONFIG.ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USE_FOR_INDEX_DUPLICATE_SEARCH.value</name>
<recordfield>DUPLICATESCANNERINDEXCONFIG.USE_FOR_INDEX_DUPLICATE_SEARCH</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_EDIT.value</name>
<recordfield>DUPLICATESCANNERINDEXCONFIG.USER_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>DUPLICATESCANNERINDEXCONFIG.USER_NEW</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
</entity>
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.get("$sys.date"));
\ No newline at end of file
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.get("$sys.date"));
\ No newline at end of file
import("system.result");
import("system.vars");
if(vars.get("$this.value") == null || vars.get("$this.value") == "")
{
result.string(vars.get("$param.DuplicateScannerId_param"));
}
\ No newline at end of file
import("system.result");
import("system.vars");
import("system.logging");
if(vars.get("$this.value") == null || vars.get("$this.value") == "")
{
result.string("0");
}
\ No newline at end of file
import("system.result");
import("system.vars");
import("system.logging");
logging.log("this value -> " + vars.get("$this.value"));
logging.log("vars get field -> " + vars.get("$field.USE_FOR_INDEX_DUPLICATE_SEARCH"));
if(vars.get("$this.value") == null || vars.get("$this.value") == "")
{
logging.log("im if -> ");
result.string("0");
}
\ No newline at end of file
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.get("$sys.user"));
\ No newline at end of file
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.get("$sys.user"));
\ No newline at end of file
import("system.vars");
import("system.result");
if(vars.get("$param.DuplicateScannerId_param"))
{
result.string("DUPLICATESCANNER_ID = '" + vars.getString("$param.DuplicateScannerId_param") + "'");
}
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<entity xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.3.12" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/entity/1.3.12">
<name>DuplicateScannerPrefilterConfig_entity</name>
<majorModelMode>DISTRIBUTED</majorModelMode>
<title>Prefilter Configuration</title>
<recordContainer>DBRecordContainer</recordContainer>
<entityFields>
<entityProvider>
<name>#PROVIDER</name>
</entityProvider>
<entityField>
<name>COUNT_CHARACTERS_TO_USE</name>
<title>Characters to use</title>
<contentType>NUMBER</contentType>
</entityField>
<entityField>
<name>FILTER_CONDITION</name>
<title>Condition</title>
<contentType>FILTER_TREE</contentType>
<valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/valueProcess.js</valueProcess>
<onValueChange>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/condition/onValueChange.js</onValueChange>
<onValueChangeTypes>
<element>MASK</element>
<element>PROCESS</element>
<element>PROCESS_SETVALUE</element>
</onValueChangeTypes>
</entityField>
<entityProvider>
<name>ScannerPrefilterConfigsProvider</name>
<recordContainer>DBRecordContainer</recordContainer>
<dependencies>
<entityDependency>
<name>a546a627-7b08-42a7-86af-c3759d163235</name>
<entityName>DuplicateScanner_entity</entityName>
<fieldName>ScannerPrefilterConfigs_Consumer</fieldName>
<isConsumer v="false" />
</entityDependency>
</dependencies>
</entityProvider>
<entityField>
<name>DUPLICATESCANNER_ID</name>
<valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/duplicatescanner_id/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>UID</name>
</entityField>
<entityParameter>
<name>EntityToFilter_param</name>
<title>EntityToFilterParam</title>
<expose v="true" />
<mandatory v="true" />
</entityParameter>
<entityField>
<name>CONDITION_CONFIG_NAME</name>
<title>Configuration name</title>
</entityField>
<entityField>
<name>parameter</name>
<title>parameter</title>
<valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/parameter/valueProcess.js</valueProcess>
</entityField>
<entityParameter>
<name>DuplicateScannerId_param</name>
<expose v="true" />
<mandatory v="true" />
</entityParameter>
<entityField>
<name>DATE_EDIT</name>
<valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/date_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>DATE_NEW</name>
<valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/date_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_NEW</name>
<valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/user_new/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>USER_EDIT</name>
<valueProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/entityfields/user_edit/valueProcess.js</valueProcess>
</entityField>
<entityField>
<name>MAX_RESULTS_THRESHOLD</name>
<title>Max results threshold</title>
</entityField>
</entityFields>
<recordContainers>
<dbRecordContainer>
<name>DBRecordContainer</name>
<alias>Data_alias</alias>
<conditionProcess>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/conditionProcess.js</conditionProcess>
<onDBUpdate>%aditoprj%/entity/DuplicateScannerPrefilterConfig_entity/recordcontainers/dbrecordcontainer/onDBUpdate.js</onDBUpdate>
<linkInformation>
<linkInformation>
<name>072783b0-8914-4886-bfa3-74565db81474</name>
<tableName>DUPLICATESCANNERPREFILTERCONFIG</tableName>
<primaryKey>ID</primaryKey>
<isUIDTable v="true" />
<readonly v="false" />
</linkInformation>
</linkInformation>
<recordFieldMappings>
<dbRecordFieldMapping>
<name>FILTER_CONDITION.value</name>
<recordfield>DUPLICATESCANNERPREFILTERCONFIG.FILTER_CONDITION</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>COUNT_CHARACTERS_TO_USE.value</name>
<recordfield>DUPLICATESCANNERPREFILTERCONFIG.COUNT_CHARACTERS_TO_USE</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DUPLICATESCANNER_ID.value</name>
<recordfield>DUPLICATESCANNERPREFILTERCONFIG.DUPLICATESCANNER_ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>UID.value</name>
<recordfield>DUPLICATESCANNERPREFILTERCONFIG.ID</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>CONDITION_CONFIG_NAME.value</name>
<recordfield>DUPLICATESCANNERPREFILTERCONFIG.CONDITION_CONFIG_NAME</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_EDIT.value</name>
<recordfield>DUPLICATESCANNERPREFILTERCONFIG.DATE_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>DATE_NEW.value</name>
<recordfield>DUPLICATESCANNERPREFILTERCONFIG.DATE_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_EDIT.value</name>
<recordfield>DUPLICATESCANNERPREFILTERCONFIG.USER_EDIT</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>USER_NEW.value</name>
<recordfield>DUPLICATESCANNERPREFILTERCONFIG.USER_NEW</recordfield>
</dbRecordFieldMapping>
<dbRecordFieldMapping>
<name>MAX_RESULTS_THRESHOLD.value</name>
<recordfield>DUPLICATESCANNERPREFILTERCONFIG.MAX_RESULTS_THRESHOLD</recordfield>
</dbRecordFieldMapping>
</recordFieldMappings>
</dbRecordContainer>
</recordContainers>
</entity>
import("system.vars");
import("system.logging");
logging.log("condition onValueChange -> " + vars.get("$field.FILTER_CONDITION"));
\ No newline at end of file
import("system.logging");
import("system.vars");
import("system.result");
logging.log("this.value -> " + vars.get("$this.value"));
if(vars.get("$this.value") == "")
{
let entityToScan = vars.get("$param.EntityToFilter_param");
let defaultFilterJson = JSON.stringify({entity: entityToScan, filter: {type: "group", operator: "AND", childs: []}});
result.string(defaultFilterJson);
}
\ No newline at end of file
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_EDIT)
result.string(vars.get("$sys.date"));
\ No newline at end of file
import("system.util");
import("system.result");
import("system.neon");
import("system.vars");
if(vars.get("$sys.recordstate") == neon.OPERATINGSTATE_NEW)
result.string(vars.get("$sys.date"));
\ No newline at end of file
import("system.result");
import("system.vars");
if(vars.get("$this.value") == null || vars.get("$this.value") == "")
{
result.string(vars.get("$param.DuplicateScannerId_param"));
}
\ No newline at end of file
import("system.result");
import("system.vars");
result.string(vars.get("$param.EntityToFilter_param"));
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment