AppStd/ZooFlow
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clean up init

Browse Source
This commit is contained in:
Jonathan Jenne 2022-06-15 16:35:10 +02:00
parent 034b8ad4fa
commit 930b2e4900
1 changed files with 5 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
ZooFlow/ClassInit.vb
View File

@ -35,9 +35,8 @@ Public Class ClassInit
_Loader = New ClassInitLoader(LogConfig) _Loader = New ClassInitLoader(LogConfig)
' === Init Schritte definieren ' === Init Schritte definieren
_Loader.AddStep("Initializing Base", AddressOf InitializeBase, True) _Loader.AddStep("Initializing Service", AddressOf InitializeService, True)
_Loader.AddStep("Initializing EDMI Service", AddressOf InitializeService, True) _Loader.AddStep("Initializing Database", AddressOf InitializeDatabase, True)
_Loader.AddStep("Initializing Database", AddressOf InitializeDatabaseWithFallback, True)
_Loader.AddStep("Initializing User", AddressOf InitializeUser, True) _Loader.AddStep("Initializing User", AddressOf InitializeUser, True)
_Loader.AddStep("Initializing BasicCatalogues", AddressOf InitializeBasicsfromDB, True) _Loader.AddStep("Initializing BasicCatalogues", AddressOf InitializeBasicsfromDB, True)
_Loader.AddStep("Initializing Language", AddressOf InitializeLanguage, False) _Loader.AddStep("Initializing Language", AddressOf InitializeLanguage, False)
@ -83,60 +82,6 @@ Public Class ClassInit
#Region "=== Init Steps ===" #Region "=== Init Steps ==="
Private Sub InitializeBase(MyApplication As My.MyApplication)
End Sub
Private Sub InitializeDatabase(MyApplication As My.MyApplication)
'Dim oConnectionString = MSSQLServer.DecryptConnectionString(My.SystemConfig.ConnectionString)
'My.DatabaseECM = New MSSQLServer(My.LogConfig, oConnectionString)
'If My.DatabaseECM.DBInitialized = False Then
' Logger.Warn("Could not initialize DD_ECM-Database!")
' Throw New InitException("Could not initialize ECM-Database!")
'Else
' Dim oSQl = "SELECT * FROM TBDD_CONNECTION WHERE BEZEICHNUNG = 'IDB' AND AKTIV = 1"
' Dim oDatatable As DataTable = My.DatabaseECM.GetDatatable(oSQl)
' If IsNothing(oDatatable) OrElse oDatatable.Rows.Count = 0 Then
' Dim oForm As New frmSQLConfig(My.LogConfig) With {.FormTitle = "IDB Datenbank"}
' Dim oResult = oForm.ShowDialog()
' If oResult = DialogResult.OK Then
' Dim oConnectionStringSaved = SaveConnectionString(oForm.ConnectionString)
' If oConnectionStringSaved = False Then
' Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!")
' End If
' oDatatable = My.Database.GetDatatableECM(oSQl)
' End If
' End If
' If oDatatable.Rows.Count > 1 Then
' Logger.Warn("Multiple IDB connection entries in TBDD_CONNECTION found!")
' Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!")
' End If
' Dim oDataRow As DataRow = oDatatable.Rows.Item(0)
' Dim oConString = My.DatabaseECM.GetConnectionString(
' oDataRow.Item("SERVER").ToString,
' oDataRow.Item("DATENBANK").ToString,
' oDataRow.Item("USERNAME").ToString,
' oDataRow.Item("PASSWORD").ToString
' )
' Dim oDecryptedConnectionString = MSSQLServer.DecryptConnectionString(oConString)
' My.DatabaseIDB = New MSSQLServer(My.LogConfig, oDecryptedConnectionString)
'End If
'If My.DatabaseIDB.DBInitialized = False Then
' Logger.Warn("Could not initialize IDB-Database!")
' Throw New InitException("Could not initialize IDB-Database!")
'End If
End Sub
Private Sub InitializeService(MyApplication As My.MyApplication) Private Sub InitializeService(MyApplication As My.MyApplication)
Try Try
If My.SystemConfig.AppServerConfig = String.Empty Then If My.SystemConfig.AppServerConfig = String.Empty Then
@ -172,7 +117,8 @@ Public Class ClassInit
Throw New InitException("Error in InitializeService", ex) Throw New InitException("Error in InitializeService", ex)
End Try End Try
End Sub End Sub
Private Sub InitializeDatabaseWithFallback(MyApplication As My.MyApplication)
Private Sub InitializeDatabase(MyApplication As My.MyApplication)
Try Try
Logger.Debug("Loading client config..") Logger.Debug("Loading client config..")
Dim oClientConfig = My.Application.Service.Client.ClientConfig Dim oClientConfig = My.Application.Service.Client.ClientConfig
@ -192,6 +138,7 @@ Public Class ClassInit
Throw New InitException("Error in InitializeDatabaseWithFallback!", ex) Throw New InitException("Error in InitializeDatabaseWithFallback!", ex)
End Try End Try
End Sub End Sub
Private Sub InitializeUser(MyApplication As My.MyApplication) Private Sub InitializeUser(MyApplication As My.MyApplication)
Try Try
Dim oSql As String = My.Queries.Common.FNDD_MODULE_INIT(Environment.UserName) Dim oSql As String = My.Queries.Common.FNDD_MODULE_INIT(Environment.UserName)
@ -348,28 +295,6 @@ Public Class ClassInit
#End Region #End Region
Private Function SetupDatabase() As Boolean
'If My.SystemConfig.ConnectionString = String.Empty Then
' Dim oConnectionString = My.SystemConfig.ConnectionString
' Dim oForm As New frmSQLConfig(My.LogConfig) With {
' .ConnectionString = oConnectionString,
' .FormTitle = "ECM Datenbank"
' }
' Dim oResult = oForm.ShowDialog()
' If oResult = DialogResult.OK Then
' My.SystemConfig.ConnectionString = oForm.ConnectionString
' My.SystemConfigManager.Save()
' Return True
' Else
' Return False
' End If
'End If
Return True
End Function
Private Function SaveConnectionString(pConnectionString As String) As Boolean Private Function SaveConnectionString(pConnectionString As String) As Boolean
Try Try
Dim oBuilder As New SqlConnectionStringBuilder(pConnectionString) Dim oBuilder As New SqlConnectionStringBuilder(pConnectionString)