From 123eaceb12e7b395e8910a12c96fa58ede72e81b Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 11 Sep 2023 15:16:10 +0200 Subject: [PATCH] Fix Sql Connection missing in Depending Controls, clean up Filesystem module use --- FileFlow.sln | 36 +++- .../ClassPostpostprocessingTest.vb | 112 +++++++++++ .../Global_Indexer.Test.vbproj | 32 +++ Global_Indexer/ClassInit.vb | 9 +- Global_Indexer/ClassPostprocessing.vb | 33 ++-- Global_Indexer/ModuleCURRENT.vb | 4 +- Global_Indexer/frmAdministration.Designer.vb | 42 ++++ Global_Indexer/frmAdministration.resx | 184 ++++++++++++------ Global_Indexer/frmIndex.resx | 2 +- Global_Indexer/frmIndex.vb | 71 ++++--- Global_Indexer/frmSQLSuggestion.vb | 55 +++--- SetupVS19/Product.wxs | 2 +- 12 files changed, 442 insertions(+), 140 deletions(-) create mode 100644 Global_Indexer.Test/ClassPostpostprocessingTest.vb create mode 100644 Global_Indexer.Test/Global_Indexer.Test.vbproj diff --git a/FileFlow.sln b/FileFlow.sln index 1c58204..a9bc9b3 100644 --- a/FileFlow.sln +++ b/FileFlow.sln @@ -1,12 +1,14 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29728.190 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.33516.290 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Global_Indexer", "Global_Indexer\Global_Indexer.vbproj", "{7474B1D2-49A4-4D12-B544-C8674D3F7231}" EndProject Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "SetupVS19", "SetupVS19\SetupVS19.wixproj", "{54DBCFAE-14B1-4811-94AF-B59FFF61EA73}" EndProject +Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "Global_Indexer.Test", "Global_Indexer.Test\Global_Indexer.Test.vbproj", "{8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution CD_ROM|Any CPU = CD_ROM|Any CPU @@ -79,6 +81,36 @@ Global {54DBCFAE-14B1-4811-94AF-B59FFF61EA73}.SingleImage|Mixed Platforms.Build.0 = Release|x86 {54DBCFAE-14B1-4811-94AF-B59FFF61EA73}.SingleImage|x86.ActiveCfg = Release|x86 {54DBCFAE-14B1-4811-94AF-B59FFF61EA73}.SingleImage|x86.Build.0 = Release|x86 + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.CD_ROM|Any CPU.ActiveCfg = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.CD_ROM|Any CPU.Build.0 = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.CD_ROM|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.CD_ROM|Mixed Platforms.Build.0 = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.CD_ROM|x86.ActiveCfg = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.CD_ROM|x86.Build.0 = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.Debug|x86.ActiveCfg = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.Debug|x86.Build.0 = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.DVD-5|Any CPU.ActiveCfg = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.DVD-5|Any CPU.Build.0 = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.DVD-5|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.DVD-5|Mixed Platforms.Build.0 = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.DVD-5|x86.ActiveCfg = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.DVD-5|x86.Build.0 = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.Release|Any CPU.Build.0 = Release|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.Release|x86.ActiveCfg = Release|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.Release|x86.Build.0 = Release|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.SingleImage|Any CPU.ActiveCfg = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.SingleImage|Any CPU.Build.0 = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.SingleImage|Mixed Platforms.ActiveCfg = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.SingleImage|Mixed Platforms.Build.0 = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.SingleImage|x86.ActiveCfg = Debug|Any CPU + {8BFA2C72-1A8A-4B80-9666-483CF1CD21B1}.SingleImage|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Global_Indexer.Test/ClassPostpostprocessingTest.vb b/Global_Indexer.Test/ClassPostpostprocessingTest.vb new file mode 100644 index 0000000..7fbfd57 --- /dev/null +++ b/Global_Indexer.Test/ClassPostpostprocessingTest.vb @@ -0,0 +1,112 @@ +Imports System.Data +Imports Microsoft.VisualStudio.TestTools.UnitTesting +Imports FluentAssertions +Imports DigitalData.Modules.Logging + +Namespace Global_Indexer.Test + + Public Class ClassPostprocessingTest + + Private LogConfig As LogConfig + Private PostProcessing As ClassPostprocessing + + + Sub Init() + LogConfig = New LogConfig(LogPath:=LogConfig.PathType.Temp) + PostProcessing = New ClassPostprocessing(LogConfig) + End Sub + + + Sub Get_Nachbearbeitung_Wert_VBSPLIT_INDEX_0() + Dim oTable = GetDataTable(ClassPostprocessing.VBSPLIT, ",", "0") + Dim oString = "1,2,3,4" + Dim oExpected = "1" + + Dim rString = PostProcessing.Get_Nachbearbeitung_Wert(oString, oTable) + rString.Should.Be(oExpected) + End Sub + + + Sub Get_Nachbearbeitung_Wert_VBSPLIT_INDEX_3() + Dim oTable = GetDataTable(ClassPostprocessing.VBSPLIT, ",", "3") + Dim oString = "1,2,3,4" + Dim oExpected = "4" + + Dim rString = PostProcessing.Get_Nachbearbeitung_Wert(oString, oTable) + rString.Should.Be(oExpected) + End Sub + + + Sub Get_Nachbearbeitung_Wert_VBSPLIT_INDEX_5() + Dim oTable = GetDataTable(ClassPostprocessing.VBSPLIT, ",", "5") + Dim oString = "1,2,3,4" + Dim oExpected = "1,2,3,4" + + Dim rString = PostProcessing.Get_Nachbearbeitung_Wert(oString, oTable) + rString.Should.Be(oExpected) + End Sub + + + Sub Get_Nachbearbeitung_Wert_VBREPLACE() + Dim oTable = GetDataTable(ClassPostprocessing.VBREPLACE, ",", "_") + Dim oString = "1,2,3,4" + Dim oExpected = "1_2_3_4" + + Dim rString = PostProcessing.Get_Nachbearbeitung_Wert(oString, oTable) + rString.Should.Be(oExpected) + End Sub + + + Sub Get_Nachbearbeitung_Wert_VBREPLACE_NOT_EXISTING() + Dim oTable = GetDataTable(ClassPostprocessing.VBREPLACE, ";", "_") + Dim oString = "1,2,3,4" + Dim oExpected = "1,2,3,4" + + Dim rString = PostProcessing.Get_Nachbearbeitung_Wert(oString, oTable) + rString.Should.Be(oExpected) + End Sub + + + Sub Get_Nachbearbeitung_Wert_VBREPLACE_EMPTY_STRING() + Dim oTable = GetDataTable(ClassPostprocessing.VBREPLACE, "", "_") + Dim oString = "1,2,3,4" + Dim oExpected = "1,2,3,4" + + Dim rString = PostProcessing.Get_Nachbearbeitung_Wert(oString, oTable) + rString.Should.Be(oExpected) + End Sub + + + Sub Get_Nachbearbeitung_Wert_VBREPLACE_NOTHING1() + Dim oTable = GetDataTable(ClassPostprocessing.VBREPLACE, ",", Nothing) + Dim oString = "1,2,3,4" + Dim oExpected = "1,2,3,4" + + Dim rString = PostProcessing.Get_Nachbearbeitung_Wert(oString, oTable) + rString.Should.Be(oExpected) + End Sub + + Sub Get_Nachbearbeitung_Wert_VBREPLACE_NOTHING2() + Dim oTable = GetDataTable(ClassPostprocessing.VBREPLACE, Nothing, "_") + Dim oString = "1,2,3,4" + Dim oExpected = "1,2,3,4" + + Dim rString = PostProcessing.Get_Nachbearbeitung_Wert(oString, oTable) + rString.Should.Be(oExpected) + End Sub + + Private Function GetDataTable(pType As String, pText1 As String, Optional pText2 As String = "") As DataTable + Dim oTable As New DataTable() + oTable.Columns.Add("TYPE", GetType(String)) + oTable.Columns.Add("TEXT1", GetType(String)) + oTable.Columns.Add("TEXT2", GetType(String)) + oTable.Rows.Add(pType, pText1, pText2) + oTable.AcceptChanges() + + Return oTable + End Function + End Class + + +End Namespace + diff --git a/Global_Indexer.Test/Global_Indexer.Test.vbproj b/Global_Indexer.Test/Global_Indexer.Test.vbproj new file mode 100644 index 0000000..c5a362e --- /dev/null +++ b/Global_Indexer.Test/Global_Indexer.Test.vbproj @@ -0,0 +1,32 @@ + + + + Global_Indexer.Test + net6.0 + + false + true + + + + + + + + + + + + + + + + + ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + + + ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + + + + diff --git a/Global_Indexer/ClassInit.vb b/Global_Indexer/ClassInit.vb index c2e7cbe..058ee88 100644 --- a/Global_Indexer/ClassInit.vb +++ b/Global_Indexer/ClassInit.vb @@ -1,11 +1,10 @@ -Imports System.ComponentModel -Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Config Imports DigitalData.Modules.Windream -Imports DigitalData.Modules.Filesystem Imports DigitalData.Modules.Messaging Imports DigitalData.Modules.Database -Imports DLLLicenseManager +Imports DigitalData.Modules.Base + Public Class ClassInit Private Form As Form @@ -81,8 +80,8 @@ Public Class ClassInit Dim configResult As Boolean configResult = Load_BasicConfig() - FILESYSTEM = New File(LOGCONFIG) EMAIL = New Email2(LOGCONFIG) + FILESYSTEM = New FilesystemEx(LOGCONFIG) If configResult = False Then If USER_LANGUAGE = "de-DE" Then diff --git a/Global_Indexer/ClassPostprocessing.vb b/Global_Indexer/ClassPostprocessing.vb index 6339cfe..2da69b4 100644 --- a/Global_Indexer/ClassPostprocessing.vb +++ b/Global_Indexer/ClassPostprocessing.vb @@ -1,12 +1,19 @@ Imports System.Text.RegularExpressions +Imports DigitalData.Modules.Base +Imports DigitalData.Modules.Logging Public Class ClassPostprocessing + Inherits BaseClass - Private Const VBSPLIT = "VBSPLIT" - Private Const VBREPLACE = "VBREPLACE" - Private Const REGEXPRESSION = "REG. EXPRESSION" + Public Const VBSPLIT = "VBSPLIT" + Public Const VBREPLACE = "VBREPLACE" + Public Const REGEXPRESSION = "REG. EXPRESSION" - Public Shared Function Get_Nachbearbeitung_Wert(idxvalue As String, Datatable As DataTable) As String + Public Sub New(pLogConfig As LogConfig) + MyBase.New(pLogConfig) + End Sub + + Public Function Get_Nachbearbeitung_Wert(idxvalue As String, Datatable As DataTable) As String Dim oIndexValues As List(Of String) = idxvalue.Split(ClassConstants.VECTORSEPARATOR).ToList() Try @@ -14,9 +21,10 @@ Public Class ClassPostprocessing Dim oResult As New List(Of String) Dim oType As String = oDataRow.Item("TYPE").ToString.ToUpper + Logger.Info(" ...Nachbearbeitung mit [{0}]", oType) + Select Case oType Case VBSPLIT - LOGGER.Info(" ...Nachbearbeitung mit VBSPLIT") Dim oSeparator As String = oDataRow.Item("TEXT1") Dim oSplitIndex As Integer = 0 @@ -31,34 +39,31 @@ Public Class ClassPostprocessing Dim oFindString = oDataRow.Item("TEXT1") Dim oReplaceString = oDataRow.Item("TEXT2") - LOGGER.Info(" ...Nachbearbeitung mit VBREPLACE") - LOGGER.Info(" ...Ersetze '" & oFindString & "' mit '" & oReplaceString & "'") + Logger.Info(" ...Ersetze '" & oFindString & "' mit '" & oReplaceString & "'") For Each oIndexValue In oIndexValues Dim oReplaceResult = oIndexValue.Replace(oFindString, oReplaceString) oResult.Add(oReplaceResult) Next - Case REGEXPRESSION - LOGGER.Info(" ...Nachbearbeitung mit RegEx") + Case REGEXPRESSION Dim oRegexList As New List(Of Regex) Dim oRegex As New Regex(oDataRow.Item("TEXT1"), RegexOptions.IgnoreCase) oRegexList.Add(oRegex) For Each oIndexValue In oIndexValues - Dim oProcessedString = extractFromStringviaRE(oIndexValue, oRegexList) + Dim oProcessedString = ExtractFromStringWithRegex(oIndexValue, oRegexList) oResult.Add(oProcessedString) - LOGGER.Info(" ...Ergebnis des RegEx: " & oProcessedString) + Logger.Info(" ...Ergebnis des RegEx: " & oProcessedString) Next End Select oIndexValues = oResult Next Catch ex As Exception - MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Get_Nachbearbeitung_Wert:") - LOGGER.Info(" - Unvorhergesehener Unexpected error in Get_Nachbearbeitung_Wert - result: " & idxvalue & " - Fehler: " & vbNewLine & ex.Message) + Logger.Error(ex) End Try Return String.Join(ClassConstants.VECTORSEPARATOR, oIndexValues.ToArray) @@ -71,7 +76,7 @@ Public Class ClassPostprocessing ''' Eine Liste von Regular Expressions ''' Die Ergebnisgruppe, die die Adresse enthält ''' Eine Emailadresse oder Nothing, wenn keine der Regular Expressions ein Ergebnis lieferte. - Public Shared Function extractFromStringviaRE(SearchString As String, RegexList As List(Of Regex), Optional RegexGroup As Integer = 1) + Private Function ExtractFromStringWithRegex(SearchString As String, RegexList As List(Of Regex), Optional RegexGroup As Integer = 1) If IsNothing(SearchString) Then Return Nothing End If diff --git a/Global_Indexer/ModuleCURRENT.vb b/Global_Indexer/ModuleCURRENT.vb index fa9df1b..62df7ad 100644 --- a/Global_Indexer/ModuleCURRENT.vb +++ b/Global_Indexer/ModuleCURRENT.vb @@ -1,6 +1,6 @@ Imports DigitalData.Modules.Config Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.Filesystem +Imports DigitalData.Modules.Base Imports DigitalData.Modules.Messaging Module ModuleCURRENT @@ -16,8 +16,8 @@ Module ModuleCURRENT Public Property CONFIG As ConfigManager(Of ClassConfig) Public Property LOGCONFIG As LogConfig Public Property LOGGER As Logger - Public Property FILESYSTEM As File Public Property EMAIL As Email2 + Public Property FILESYSTEM As FilesystemEx Public Property FILE_HANDLER As ClassFileHandler Public Property FOLDER_WATCHER As ClassFolderWatcher diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb index 80ceb96..34ce4af 100644 --- a/Global_Indexer/frmAdministration.Designer.vb +++ b/Global_Indexer/frmAdministration.Designer.vb @@ -357,12 +357,20 @@ Partial Class frmAdministration GEANDERTWERLabel = New System.Windows.Forms.Label() GEAENDERTWANNLabel = New System.Windows.Forms.Label() CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl2.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl2.Panel1.SuspendLayout() + CType(Me.SplitContainerControl2.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl2.Panel2.SuspendLayout() Me.SplitContainerControl2.SuspendLayout() CType(Me.gridAssignedGroups, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.viewAssignedGroups, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.gridAvailableGroups, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.viewAvailableGroups, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl5, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl5.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl5.Panel1.SuspendLayout() + CType(Me.SplitContainerControl5.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl5.Panel2.SuspendLayout() Me.SplitContainerControl5.SuspendLayout() CType(Me.gridAssignedUsers, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.viewAssignedUsers, System.ComponentModel.ISupportInitialize).BeginInit() @@ -370,6 +378,10 @@ Partial Class frmAdministration CType(Me.gridAvailableUsers, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.viewAvailableUsers, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl4.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl4.Panel1.SuspendLayout() + CType(Me.SplitContainerControl4.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl4.Panel2.SuspendLayout() Me.SplitContainerControl4.SuspendLayout() CType(Me.GridControlProfile, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_DOKUMENTARTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -421,9 +433,15 @@ Partial Class frmAdministration resources.ApplyResources(Me.SplitContainerControl2, "SplitContainerControl2") Me.SplitContainerControl2.Horizontal = False Me.SplitContainerControl2.Name = "SplitContainerControl2" + ' + 'SplitContainerControl2.Panel1 + ' Me.SplitContainerControl2.Panel1.Controls.Add(Me.gridAssignedGroups) Me.SplitContainerControl2.Panel1.Controls.Add(Me.Label13) resources.ApplyResources(Me.SplitContainerControl2.Panel1, "SplitContainerControl2.Panel1") + ' + 'SplitContainerControl2.Panel2 + ' Me.SplitContainerControl2.Panel2.Controls.Add(Me.gridAvailableGroups) Me.SplitContainerControl2.Panel2.Controls.Add(Me.Label14) resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2") @@ -536,9 +554,15 @@ Partial Class frmAdministration resources.ApplyResources(Me.SplitContainerControl5, "SplitContainerControl5") Me.SplitContainerControl5.Horizontal = False Me.SplitContainerControl5.Name = "SplitContainerControl5" + ' + 'SplitContainerControl5.Panel1 + ' Me.SplitContainerControl5.Panel1.Controls.Add(Me.gridAssignedUsers) Me.SplitContainerControl5.Panel1.Controls.Add(Me.Label2) resources.ApplyResources(Me.SplitContainerControl5.Panel1, "SplitContainerControl5.Panel1") + ' + 'SplitContainerControl5.Panel2 + ' Me.SplitContainerControl5.Panel2.Controls.Add(Me.gridAvailableUsers) Me.SplitContainerControl5.Panel2.Controls.Add(Me.Label35) resources.ApplyResources(Me.SplitContainerControl5.Panel2, "SplitContainerControl5.Panel2") @@ -974,9 +998,15 @@ Partial Class frmAdministration ' resources.ApplyResources(Me.SplitContainerControl4, "SplitContainerControl4") Me.SplitContainerControl4.Name = "SplitContainerControl4" + ' + 'SplitContainerControl4.Panel1 + ' Me.SplitContainerControl4.Panel1.Controls.Add(Me.GridControlProfile) Me.SplitContainerControl4.Panel1.Controls.Add(Me.Label3) resources.ApplyResources(Me.SplitContainerControl4.Panel1, "SplitContainerControl4.Panel1") + ' + 'SplitContainerControl4.Panel2 + ' Me.SplitContainerControl4.Panel2.Controls.Add(Me.XtraTabControl1) resources.ApplyResources(Me.SplitContainerControl4.Panel2, "SplitContainerControl4.Panel2") Me.SplitContainerControl4.SplitterPosition = 224 @@ -2477,12 +2507,20 @@ Partial Class frmAdministration Me.Name = "frmAdministration" Me.Ribbon = Me.RibbonControl1 Me.StatusBar = Me.RibbonStatusBar1 + CType(Me.SplitContainerControl2.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl2.Panel1.ResumeLayout(False) + CType(Me.SplitContainerControl2.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl2.Panel2.ResumeLayout(False) CType(Me.SplitContainerControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl2.ResumeLayout(False) CType(Me.gridAssignedGroups, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.viewAssignedGroups, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.gridAvailableGroups, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.viewAvailableGroups, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControl5.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl5.Panel1.ResumeLayout(False) + CType(Me.SplitContainerControl5.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl5.Panel2.ResumeLayout(False) CType(Me.SplitContainerControl5, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl5.ResumeLayout(False) CType(Me.gridAssignedUsers, System.ComponentModel.ISupportInitialize).EndInit() @@ -2490,6 +2528,10 @@ Partial Class frmAdministration CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.gridAvailableUsers, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.viewAvailableUsers, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.SplitContainerControl4.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl4.Panel1.ResumeLayout(False) + CType(Me.SplitContainerControl4.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl4.Panel2.ResumeLayout(False) CType(Me.SplitContainerControl4, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl4.ResumeLayout(False) CType(Me.GridControlProfile, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index af96d28..c8d7647 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -258,6 +258,18 @@ Panel1 + + SplitContainerControl2.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl2 + + + 0 + Fill @@ -307,7 +319,7 @@ 170 - 1072, 246 + 1072, 245 88 @@ -357,8 +369,20 @@ Panel2 + + SplitContainerControl2.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl2 + + + 1 + - 1072, 561 + 1072, 560 88 @@ -437,7 +461,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOwDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -464,7 +488,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEcDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -488,7 +512,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4DAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -512,7 +536,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -533,7 +557,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -555,7 +579,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -574,7 +598,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4DAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -598,7 +622,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMcCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -620,7 +644,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABsDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -644,7 +668,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOgCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -667,7 +691,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -686,7 +710,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -708,7 +732,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -729,7 +753,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -748,7 +772,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4DAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -772,7 +796,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -794,7 +818,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -815,7 +839,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -834,7 +858,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4DAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -858,7 +882,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -880,7 +904,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -901,7 +925,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -920,7 +944,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4DAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -944,7 +968,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALMCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -966,7 +990,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGICAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -987,7 +1011,7 @@ - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADkDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -1049,7 +1073,7 @@ Grundeinstellungen - 1310, 157 + 1310, 158 0, 774 @@ -1132,6 +1156,18 @@ Panel1 + + SplitContainerControl5.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl5 + + + 0 + Fill @@ -1184,7 +1220,7 @@ 150 - 1072, 277 + 1072, 276 1 @@ -1237,8 +1273,20 @@ Panel2 + + SplitContainerControl5.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl5 + + + 1 + - 1072, 561 + 1072, 560 0 @@ -1259,7 +1307,7 @@ Fill - 0, 157 + 0, 158 127, 17 @@ -1270,22 +1318,22 @@ Fill - + True - + None - + None - + NoControl - + None - + Application @@ -1313,7 +1361,7 @@ 277 - 224, 587 + 224, 586 93 @@ -1369,6 +1417,18 @@ Panel1 + + SplitContainerControl4.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl4 + + + 0 + Fill @@ -2246,7 +2306,7 @@ Bottom - 0, 281 + 0, 280 True @@ -3262,7 +3322,7 @@ der Datei - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFcCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -4173,7 +4233,7 @@ der Datei - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHQHAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -5053,7 +5113,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADQDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -5485,7 +5545,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGcEAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -5940,7 +6000,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -6371,7 +6431,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOYDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -6397,7 +6457,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3, 4, 3, 4 - 1074, 587 + 1074, 586 Profil-Verwaltung @@ -6415,7 +6475,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 0 - 1076, 617 + 1076, 616 1 @@ -6431,7 +6491,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOsDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -6454,7 +6514,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1072, 561 + 1072, 560 Gruppen-Zuordnung @@ -6472,14 +6532,14 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 1 - 1074, 587 + 1074, 586 89 - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOoDAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -6502,7 +6562,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1072, 561 + 1072, 560 Benutzer-Zuordnung @@ -6533,7 +6593,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJkCAAAC77u/ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi @@ -6554,7 +6614,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3, 4, 3, 4 - 1074, 587 + 1074, 586 Profil-Zuordnung @@ -6586,8 +6646,20 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei Panel2 + + SplitContainerControl4.Panel2 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl4 + + + 1 + - 1310, 617 + 1310, 616 4 diff --git a/Global_Indexer/frmIndex.resx b/Global_Indexer/frmIndex.resx index e27071e..52b8762 100644 --- a/Global_Indexer/frmIndex.resx +++ b/Global_Indexer/frmIndex.resx @@ -610,7 +610,7 @@ DocumentViewer1 - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.9.1.0, Culture=neutral, PublicKeyToken=null SplitContainer1.Panel2 diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 48638e3..9aeab7b 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -3,16 +3,14 @@ Imports System.Text.RegularExpressions Imports System.Text Imports System.Security.AccessControl Imports System.Security.Principal -Imports System.DirectoryServices Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.Language Imports DigitalData.Controls.LookupGrid Imports DigitalData.GUIs.GlobalIndexer Imports DevExpress.XtraEditors.Controls Imports Limilabs.Mail -Imports Limilabs.Mail.Headers Imports DevExpress.XtraEditors Imports DigitalData.GUIs.Common +Imports DigitalData.Modules.Base Public Class frmIndex #Region "+++++ Variablen ++++++" @@ -49,6 +47,7 @@ Public Class frmIndex Private ReadOnly _Logger As Logger Private ReadOnly _FormHelper As FormHelper + Private ReadOnly _PostProcessing As ClassPostprocessing #End Region @@ -83,6 +82,7 @@ Public Class frmIndex ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. _Logger = LOGCONFIG.GetLogger() _FormHelper = New FormHelper(LOGCONFIG, Me) + _PostProcessing = New ClassPostprocessing(LOGCONFIG) Localizer.Active = New LookupGridLocalizer() End Sub @@ -524,7 +524,7 @@ Public Class frmIndex Dim DTNB As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & idxid & " AND VARIANT = 'ONLY FILE/FOLDER' ORDER BY SEQUENCE") If DTNB Is Nothing = False Then If DTNB.Rows.Count > 0 Then - value_post = ClassPostprocessing.Get_Nachbearbeitung_Wert(wert_in, DTNB) + value_post = _PostProcessing.Get_Nachbearbeitung_Wert(wert_in, DTNB) DR.Item("Indexwert") = wert_in DR.Item("Indexwert_File") = value_post End If @@ -534,7 +534,7 @@ Public Class frmIndex DTNB = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & idxid & " AND VARIANT = 'FILE AND INDEX' ORDER BY SEQUENCE") If DTNB Is Nothing = False Then If DTNB.Rows.Count > 0 Then - value_post = ClassPostprocessing.Get_Nachbearbeitung_Wert(wert_in, DTNB) + value_post = _PostProcessing.Get_Nachbearbeitung_Wert(wert_in, DTNB) DR.Item("Indexwert") = value_post End If End If @@ -551,7 +551,6 @@ Public Class frmIndex Try _Logger.Debug("#### Name_Generieren ####") Dim sql As String = "select VERSION_DELIMITER, FILE_DELIMITER FROM TBDD_MODULES WHERE GUID = 1" - Dim oFilesystem As New DigitalData.Modules.Filesystem.File(LOGCONFIG) Dim DT1 As DataTable = DATABASE_ECM.GetDatatable(sql) For Each row As DataRow In DT1.Rows FILE_DELIMITER = row.Item("FILE_DELIMITER") @@ -725,7 +724,7 @@ Public Class frmIndex End Select Next - CURRENT_NEWFILENAME = oFilesystem.GetCleanFilename(NewFileString) + CURRENT_NEWFILENAME = FILESYSTEM.GetCleanFilename(NewFileString) 'CURRENT_NEWFILENAME = ClassFilehandle.CleanFilename(NewFileString, "") CURRENT_NEWFILENAME = Path.Combine(oRAWZielordner, CURRENT_NEWFILENAME) @@ -1903,7 +1902,7 @@ Public Class frmIndex Dim AddNewItems As Boolean = oRow.Item("VKT_ADD_ITEM") Dim PreventDuplicates As Boolean = oRow.Item("VKT_PREVENT_MULTIPLE_VALUES") Dim oControlName As String = oRow.Item("NAME") - Dim oConnectionId = Utils.NotNull(oRow.Item("CONNECTION_ID"), 0) + Dim oConnectionId = oRow.ItemEx("CONNECTION_ID", 0) Dim oSQLSuggestion = oRow.Item("SUGGESTION") Dim oSQLResult = oRow.Item("SQL_RESULT") @@ -2030,9 +2029,9 @@ Public Class frmIndex LOGGER.Debug("Found [{0}] depending controls for [{1}]", oDatatable.Rows.Count, Control.Name) For Each oRow As DataRow In oDatatable.Rows - Dim oControlName As String = Utils.NotNull(oRow.Item("NAME"), "") - Dim oConnectionId As Integer = Utils.NotNull(oRow.Item("CONNECTION_ID"), -1) - Dim oControlSql As String = Utils.NotNull(oRow.Item("SQL_RESULT"), "") + Dim oControlName As String = oRow.ItemEx("NAME", "") + Dim oConnectionId As Integer = oRow.ItemEx("CONNECTION_ID", -1) + Dim oControlSql As String = oRow.ItemEx("SQL_RESULT", "") If oConnectionId = -1 Or oControlSql = String.Empty Then LOGGER.Warn("Missing SQL Query or ConnectionId for Control [{0}]! Continuing.", oControlName) @@ -2059,8 +2058,7 @@ Public Class frmIndex End If Dim oConnectionString = DATABASE_ECM.Get_ConnectionStringforID(SqlConnectionId) - 'Dim oDatatable As DataTable = ClassDatabase.Return_Datatable_CS(SqlCommand, oConnectionString) - Dim oDatatable As DataTable = DATABASE_ECM.GetDatatable(SqlCommand) + Dim oDatatable As DataTable = DATABASE_ECM.GetDatatableWithConnection(SqlCommand, oConnectionString) Dim oFoundControl As Control = Nothing For Each oControl As Control In pnlIndex.Controls @@ -2088,7 +2086,7 @@ Public Class frmIndex End If Select Case oFoundControl.GetType.Name - Case GetType(DevExpress.XtraEditors.TextEdit).Name + Case GetType(TextEdit).Name If oDatatable.Rows.Count > 0 Then Dim oFirstRow As DataRow = oDatatable.Rows.Item(0) @@ -2096,7 +2094,7 @@ Public Class frmIndex Dim oValue = oFirstRow.Item(0).ToString() LOGGER.Debug("Setting Value for TextEdit [{0}]: [{1}]", oFoundControl.Name, oValue) - DirectCast(oFoundControl, DevExpress.XtraEditors.TextEdit).Text = oValue + DirectCast(oFoundControl, TextEdit).Text = oValue End If End If Case GetType(LookupControl3).Name @@ -2177,19 +2175,19 @@ Public Class frmIndex End If ' 1. Schritt: Einfach-Indexe und Platzhalter ersetzen - For Each oAutoIndexRow As DataRow In oDatatable - _Logger.Info("Working on AutomaticIndex: " & oAutoIndexRow.Item("INDEXNAME") & "...") - Dim oSqlResult As String = Utils.NotNull(oAutoIndexRow.Item("SQL_RESULT"), "") - Dim oSqlActive As Boolean = Utils.NotNull(oAutoIndexRow.Item("SQL_ACTIVE"), False) - Dim oSqlConnectionId As Integer = Utils.NotNull(oAutoIndexRow.Item("CONNECTION_ID"), -1) - Dim oSqlProvider As String = Utils.NotNull(oAutoIndexRow.Item("SQL_PROVIDER"), "") + For Each oRow As DataRow In oDatatable + _Logger.Info("Working on AutomaticIndex: " & oRow.Item("INDEXNAME") & "...") + Dim oSqlResult As String = oRow.ItemEx("SQL_RESULT", "") + Dim oSqlActive As Boolean = oRow.ItemEx("SQL_ACTIVE", False) + Dim oSqlConnectionId As Integer = oRow.ItemEx("CONNECTION_ID", -1) + Dim oSqlProvider As String = oRow.ItemEx("SQL_PROVIDER", "") Dim oEndResult As New List(Of String) ' Wenn kein SQL Befehl vorhanden oder aktiv ist, ' versuchen wir, die Spalte VALUE zu ersetzen If oSqlResult = String.Empty Or oSqlActive = 0 Then Dim oPlaceholderResult As String - Dim oValue As String = Utils.NotNull(oAutoIndexRow.Item("VALUE"), "") + Dim oValue As String = oRow.ItemEx("VALUE", "") oPlaceholderResult = GetPlaceholderValue(oValue, CURRENT_WORKFILE, USER_SHORTNAME) @@ -2197,8 +2195,8 @@ Public Class frmIndex oValue = oPlaceholderResult End If - oAutoIndexRow.Item("Indexiert") = True - oAutoIndexRow.Item("Indexwert") = oValue + oRow.Item("Indexiert") = True + oRow.Item("Indexwert") = oValue Continue For End If @@ -2271,14 +2269,14 @@ Public Class frmIndex If oIsFirstMatch Then Exit For End If - oAutoIndexRow.Item("Indexiert") = True - oAutoIndexRow.Item("Indexwert") = String.Join(ClassConstants.VECTORSEPARATOR, oEndResult.ToArray) + oRow.Item("Indexiert") = True + oRow.Item("Indexwert") = String.Join(ClassConstants.VECTORSEPARATOR, oEndResult.ToArray) Next Else Dim oResult = GetAutomaticIndexSQLValue(oSqlResult, oSqlConnectionId, oSqlProvider) _Logger.Info("Got a simple SQLResult: " & oResult.ToString) - oAutoIndexRow.Item("Indexiert") = True - oAutoIndexRow.Item("Indexwert") = oResult + oRow.Item("Indexiert") = True + oRow.Item("Indexwert") = oResult End If Next @@ -2548,8 +2546,7 @@ Public Class frmIndex Private Function CreateFolderForIndex(DynamicFolderConfig As String) Try Dim oRootFolder As String = Path.GetDirectoryName(CURRENT_NEWFILENAME) - Dim oFilesystem As New DigitalData.Modules.Filesystem.File(LOGCONFIG) - + 'Dim oFilesystem As New Filesystem(LOGCONFIG) If DynamicFolderConfig <> String.Empty Then '###### @@ -2577,7 +2574,7 @@ Public Class frmIndex oManIndexValue = CDate(oManIndexValue).ToString("yyyyMMdd") End If - oManIndexValue = oFilesystem.GetCleanPath(oManIndexValue) + oManIndexValue = FILESYSTEM.GetCleanPath(oManIndexValue) 'oManIndexValue = ClassFilehandle.CleanFilename(oManIndexValue, "") DynamicFolderConfig = DynamicFolderConfig.Replace(oMatch.ToString, oManIndexValue) @@ -2599,7 +2596,7 @@ Public Class frmIndex _Logger.Info("Ergebnis/Wert für neuen Ordner: '" & oAutoIndexName & "'") If Not oAutoIndexValue = String.Empty Then - oAutoIndexValue = oFilesystem.GetCleanPath(oAutoIndexValue) + oAutoIndexValue = FILESYSTEM.GetCleanPath(oAutoIndexValue) 'oAutoIndexValue = ClassFilehandle.CleanFilename(oAutoIndexValue, "") If oAutoIndexValue = "EMPTY_OI" Then DynamicFolderConfig = DynamicFolderConfig.Replace(oMatch.ToString, "") @@ -2804,11 +2801,11 @@ Public Class frmIndex Dim DTFiles2Work As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')") If DTFiles2Work IsNot Nothing Then Dim err = False - For Each filerow As DataRow In DTFiles2Work.Rows - CURRENT_WORKFILE_GUID = filerow.Item("GUID") - CURRENT_WORKFILE = filerow.Item("FILENAME2WORK") - CURRENT_WORKFILE_HASH = Utils.NotNull(filerow.Item("FILE_HASH"), "") - DropType = filerow.Item("HANDLE_TYPE") + For Each oRow As DataRow In DTFiles2Work.Rows + CURRENT_WORKFILE_GUID = oRow.Item("GUID") + CURRENT_WORKFILE = oRow.Item("FILENAME2WORK") + CURRENT_WORKFILE_HASH = oRow.ItemEx("FILE_HASH", "") + DropType = oRow.Item("HANDLE_TYPE") If WORK_FILE() = False Then err = True diff --git a/Global_Indexer/frmSQLSuggestion.vb b/Global_Indexer/frmSQLSuggestion.vb index 27f7e29..1944ee2 100644 --- a/Global_Indexer/frmSQLSuggestion.vb +++ b/Global_Indexer/frmSQLSuggestion.vb @@ -1,5 +1,30 @@ -Imports Oracle.ManagedDataAccess.Client +Imports DigitalData.Modules.Logging +Imports Oracle.ManagedDataAccess.Client Public Class frmSQLSuggestion + Private _Logger As Logger + Private _PostProcessing As ClassPostprocessing + + Private Sub frmSQLSuggestion_Load(sender As Object, e As EventArgs) Handles Me.Load + Try + _Logger = LOGCONFIG.GetLogger() + _PostProcessing = New ClassPostprocessing(LOGCONFIG) + + 'TODO: Diese Codezeile lädt Daten in die Tabelle "MyDataset.TBDD_CONNECTION". Sie können sie bei Bedarf verschieben oder entfernen. + Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBDD_CONNECTIONTableAdapter.Fill(Me.MyDataset.TBDD_CONNECTION) + Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN) + If DT.Rows.Count = 1 Then + Me.cmbConnection.SelectedValue = DT.Rows(0).Item("CONNECTION_ID") + SQL_ERGEBNISTextBox.Text = DT.Rows(0).Item("SQL_RESULT") + SQL_UEBERPRUEFUNGTextBox.Text = DT.Rows(0).Item("SQL_CHECK") + End If + lblSave.Visible = False + Catch ex As Exception + _Logger.Error(ex) + MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Open Form:") + End Try + End Sub + Private Sub btnVorschlag_Click(sender As Object, e As EventArgs) Handles btnVorschlag.Click TestSQL(cmbConnection.SelectedValue, SQL_ERGEBNISTextBox.Text) End Sub @@ -88,28 +113,13 @@ Public Class frmSQLSuggestion End If Catch ex As Exception - LOGGER.Info(" - Unexpected error in TestSQL - Fehler: " & vbNewLine & ex.Message) - LOGGER.Error(ex) + _Logger.Info(" - Unexpected error in TestSQL - Fehler: " & vbNewLine & ex.Message) + _Logger.Error(ex) MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in TestSQL:") End Try End Sub - Private Sub frmSQLSuggestion_Load(sender As Object, e As EventArgs) Handles Me.Load - Try - 'TODO: Diese Codezeile lädt Daten in die Tabelle "MyDataset.TBDD_CONNECTION". Sie können sie bei Bedarf verschieben oder entfernen. - Me.TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString - Me.TBDD_CONNECTIONTableAdapter.Fill(Me.MyDataset.TBDD_CONNECTION) - Dim DT As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN) - If DT.Rows.Count = 1 Then - Me.cmbConnection.SelectedValue = DT.Rows(0).Item("CONNECTION_ID") - SQL_ERGEBNISTextBox.Text = DT.Rows(0).Item("SQL_RESULT") - SQL_UEBERPRUEFUNGTextBox.Text = DT.Rows(0).Item("SQL_CHECK") - End If - lblSave.Visible = False - Catch ex As Exception - MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Open Form:") - End Try - End Sub + Private Sub TBDD_CONNECTIONBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs) Me.Validate() @@ -131,10 +141,10 @@ Public Class frmSQLSuggestion Dim origConnection = DATABASE_ECM.GetScalarValue("SELECT CONNECTION_ID FROM TBDD_INDEX_MAN WHERE GUID = " & CURRENT_INDEXMAN) Dim insresultstring = SQL_ERGEBNISTextBox.Text.Replace("'", "''") Dim inscheckstring = SQL_UEBERPRUEFUNGTextBox.Text.Replace("'", "''") - If insresultstring <> origresultstring Or _ + If insresultstring <> origresultstring Or inscheckstring <> origcheckstring Then Dim cmd As String - cmd = "UPDATE TBDD_INDEX_MAN SET CONNECTION_ID = " & cmbConnection.SelectedValue & ",SQL_RESULT = '" & insresultstring & "',SQL_CHECK = '" & inscheckstring & "',CHANGED_WHO = '" & _ + cmd = "UPDATE TBDD_INDEX_MAN SET CONNECTION_ID = " & cmbConnection.SelectedValue & ",SQL_RESULT = '" & insresultstring & "',SQL_CHECK = '" & inscheckstring & "',CHANGED_WHO = '" & Environment.UserName & "' WHERE GUID = " & CURRENT_INDEXMAN If DATABASE_ECM.ExecuteNonQuery(cmd) = True Then If USER_LANGUAGE = "de-DE" Then @@ -157,6 +167,7 @@ Public Class frmSQLSuggestion End If End If Catch ex As Exception + _Logger.Error(ex) MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in Save SQl IndexMan:") End Try End Sub @@ -166,7 +177,7 @@ Public Class frmSQLSuggestion Dim DTNB As DataTable = DATABASE_ECM.GetDatatable("SELECT * FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE IDXMAN_ID = " & CURRENT_INDEXMAN & " ORDER BY SEQUENCE") If DTNB Is Nothing = False Then If DTNB.Rows.Count > 0 Then - Dim value As String = ClassPostprocessing.Get_Nachbearbeitung_Wert(txtTest_idxMan.Text, DTNB) + Dim value As String = _PostProcessing.Get_Nachbearbeitung_Wert(txtTest_idxMan.Text, DTNB) MsgBox("Der Rückgabewert - nach Durchlaufen von (" & DTNB.Rows.Count.ToString & ") Nachbearbeitungsfunktionen lautet: '" & value & "'", MsgBoxStyle.Exclamation) If USER_LANGUAGE = "de-DE" Then diff --git a/SetupVS19/Product.wxs b/SetupVS19/Product.wxs index cd236eb..e80aaa1 100644 --- a/SetupVS19/Product.wxs +++ b/SetupVS19/Product.wxs @@ -112,7 +112,6 @@ - @@ -140,6 +139,7 @@ +