From bb23e4f7e8e68b5b1cc3894f7b0e120eb8aea5ae Mon Sep 17 00:00:00 2001
From: "j.goderbauer" <j.goderbauer@adito.de>
Date: Mon, 1 Apr 2019 16:18:04 +0200
Subject: [PATCH] Indexer: adjust column sort
---
.../Data_alias/indexsearchgroups/organisation/query.js | 6 +++---
.../Data_alias/indexsearchgroups/person/query.js | 5 ++---
process/runIndexer_ws/runIndexer_ws.aod | 1 +
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
index 1bb4c5ad461..0480b06a5f4 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/organisation/query.js
@@ -15,9 +15,9 @@ sqlQuery = "select CONTACT.CONTACTID "
+ "," + sqlHelper.concat(["ORGANISATION.NAME", "'|'", "ORGANISATION.CUSTOMERCODE"])
+ " as TITLECOLUMN "
+ "," + sqlHelper.concat([
- sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
- ,sqlHelper.concat(["defaultAddress.ZIP", "defaultAddress.CITY"])
- ,"defaultAddress.COUNTRY"], ", ") + " as DESCCOLUMN "
+ sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
+ ,sqlHelper.concat(["defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
+ ], " - ") + " as DESCCOLUMN "
//additional indexed fields
+ ",ORGANISATION.NAME, COMMUNICATION.ADDR "
+ " from ORGANISATION "
diff --git a/aliasDefinition/Data_alias/indexsearchgroups/person/query.js b/aliasDefinition/Data_alias/indexsearchgroups/person/query.js
index 61781132610..32e581b1552 100644
--- a/aliasDefinition/Data_alias/indexsearchgroups/person/query.js
+++ b/aliasDefinition/Data_alias/indexsearchgroups/person/query.js
@@ -3,7 +3,6 @@ import("system.vars");
import("system.calendars");
import("system.db");
import("Sql_lib");
-
var sqlQuery, sqlHelper, queryCondition, affectedIds;
if (vars.exists("$local.idvalue")) {
affectedIds = vars.get("$local.idvalue");
@@ -16,8 +15,8 @@ sqlQuery = "select CONTACT.CONTACTID "
+ " as TITLECOLUMN "
+ "," + sqlHelper.concat([
sqlHelper.concat(["defaultAddress.ADDRESS", "defaultAddress.BUILDINGNO"])
- ,sqlHelper.concat(["defaultAddress.ZIP", "defaultAddress.CITY"])
- ,"defaultAddress.COUNTRY"], ", ") + " as DESCCOLUMN "
+ ,sqlHelper.concat(["defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
+ ], " - ") + " as DESCCOLUMN "
//additional indexed fields
+ ",ORGANISATION.NAME, COMMUNICATION.ADDR "
+ " from PERSON "
diff --git a/process/runIndexer_ws/runIndexer_ws.aod b/process/runIndexer_ws/runIndexer_ws.aod
index 264fd8f40a7..a3c2f51db78 100644
--- a/process/runIndexer_ws/runIndexer_ws.aod
+++ b/process/runIndexer_ws/runIndexer_ws.aod
@@ -7,4 +7,5 @@
<style>REST</style>
<loginTypeId>internal.none</loginTypeId>
<restrictedRoles />
+ <alias>Data_alias</alias>
</process>
--
GitLab