MS

app/ClassWMResulthandler/clsDatabase.vb

@@ -1,9 +1,14 @@
 Imports System.Data.SqlClient
 Imports Oracle.ManagedDataAccess.Client
-Public Class clsDatatabase
+Imports DigitalData.Modules.Logging
+Public Class clsDatabase
     Private Shared MSSQL_inited As Boolean = False
-    Private Shared Logger As NLog.Logger = NLog.LogManager.GetCurrentClassLogger
-    Public Shared Function Init(CONSTRING As String)
+    Dim Logger As Logger
+    Sub New(MyLogger As LogConfig, ConStr As String)
+        Logger = MyLogger.GetLogger()
+        Init(ConStr)
+    End Sub
+    Public Function Init(CONSTRING As String)
         Try
             Dim SQLconnect As New SqlClient.SqlConnection
             SQLconnect.ConnectionString = CONSTRING
@@ -11,11 +16,6 @@ Public Class clsDatatabase
             SQLconnect.Close()
             clsCURRENT.SQLSERVER_CS = CONSTRING
             MSSQL_inited = True
-            clsCURRENT.DT_TBWMRH_KONFIGURATION = clsDatatabase.Return_Datatable("SELECT * FROM TBWMRH_KONFIGURATION WHERE GUID = 1")
-            If clsCURRENT.DT_TBWMRH_KONFIGURATION.Rows.Count = 1 Then
-                clsCURRENT.LOG_ERRORS_ONLY = CBool(clsCURRENT.DT_TBWMRH_KONFIGURATION.Rows(0).Item("LOG_ERRORS_ONLY"))
-                clsCURRENT.WDLAUFWERK = clsCURRENT.DT_TBWMRH_KONFIGURATION.Rows(0).Item("WD_LAUFWERK")
-            End If
 
             Return True
         Catch ex As Exception
@@ -26,7 +26,7 @@ Public Class clsDatatabase
     End Function
 
 
-    Public Shared Function ExecuteonOracleDb(CONSTRING As String, ByVal plsqlcommand As String)
+    Public Function ExecuteonOracleDb(CONSTRING As String, ByVal plsqlcommand As String)
         Try
             Logger.Debug("plsqlcommand: " & plsqlcommand)
             ' die nötigen Variablen definieren
@@ -94,7 +94,7 @@ Public Class clsDatatabase
         End Try
 
     End Function
-    Public Shared Function Oracle_CS_Test(CONSTRING As String)
+    Public Function Oracle_CS_Test(CONSTRING As String)
         Try
             Dim conn As New OracleConnectionStringBuilder
 
@@ -119,7 +119,7 @@ Public Class clsDatatabase
         End Try
 
     End Function
-    Public Shared Function MSSQL_CS_Test(CONSTRING As String)
+    Public Function MSSQL_CS_Test(CONSTRING As String)
         Try
 
             ' die nötigen Variablen definieren
@@ -146,7 +146,7 @@ Public Class clsDatatabase
         End Try
 
     End Function
-    Public Shared Function ExecuteonMSSQL(ConString As String, ByVal sqlcommand As String)
+    Public Function ExecuteonMSSQL(ConString As String, ByVal sqlcommand As String)
         Try
             Logger.Debug("sqlcommand: " & sqlcommand)
             If MSSQL_inited = False Then Return False
@@ -219,7 +219,7 @@ Public Class clsDatatabase
     End Function
 
 
-    Public Shared Function Return_Datatable(Select_anweisung As String)
+    Public Function Return_Datatable(Select_anweisung As String)
         Try
             Logger.Debug("Select_anweisung: " & Select_anweisung)
             If MSSQL_inited = False Then Return Nothing
@@ -247,7 +247,7 @@ Public Class clsDatatabase
             Return Nothing
         End Try
     End Function
-    Public Shared Function Execute_non_Query(ExecuteCMD As String)
+    Public Function Execute_non_Query(ExecuteCMD As String)
         If MSSQL_inited = False Then Return False
         Try
             Logger.Debug("ExecuteCMD: " & ExecuteCMD)
@@ -276,7 +276,7 @@ Public Class clsDatatabase
         End Try
     End Function
 
-    Public Shared Function Execute_Scalar(cmdscalar As String)
+    Public Function Execute_Scalar(cmdscalar As String)
         If MSSQL_inited = False Then Return Nothing
         Dim result
         Try
@@ -306,7 +306,7 @@ Public Class clsDatatabase
             Return Nothing
         End Try
     End Function
-    Public Shared Function OracleExecute_Scalar(cmdscalar As String, OracleConnection As String)
+    Public Function OracleExecute_Scalar(cmdscalar As String, OracleConnection As String)
         Dim result
         Try
             Logger.Debug("cmdscalar: " & cmdscalar)
@@ -328,7 +328,7 @@ Public Class clsDatatabase
             Return Nothing
         End Try
     End Function
-    Public Shared Function OracleExecute_non_Query(ExecuteCMD As String, OracleConnection As String, Optional userInput As Boolean = False)
+    Public Function OracleExecute_non_Query(ExecuteCMD As String, OracleConnection As String, Optional userInput As Boolean = False)
         Try
             Logger.Debug("ExecuteCMD: " & ExecuteCMD)
             Dim SQLconnect As New OracleConnection
@@ -351,7 +351,7 @@ Public Class clsDatatabase
         End Try
     End Function
 
-    Public Shared Function Oracle_Return_Datatable(Select_anweisung As String, OracleConnection As String, Optional userInput As Boolean = False)
+    Public Function Oracle_Return_Datatable(Select_anweisung As String, OracleConnection As String, Optional userInput As Boolean = False)
         Try
             Logger.Debug("Select_anweisung: " & Select_anweisung)
             Dim SQLconnect As New OracleConnection