From 693cc6e8d9b5f6feae3c63b957218f4b2c235b61 Mon Sep 17 00:00:00 2001
From: Johannes Hoermann <j.hoermann@adito.de>
Date: Thu, 21 Nov 2019 10:31:42 +0100
Subject: [PATCH] Lead import: use keyword attributes for technical value of
the separators
---
.../2019.3.2/leadimport/init_Field_Limit.xml | 35 +-
.../leadimport/init_Field_Separator.xml | 62 ++-
.../leadimport/init_Import_Status.xml | 60 +--
.../leadimport/init_Record_Separator.xml | 37 +-
.../2019.3.2/leadimport/init_dupStatus.xml | 78 +--
.../2019.3.2/leadimport/init_importFields.xml | 474 +++++++++---------
.../entityfields/valueproxy/valueProcess.js | 2 +-
.../fieldseparator/displayValueProcess.js | 1 +
.../containername_param/valueProcess.js | 1 +
.../entityfields/load_data/onActionProcess.js | 13 +-
.../transferdata/onActionProcess.js | 12 +-
.../recordcontainers/db/onDBInsert.js | 7 +-
.../recordcontainers/db/onDBUpdate.js | 6 +-
process/KeywordRegistry_basic/process.js | 1 +
process/Leadimport_lib/process.js | 62 ++-
process/Util_lib/process.js | 24 +
16 files changed, 498 insertions(+), 377 deletions(-)
diff --git a/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Field_Limit.xml b/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Field_Limit.xml
index 12e75642c5..c4773b2409 100644
--- a/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Field_Limit.xml
+++ b/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Field_Limit.xml
@@ -3,15 +3,28 @@
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="f.maier" id="leadimportFmai">
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="73b3b4b3-6ba1-4551-b9dd-161079a1c755"/>
-<column name="KEYID" value="6d3b5757-0b8f-45ca-b625-98aaef7f5782"/>
-<column name="TITLE" value='"'/>
-<column name="CONTAINER" value="FieldLimit"/>
-<column name="SORTING" valueNumeric="0"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-</changeSet>
+ <changeSet author="f.maier" id="leadimportFmai">
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="38997f56-c86a-4dd3-b2ed-1fb73da604ae"/>
+ <column name="NAME" value="technicalValue"/>
+ <column name="CONTAINER" value="FieldLimit"/>
+ <column name="KIND" value="CHAR_VALUE"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="73b3b4b3-6ba1-4551-b9dd-161079a1c755"/>
+ <column name="KEYID" value="DOUBLEQUOTATION"/>
+ <column name="TITLE" value='"'/>
+ <column name="CONTAINER" value="FieldLimit"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="3b9fb859-3dd6-49c9-8ad4-cdefac3958f9"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="73b3b4b3-6ba1-4551-b9dd-161079a1c755"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="38997f56-c86a-4dd3-b2ed-1fb73da604ae"/>
+ <column name="CHAR_VALUE" value="""/>
+ </insert>
+ </changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Field_Separator.xml b/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Field_Separator.xml
index 875efb569a..54d9645d16 100644
--- a/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Field_Separator.xml
+++ b/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Field_Separator.xml
@@ -1,26 +1,46 @@
<?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
+ 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="f.maier" id="leadimportFmai">
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="2324a950-6767-4366-abf5-a343b7fd11f6"/>
-<column name="KEYID" value="21a849d8-27ed-448e-86aa-6f4ab54d22ev"/>
-<column name="TITLE" value="Tab"/>
-<column name="CONTAINER" value="FieldSeparator"/>
-<column name="SORTING" valueNumeric="0"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="0c89fdc7-63cb-4e2b-a65a-ad77d3e58cc7"/>
-<column name="KEYID" value="007a2bf2-803a-4cf0-bf69-ff649acc113v"/>
-<column name="TITLE" value=";"/>
-<column name="CONTAINER" value="FieldSeparator"/>
-<column name="SORTING" valueNumeric="1"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-</changeSet>
+ <changeSet author="f.maier" id="leadimportFmai">
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="0c2203a0-6704-4400-b413-5deb876d67a5"/>
+ <column name="NAME" value="technicalValue"/>
+ <column name="CONTAINER" value="FieldSeparator"/>
+ <column name="KIND" value="CHAR_VALUE"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="2324a950-6767-4366-abf5-a343b7fd11f6"/>
+ <column name="KEYID" value="TAB"/>
+ <column name="TITLE" value="Tab"/>
+ <column name="CONTAINER" value="FieldSeparator"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="b4a5cd3d-f3ea-4a0e-97d0-1429bee29edc"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="2324a950-6767-4366-abf5-a343b7fd11f6"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="0c2203a0-6704-4400-b413-5deb876d67a5"/>
+ <column name="CHAR_VALUE" value="\t"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="0c89fdc7-63cb-4e2b-a65a-ad77d3e58cc7"/>
+ <column name="KEYID" value="SEMICOLON"/>
+ <column name="TITLE" value=";"/>
+ <column name="CONTAINER" value="FieldSeparator"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="7ab68748-27ca-4a21-a84e-aab22cdcb550"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="0c89fdc7-63cb-4e2b-a65a-ad77d3e58cc7"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="0c2203a0-6704-4400-b413-5deb876d67a5"/>
+ <column name="CHAR_VALUE" value=";"/>
+ </insert>
+ </changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Import_Status.xml b/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Import_Status.xml
index 43b6b85636..6e1932117b 100644
--- a/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Import_Status.xml
+++ b/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Import_Status.xml
@@ -1,35 +1,35 @@
<?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
+ 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="f.maier" id="leadimportFmai">
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="50b50394-6d77-4ded-a76c-1e07c08bbdcb"/>
-<column name="KEYID" value="CREATED"/>
-<column name="TITLE" value="Importer created"/>
-<column name="CONTAINER" value="ImportStatus"/>
-<column name="SORTING" valueNumeric="0"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="4c851554-2cef-4e0d-823b-bf225b084964"/>
-<column name="KEYID" value="LOADED"/>
-<column name="TITLE" value="Data loaded"/>
-<column name="CONTAINER" value="ImportStatus"/>
-<column name="SORTING" valueNumeric="1"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="3c075444-1ded-4fbd-8095-e3a71ade1f44"/>
-<column name="KEYID" value="TRANSFERED"/>
-<column name="TITLE" value="Data transfered"/>
-<column name="CONTAINER" value="ImportStatus"/>
-<column name="SORTING" valueNumeric="2"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-</changeSet>
+ <changeSet author="f.maier" id="leadimportFmai">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="50b50394-6d77-4ded-a76c-1e07c08bbdcb"/>
+ <column name="KEYID" value="CREATED"/>
+ <column name="TITLE" value="Importer created"/>
+ <column name="CONTAINER" value="ImportStatus"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="4c851554-2cef-4e0d-823b-bf225b084964"/>
+ <column name="KEYID" value="LOADED"/>
+ <column name="TITLE" value="Data loaded"/>
+ <column name="CONTAINER" value="ImportStatus"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="3c075444-1ded-4fbd-8095-e3a71ade1f44"/>
+ <column name="KEYID" value="TRANSFERED"/>
+ <column name="TITLE" value="Data transfered"/>
+ <column name="CONTAINER" value="ImportStatus"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Record_Separator.xml b/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Record_Separator.xml
index f8e2c8b530..732f95cff4 100644
--- a/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Record_Separator.xml
+++ b/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_Record_Separator.xml
@@ -1,17 +1,30 @@
<?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
+ 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="f.maier" id="leadimportFmai">
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="59c5e0cb-a5e5-4bcf-81e5-cc9a37c3d533"/>
-<column name="KEYID" value="dbd48449-41cd-42f8-8889-3801c17babdd"/>
-<column name="TITLE" value="CRLF"/>
-<column name="CONTAINER" value="RecordSeparator"/>
-<column name="SORTING" valueNumeric="0"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-</changeSet>
+ <changeSet author="f.maier" id="leadimportFmai">
+ <insert tableName="AB_KEYWORD_ATTRIBUTE">
+ <column name="AB_KEYWORD_ATTRIBUTEID" value="f14fe48f-48d8-470c-ba17-1d5c4a9c6728"/>
+ <column name="NAME" value="technicalValue"/>
+ <column name="CONTAINER" value="RecordSeparator"/>
+ <column name="KIND" value="CHAR_VALUE"/>
+ </insert>
+
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="59c5e0cb-a5e5-4bcf-81e5-cc9a37c3d533"/>
+ <column name="KEYID" value="CRLF"/>
+ <column name="TITLE" value="CRLF"/>
+ <column name="CONTAINER" value="RecordSeparator"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ATTRIBUTERELATION">
+ <column name="AB_KEYWORD_ATTRIBUTERELATIONID" value="e9158951-d79b-4357-b4ab-7b2456190a44"/>
+ <column name="AB_KEYWORD_ENTRY_ID" value="59c5e0cb-a5e5-4bcf-81e5-cc9a37c3d533"/>
+ <column name="AB_KEYWORD_ATTRIBUTE_ID" value="f14fe48f-48d8-470c-ba17-1d5c4a9c6728"/>
+ <column name="CHAR_VALUE" value="\r\n"/>
+ </insert>
+ </changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_dupStatus.xml b/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_dupStatus.xml
index ca07ad3cff..c41cb0e220 100644
--- a/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_dupStatus.xml
+++ b/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_dupStatus.xml
@@ -1,44 +1,44 @@
<?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
+ 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="f.maier" id="leadimportFmai">
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="81fdc4ce-b45c-4481-b9cc-77f69a46a465"/>
-<column name="KEYID" value="NODUP"/>
-<column name="TITLE" value="No duplicate"/>
-<column name="CONTAINER" value="DupStatus"/>
-<column name="SORTING" valueNumeric="0"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="31a341e0-fce1-4efe-be3f-611166ad83be"/>
-<column name="KEYID" value="PERSDUP"/>
-<column name="TITLE" value="Person duplicate"/>
-<column name="CONTAINER" value="DupStatus"/>
-<column name="SORTING" valueNumeric="1"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="dc700194-78c3-4a34-a196-4f0d8e19f0d5"/>
-<column name="KEYID" value="ORGDUP"/>
-<column name="TITLE" value="Company duplicate"/>
-<column name="CONTAINER" value="DupStatus"/>
-<column name="SORTING" valueNumeric="2"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="5dd157b1-19e4-4b76-8483-b9eb53fa71eb"/>
-<column name="KEYID" value="ORGPERSDUP"/>
-<column name="TITLE" value="Company/Person duplicate"/>
-<column name="CONTAINER" value="DupStatus"/>
-<column name="SORTING" valueNumeric="3"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-</changeSet>
+ <changeSet author="f.maier" id="leadimportFmai">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="81fdc4ce-b45c-4481-b9cc-77f69a46a465"/>
+ <column name="KEYID" value="NODUP"/>
+ <column name="TITLE" value="No duplicate"/>
+ <column name="CONTAINER" value="DupStatus"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="31a341e0-fce1-4efe-be3f-611166ad83be"/>
+ <column name="KEYID" value="PERSDUP"/>
+ <column name="TITLE" value="Person duplicate"/>
+ <column name="CONTAINER" value="DupStatus"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="dc700194-78c3-4a34-a196-4f0d8e19f0d5"/>
+ <column name="KEYID" value="ORGDUP"/>
+ <column name="TITLE" value="Company duplicate"/>
+ <column name="CONTAINER" value="DupStatus"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="5dd157b1-19e4-4b76-8483-b9eb53fa71eb"/>
+ <column name="KEYID" value="ORGPERSDUP"/>
+ <column name="TITLE" value="Company/Person duplicate"/>
+ <column name="CONTAINER" value="DupStatus"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_importFields.xml b/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_importFields.xml
index 11779ad285..6e9f527637 100644
--- a/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_importFields.xml
+++ b/.liquibase/Data_alias/basic/2019.3.2/leadimport/init_importFields.xml
@@ -1,242 +1,242 @@
<?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
+ 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="f.maier" id="leadimportFmai">
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="0a3970d9-c08e-48f2-97b7-8b62bd2df79a"/>
-<column name="KEYID" value="ADDRESS"/>
-<column name="TITLE" value="Street"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="0"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="305a6c15-9fb8-46f0-8855-cfcf3ac1fbe7"/>
-<column name="KEYID" value="BUILDINGNO"/>
-<column name="TITLE" value="Building no."/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="1"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="4bec1be3-13c4-42d8-9e88-a351fdddf5ba"/>
-<column name="KEYID" value="CITY"/>
-<column name="TITLE" value="City"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="2"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="102ddb10-a355-4487-9478-33d816eaff7a"/>
-<column name="KEYID" value="COUNTRY"/>
-<column name="TITLE" value="Country"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="3"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="0bf9fd30-8e88-460b-bbcd-fcc8b66c1a95"/>
-<column name="KEYID" value="CUSTOMERCODE"/>
-<column name="TITLE" value="Customer code"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="4"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="eeb1b0db-af21-4318-8517-ced5eaad8476"/>
-<column name="KEYID" value="DEPARTMENT"/>
-<column name="TITLE" value="Department"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="5"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="480de65f-73e8-4108-af2e-009b442613b0"/>
-<column name="KEYID" value="DATEOFBIRTH"/>
-<column name="TITLE" value="Birthday"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="6"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="9df3b34f-8b63-4360-bb56-8be43c689db6"/>
-<column name="KEYID" value="FIRSTNAME"/>
-<column name="TITLE" value="Firstname"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="7"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="8579a002-c7f4-4755-ab06-4011ac659760"/>
-<column name="KEYID" value="ISOLANGUAGE"/>
-<column name="TITLE" value="Language"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="8"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="64c307b5-9794-4671-b0ff-ce483ec2e604"/>
-<column name="KEYID" value="LASTNAME"/>
-<column name="TITLE" value="Lastname"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="9"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="6ace6e7c-6a9f-44d8-9cca-67ce7dad2aee"/>
-<column name="KEYID" value="LETTERSALUTATION"/>
-<column name="TITLE" value="Letter salutation"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="10"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="da3acc3a-457e-4c88-a477-8abdaf819539"/>
-<column name="KEYID" value="COMMMOBIL"/>
-<column name="TITLE" value="Mobile number"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="11"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="2e7952b1-56a8-484d-9d82-564236c30d20"/>
-<column name="KEYID" value="COMMEMAIL"/>
-<column name="TITLE" value="Mail"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="12"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="96534736-0247-4596-a8db-f6d7eee611c5"/>
-<column name="KEYID" value="COMMPHONE"/>
-<column name="TITLE" value="Phone number"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="13"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="9ed26d58-cc2f-436e-b67b-afbb9f102bf4"/>
-<column name="KEYID" value="COMMINTERNET"/>
-<column name="TITLE" value="Internet"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="14"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="52bad941-02be-4c63-94a7-979e8ecef0c9"/>
-<column name="KEYID" value="COMMBLOG"/>
-<column name="TITLE" value="Blog"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="15"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="8bf354dc-4278-493e-9824-40367382290f"/>
-<column name="KEYID" value="COMMXING"/>
-<column name="TITLE" value="Xing"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="16"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="97e27378-e733-4629-b0c4-515faf89da7e"/>
-<column name="KEYID" value="COMMLINKEDIN"/>
-<column name="TITLE" value="Linked in"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="17"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="bc4e4390-e1b9-4054-8ffd-6fd7b1b5096a"/>
-<column name="KEYID" value="ORGINFO"/>
-<column name="TITLE" value="Info (Company)"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="18"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="2aec9eed-a4f2-473a-8ae0-563706eb6cd4"/>
-<column name="KEYID" value="NAME"/>
-<column name="TITLE" value="Company name"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="19"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="9e2da66c-380c-40a4-9104-722015ff4b70"/>
-<column name="KEYID" value="REGION"/>
-<column name="TITLE" value="Region"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="20"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="019fcac3-4eb2-45ff-a936-c59da4a2da04"/>
-<column name="KEYID" value="CONTACTPOSITION"/>
-<column name="TITLE" value="Position"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="21"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="a4872b5e-8b41-4b93-a663-fd7aa748b3a7"/>
-<column name="KEYID" value="SALUTATION"/>
-<column name="TITLE" value="Salutation"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="22"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="c92b180a-a7d7-4c0c-8fbb-ce8abcd5214d"/>
-<column name="KEYID" value="TITLE"/>
-<column name="TITLE" value="Title"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="23"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="6164631f-3378-412d-8c80-8be0aaca7c77"/>
-<column name="KEYID" value="ZIP"/>
-<column name="TITLE" value="Zip"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="24"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-<insert tableName="AB_KEYWORD_ENTRY">
-<column name="AB_KEYWORD_ENTRYID" value="6164631f-3378-412d-8c80-8be0aaca7c65"/>
-<column name="KEYID" value="GENDER"/>
-<column name="TITLE" value="Gender"/>
-<column name="CONTAINER" value="ImportFields"/>
-<column name="SORTING" valueNumeric="25"/>
-<column name="ISACTIVE" valueNumeric="1"/>
-<column name="ISESSENTIAL" valueNumeric="0"/>
-</insert>
-</changeSet>
+ <changeSet author="f.maier" id="leadimportFmai">
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="0a3970d9-c08e-48f2-97b7-8b62bd2df79a"/>
+ <column name="KEYID" value="ADDRESS"/>
+ <column name="TITLE" value="Street"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="0"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="305a6c15-9fb8-46f0-8855-cfcf3ac1fbe7"/>
+ <column name="KEYID" value="BUILDINGNO"/>
+ <column name="TITLE" value="Building no."/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="1"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="4bec1be3-13c4-42d8-9e88-a351fdddf5ba"/>
+ <column name="KEYID" value="CITY"/>
+ <column name="TITLE" value="City"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="2"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="102ddb10-a355-4487-9478-33d816eaff7a"/>
+ <column name="KEYID" value="COUNTRY"/>
+ <column name="TITLE" value="Country"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="3"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="0bf9fd30-8e88-460b-bbcd-fcc8b66c1a95"/>
+ <column name="KEYID" value="CUSTOMERCODE"/>
+ <column name="TITLE" value="Customer code"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="4"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="eeb1b0db-af21-4318-8517-ced5eaad8476"/>
+ <column name="KEYID" value="DEPARTMENT"/>
+ <column name="TITLE" value="Department"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="5"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="480de65f-73e8-4108-af2e-009b442613b0"/>
+ <column name="KEYID" value="DATEOFBIRTH"/>
+ <column name="TITLE" value="Birthday"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="6"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="9df3b34f-8b63-4360-bb56-8be43c689db6"/>
+ <column name="KEYID" value="FIRSTNAME"/>
+ <column name="TITLE" value="Firstname"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="7"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="8579a002-c7f4-4755-ab06-4011ac659760"/>
+ <column name="KEYID" value="ISOLANGUAGE"/>
+ <column name="TITLE" value="Language"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="8"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="64c307b5-9794-4671-b0ff-ce483ec2e604"/>
+ <column name="KEYID" value="LASTNAME"/>
+ <column name="TITLE" value="Lastname"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="9"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="6ace6e7c-6a9f-44d8-9cca-67ce7dad2aee"/>
+ <column name="KEYID" value="LETTERSALUTATION"/>
+ <column name="TITLE" value="Letter salutation"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="10"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="da3acc3a-457e-4c88-a477-8abdaf819539"/>
+ <column name="KEYID" value="COMMMOBIL"/>
+ <column name="TITLE" value="Mobile number"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="11"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="2e7952b1-56a8-484d-9d82-564236c30d20"/>
+ <column name="KEYID" value="COMMEMAIL"/>
+ <column name="TITLE" value="Mail"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="12"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="96534736-0247-4596-a8db-f6d7eee611c5"/>
+ <column name="KEYID" value="COMMPHONE"/>
+ <column name="TITLE" value="Phone number"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="13"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="9ed26d58-cc2f-436e-b67b-afbb9f102bf4"/>
+ <column name="KEYID" value="COMMINTERNET"/>
+ <column name="TITLE" value="Internet"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="14"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="52bad941-02be-4c63-94a7-979e8ecef0c9"/>
+ <column name="KEYID" value="COMMBLOG"/>
+ <column name="TITLE" value="Blog"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="15"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="8bf354dc-4278-493e-9824-40367382290f"/>
+ <column name="KEYID" value="COMMXING"/>
+ <column name="TITLE" value="Xing"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="16"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="97e27378-e733-4629-b0c4-515faf89da7e"/>
+ <column name="KEYID" value="COMMLINKEDIN"/>
+ <column name="TITLE" value="Linked in"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="17"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="bc4e4390-e1b9-4054-8ffd-6fd7b1b5096a"/>
+ <column name="KEYID" value="ORGINFO"/>
+ <column name="TITLE" value="Info (Company)"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="18"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="2aec9eed-a4f2-473a-8ae0-563706eb6cd4"/>
+ <column name="KEYID" value="NAME"/>
+ <column name="TITLE" value="Company name"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="19"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="9e2da66c-380c-40a4-9104-722015ff4b70"/>
+ <column name="KEYID" value="REGION"/>
+ <column name="TITLE" value="Region"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="20"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="019fcac3-4eb2-45ff-a936-c59da4a2da04"/>
+ <column name="KEYID" value="CONTACTPOSITION"/>
+ <column name="TITLE" value="Position"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="21"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="a4872b5e-8b41-4b93-a663-fd7aa748b3a7"/>
+ <column name="KEYID" value="SALUTATION"/>
+ <column name="TITLE" value="Salutation"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="22"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="c92b180a-a7d7-4c0c-8fbb-ce8abcd5214d"/>
+ <column name="KEYID" value="TITLE"/>
+ <column name="TITLE" value="Title"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="23"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="6164631f-3378-412d-8c80-8be0aaca7c77"/>
+ <column name="KEYID" value="ZIP"/>
+ <column name="TITLE" value="Zip"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="24"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ <insert tableName="AB_KEYWORD_ENTRY">
+ <column name="AB_KEYWORD_ENTRYID" value="6164631f-3378-412d-8c80-8be0aaca7c65"/>
+ <column name="KEYID" value="GENDER"/>
+ <column name="TITLE" value="Gender"/>
+ <column name="CONTAINER" value="ImportFields"/>
+ <column name="SORTING" valueNumeric="25"/>
+ <column name="ISACTIVE" valueNumeric="1"/>
+ <column name="ISESSENTIAL" valueNumeric="0"/>
+ </insert>
+ </changeSet>
</databaseChangeLog>
\ No newline at end of file
diff --git a/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/valueProcess.js b/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/valueProcess.js
index 586823ef8a..eefec9165c 100644
--- a/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/valueProcess.js
+++ b/entity/KeywordAttributeRelation_entity/entityfields/valueproxy/valueProcess.js
@@ -2,7 +2,7 @@ import("system.result");
import("system.vars");
var value = vars.get("$this.value");
-if (!value)
+//if (!value)
{
var type = vars.get("$field.attributeType");
switch (type)
diff --git a/entity/Leadimport_entity/entityfields/fieldseparator/displayValueProcess.js b/entity/Leadimport_entity/entityfields/fieldseparator/displayValueProcess.js
index 57f421657d..e7b8931aff 100644
--- a/entity/Leadimport_entity/entityfields/fieldseparator/displayValueProcess.js
+++ b/entity/Leadimport_entity/entityfields/fieldseparator/displayValueProcess.js
@@ -2,4 +2,5 @@ import("system.result");
import("system.vars");
import("KeywordRegistry_basic");
import("Keyword_lib");
+
result.string(KeywordUtils.getViewValue($KeywordRegistry.fieldSeparator(), vars.get("$field.FIELDSEPARATOR")));
\ No newline at end of file
diff --git a/entity/Leadimport_entity/entityfields/keywordfieldseparator/children/containername_param/valueProcess.js b/entity/Leadimport_entity/entityfields/keywordfieldseparator/children/containername_param/valueProcess.js
index 97e9dc146c..8bbfad5e3e 100644
--- a/entity/Leadimport_entity/entityfields/keywordfieldseparator/children/containername_param/valueProcess.js
+++ b/entity/Leadimport_entity/entityfields/keywordfieldseparator/children/containername_param/valueProcess.js
@@ -1,4 +1,5 @@
import("system.result");
import("Keyword_lib");
import("KeywordRegistry_basic");
+
result.string($KeywordRegistry.fieldSeparator());
\ No newline at end of file
diff --git a/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js b/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js
index 8c39bbcf29..658c07c3ad 100644
--- a/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js
+++ b/entity/Leadimport_entity/entityfields/load_data/onActionProcess.js
@@ -22,15 +22,10 @@ if (binMetadatas.length > 0)
{
var binId = binMetadatas[0].id;
- var fieldSep = KeywordUtils.getViewValue($KeywordRegistry.fieldSeparator(), vars.get("$field.FIELDSEPARATOR"));
- var fieldLimit = KeywordUtils.getViewValue($KeywordRegistry.fieldLimit(), vars.get("$field.FIELDDELIMITERS"));
- var recordSep = KeywordUtils.getViewValue($KeywordRegistry.recordSeparator(), vars.get("$field.SENTENCESEPARATOR"));
-
-
- if (recordSep == "CRLF") recordSep = '\r\n';
- if ( fieldSep == "TAB" ) fieldSep = '\t';
- else fieldSep = fieldSep.charAt(0);
-
+ var fieldSep = LeadImportUtils.getFieldSeparator(vars.get("$field.FIELDSEPARATOR"));
+ var fieldLimit = LeadImportUtils.getFieldLimit(vars.get("$field.FIELDDELIMITERS"));
+ var recordSep = LeadImportUtils.getRecordSeparator(vars.get("$field.SENTENCESEPARATOR"));
+
var data = db.getBinaryContent(binId, SqlUtils.getBinariesAlias());
data = util.decodeBase64String(data);
diff --git a/entity/Leadimport_entity/entityfields/transferdata/onActionProcess.js b/entity/Leadimport_entity/entityfields/transferdata/onActionProcess.js
index 9ae7b75496..36a4c97ee1 100644
--- a/entity/Leadimport_entity/entityfields/transferdata/onActionProcess.js
+++ b/entity/Leadimport_entity/entityfields/transferdata/onActionProcess.js
@@ -1,3 +1,4 @@
+import("Leadimport_lib");
import("system.question");
import("Employee_lib");
import("system.process");
@@ -16,13 +17,12 @@ if (binMetadatas.length > 0)
var assignmentRowId = vars.get("$field.LEADIMPORTID");
var name = vars.get("$field.NAME");
- var fieldSep = KeywordUtils.getViewValue($KeywordRegistry.fieldSeparator(), vars.get("$field.FIELDSEPARATOR"));
- var recordSep = KeywordUtils.getViewValue($KeywordRegistry.recordSeparator(), vars.get("$field.SENTENCESEPARATOR"));
- var fieldLimit = KeywordUtils.getViewValue($KeywordRegistry.fieldLimit(), vars.get("$field.FIELDDELIMITERS"));
var user = vars.get("$sys.user");
- if (recordSep == "CRLF") recordSep = '\r\n';
- if ( fieldSep == "TAB" ) fieldSep = '\t';
- else fieldSep = fieldSep.charAt(0);
+
+ var fieldSep = LeadImportUtils.getFieldSeparator(vars.get("$field.FIELDSEPARATOR"));
+ var fieldLimit = LeadImportUtils.getFieldLimit(vars.get("$field.FIELDDELIMITERS"));
+ var recordSep = LeadImportUtils.getRecordSeparator(vars.get("$field.SENTENCESEPARATOR"));
+
var params =
{
diff --git a/entity/Leadimport_entity/recordcontainers/db/onDBInsert.js b/entity/Leadimport_entity/recordcontainers/db/onDBInsert.js
index 05e42d8828..5d54b3a0c5 100644
--- a/entity/Leadimport_entity/recordcontainers/db/onDBInsert.js
+++ b/entity/Leadimport_entity/recordcontainers/db/onDBInsert.js
@@ -11,10 +11,9 @@ var assignmentRowId = vars.get("$field.LEADIMPORTID");
var bindata = DocumentUtil.getBindataFromUpload(vars.get("$field.bindata"));
var filename = DocumentUtil.getFilenameFromUpload(vars.get("$field.bindata"));
-var fieldSep = KeywordUtils.getViewValue($KeywordRegistry.fieldSeparator(), vars.get("$field.FIELDSEPARATOR"));
-var fieldLimit = KeywordUtils.getViewValue($KeywordRegistry.fieldLimit(), vars.get("$field.FIELDDELIMITERS"));
-var recordSep = KeywordUtils.getViewValue($KeywordRegistry.recordSeparator(), vars.get("$field.SENTENCESEPARATOR"));
-
+var fieldSep = LeadImportUtils.getFieldSeparator(vars.get("$field.FIELDSEPARATOR"));
+var fieldLimit = LeadImportUtils.getFieldLimit(vars.get("$field.FIELDDELIMITERS"));
+var recordSep = LeadImportUtils.getRecordSeparator(vars.get("$field.SENTENCESEPARATOR"));
if(bindata != '' && filename != '')
{
diff --git a/entity/Leadimport_entity/recordcontainers/db/onDBUpdate.js b/entity/Leadimport_entity/recordcontainers/db/onDBUpdate.js
index 3342342c82..6eb7c12952 100644
--- a/entity/Leadimport_entity/recordcontainers/db/onDBUpdate.js
+++ b/entity/Leadimport_entity/recordcontainers/db/onDBUpdate.js
@@ -12,9 +12,9 @@ var assignmentRowId = vars.get("$field.LEADIMPORTID");
var bindata = DocumentUtil.getBindataFromUpload(vars.get("$field.bindata"));
var filename = DocumentUtil.getFilenameFromUpload(vars.get("$field.bindata"));
-var fieldSep = KeywordUtils.getViewValue($KeywordRegistry.fieldSeparator(), vars.get("$field.FIELDSEPARATOR"));
-var fieldLimit = KeywordUtils.getViewValue($KeywordRegistry.fieldLimit(), vars.get("$field.FIELDDELIMITERS"));
-var recordSep = KeywordUtils.getViewValue($KeywordRegistry.recordSeparator(), vars.get("$field.SENTENCESEPARATOR"));
+var fieldSep = LeadImportUtils.getFieldSeparator(vars.get("$field.FIELDSEPARATOR"));
+var fieldLimit = LeadImportUtils.getFieldLimit(vars.get("$field.FIELDDELIMITERS"));
+var recordSep = LeadImportUtils.getRecordSeparator(vars.get("$field.SENTENCESEPARATOR"));
if(bindata != '' && filename != '')
{
diff --git a/process/KeywordRegistry_basic/process.js b/process/KeywordRegistry_basic/process.js
index 83cee5a102..aec1b7940d 100644
--- a/process/KeywordRegistry_basic/process.js
+++ b/process/KeywordRegistry_basic/process.js
@@ -222,6 +222,7 @@ $KeywordRegistry.importStatus = function(){return "ImportStatus";};
$KeywordRegistry.importStatus$created = function(){return $KeywordRegistry._autoPad("CREATED");};
$KeywordRegistry.importStatus$loaded = function(){return $KeywordRegistry._autoPad("LOADED");};
$KeywordRegistry.importStatus$transfered = function(){return $KeywordRegistry._autoPad("TRANSFERED");};
+
$KeywordRegistry.fieldSeparator = function(){return "FieldSeparator";};
$KeywordRegistry.fieldLimit = function(){return "FieldLimit";};
$KeywordRegistry.recordSeparator = function(){return "RecordSeparator";};
diff --git a/process/Leadimport_lib/process.js b/process/Leadimport_lib/process.js
index 92d6007427..403521f38d 100644
--- a/process/Leadimport_lib/process.js
+++ b/process/Leadimport_lib/process.js
@@ -1,3 +1,4 @@
+import("Util_lib");
import("system.logging");
import("DuplicateScanner_lib");
import("system.datetime");
@@ -95,10 +96,6 @@ LeadImportUtils.loadImportFile = function(pBinId, pFieldSep, pFieldLimit, pRecor
if (pBinId)
{
- if (pRecordSep == "CRLF") pRecordSep = '\r\n';
- if (pFieldSep == "TAB") pFieldSep = '\t';
- else pFieldSep = pFieldSep.charAt(0);
-
try
{
var data = db.getBinaryContent(pBinId, SqlUtils.getBinariesAlias());
@@ -876,6 +873,63 @@ LeadImportUtils.CheckDup = function( pLeadValues)
return query.array();
}
+/**
+ * loads the technical value defined for the given field separator
+ *
+ * @param {String} pKeyId
+ * @return {String} the value
+ * @exception if no technicalValue defined for the keyword
+ */
+LeadImportUtils.getFieldSeparator = function(pKeyId)
+{
+ var fieldSep = StringUtils.unescapeSlashes(KeywordUtils.getAttributeRelation(pKeyId, $KeywordRegistry.fieldSeparator(), "technicalValue", ""));
+
+ if (fieldSep === "")
+ {
+ throw new Error("errror no keyword attribute \"technicalValue\" defined for keyword " + pKeyId);
+ }
+
+ return fieldSep;
+}
+
+/**
+ * loads the technical value defined for the given field limit
+ *
+ * @param {String} pKeyId
+ * @return {String} the value
+ * @exception if no technicalValue defined for the keyword
+ */
+LeadImportUtils.getFieldLimit = function(pKeyId)
+{
+ var fieldLimit = StringUtils.unescapeSlashes(KeywordUtils.getAttributeRelation(pKeyId, $KeywordRegistry.fieldLimit(), "technicalValue", ""));
+
+ if (fieldLimit === "")
+ {
+ throw new Error("errror no keyword attribute \"technicalValue\" defined for keyword " + pKeyId);
+ }
+
+ return fieldLimit;
+}
+
+/**
+ * loads the technical value defined for the given record separator
+ *
+ * @param {String} pKeyId
+ * @return {String} the value
+ * @exception if no technicalValue defined for the keyword
+ */
+LeadImportUtils.getRecordSeparator = function(pKeyId)
+{
+ var recordSeparator = StringUtils.unescapeSlashes(KeywordUtils.getAttributeRelation(pKeyId, $KeywordRegistry.recordSeparator(), "technicalValue", ""));
+
+ if (recordSeparator === "")
+ {
+ throw new Error("errror no keyword attribute \"technicalValue\" defined for keyword " + pKeyId);
+ }
+
+ return recordSeparator;
+}
+
/**
* a static Utility class for contact infos
*
diff --git a/process/Util_lib/process.js b/process/Util_lib/process.js
index 123aecd4b7..28578e37a0 100644
--- a/process/Util_lib/process.js
+++ b/process/Util_lib/process.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("Sql_lib");
import("system.neon");
import("system.project");
@@ -48,6 +49,29 @@ StringUtils.pad36 = function(pValue)
return (pValue + " ").slice(0, 36);
}
+/**
+ * Unescape all slash-escapes. (e.g. \t becames a tab \r\n becomes a newline)
+ * It uses JSON.parse for this.
+ *
+ * @param {String} pValue the value to be unescaped
+ * @return {String} the unescaped value
+ */
+StringUtils.unescapeSlashes = function(pValue)
+{
+ // add another escaped slash if the string ends with an odd
+ // number of escaped slashes which will crash JSON.parse
+ let parsedStr = pValue.replace(/(^|[^\\])(\\\\)*\\$/, "$&\\");
+ // escape "
+ parsedStr = parsedStr.replace(/"/, '\\"');
+ try {
+ parsedStr = JSON.parse('"' + parsedStr + '"');
+ } catch(e) {
+ logging.log(e);
+ return pValue;
+ }
+ return parsedStr ;
+}
+
/**
* Class containing static utility functions for numbers
* Do not create an instance of this
--
GitLab