--- dao/DaoMqPump2/MQFilter/FilterController.cs	2014/05/16 20:56:22	2168
+++ dao/DaoMqPump2/MQFilter/FilterController.cs	2014/05/17 11:25:26	2174
@@ -71,11 +71,12 @@
             String tmpFilterTransactions = (string)key.GetValue("FilterTransactions");
             if (tmpFilterTransactions == null || tmpFilterTransactions.Length == 0)
                 throw new System.ArgumentException("FilterTransactions cannot be null or empty");
+            tmpFilterTransactions = tmpFilterTransactions.Replace(';', ',');
             filterTranscations = Regex.Split(tmpFilterTransactions, ",");
 
             for (int i = 0; i < filterTranscations.Length; i++)
             {
-                filterTranscations[i] = filterTranscations[i].Trim();
+                filterTranscations[i] = filterTranscations[i].Trim().ToUpper();
             }
 
             ////////////
@@ -83,14 +84,7 @@
         }
 
 
-        private Hashtable getConnectionProperties()
-        {
-            Hashtable connProperties = new Hashtable();
-            connProperties.Add(MQC.TRANSPORT_PROPERTY, MQC.TRANSPORT_MQSERIES_CLIENT);
-            connProperties.Add(MQC.HOST_NAME_PROPERTY, mqHost);
-            connProperties.Add(MQC.CHANNEL_PROPERTY, mqChannel);
-            return connProperties;
-        }
+
 
 
         public void transportAllMessages()
@@ -105,7 +99,7 @@
             try
             {
                 //MQ options
-                Hashtable connProps = getConnectionProperties();
+                Hashtable connProps = MQHelper.getConnectionProperties(mqHost, mqChannel);
                 int openInputOptions = MQC.MQOO_INPUT_AS_Q_DEF + MQC.MQOO_FAIL_IF_QUIESCING;
                 int openOutputOptions = MQC.MQOO_OUTPUT + MQC.MQOO_FAIL_IF_QUIESCING;
 
@@ -133,26 +127,39 @@
                         queueIndbakke.Get(mqMsg, mqGetMsgOpts);
                         if (mqMsg.Format.CompareTo(MQC.MQFMT_STRING) == 0)
                         {
-                            string msgString = mqMsg.ReadString(mqMsg.MessageLength);
+                            string salt2String = mqMsg.ReadString(mqMsg.MessageLength);
                             //System.Console.WriteLine(msgString);
 
 
-                            // Hvis transaktionen starter med et ? er det ikke en gyldig transaktion
-                            // validér ligeledes at headeren er gyldig
-                            if (msgString.StartsWith("?") || DaoUtil.validateSalt2Header(msgString) == false)
+                            // validér at headeren er gyldig
+                            if ( Salt2Helper.validateSalt2Header(salt2String) == false)
                             {
                                 string discarded_filename = Logfile.getLogFilename(LogfileType.LogTransactions, logDirectory, "filter");
                                 using (StreamWriter discardedlog = new StreamWriter(discarded_filename, true))
                                 {
-                                    discardedlog.WriteLine(Logfile.getNowString() + " " + msgString);
+                                    discardedlog.WriteLine(Logfile.getNowString() + " " + salt2String);
                                 }
                                 continue; //gå frem til at tage næste transaktion fra køen
                             }
 
+                            MQPutMessageOptions pmo = new MQPutMessageOptions(); // accept the defaults,
+                            // same as MQPMO_DEFAULT
 
-
-
-
+                            MQMessage msg = new MQMessage();
+                            msg.Format = MQC.MQFMT_STRING;
+                            msg.CharacterSet = 1252;
+                            msg.WriteString(salt2String);
+
+                            Salt2Header header = Salt2Helper.parseHeader(salt2String);
+                            queueMysql.Put(msg, pmo);
+                            if (saveForLater(header))
+                            {
+                                queueStore.Put(msg, pmo);
+                            }
+                            else
+                            {
+                                queueDimaps.Put(msg, pmo);
+                            }
 
 
 
@@ -197,44 +204,55 @@
             }
             finally
             {
-                closeQueue(queueIndbakke);
-                closeQueue(queueMysql);
-                closeQueue(queueDimaps);
-                closeQueue(queueStore);
+                MQHelper.closeQueueSafe(queueIndbakke);
+                MQHelper.closeQueueSafe(queueMysql);
+                MQHelper.closeQueueSafe(queueDimaps);
+                MQHelper.closeQueueSafe(queueStore);
 
+                MQHelper.closeQueueManagerSafe(mqMgr);
+            }
+        }
+
+        private Boolean saveForLater(Salt2Header header)
+        {
 
-                if (mqMgr != null && mqMgr.IsOpen)
+            DateTime now = DateTime.Now;
+            int hour = now.Hour;
+            if (hour >= 14 && hour < 18)
+            {
+                
+                if (contains(header.transaktionForkortelse, this.filterTranscations) ) //Så længe vi skal være .net3.0 kompatible er LINQ problematisk (LINQ kræver 3.5)
                 {
-                    try
-                    {
-                        mqMgr.Close();
-                    }
-                    catch (Exception e)
-                    {
-                        Console.WriteLine("Error cleaning up qmgr " + e.Message);
-                    }
+                    return true;
+                }
+                else 
+                {
+                    return false;
                 }
             }
+            else //normal operation - send straight trough
+            {
+                return false;
+            }
+
         }
 
-        private void closeQueue(MQQueue queue)
+        private bool contains(string needle, string[] haystack) // s
         {
-            if (queue != null && queue.IsOpen)
+            foreach(string hay in haystack) 
             {
-                try
+                if (needle.Equals(hay)) 
                 {
-                    queue.Close();
-                }
-                catch (Exception e)
-                {
-                    Console.WriteLine("Error cleaning up queue " + e.Message);
+                    return true;
                 }
             }
 
+            return false;            
         }
 
 
 
+
         /* Singleton */
         private static FilterController instance = null;
         public static FilterController getInstance()