added addresses to index

[Projekt: Entwicklung - Neon][TicketNr.: 1023706][Bearbeitung - Auswahl der Verknüpfungen durch Lookup-Komponente]

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>

aliasDefinition/Data_alias/indexsearchgroups/org/query.js

+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 "

aliasDefinition/Data_alias/indexsearchgroups/org/subQueries.js

+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

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 "

aliasDefinition/Data_alias/indexsearchgroups/pers/subQueries.js

+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