diff --git a/ENI-2/DBTabellen.png b/ENI-2/DBTabellen.png new file mode 100644 index 00000000..6bc0a277 Binary files /dev/null and b/ENI-2/DBTabellen.png differ diff --git a/ENI-2/Projektbeschreibung.docx b/ENI-2/Projektbeschreibung.docx index 59aa57ab..ef71026a 100644 Binary files a/ENI-2/Projektbeschreibung.docx and b/ENI-2/Projektbeschreibung.docx differ diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx index c68dab4b..a4abdad0 100644 Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ diff --git a/nsw/Source/SendNSWMessageService/NSWSendService.cs b/nsw/Source/SendNSWMessageService/NSWSendService.cs index eea3860b..e4445b90 100644 --- a/nsw/Source/SendNSWMessageService/NSWSendService.cs +++ b/nsw/Source/SendNSWMessageService/NSWSendService.cs @@ -30,6 +30,17 @@ namespace SendNSWMessageService InitializeComponent(); } + public void Commandline(string[] args) + { + // Dieser Modus dient allein dazu, eine separate Instanz "nebenher" laufen zu lassen, ohne + // sie als Service zu installieren. Dies ist sinnvoll um für spezielle HIS Einstellungen Tests zu machen + // ohne den laufenden Betrieb zu stören (hoffentlich!) + this.Init(args); // setup timer + this.DoOnce(); + while (true) + System.Threading.Thread.Sleep(1000); // sleep until someone kills me :) + } + protected override void OnStart(string[] args) { this.EventLog.Source = this.ServiceName; @@ -79,6 +90,9 @@ namespace SendNSWMessageService { List messages = DBManager.Instance.GetMessagesForCore(core); + // TODO: Das muss wieder entfernt werden wenn 3.0 funktional ist + if (core.InitialHIS != Message.NSWProvider.DBH_TEST) continue; // ignore everything else + if (core.InitialHIS == Message.NSWProvider.DUDR) { // Rostocker: wir senden alle Nachrichten auf einmal @@ -219,18 +233,19 @@ namespace SendNSWMessageService // switch über passendes HIS / Schnittstelle switch (message.HIS) { - case Message.NSWProvider.DBH: + // TODO: Das muss wieder entfernt werden wenn 3.0 funktional geht + // case Message.NSWProvider.DBH: case Message.NSWProvider.DBH_TEST: sendSucceeded = bsmd.dbh.Request.SendMessage(message, (message.HIS == Message.NSWProvider.DBH_TEST)); if (!sendSucceeded) message.InternalStatus = Message.BSMDStatus.SEND_FAILED; break; - + /* case Message.NSWProvider.DAKOSY: sendSucceeded = bsmd.dakosy.Request.Send(message); if (!sendSucceeded) message.InternalStatus = Message.BSMDStatus.SEND_FAILED; break; - + */ default: _log.WarnFormat("Initial HIS not specified for message {0}", message.Id); break; @@ -272,7 +287,8 @@ namespace SendNSWMessageService } // Auf erhaltene Visit-Ids prüfen (HIS-NORD) - bsmd.hisnord.Request.ReadAnswers(); + // TODO + // bsmd.hisnord.Request.ReadAnswers(); DBManager.Instance.Disconnect(); diff --git a/nsw/Source/SendNSWMessageService/Program.cs b/nsw/Source/SendNSWMessageService/Program.cs index 672f7d5b..50cdeadf 100644 --- a/nsw/Source/SendNSWMessageService/Program.cs +++ b/nsw/Source/SendNSWMessageService/Program.cs @@ -14,7 +14,7 @@ namespace SendNSWMessageService /// /// The main entry point for the application. /// - static void Main() + static void Main(string[] args) { ServiceBase[] ServicesToRun; @@ -28,6 +28,10 @@ namespace SendNSWMessageService { ((NSWSendService)ServicesToRun[0]).DoOnce(); } + else if(args.Length > 0) + { + ((NSWSendService)ServicesToRun[0]).Commandline(args); + } else { ServiceBase.Run(ServicesToRun); diff --git a/nsw/Source/SendNSWMessageService/packages.config b/nsw/Source/SendNSWMessageService/packages.config new file mode 100644 index 00000000..a51db168 --- /dev/null +++ b/nsw/Source/SendNSWMessageService/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/nsw/Source/bsmd.dakosy/packages.config b/nsw/Source/bsmd.dakosy/packages.config new file mode 100644 index 00000000..a51db168 --- /dev/null +++ b/nsw/Source/bsmd.dakosy/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/nsw/Source/bsmd.database/packages.config b/nsw/Source/bsmd.database/packages.config new file mode 100644 index 00000000..a51db168 --- /dev/null +++ b/nsw/Source/bsmd.database/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/nsw/Source/bsmd.dbh/packages.config b/nsw/Source/bsmd.dbh/packages.config new file mode 100644 index 00000000..a51db168 --- /dev/null +++ b/nsw/Source/bsmd.dbh/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file