--- dao/DaoMqPump2/MQFilter/FilterController.cs 2014/05/17 10:53:58 2172 +++ dao/DaoMqPump2/MQFilter/FilterController.cs 2014/05/19 11:59:45 2175 @@ -45,21 +45,33 @@ //Læser globale MQ Parametre mqHost = (string)key.GetValue("MQHost"); if (mqHost == null || mqHost.Length == 0) + { + key.SetValue("MQHost", "", RegistryValueKind.String); throw new System.ArgumentException("MQHost cannot be null or empty"); + } mqChannel = (string)key.GetValue("MQChannel"); if (mqChannel == null || mqChannel.Length == 0) + { + key.SetValue("MQChannel", "", RegistryValueKind.String); throw new System.ArgumentException("MQChannel cannot be null or empty"); + } mqQueueManager = (string)key.GetValue("MQQueueManager"); if (mqQueueManager == null || mqQueueManager.Length == 0) + { + key.SetValue("MQQueueManager", "", RegistryValueKind.String); throw new System.ArgumentException("MQQueueManager cannot be null or empty"); + } //////////// logDirectory = (string)key.GetValue("LogDirectory"); if (logDirectory == null || logDirectory.Length == 0) + { + key.SetValue("LogDirectory", "", RegistryValueKind.String); throw new System.ArgumentException("LogDirectory cannot be null or empty"); + } if (Directory.Exists(logDirectory) == false) { @@ -70,12 +82,16 @@ String tmpFilterTransactions = (string)key.GetValue("FilterTransactions"); if (tmpFilterTransactions == null || tmpFilterTransactions.Length == 0) + { + key.SetValue("FilterTransactions", "", RegistryValueKind.String); 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(); } //////////// @@ -106,11 +122,12 @@ //MQ objects i v6 implementerer ikke IDisposable og kan derfor ikke bruges med "using" statement mqMgr = new MQQueueManager(mqQueueManager, connProps);//stage 1 connect to mq - queueIndbakke = mqMgr.AccessQueue(queueNameIndbakke, openInputOptions); - queueMysql = mqMgr.AccessQueue(queueNameMysql, openOutputOptions); - queueDimaps = mqMgr.AccessQueue(queueNameDimaps, openOutputOptions); - queueStore = mqMgr.AccessQueue(queueNameStore, openOutputOptions); + queueIndbakke = MQHelper.openQueueHelper(queueNameIndbakke, mqMgr, openInputOptions); + + queueMysql = MQHelper.openQueueHelper(queueNameMysql, mqMgr, openOutputOptions); + queueDimaps = MQHelper.openQueueHelper(queueNameDimaps, mqMgr, openOutputOptions); + queueStore = MQHelper.openQueueHelper(queueNameStore, mqMgr, openOutputOptions); bool isContinue = true; @@ -214,12 +231,13 @@ private Boolean saveForLater(Salt2Header header) { + 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 + if (contains(header.transaktionForkortelse, this.filterTranscations) ) //Så længe vi skal være .net3.0 kompatible er LINQ problematisk (LINQ kræver 3.5) { return true; }