From 133e9f0278ce5e2e437e260e88765264ef9eb523 Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 17 Sep 2018 15:56:38 +0200
Subject: [PATCH] =?UTF-8?q?added=20addresses=20to=20index=20[Projekt:=20En?=
=?UTF-8?q?twicklung=20-=20Neon][TicketNr.:=201023706][Bearbeitung=20-=20A?=
=?UTF-8?q?uswahl=20der=20Verkn=C3=BCpfungen=20durch=20Lookup-Komponente]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
aliasDefinition/Data_alias/Data_alias.aod | 2 ++
aliasDefinition/Data_alias/indexsearchgroups/org/query.js | 5 +++--
.../Data_alias/indexsearchgroups/org/subQueries.js | 3 +++
aliasDefinition/Data_alias/indexsearchgroups/pers/query.js | 7 +++++--
.../Data_alias/indexsearchgroups/pers/subQueries.js | 3 +++
5 files changed, 16 insertions(+), 4 deletions(-)
create mode 100644 aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js
create mode 100644 aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js
diff --git a/aliasDefinition/Data_alias/Data_alias.aod b/aliasDefinition/Data_alias/Data_alias.aod
index c58080846f..96bc635802 100644
--- a/aliasDefinition/Data_alias/Data_alias.aod
+++ b/aliasDefinition/Data_alias/Data_alias.aod
@@ -1189,6 +1189,7 @@
<titleColumn>TITLECOLUMN</titleColumn>
<descriptionColumn>DESCCOLUMN</descriptionColumn>
<query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/query.js</query>
+ <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js</subQueries>
<resultContextNeon>Org_context</resultContextNeon>
<affectedTables>
<element>ADDRESS</element>
@@ -1206,6 +1207,7 @@
<titleColumn>TITLECOLUMN</titleColumn>
<descriptionColumn>DESCCOLUMN</descriptionColumn>
<query>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js</query>
+ <subQueries>%aditoprj%/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js</subQueries>
<resultContextNeon>Pers_context</resultContextNeon>
<affectedTables>
<element>ADDRESS</element>
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/org/query.js b/aliasDefinition/Data_alias/indexsearchgroups/org/query.js
index b49ee30966..b1b4540ee7 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/org/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/org/query.js
@@ -1,3 +1,4 @@
+import("system.logging");
import("system.result");
import("system.vars");
import("system.calendars");
@@ -10,11 +11,11 @@ if (vars.exists("$local.idvalue")) {
queryCondition = "where RELATION.RELATIONID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
//TODO: refactor this for incremental indexer (injections?)
}
-sqlHelper = new SqlUtils();
+sqlHelper = new LegacySqlUtils();
sqlQuery = "select RELATION.RELATIONID "
+ "," + sqlHelper.concat(["ORG.NAME", "ORG.CUSTOMERCODE", "defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
+ " as TITLECOLUMN "
- + "," + sqlHelper.concat(["ADDRESS", "BUILDINGNO", "', '", "COUNTRY", "'-'", "ZIP", "CITY"], ' ') + " as DESCCOLUMN "
+ + ", " + sqlHelper.concat(["ADDRESS","BUILDINGNO","'-'", "COUNTRY", "ZIP", "CITY"], " ")
//additional indexed fields
+ ",ORG.NAME, COMM.ADDR "
+ " from ORG "
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js b/aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js
new file mode 100644
index 0000000000..6e5a9c19f3
--- /dev/null
+++ b/aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("select ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.COUNTRY, ADDRESS.ADDRESS from ADDRESS where ADDRESS.RELATION_ID = '@@@'");
\ No newline at end of file
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js b/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js
index 39d30b5b8b..5a04df2382 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/pers/query.js
@@ -10,11 +10,14 @@ if (vars.exists("$local.idvalue")) {
queryCondition = "where RELATION.RELATIONID in ('" + affectedIds.map(function (v){return db.quote(v);}).join("', '") + "')";
//TODO: refactor this for incremental indexer (injections?)
}
-sqlHelper = new SqlUtils();
+sqlHelper = new LegacySqlUtils();
sqlQuery = "select RELATION.RELATIONID "
+ "," + sqlHelper.concat(["PERS.SALUTATION", "PERS.FIRSTNAME", "PERS.LASTNAME", "ORG.NAME"])
+ " as TITLECOLUMN "
- + "," + sqlHelper.concat(["ADDRESS", "BUILDINGNO", "', '", "COUNTRY", "'-'", "ZIP", "CITY"], ' ') + " as DESCCOLUMN "
+ + "," + sqlHelper.concat([
+ sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
+ ,sqlHelper.concat(["defaultAddress.ZIP", "defaultAddress.CITY"])
+ ,"defaultAddress.COUNTRY"], ", ") + " as DESCCOLUMN "
//additional indexed fields
+ ",ORG.NAME, COMM.ADDR "
+ " from PERS "
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js b/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js
new file mode 100644
index 0000000000..6e5a9c19f3
--- /dev/null
+++ b/aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js
@@ -0,0 +1,3 @@
+import("system.result");
+
+result.string("select ADDRESS.ZIP, ADDRESS.CITY, ADDRESS.COUNTRY, ADDRESS.ADDRESS from ADDRESS where ADDRESS.RELATION_ID = '@@@'");
\ No newline at end of file
--
GitLab