zwischenspeicher

process/mailbridge_service/process.js

@@ -129,7 +129,7 @@ TicketMailbridgeUtils.getInboxInformationAllRecipients = function(pRecipients, p
                                     .whereIfSet("inbox.inboxid", inboxObj["inboxID"][0])
                                     .table();
                                     
-    inboxObj["attributeFilterArray"] = newSelect("ATTRIBUTE_FILTERID, RTRIM(COMPONENT), SEARCHTERM, COMPARISON_METHOD, THRESHOLD")
+    inboxObj["attributeFilterArray"] = newSelect("ATTRIBUTE_FILTERID, RTRIM(COMPONENT), SEARCHTERM")
                                     .from("ATTRIBUTE_FILTER")
                                     .join("INBOXFILTERGROUP", "INBOXFILTERGROUP.INBOXFILTERGROUPID = ATTRIBUTE_FILTER.INBOXFILTERGROUP_ID")
                                     .join("INBOXFILTERGROUP_RELATION", "INBOXFILTERGROUP_RELATION.INBOXFILTERGROUP_ID = INBOXFILTERGROUP.INBOXFILTERGROUPID")
@@ -663,18 +663,19 @@ TicketMailbridgeUtils.createTicket = function(pMailObject, pFilterResult, pInbox
     // sending Automatic Answeremail 
     if(answerMail != "" && answerMail != undefined && answerMailActive !="" && answerMailActive == true)
     {
+        logging.log(answerMail);
         var eml             = new Email();
         eml.sender          = mailRec || inboxUser;
         eml.subject         = ticketSub +" ["+ ticketCode +"]";
         
-        eml.body            = DocumentTemplateUtils.getTemplate(answerMail) + "\n"+ DocumentTemplateUtils.getTemplate(signature) ;
+        eml.body            = DocumentTemplateUtils.getTemplate(answerMail, false) + "\n"+ DocumentTemplateUtils.getTemplate(signature, false) ;
         eml.toRecipients    = [persFrom];
-        
+        logging.log(JSON.stringify(DocumentTemplateUtils.getTemplate(answerMail)));
         // overwrite eml.body with individual answer, if individual answer template is set for the selected ticket template
         var indiAns         = TicketTemplateUtils.checkIndividualAnswer(ticketTemplateId[0]);
         if(indiAns !="" && indiAns != undefined)
         {
-            eml.body = DocumentTemplateUtils.getTemplate(indiAns) + "\n"+ DocumentTemplateUtils.getTemplate(signature);
+            eml.body = DocumentTemplateUtils.getTemplate(indiAns, false) + "\n"+ DocumentTemplateUtils.getTemplate(signature, false);
         }
         // overwrite eml.sender with answer mail address, if answer mail address is set for the selected inbox
        
@@ -789,51 +790,23 @@ TicketMailbridgeUtils.setTicketCodeRegex = function(pRegexString){
 TicketMailbridgeUtils.useAttributeFilter = function(pInboxObj, pTicketID, pMailObject)
 {
     var attributeFilters = pInboxObj["attributeFilterArray"];
-    var fixAttributeFilters = [];
-    var probabiltityAttributeFilters = [];
     var matchedAttributeFilterIds = [];
     var attributesToInsert = [];
     var attributeIds = [];
     var inserts = [];
-    var IDX_COMP_METHOD = 3;
     var IDX_MAX_COUNT = 0;
     var IDX_EXISTING_ATTRS = 1;
     var IDX_ATTRIBUTEID = 0;
     var attributeCountObj = {};
-    var logMessageFix = "";
-    var logMessageProbability = "";
-    
-    // Divide fixed and probability attribute filer
-    attributeFilters.forEach(function(attributeFilter){
-        if(attributeFilter[IDX_COMP_METHOD] == $KeywordRegistry.attributeFilterComparisonMethod$fix())
-        {
-            fixAttributeFilters.push(attributeFilter);
-        }
-        else
-        {
-            probabiltityAttributeFilters.push(attributeFilter);
-        }
-    });
-    
-    // searches for the appropriate fix attribute filter ids
-    if(fixAttributeFilters.length > 0)
+    if (attributeFilters.length > 0)
     {
-       var resultCheckFixAttrFilters = TicketMailbridgeUtils.checkAttributeFilters(fixAttributeFilters, pMailObject, $KeywordRegistry.attributeFilterComparisonMethod$fix());
-        matchedAttributeFilterIds = resultCheckFixAttrFilters[0];
-       logMessageFix = resultCheckFixAttrFilters[1];
-    }
-    
-    // searches for the appropriate probability attribute filter ids
-    if(probabiltityAttributeFilters.length > 0)
-    {
-        var resultCheckProbabilityAttrFilters = TicketMailbridgeUtils.checkAttributeFilters(fixAttributeFilters, pMailObject, $KeywordRegistry.attributeFilterComparisonMethod$probability());
-        matchedAttributeFilterIds.concat(resultCheckProbabilityAttrFilters[0]);
-        logMessageProbability = resultCheckProbabilityAttrFilters[1];
+    // searches for the appropriate fix attribute filter ids
+    var resultCheckFixAttrFilters = TicketMailbridgeUtils.checkAttributeFilters(attributeFilters, pMailObject);
+    matchedAttributeFilterIds = resultCheckFixAttrFilters[0];
+    var logMessage = resultCheckFixAttrFilters[1];    
     }
     
-    var logMessage = logMessageFix + "\n" + logMessageProbability
-    
-     if(matchedAttributeFilterIds.length > 0)
+    if(matchedAttributeFilterIds.length > 0)
     {
         // Fetches the stored attributes of the matching attribute filter
         attributesToInsert = newSelect(" distinct AB_ATTRIBUTE_ID, CHAR_VALUE, ID_VALUE, DATE_VALUE, NUMBER_VALUE, INT_VALUE")
@@ -907,17 +880,16 @@ TicketMailbridgeUtils.useAttributeFilter = function(pInboxObj, pTicketID, pMailO
 /*
 * checks for possible attribute filters and returns the matching attributefilter IDs and a log message
 * 
-* @param pFixAttributeFilters {Array}   the detected attribute filters
+* @param pAttributeFilters {Array}      the detected attribute filters
 * @param pMailObject {Object}           the inbox object created in funktion TicketMailbridgeUtils.getInboxInformation()
-* @param pKind {String}                 the kind of serch
 * 
 * @return {Array}                       structure: [[attributeFilterId], logMessage]
 */
-TicketMailbridgeUtils.checkAttributeFilters = function(pFixAttributeFilters, pMailObject, pKind)
+TicketMailbridgeUtils.checkAttributeFilters = function(pAttributeFilters, pMailObject)
 {
     var filterResult;
     
-    pFixAttributeFilters.forEach(function([attributeFilterId, component, searchterm, coparisonMethod, threshold]){
+    pAttributeFilters.forEach(function([attributeFilterId, component, searchterm]){
         
         var textToSearch;
         searchterm = searchterm || "";
@@ -938,14 +910,7 @@ TicketMailbridgeUtils.checkAttributeFilters = function(pFixAttributeFilters, pMa
                 break;
         }
         textToSearch = textToSearch || "";
-        
-        if(pKind == $KeywordRegistry.attributeFilterComparisonMethod$fix())
-        {
-            filterResult = TicketMailbridgeUtils.checkFixAttributeFilters(searchterm, attributeFilterId, textToSearch, component);
-        }
-        else if(pKind == $KeywordRegistry.attributeFilterComparisonMethod$probability()) {
-            filterResult = TicketMailbridgeUtils.checkProbabilityAttributeFilters(searchterm, attributeFilterId, textToSearch, component);
-        }
+        filterResult = TicketMailbridgeUtils.checkFixAttributeFilters(searchterm, attributeFilterId, textToSearch, component);
     });
     
     return filterResult;