From 873b024f1356d98ad7164089482d2c72d5d81c87 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 14 Nov 2022 10:50:44 +0100 Subject: [PATCH] Revert changes in Database module --- WEBSERVICES/ZUGFeRDRESTService/Database.cs | 36 +++++++++------------- 1 file changed, 15 insertions(+), 21 deletions(-) diff --git a/WEBSERVICES/ZUGFeRDRESTService/Database.cs b/WEBSERVICES/ZUGFeRDRESTService/Database.cs index b566a324..31f56346 100644 --- a/WEBSERVICES/ZUGFeRDRESTService/Database.cs +++ b/WEBSERVICES/ZUGFeRDRESTService/Database.cs @@ -23,31 +23,25 @@ namespace ZUGFeRDRESTService public MSSQLServer MSSQL { get; set; } public Firebird Firebird { get; set; } - public Database(ILogging Logging, IConfiguration Config, IOptions Options) + public Database(ILogging Logging, IConfiguration Config) { - var LogConfig = Logging.LogConfig; - var Logger = Logging.LogConfig.GetLogger(); - var FirebirdConfig = Options.Value.Firebird; + var oLogConfig = Logging.LogConfig; + var oLogger = Logging.LogConfig.GetLogger(); + var oAppConfig = Config.GetSection("Config"); + var oFirebirdConfig = oAppConfig.GetSection("Firebird"); - // var AppConfig = Config.GetSection("Config"); - // var FBConfig = AppConfig.GetSection("Firebird"); + oLogger.Debug("Establishing MSSQL Database connection.."); + MSSQL = new MSSQLServer(oLogConfig, oAppConfig["MSSQLConnectionString"]); + oLogger.Debug("Establishing Firebird Database connection.."); + Firebird = new Firebird(oLogConfig, + oFirebirdConfig["Datasource"], + oFirebirdConfig["Database"], + oFirebirdConfig["Username"], + oFirebirdConfig["Password"]); - Logger.Debug("Establishing MSSQL Database connection.."); - MSSQL = new MSSQLServer(LogConfig, Options.Value.MSSQLConnectionString); - - Logger.Debug("Establishing Firebird Database connection.."); - Firebird = new Firebird(LogConfig, - FirebirdConfig.Datasource, - FirebirdConfig.Database, - FirebirdConfig.Username, - FirebirdConfig.Password); - - // MSSQL = new MSSQLServer(LogConfig, AppConfig["MSSQLConnectionString"]); - // Firebird = new Firebird(LogConfig, FBConfig["Datasource"], FBConfig["Database"], FBConfig["Username"], FBConfig["Password"]); - - Logger.Debug("MSSQL Connection: [{0}]", MSSQL.CurrentConnectionString); - Logger.Debug("Firebird Connection: [{0}]", Firebird.ConnectionString); + oLogger.Debug("MSSQL Connection: [{0}]", MSSQL.CurrentConnectionString); + oLogger.Debug("Firebird Connection: [{0}]", Firebird.ConnectionString); } public string GetGDPictureKey()