3 Commits

Author SHA1 Message Date
Jonathan Jenne
ca03492326 ZooFlow: Version 0.0.2.0 2020-12-23 16:36:39 +01:00
Jonathan Jenne
bd3c981807 ZooFlow: clean up 2020-12-23 16:36:24 +01:00
Jonathan Jenne
088c330f0c ZooFlow: integrate service config 2020-12-23 16:14:02 +01:00
4 changed files with 27 additions and 14 deletions

View File

@@ -18,11 +18,6 @@ Public Class ClassInit
Public Sub New(LogConfig As LogConfig, ParentForm As frmFlowForm)
_MainForm = ParentForm
_Logger = LogConfig.GetLogger()
Try
Catch ex As Exception
End Try
End Sub
Public Sub InitializeApplication()
@@ -42,7 +37,8 @@ Public Class ClassInit
' === Init Schritte definieren
oInit.AddStep("Checking connectivity..", AddressOf CheckConnectivity, True)
oInit.AddStep("Initializing User..", AddressOf InitializeUser, True)
oInit.AddStep("Initializing IDB..", AddressOf InitializeIDB, True)
oInit.AddStep("Initializing IDB Database..", AddressOf InitializeIDBDatabase, True)
oInit.AddStep("Initializing IDB Service..", AddressOf InitializeIDBService, True)
oInit.AddStep("Initializing Language..", AddressOf InitializeLanguage, False)
oInit.AddStep("Loading 3rd-party licenses..", AddressOf Initialize3rdParty, False)
oInit.AddStep("Loading Basic Configs..", AddressOf InitBasicData, False)
@@ -139,16 +135,23 @@ Public Class ClassInit
Dim oSql = "SELECT * FROM TBGI_FUNCTION_REGEX"
My.Application.Globix.DT_FUNCTION_REGEX = My.Database.GetDatatable(oSql)
Catch ex As Exception
_Logger.Error(ex)
Throw New InitException("Error in InitBasicData")
End Try
End Sub
Private Sub InitializeIDB(MyApplication As My.MyApplication)
Private Sub InitializeIDBService(MyApplication As My.MyApplication)
Try
MyApplication.Service.Address = My.SystemConfig.AppServerConfig
MyApplication.Service.IsActive = True
Catch ex As Exception
_Logger.Error(ex)
Throw New InitException("Error in InitBasicData")
End Try
End Sub
Private Sub InitializeIDBDatabase(MyApplication As My.MyApplication)
If MyApplication.ModulesActive.Contains(MODULE_ZOOFLOW) Then
If My.Database.DBInitialized Then
Dim oSQl = "SELECT * FROM TBDD_CONNECTION WHERE BEZEICHNUNG = 'IDB'"
@@ -164,7 +167,13 @@ Public Class ClassInit
Throw New InitException("Fehler beim Laden der IDB Verbindungsdaten!")
End If
Dim oConString = My.Database.GetConnectionString(oDatatable.Rows(0).Item("SERVER"), oDatatable.Rows(0).Item("DATENBANK"), oDatatable.Rows(0).Item("USERNAME"), oDatatable.Rows(0).Item("PASSWORD"))
Dim oDataRow As DataRow = oDatatable.Rows.Item(0)
Dim oConString = My.Database.GetConnectionString(
oDataRow.Item("SERVER").ToString,
oDataRow.Item("DATENBANK").ToString,
oDataRow.Item("USERNAME").ToString,
oDataRow.Item("PASSWORD").ToString)
My.DatabaseIDB = New MSSQLServer(My.LogConfig, oConString)
If My.DatabaseIDB.DBInitialized = False Then
_Logger.Warn("Could not initialize IDB-Database!")
@@ -173,7 +182,7 @@ Public Class ClassInit
End If
Else
_Logger.Warn("ZooFlow missing from Active Modules!")
Throw New InitException("ZooFlow Modult ist nicht aktiv oder nicht lizensiert!")
Throw New InitException("ZooFlow Modul ist nicht aktiv oder nicht lizensiert!")
End If
End Sub

View File

@@ -40,6 +40,9 @@ Public Class ClassConfig
<ConnectionString>
Public Property ConnectionString As String = String.Empty
<GlobalSetting>
Public Property AppServerConfig As String = "172.24.12.39:9000"
' === Logging Configuration
Public Property LogDebug As Boolean = False

View File

@@ -32,5 +32,5 @@ Imports System.Runtime.InteropServices
' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below:
' [assembly: AssemblyVersion("1.0.*")]
<Assembly: AssemblyVersion("0.0.1.0")>
<Assembly: AssemblyVersion("0.0.2.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")>

View File

@@ -944,7 +944,8 @@ Public Class frmSearchStart
.Modules = My.Application.Modules,
.Database = My.Database,
.DatabaseIDB = My.DatabaseIDB,
.Settings = My.Application.Settings
.Settings = My.Application.Settings,
.Service = My.Application.Service
}
Dim oDTSearchResult As DataTable = My.DatabaseIDB.GetDatatable(oSearchSQL)
If oDTSearchResult.Rows.Count > 0 Then