--- dao/DaoMqPump2/DaoCommon/Salt2Helper.cs	2014/05/16 21:10:02	2169
+++ dao/DaoMqPump2/DaoCommon/Salt2Helper.cs	2014/05/17 10:53:58	2172
@@ -22,12 +22,22 @@
             header.afsender = salt2String.Substring(0, 5);
             header.modtager = salt2String.Substring(5, 5);
             header.transaktionForkortelse = salt2String.Substring(55, 4);
+
+
+            header.transaktionForkortelse = header.transaktionForkortelse.Trim();
+
             return header;
         }
 
 
         public static bool validateSalt2Header(string salt2String)
         {
+            if (salt2String.StartsWith("?"))
+            {
+                //addLogEntry("Illegal start character - discarding");
+                return false;
+            }
+
             if (salt2String.Length < 66)
             {
                 //addLogEntry("Transaction too short - discarding");
@@ -38,16 +48,16 @@
             int result;
             long result_long;
 
-            string afsender = salt2String.Substring(0, 5);
-            string modtager = salt2String.Substring(5, 5);
-            string afsenderTegnSaet = salt2String.Substring(10, 6);
-            string standardNavn = salt2String.Substring(16, 6);
+            //string afsender = salt2String.Substring(0, 5);
+            //string modtager = salt2String.Substring(5, 5);
+            //string afsenderTegnSaet = salt2String.Substring(10, 6);
+            //string standardNavn = salt2String.Substring(16, 6);
             string standardVersion = salt2String.Substring(22, 3);
             string afsenderSekvensnr = salt2String.Substring(25, 6);
             string afsenderTidsstempel = salt2String.Substring(31, 14);
-            string afsenderBakkeIdent = salt2String.Substring(45, 5);
-            string modtagerBakkeIdent = salt2String.Substring(50, 5);
-            string transaktionForkortelse = salt2String.Substring(55, 4);
+            //string afsenderBakkeIdent = salt2String.Substring(45, 5);
+            //string modtagerBakkeIdent = salt2String.Substring(50, 5);
+            //string transaktionForkortelse = salt2String.Substring(55, 4);
             string transaktionsLaengde = salt2String.Substring(59, 5);
             string prioritet = salt2String.Substring(64, 1);