From 6ab3bef54dc280e846a78d8f0cc399d79c660de7 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 18 Dec 2020 16:27:18 +0100 Subject: [PATCH] Prepare Rights Management in DocumentResults --- app/DD_Clipboard_Searcher/ClassConfig.vb | 8 +++++++- app/DD_Clipboard_Searcher/ClassInit.vb | 11 ++++------- app/DD_Clipboard_Searcher/frmMain.vb | 9 ++++++++- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/app/DD_Clipboard_Searcher/ClassConfig.vb b/app/DD_Clipboard_Searcher/ClassConfig.vb index e14d32c..1b38514 100644 --- a/app/DD_Clipboard_Searcher/ClassConfig.vb +++ b/app/DD_Clipboard_Searcher/ClassConfig.vb @@ -20,5 +20,11 @@ Public Class ClassConfig Public Property ConnectionStringAppServer As String = "" - Public Property AppServerConfig As String = "" + Public Property AppServerConfig As String = "172.24.12.39:9000" + + Public ReadOnly Property IsIDB As Boolean + Get + Return AppServerConfig.Length > 0 + End Get + End Property End Class diff --git a/app/DD_Clipboard_Searcher/ClassInit.vb b/app/DD_Clipboard_Searcher/ClassInit.vb index 2bd9e0c..62d055d 100644 --- a/app/DD_Clipboard_Searcher/ClassInit.vb +++ b/app/DD_Clipboard_Searcher/ClassInit.vb @@ -132,21 +132,18 @@ Public Class ClassInit If ConfigManager.Config.AppServerConfig <> String.Empty Then Try - Dim oSplit() = ConfigManager.Config.AppServerConfig.ToString.Split(";") - Dim oAppServer = oSplit(0) - Dim oAppServerPort = 9000 + Dim oSplit() As String = ConfigManager.Config.AppServerConfig.ToString.Split(":") + Dim oAppServerAddress As String = oSplit(0) + Dim oAppServerPort As Integer = 9000 If oSplit.Length = 2 Then oAppServerPort = oSplit(1) End If - _Client = New Client(LogConfig, oAppServer, oAppServerPort) + _Client = New Client(LogConfig, oAppServerAddress, oAppServerPort) If Not IsNothing(_Client) Then If _Client.Connect() Then APPSERVER_ACTIVE = True End If End If - - - Catch ex As Exception Logger.Warn($"Could not initialize the AppServer: {ex.Message}") End Try diff --git a/app/DD_Clipboard_Searcher/frmMain.vb b/app/DD_Clipboard_Searcher/frmMain.vb index 30850b0..906ccc0 100644 --- a/app/DD_Clipboard_Searcher/frmMain.vb +++ b/app/DD_Clipboard_Searcher/frmMain.vb @@ -269,6 +269,12 @@ Public Class frmMain .UserName = USER_USERNAME } + Dim oService As New State.ServiceState() With { + .Address = ConfigManager.Config.AppServerConfig, + .IsActive = ConfigManager.Config.IsIDB, + .IsOnline = False + } + Dim oSettings As New State.SettingsState() With { .GdPictureKey = GDPICTURE_LICENSE } @@ -277,7 +283,8 @@ Public Class frmMain .Database = Database, .Modules = Nothing, .User = oUser, - .Settings = oSettings + .Settings = oSettings, + .Service = oService } Return oEnvironment