From c04099edb24b0c835a0a1bb156ade231ebd78fd4 Mon Sep 17 00:00:00 2001
From: Daniel Schick <schick@textbausteine.net>
Date: Tue, 14 Feb 2023 07:50:17 +0100
Subject: [PATCH] Bugfix PRE72H Excel scan and better logging output for
 SEND/REC HIS-Nord

---
 ENI2/Excel/ExcelReader.cs               | 4 ++--
 SendNSWMessageService/NSWSendService.cs | 2 +-
 bsmd.hisnord/Response.cs                | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ENI2/Excel/ExcelReader.cs b/ENI2/Excel/ExcelReader.cs
index ab6f628f..afe03d2e 100644
--- a/ENI2/Excel/ExcelReader.cs
+++ b/ENI2/Excel/ExcelReader.cs
@@ -295,7 +295,7 @@ namespace ENI2.Excel
                     if (int.TryParse(val, out int parsed))
                     {
                         if ((parsed < 4) && (parsed > 0))
-                            result = (byte)parsed;
+                            result = (byte)(parsed - 1);
                     }
                 }
             }
@@ -362,7 +362,7 @@ namespace ENI2.Excel
                     if (int.TryParse(val, out int parsed))
                     {
                         if ((parsed < 4) && (parsed > 0))
-                            result = (byte)parsed;
+                            result = (byte)(parsed - 1);
                     }
                 }
             }
diff --git a/SendNSWMessageService/NSWSendService.cs b/SendNSWMessageService/NSWSendService.cs
index 0dc3755e..8ef4d838 100644
--- a/SendNSWMessageService/NSWSendService.cs
+++ b/SendNSWMessageService/NSWSendService.cs
@@ -176,7 +176,7 @@ namespace SendNSWMessageService
                             if(message.HIS == Message.NSWProvider.UNDEFINED)
                                 message.HIS = core.InitialHIS;
 
-                            _log.InfoFormat("Sending {0} message to {1}", message.MessageNotificationClass.ToString(), message.HIS.ToString());
+                            _log.InfoFormat("Sending {0} message {1} to {2}", message.MessageNotificationClass.ToString(), message.Id, message.HIS.ToString());
                             
                             // switch über passendes HIS / Schnittstelle
                             switch (message.HIS)
diff --git a/bsmd.hisnord/Response.cs b/bsmd.hisnord/Response.cs
index 4940df8f..b22f04c0 100644
--- a/bsmd.hisnord/Response.cs
+++ b/bsmd.hisnord/Response.cs
@@ -248,8 +248,8 @@ namespace bsmd.hisnord
                                                         DBManager.Instance.Save(messageError);
                                                     }
 
-                                                    _log.InfoFormat("Saving Message {0} Status {1} InternalStatus {2}",
-                                                        aMessage.Id, aMessage.Status, aMessage.InternalStatus);
+                                                    _log.InfoFormat("{0} message {1} returned: Status {2} InternalStatus {3}",
+                                                        aMessage.MessageNotificationClassDisplay, aMessage.Id, aMessage.Status, aMessage.InternalStatus);
 
                                                     DBManager.Instance.Save(aMessage);
 
@@ -260,7 +260,7 @@ namespace bsmd.hisnord
                                                 if (aMessage.InternalStatus == Message.BSMDStatus.SENT)
                                                 {
                                                     aMessageStillInSENTstate = true;
-                                                    _log.InfoFormat("message {0} {1} still in SENT state", aMessage.Id, aMessage.MessageNotificationClassDisplay);
+                                                    _log.DebugFormat("message {0} {1} still in SENT state", aMessage.Id, aMessage.MessageNotificationClassDisplay);
                                                 }
 
                                             }