bugfix indexsuche

entity/Organisation_entity/recordcontainers/index/query.js

@@ -29,12 +29,13 @@ var querySelect = newSelect("CONTACT.CONTACTID "
                            + ", ADDRESS.CITY " 
                            + ", COMMUNICATION.ADDR " 
                            + ", PHONE.ADDR " 
+                       )
                     .from("ORGANISATION")
                     .join("CONTACT", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID and CONTACT.PERSON_ID is null")
                     .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
                     .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID")
                     .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
-                    .leftJoin("COMMUNICATION", "PHONE.CONTACT_ID = CONTACT.CONTACTID and PHONE.MEDIUM_ID in ('" + CommMediumPhoneIds.join("', '") + "'), "PHONE")//TODO: refactor to new SqlBuilder
+                    .leftJoin("COMMUNICATION", "PHONE.CONTACT_ID = CONTACT.CONTACTID and PHONE.MEDIUM_ID in ('" + CommMediumPhoneIds.join("', '") + "')", "PHONE")//TODO: refactor to new SqlBuilder
 
 if (vars.exists("$local.idvalue") && vars.get("$local.idvalue") && vars.get("$local.idvalue").length > 0) 
 {

entity/Person_entity/Person_entity.aod

@@ -1399,18 +1399,21 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
           <indexFieldType>STRING</indexFieldType>
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
-          <name>IndexAddress.value</name>
-          <indexFieldType>ADDRESS</indexFieldType>
+          <name>ORGANISATION_ID.value</name>
+          <indexFieldType>STRING</indexFieldType>
+        </indexRecordFieldMapping>
+        <indexRecordFieldMapping>
+          <name>ORGANISATION_NAME.value</name>
+          <indexFieldType>PROPER_NAME</indexFieldType>
           <additionalFieldNameAliases>
-            <element>address</element>
+            <element>name</element>
           </additionalFieldNameAliases>
-          <isMultiValued v="true" />
         </indexRecordFieldMapping>
         <indexRecordFieldMapping>
-          <name>IndexCity.value</name>
+          <name>IndexAddress.value</name>
           <indexFieldType>ADDRESS</indexFieldType>
           <additionalFieldNameAliases>
-            <element>city</element>
+            <element>address</element>
           </additionalFieldNameAliases>
           <isMultiValued v="true" />
         </indexRecordFieldMapping>
@@ -1430,6 +1433,14 @@ Usually this is used for filtering COMMUNICATION-entries by a specified contact
           </additionalFieldNameAliases>
           <isMultiValued v="true" />
         </indexRecordFieldMapping>
+        <indexRecordFieldMapping>
+          <name>IndexCity.value</name>
+          <indexFieldType>ADDRESS</indexFieldType>
+          <additionalFieldNameAliases>
+            <element>city</element>
+          </additionalFieldNameAliases>
+          <isMultiValued v="true" />
+        </indexRecordFieldMapping>
         <indexRecordFieldMapping>
           <name>IndexCommunication.value</name>
           <indexFieldType>COMMUNICATION</indexFieldType>

entity/Person_entity/recordcontainers/index/query.js

@@ -17,7 +17,7 @@ var querySelect = newSelect("CONTACT.CONTACTID "
                                 ,"defaultAddress.COUNTRY", "defaultAddress.ZIP", "defaultAddress.CITY"])
                             ,sqlHelper.concat(["'" + translate.text("Phone") + ":'", "(" + CommUtil.getStandardSubSqlPhone() + ")"])
                             ,sqlHelper.concat(["'" + translate.text("Email") + ":'", "(" + CommUtil.getStandardSubSqlMail() + ")"])
-                            ], " | ") "
+                            ], " | ")
                             //additional indexed fields
                             + ", CONTACT.CONTACTID "
                             + ", PERSON.PERSONID "
@@ -32,13 +32,14 @@ var querySelect = newSelect("CONTACT.CONTACTID "
                             + ", ADDRESS.CITY " 
                             + ", COMMUNICATION.ADDR " 
                             + ", PHONE.ADDR " 
+                        )
                     .from("PERSON")
                     .join("CONTACT", "CONTACT.PERSON_ID = PERSON.PERSONID")
                     .join("ORGANISATION", "CONTACT.ORGANISATION_ID = ORGANISATION.ORGANISATIONID")
                     .leftJoin("ADDRESS", "defaultAddress.ADDRESSID = CONTACT.ADDRESS_ID", "defaultAddress")
                     .leftJoin("ADDRESS", "ADDRESS.CONTACT_ID = CONTACT.CONTACTID or ADDRESS.ADDRESSID = CONTACT.ADDRESS_ID")
                     .leftJoin("COMMUNICATION", "COMMUNICATION.CONTACT_ID = CONTACT.CONTACTID")
-                    .leftJoin("COMMUNICATION", "PHONE.CONTACT_ID = CONTACT.CONTACTID and PHONE.MEDIUM_ID in ('" + CommMediumPhoneIds.join("', '") + "'), "PHONE")//TODO: refactor to new SqlBuilder
+                    .leftJoin("COMMUNICATION", "PHONE.CONTACT_ID = CONTACT.CONTACTID and PHONE.MEDIUM_ID in ('" + CommMediumPhoneIds.join("', '") + "')", "PHONE") //TODO: refactor to new SqlBuilder
                     .orderBy("CONTACT.CONTACTID");
 
 if (vars.exists("$local.idvalue")) {