From d0fb7d1ab8f47ef9b12267baff851bead891a871 Mon Sep 17 00:00:00 2001
From: "a.niebisch" <a.niebisch@adito.de>
Date: Thu, 25 Jul 2019 15:10:02 +0200
Subject: [PATCH] Auskommentierten Code entfernt.
---
.../index/affectedConsumerIds.js | 2 --
.../recordcontainers/index/affectedIds.js | 24 ----------------
entity/Person_entity/Person_entity.aod | 1 -
.../index/affectedConsumerIds.js | 10 +------
.../recordcontainers/index/affectedIds.js | 28 -------------------
.../index/patternExtensionProcess.js | 12 --------
6 files changed, 1 insertion(+), 76 deletions(-)
delete mode 100644 entity/Person_entity/recordcontainers/index/patternExtensionProcess.js
diff --git a/entity/Organisation_entity/recordcontainers/index/affectedConsumerIds.js b/entity/Organisation_entity/recordcontainers/index/affectedConsumerIds.js
index 9e9351b3c7..15fbab7d0c 100644
--- a/entity/Organisation_entity/recordcontainers/index/affectedConsumerIds.js
+++ b/entity/Organisation_entity/recordcontainers/index/affectedConsumerIds.js
@@ -40,7 +40,6 @@ function addIds(pRes, pConsumerName, pIds)
function addAddressIds(pRes, pCurrId)
{
var sql, ids;
-// sql = "select ADDRESS.ADDRESSID from ADDRESS left join CONTACT on CONTACT.CONTACTID = ADDRESS.CONTACT_ID where CONTACT.ORGANISATION_ID = '" + pCurrId + "'";
sql = "select ADDRESS.ADDRESSID from ADDRESS where ADDRESS.CONTACT_ID = '" + pCurrId + "'";
ids = db.array(db.COLUMN, sql, alias, 0 , 1 * datetime.ONE_MINUTE);
@@ -50,7 +49,6 @@ function addAddressIds(pRes, pCurrId)
function addCommunicationIds(pRes, pCurrId)
{
var sql, ids;
-// sql = "select COMMUNICATION.COMMUNICATIONID from COMMUNICATION left join CONTACT on CONTACT.CONTACTID = COMMUNICATION.CONTACT_ID where CONTACT.ORGANISATION_ID = '" + pCurrId + "'";
sql = "select COMMUNICATION.COMMUNICATIONID from COMMUNICATION where COMMUNICATION.CONTACT_ID = '" + pCurrId + "'";
ids = db.array(db.COLUMN, sql, alias, 0 , 1 * datetime.ONE_MINUTE);
diff --git a/entity/Organisation_entity/recordcontainers/index/affectedIds.js b/entity/Organisation_entity/recordcontainers/index/affectedIds.js
index dc4472218b..6d58b69c12 100644
--- a/entity/Organisation_entity/recordcontainers/index/affectedIds.js
+++ b/entity/Organisation_entity/recordcontainers/index/affectedIds.js
@@ -13,30 +13,6 @@ infoContainer = IndexsearchUtils.createAffectedInfoContainer(idValue, null, var
,function (){return vars.get("$local.oldvalues")}
,function (){return vars.get("$local.values")});
-//switch (tableName)
-//{
-// case "ORGANISATION":
-// res = [idValue];
-// break;
-// case "CONTACT":
-// res = db.array(db.COLUMN, "select CONTACT.ORGANISATION_ID from CONTACT where CONTACT.PERSON_ID is null and CONTACT.CONTACTID = '" + idValue + "'");
-// break;
-// case "ADDRESS":
-// res = IndexsearchUtils.getAffectedIdValues("ORGANISATION_ID", infoContainer, function (id){
-// return db.array(db.COLUMN, ["select CONTACT.ORGANISATION_ID from ADDRESS left join CONTACT on CONTACT.CONTACTID = ADDRESS.CONTACT_ID where CONTACT.PERSON_ID is null and ADDRESS.ADDRESSID = ?", [
-// [id, SqlUtils.getSingleColumnType("ADDRESS", "ADDRESSID")]
-// ]]);
-// });
-// break;
-// case "COMMUNICATION":
-// res = IndexsearchUtils.getAffectedIdValues("ORGANISATION_ID", infoContainer, function (id){
-// return db.array(db.COLUMN, ["select CONTACT.ORGANISATION_ID from COMMUNICATION left join CONTACT on CONTACT.CONTACTID = COMMUNICATION.CONTACT_ID where CONTACT.PERSON_ID is null and where COMMUNICATIONID = ?", [
-// [id, SqlUtils.getSingleColumnType("COMMUNICATION", "COMMUNICATIONID")]
-// ]]);
-// });
-// break;
-//}
-
switch (tableName)
{
case "CONTACT":
diff --git a/entity/Person_entity/Person_entity.aod b/entity/Person_entity/Person_entity.aod
index 3da8ef384e..a9c8305abb 100644
--- a/entity/Person_entity/Person_entity.aod
+++ b/entity/Person_entity/Person_entity.aod
@@ -1144,7 +1144,6 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
<indexRecordContainer>
<name>index</name>
<configMode>INDEXGROUP_DEFINITION</configMode>
- <patternExtensionProcess>%aditoprj%/entity/Person_entity/recordcontainers/index/patternExtensionProcess.js</patternExtensionProcess>
<indexRecordAlias>Data_alias</indexRecordAlias>
<query>%aditoprj%/entity/Person_entity/recordcontainers/index/query.js</query>
<affectedTables>
diff --git a/entity/Person_entity/recordcontainers/index/affectedConsumerIds.js b/entity/Person_entity/recordcontainers/index/affectedConsumerIds.js
index ba72575bc7..36a6f2b39b 100644
--- a/entity/Person_entity/recordcontainers/index/affectedConsumerIds.js
+++ b/entity/Person_entity/recordcontainers/index/affectedConsumerIds.js
@@ -41,7 +41,6 @@ function addIds(pRes, pConsumerName, pIds)
function addPersAddressIds(pRes, pCurrId)
{
var sql, ids;
-// sql = "select ADDRESS.ADDRESSID from ADDRESS left join CONTACT on CONTACT.CONTACTID = ADDRESS.CONTACT_ID where CONTACT.PERSON_ID = '" + pCurrId + "'";
sql = "select ADDRESS.ADDRESSID from ADDRESS where ADDRESS.CONTACT_ID = '" + pCurrId + "'";
ids = db.array(db.COLUMN, sql, alias, 0 , 1 * datetime.ONE_MINUTE);
addIds(pRes, "PersAddresses", ids);
@@ -49,13 +48,7 @@ function addPersAddressIds(pRes, pCurrId)
function addOrgAddressIds(pRes, pCurrId)
{
- var sql, ids;
-// sql = "select CONTACT.ADDRESS_ID from ORGANISATION "
-// + "join CONTACT on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null "
-// + "where ORGANISATION.ORGANISATIONID = ( "
-// + "select c.ORGANISATION_ID FROM CONTACT as c where c.PERSON_ID = '" + pCurrId
-// + "')";
-//
+ var sql, ids;
sql = "select CONTACT.ADDRESS_ID from ORGANISATION "
+ "join CONTACT on CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null "
+ "where ORGANISATION.ORGANISATIONID = ( "
@@ -69,7 +62,6 @@ function addOrgAddressIds(pRes, pCurrId)
function addCommunicationIds(pRes, pCurrId)
{
var sql, ids;
-// sql = "select COMMUNICATION.COMMUNICATIONID from COMMUNICATION left join CONTACT on CONTACT.CONTACTID = COMMUNICATION.CONTACT_ID where CONTACT.PERSON_ID = '" + pCurrId + "'";
sql = "select COMMUNICATION.COMMUNICATIONID from COMMUNICATION where COMMUNICATION.CONTACT_ID = '" + pCurrId + "'";
ids = db.array(db.COLUMN, sql, alias, 0 , 1 * datetime.ONE_MINUTE);
addIds(pRes, "Communications", ids);
diff --git a/entity/Person_entity/recordcontainers/index/affectedIds.js b/entity/Person_entity/recordcontainers/index/affectedIds.js
index ed25062b17..488e44a0b1 100644
--- a/entity/Person_entity/recordcontainers/index/affectedIds.js
+++ b/entity/Person_entity/recordcontainers/index/affectedIds.js
@@ -13,34 +13,6 @@ infoContainer = IndexsearchUtils.createAffectedInfoContainer(idValue, null, var
,function (){return vars.get("$local.oldvalues")}
,function (){return vars.get("$local.values")});
-//
-//switch (tableName)
-//{
-// case "PERSON":
-// res = [idValue];
-// break;
-// case "CONTACT":
-// res = db.array(db.COLUMN, "select CONTACT.PERSON_ID from CONTACT where CONTACT.CONTACTID = '" + idValue + "'");
-// break;
-// case "ORGANISATION":
-// res = db.array(db.COLUMN, "select CONTACT.PERSON_ID from CONTACT where CONTACT.PERSON_ID is not null and CONTACT.ORGANISATION_ID = '" + idValue + "'");
-// break;
-// case "ADDRESS":
-// res = IndexsearchUtils.getAffectedIdValues("PERSON_ID", infoContainer, function (id){
-// return db.array(db.COLUMN, ["select CONTACT.PERSON_ID from ADDRESS left join CONTACT on CONTACT.CONTACTID = ADDRESS.CONTACT_ID where CONTACT.PERSON_ID is not null and ADDRESS.ADDRESSID = ?", [
-// [id, SqlUtils.getSingleColumnType("ADDRESS", "ADDRESSID")]
-// ]]);
-// });
-// break;
-// case "COMMUNICATION":
-// res = IndexsearchUtils.getAffectedIdValues("PERSON_ID", infoContainer, function (id){
-// return db.array(db.COLUMN, ["select CONTACT.PERSON_ID from COMMUNICATION left join CONTACT on CONTACT.CONTACTID = COMMUNICATION.CONTACT_ID where CONTACT.PERSON_ID is not null and where COMMUNICATIONID = ?", [
-// [id, SqlUtils.getSingleColumnType("COMMUNICATION", "COMMUNICATIONID")]
-// ]]);
-// });
-// break;
-//}
-
switch (tableName)
{
case "CONTACT":
diff --git a/entity/Person_entity/recordcontainers/index/patternExtensionProcess.js b/entity/Person_entity/recordcontainers/index/patternExtensionProcess.js
deleted file mode 100644
index e1de697d7b..0000000000
--- a/entity/Person_entity/recordcontainers/index/patternExtensionProcess.js
+++ /dev/null
@@ -1,12 +0,0 @@
-import("system.vars");
-import("system.result");
-
-var pattern = vars.get("$local.pattern");
-
-var extension = "";
-
-if(pattern.search("AG") != -1 || pattern.search("ag") != -1){
- extension += "-firstname:anja";
-}
-
-result.string(extension);
\ No newline at end of file
--
GitLab