MS Release

This commit is contained in:
2020-11-20 14:27:56 +01:00
parent cbef1ceebc
commit 8ec1b7b2f1
9 changed files with 2382 additions and 3328 deletions

View File

@@ -45,18 +45,18 @@
Dim CON_ID = oMode.Replace("PM.IDB_CONID!", "")
Dim oConString = ClassDatabase.Get_ConnectionString(CON_ID)
CONNECTION_STRING_IDB = oConString
If ClassDatabase.Init(CONNECTION_STRING_IDB_APP_SERVER) = False Then
If ClassDatabase.Init(CONNECTION_STRING_IDB) = False Then
IDB_ACTIVE = False
Else
IDB_ACTIVE = True
LOGGER.Warn($"Got an IDB-ConnID [{CON_ID}] but check DT Attribute is Nothing!!")
LOGGER.Info($"Got an IDB-Connection [{CON_ID}]!")
End If
ElseIf oMode.StartsWith("PM.IDB_APP_SERV_CONID!") Then
Dim CON_ID = oMode.Replace("PM.IDB_APP_SERV_CONID!", "")
Dim oConString = ClassDatabase.Get_ConnectionString(CON_ID)
CONNECTION_STRING_IDB_APP_SERVER = oConString
If ClassDatabase.Init(CONNECTION_STRING_IDB_APP_SERVER) = True Then
CONNECTION_STRING_IDB_APP_SERVER = ""
LOGGER.Info($"Got an IDB APP-Server-Connection [{CON_ID}]!")
End If
ElseIf oMode = "PM.MONITORING" Then
MONITORING_ACTIVE = True
@@ -84,6 +84,7 @@
Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_EDITED=", "")
Try
LAST_EDITED_COLUMN = oLEDITEDCOL
LOGGER.Info($"LAST_EDITED_COLUMN: {oLEDITEDCOL}")
Catch ex As Exception
LAST_EDITED_COLUMN = ""
@@ -92,6 +93,7 @@
Dim oLEDITEDCOL = oMode.Replace("PM.COL_LAST_ADDED=", "")
Try
LAST_ADDED_COLUMN = oLEDITEDCOL
LOGGER.Info($"LAST_ADDED_COLUMN: {oLEDITEDCOL}")
Catch ex As Exception
LAST_ADDED_COLUMN = ""
@@ -103,6 +105,22 @@
Catch ex As Exception
USE_APPSERVER = False
End Try
ElseIf oMode.StartsWith("PM.SEARCH1") Then
Dim oSearch1 = oMode.Replace("PM.SEARCH1=", "")
Try
SEARCH1 = oSearch1
Catch ex As Exception
SEARCH1 = ""
End Try
ElseIf oMode.StartsWith("PM.SEARCH2") Then
Dim oSearch2 = oMode.Replace("PM.SEARCH2=", "")
Try
SEARCH2 = oSearch2
Catch ex As Exception
SEARCH2 = ""
End Try
Else
LOGGER.Info($"Wrong oMode: {oMode}")