Merge branch 'master' of http://dd-vmp07-com04:3000/SchreiberM/GlobalIndexer

Global_Indexer/ClassControls.vb

@@ -76,10 +76,19 @@ Public Class ClassControls
             }
 
             If Not String.IsNullOrEmpty(Vorgabe) Then
-                Dim oDefaultValues = Vorgabe.
+                Dim oDefaultValues As New List(Of String)
+
+                If Vorgabe.Contains(",") Then
+                    oDefaultValues = Vorgabe.
                         Split(",").ToList().
                         Select(Function(item) item.Trim()).
                         ToList()
+                Else
+                    oDefaultValues = Vorgabe.
+                        Split(ClassConstants.VECTORSEPARATOR).ToList().
+                        Select(Function(item) item.Trim()).
+                        ToList()
+                End If
                 oControl.SelectedValues = oDefaultValues
             End If
 
@@ -87,7 +96,7 @@ Public Class ClassControls
 
             oConnectionString = ClassFormFunctions.GetConnectionString(conid)
 
-            If oConnectionString IsNot Nothing Then
+            If oConnectionString IsNot Nothing And oSql.Length > 0 Then
                 LOGGER.Debug("Connection String (redacted): [{0}]", oConnectionString.Substring(0, 30))
 
                 If ClassPatterns.HasComplexPatterns(oSql) Then
@@ -388,7 +397,7 @@ Public Class ClassControls
                         Continue For
                     End If
 
-                    oControlSql = ClassPatterns.ReplaceUserValues(oControlSql, USER_PRENAME, USER_SURNAME, USER_SHORT_NAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_DOKART_ID)
+                    oControlSql = ClassPatterns.ReplaceUserValues(oControlSql, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_DOKART_ID)
                     oControlSql = ClassPatterns.ReplaceInternalValues(oControlSql)
                     oControlSql = ClassPatterns.ReplaceControlValues(oControlSql, Panel)
 

Global_Indexer/ClassDatabase.vb

@@ -18,7 +18,7 @@ Public Class ClassDatabase
             Return True
         Catch ex As Exception
             LOGGER.Info("Unexpected error in Database-Init: " & ex.Message)
-            LOGGER.Error(ex.Message)
+            LOGGER.Error(ex)
             Return False
         End Try
     End Function
@@ -95,7 +95,7 @@ Public Class ClassDatabase
                 If userInput = True Then
                     MsgBox("Error in Return_Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
                 End If
-                LOGGER.Info("Unexpected error in Return_Datatable: " & ex.Message)
+                LOGGER.Error(ex)
                 LOGGER.Info("#SQL: " & sql_command)
             End If
 
@@ -104,7 +104,7 @@ Public Class ClassDatabase
             If userInput = True Then
                 MsgBox("Error in Return Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
             End If
-            LOGGER.Info("Unexpected error in Return_Datatable: " & ex.Message)
+            LOGGER.Error(ex)
             LOGGER.Info("#SQL: " & sql_command)
             Return Nothing
         End Try
@@ -134,7 +134,7 @@ Public Class ClassDatabase
                 If userInput = True Then
                     MsgBox("Error in Return_Datatable_CS - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
                 End If
-                LOGGER.Info("Unexpected error in Return_Datatable_CS: " & ex.Message)
+                LOGGER.Error(ex)
                 LOGGER.Info("#SQL: " & sql_command)
             End If
 
@@ -143,7 +143,7 @@ Public Class ClassDatabase
             If userInput = True Then
                 MsgBox("Error in Return_Datatable_CS - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
             End If
-            LOGGER.Info("Unexpected error in Return_Datatable_CS: " & ex.Message)
+            LOGGER.Error(ex)
             LOGGER.Info("#SQL: " & sql_command)
             Return Nothing
         End Try
@@ -172,7 +172,7 @@ Public Class ClassDatabase
                 If userInput = True Then
                     MsgBox("Error in Execute non query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
                 End If
-                LOGGER.Info("Unexpected error in Execute_non_Query: " & ex.Message)
+                LOGGER.Error(ex)
                 LOGGER.Info("#SQL: " & sql_command)
             End If
 
@@ -181,12 +181,38 @@ Public Class ClassDatabase
             If userInput = True Then
                 MsgBox("Error in Execute non query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
             End If
-            LOGGER.Info("Unexpected error in Execute_non_Query: " & ex.Message)
+            LOGGER.Error(ex)
             LOGGER.Info("#SQL: " & sql_command)
 
             Return False
         End Try
     End Function
+    Public Shared Function Execute_non_Query_ConStr(ExecuteCMD As String, ConnString As String, Optional userInput As Boolean = False)
+        Try
+            Dim SQLconnect As New SqlClient.SqlConnection
+            Dim SQLcommand As SqlClient.SqlCommand
+            SQLconnect.ConnectionString = ConnString
+            SQLconnect.Open()
+            SQLcommand = SQLconnect.CreateCommand
+            'Update Last Created Record in Foo
+            SQLcommand.CommandText = ExecuteCMD
+            LOGGER.Debug("Execute_non_Query_ConStr Created: " & ExecuteCMD)
+            SQLcommand.ExecuteNonQuery()
+            SQLcommand.Dispose()
+            SQLconnect.Close()
+            Return True
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            If userInput = True Then
+                MsgBox("Error in Execute_non_Query_ConStr - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
+            End If
+            Clipboard.SetText("Error Execute_non_Query_ConStr: " & ex.Message & vbNewLine & "SQL: " & ExecuteCMD)
+            LOGGER.Info("Fehler bei Execute_non_Query_ConStr: " & ex.Message, True)
+            LOGGER.Info("#SQL: " & ExecuteCMD, False)
+
+            Return False
+        End Try
+    End Function
     Public Shared Function Execute_Scalar(sql_command As String, ConString As String, Optional userInput As Boolean = False)
         Dim result
         Try
@@ -212,7 +238,7 @@ Public Class ClassDatabase
                 If userInput = True Then
                     MsgBox("Error in Execute non query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
                 End If
-                LOGGER.Info("Unexpected error in Execute_non_Query: " & ex.Message)
+                LOGGER.Error(ex)
                 LOGGER.Info("#SQL: " & sql_command)
             End If
 
@@ -221,7 +247,7 @@ Public Class ClassDatabase
             If userInput = True Then
                 MsgBox("Error in Execute Scalar - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & sql_command, MsgBoxStyle.Critical)
             End If
-            LOGGER.Info("Unexpected error in Execute_Scalar: " & ex.Message)
+            LOGGER.Error(ex)
             LOGGER.Info("#SQL: " & sql_command)
             Return Nothing
         End Try
@@ -264,7 +290,7 @@ Public Class ClassDatabase
             If userInput = True Then
                 MsgBox("Error in OracleExecute_non_Query - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & ExecuteCMD, MsgBoxStyle.Critical)
             End If
-            LOGGER.Info("Unexpected error in OracleExecute_non_Query: " & ex.Message)
+            LOGGER.Error(ex)
             LOGGER.Info("#SQL: " & ExecuteCMD)
 
             Return False
@@ -289,7 +315,7 @@ Public Class ClassDatabase
             If userInput = True Then
                 MsgBox("Error in Oracle Return Datatable - Error-Message:" & vbNewLine & ex.Message & vbNewLine & "SQL-Command:" & vbNewLine & Select_anweisung, MsgBoxStyle.Critical)
             End If
-            LOGGER.Info("Unexpected error in Oracle_Return_Datatable: " & ex.Message)
+            LOGGER.Error(ex)
             LOGGER.Info("#SQL: " & Select_anweisung)
             Return Nothing
         End Try

Global_Indexer/ClassFilehandle.vb

@@ -39,6 +39,16 @@ Public Class ClassFilehandle
                     End If
                 End If
             End If
+
+            If filename.ToUpper.EndsWith(".LNK") Then
+                If USER_LANGUAGE = "de-DE" Then
+                    MsgBox("Verknüpfungen können nicht abgelegt werden!", MsgBoxStyle.Critical, "Global Indexer")
+                Else
+                    MsgBox("Shortcuts cannot be droppped!", MsgBoxStyle.Critical, "Global Indexer")
+                End If
+                Return False
+            End If
+
             Return Insert_GI_File(filename, handletype)
         Catch ex As Exception
             MsgBox("Unexpected Error in Decide_FileHandle: " & ex.Message, MsgBoxStyle.Critical)
@@ -94,7 +104,20 @@ Public Class ClassFilehandle
                     Else
                         attachment_name = attachment.LongFileName
                     End If
-                    If Not attachment_name.Contains("inline") Then
+                    If attachment.EmbeddedMessage IsNot Nothing Then
+                        attachment_name = ClassFilehandle.InvalidCharacters(attachment_name)
+                        tempfile = Path.Combine(Path.GetTempPath, attachment_name & ".msg")
+                        tempfile = ClassFilehandle.Versionierung_Datei(tempfile)
+
+                        If tempfile <> String.Empty Then
+                            Dim oMessage = attachment.EmbeddedMessage
+                            oMessage.Save(tempfile)
+                            TEMP_FILES.Add(tempfile)
+                            LOGGER.Info(">> Attachment (" & i1 & "):" & tempfile)
+                            erfolgreich = Insert_GI_File(tempfile, ATT_EXTR)
+                            i1 += 1
+                        End If
+                    ElseIf Not attachment_name.Contains("inline") Then
                         'Sonderzeichen entfernen
                         attachment_name = ClassFilehandle.InvalidCharacters(attachment_name)
                         tempfile = Path.Combine(Path.GetTempPath, attachment_name)

Global_Indexer/ClassIDBData.vb

@@ -0,0 +1,226 @@
+Public Class ClassIDBData
+    Public DTVWIDB_BE_ATTRIBUTE As DataTable
+    ''' <summary>
+    ''' Gets all indices by BusinessEntity.
+    ''' </summary>
+    ''' <param name="BusinessEntity">Title of Business Entity</param>
+    ''' <returns>Array with all Indices</returns>
+    ''' <remarks></remarks>
+    ''' 
+    Public Function Init()
+        Dim oSQL = $"SELECT * FROM VWIDB_BE_ATTRIBUTE"
+        DTVWIDB_BE_ATTRIBUTE = ClassDatabase.Return_Datatable_CS(oSQL, CONNECTION_STRING_IDB)
+    End Function
+    Public IDBSystemIndices As List(Of String)
+    Public Function GetIndicesByBE(ByVal BusinessEntity As String) As String()
+        Try
+            Dim aNames(4) As String
+            aNames(0) = "ObjectID"
+            aNames(1) = "IDBCreatedWhen"
+            aNames(2) = "IDBCreatedWho"
+            aNames(3) = "IDBChangedWhen"
+            aNames(4) = "IDBChangedWho"
+            IDBSystemIndices = aNames.ToList
+            ' Array für Indizes vorbereiten
+            Dim aIndexNames(DTVWIDB_BE_ATTRIBUTE.Rows.Count + 4) As String
+            Dim oCount As Integer = 0
+            aIndexNames(oCount) = "ObjectID"
+            oCount += 1
+            aIndexNames(oCount) = "IDBCreatedWhen"
+            oCount += 1
+            aIndexNames(oCount) = "IDBCreatedWho"
+            oCount += 1
+            aIndexNames(oCount) = "IDBChangedWhen"
+            oCount += 1
+            aIndexNames(oCount) = "IDBChangedWho"
+            For Each oRow As DataRow In DTVWIDB_BE_ATTRIBUTE.Rows
+                oCount += 1
+                aIndexNames(oCount) = oRow.Item("ATTR_TITLE")
+
+            Next
+
+
+            ' Indexarray sortiert zurückgeben
+            Array.Sort(aIndexNames)
+            ' Indexarray zurückgeben
+            Return aIndexNames
+
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            MsgBox(ex.Message, MsgBoxStyle.Critical, "Error getting the IDB Indicies")
+            Return Nothing
+        End Try
+    End Function
+    Public Function GetTypeOfIndex(ByVal indexname As String) As Integer
+        Try
+            For Each oRow As DataRow In DTVWIDB_BE_ATTRIBUTE.Rows
+                If oRow.Item("ATTR_TITLE") = indexname Then
+                    Dim oType = oRow.Item("TYP_ID")
+                    Return oType
+                End If
+            Next
+
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            Return Nothing
+        End Try
+
+    End Function
+    Public Function GetVariableValue(oAttributeName As String, Optional oIDBTyp As Integer = 0, Optional FromIDB As Boolean = False) As Object
+        Try
+            Dim oSingleAttribute As Boolean = True
+            Select Case oIDBTyp
+                Case 8
+                    oSingleAttribute = False
+                Case 9
+                    oSingleAttribute = False
+            End Select
+            Dim oAttributeValue
+
+            If oSingleAttribute = True And IDB_DT_DOC_DATA.Rows.Count = 1 And FromIDB = False Then
+                Try
+                    If oAttributeName = "IDBCreatedWhen" Then
+                        oAttributeName = "ADDED_WHEN"
+                    ElseIf oAttributeName = "IDBCreatedWho" Then
+                        oAttributeName = "ADDED_WHO"
+                    ElseIf oAttributeName = "IDBChangedWhen" Then
+                        oAttributeName = "CHANGED_WHEN"
+                    ElseIf oAttributeName = "IDBChangedWho" Then
+                        oAttributeName = "CHANGED_WHO"
+                    End If
+
+                    oAttributeValue = IDB_DT_DOC_DATA.Rows(0).Item(oAttributeName)
+                Catch ex As Exception
+                    LOGGER.Debug($"Error getting Attribute from IDB_DT_DOC_DATA: {ex.Message}")
+                End Try
+
+            End If
+            If Not IsNothing(oAttributeValue) Then
+                Return oAttributeValue
+            Else
+                LOGGER.Debug($"oAttributeValue for Attribute [{oAttributeName}] is so far nothing..Now trying FNIDB_PM_GET_VARIABLE_VALUE ")
+            End If
+            Dim oFNSQL = $"SELECT * FROM [dbo].[FNIDB_PM_GET_VARIABLE_VALUE] ({IDB_DOC_ID},'{oAttributeName}','{USER_LANGUAGE}',CONVERT(BIT,'{IDB_USES_WMFILESTORE}'))"
+            oAttributeValue = ClassDatabase.Return_Datatable_CS(oFNSQL, CONNECTION_STRING_IDB)
+            Dim odt As DataTable = oAttributeValue
+            If odt.Rows.Count = 1 Then
+                oAttributeValue = odt.Rows(0).Item(0)
+            End If
+            Return oAttributeValue
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            Return Nothing
+        End Try
+
+    End Function
+    Public Function Delete_Term_Object_From_Metadata(oAttributeName As String, oTerm2Delete As String) As Object
+        Try
+            Dim oAttributeValue
+            Dim oID_IS_FOREIGN As Integer
+            oID_IS_FOREIGN = 0
+            If IDB_USES_WMFILESTORE Then
+                oID_IS_FOREIGN = 1
+            End If
+            Dim oDELSQL = $"EXEC PRIDB_DELETE_TERM_OBJECT_METADATA {IDB_DOC_ID},'{oAttributeName}','{oTerm2Delete}','{USER_USERNAME}','{USER_LANGUAGE}',{oID_IS_FOREIGN}"
+            ClassDatabase.Execute_non_Query_ConStr(oDELSQL, CONNECTION_STRING_IDB)
+
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            Return Nothing
+        End Try
+
+    End Function
+    Public Function Delete_AttributeData(pIDB_OBJID As Int64, pAttributeName As String) As Object
+        Try
+            Dim oDELSQL = $"EXEC PRIDB_DELETE_ATTRIBUTE_DATA {pIDB_OBJID},'{pAttributeName}','{USER_USERNAME}'"
+            ClassDatabase.Execute_non_Query_ConStr(oDELSQL, CONNECTION_STRING_IDB)
+
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            Return Nothing
+        End Try
+
+    End Function
+
+    Public Function SetVariableValue(oAttributeName As String, oNewValue As Object, Optional CheckDeleted As Boolean = False, Optional oIDBTyp As Integer = 0)
+        Try
+            Dim omytype = oNewValue.GetType.ToString
+            If omytype = "System.Data.DataTable" Then
+                Dim oDTMyNewValues As DataTable = oNewValue
+                Dim oOldAttributeResult
+                Dim oTypeOldResult
+
+                If CheckDeleted = True Then
+                    oOldAttributeResult = GetVariableValue(oAttributeName, oIDBTyp)
+                    oTypeOldResult = oOldAttributeResult.GetType.ToString
+                    If oTypeOldResult = "System.Data.DataTable" Then
+                        Dim myOldValues As DataTable = oOldAttributeResult
+                        If myOldValues.Rows.Count > 1 Then
+
+                            'now Checking whether the old row still remains in Vector? If not it will be deleted as it cannot be replaced in multivalues
+                            For Each oOldValueRow As DataRow In myOldValues.Rows
+                                Dim oExists As Boolean = False
+                                For Each oNewValueRow As DataRow In oDTMyNewValues.Rows
+                                    Dim oInfo1 = $"Checking oldValue[{oOldValueRow.Item(0)}] vs NewValue [{oNewValueRow.Item(1)}]"
+                                    If oNewValueRow.Item(1).ToString.ToUpper = oOldValueRow.Item(0).ToString.ToUpper Then
+                                        oExists = True
+                                        Exit For
+                                    End If
+                                Next
+
+                                If oExists = False Then
+                                    Dim oInfo = $"Value [{oOldValueRow.Item(0)}] no longer existing in Vector-Attribute [{oAttributeName}] - will be deleted!"
+                                    LOGGER.Info(oInfo)
+                                    SetVariableValue(IDB_LOG_INDEX, oInfo)
+                                    Delete_Term_Object_From_Metadata(oAttributeName, oOldValueRow.Item(0))
+                                End If
+
+                            Next
+                        End If
+                    Else
+                        If oDTMyNewValues.Rows.Count > 1 Then
+                            Dim oExists As Boolean = False
+                            For Each oNewValueRow As DataRow In oDTMyNewValues.Rows
+                                Dim oInfo1 = $"Checking oldValue[{oOldAttributeResult}] vs NewValue [{oNewValueRow.Item(1)}]"
+                                If oNewValueRow.Item(1).ToString.ToUpper = oOldAttributeResult.ToString.ToUpper Then
+                                    oExists = True
+                                    Exit For
+                                End If
+                            Next
+                            If oExists = False Then
+                                Dim oInfo2 = $"Value [{oOldAttributeResult}] no longer existing in Vector-Attribute [{oAttributeName}] - will be deleted!"
+                                LOGGER.Info(oInfo2)
+                                SetVariableValue(IDB_LOG_INDEX, oInfo2)
+                                Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult)
+                            End If
+                        Else
+                            Dim oInfo = $"Value [{oOldAttributeResult}] of Attribute [{oAttributeName}] obviously was updated during runtime - will be deleted!"
+                            LOGGER.Info(oInfo)
+                            SetVariableValue(IDB_LOG_INDEX, oInfo)
+                            Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult)
+                        End If
+
+                    End If
+
+                End If
+
+                For Each oNewValueRow As DataRow In oDTMyNewValues.Rows
+                    Dim oSuccess As Boolean = False
+                    Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {IDB_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValueRow.Item(1).ToString}','{USER_LANGUAGE}',{IDB_DOC_ID},@OMD_ID = @NEW_OBJ_MD_ID OUTPUT"
+                    oSuccess = ClassDatabase.Execute_non_Query_ConStr(oFNSQL, CONNECTION_STRING_IDB)
+                    If oSuccess = False Then
+                        Return False
+                    End If
+                Next
+                Return True
+            Else
+                Dim oFNSQL = $"DECLARE @NEW_OBJ_MD_ID BIGINT " & vbNewLine & $"EXEC PRIDB_NEW_OBJ_DATA {IDB_DOC_ID},'{oAttributeName}','{USER_USERNAME}','{oNewValue}','{USER_LANGUAGE}',{IDB_DOC_ID},@OMD_ID = @NEW_OBJ_MD_ID OUTPUT"
+                Return ClassDatabase.Execute_non_Query_ConStr(oFNSQL, CONNECTION_STRING_IDB)
+            End If
+
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            Return False
+        End Try
+    End Function
+End Class

Global_Indexer/ClassInit.vb

@@ -2,15 +2,16 @@
 Imports DLLLicenseManager
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Config
+Imports DigitalData.Modules.Windream
 
 Public Class ClassInit
     Public _lizenzManager As ClassLicenseManager
-    Public Sub New()
-    End Sub
 
     Public Sub InitLogger()
         ClassLogger.Init("", Environment.UserName)
-        LOGCONFIG = New LogConfig(LogConfig.PathType.AppData)
+        LOGCONFIG = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing,
+                                  CompanyName:=My.Application.Info.CompanyName,
+                                  ProductName:=My.Application.Info.ProductName)
         LOGGER = LOGCONFIG.GetLogger("Globix")
         LOGGER.Info("Programmstart: " & Now)
         LOGGER.Info("Username: {0}", Environment.UserName)
@@ -70,6 +71,23 @@ Public Class ClassInit
             Else
                 Throw New Exception("Unexpected error while initializing basic-settings. More info in the log.")
             End If
+        Else
+            If IDB_ACTIVE = False Then
+                Try
+                    WINDREAM = New Windream(LOGCONFIG, False, WMDrive, "\\windream\objects", True, "", "", "", "")
+                    If Not IsNothing(WINDREAM) Then
+                        If WINDREAM.SessionLoggedin = True Then
+                            LOGGER.Debug("windream initialisiert")
+                        Else
+                            Throw New Exception("Could not create a windream session")
+                        End If
+                    End If
+                Catch ex As Exception
+                    LOGGER.Warn("CHECKING WMConnectivity: " & ex.Message)
+                    Throw New Exception("Unexpected error in CHECKING WMConnectivity")
+                End Try
+            End If
+
         End If
     End Sub
 
@@ -80,9 +98,12 @@ Public Class ClassInit
             Dim DT As DataTable = ClassDatabase.Return_Datatable(oSql)
             If DT.Rows.Count = 1 Then
                 GI_withWindream = DT.Rows(0).Item("BIT1")
-                vWLaufwerk = DT.Rows(0).Item("STRING1")
+                'vWLaufwerk = DT.Rows(0).Item("STRING1")
-
+            End If
-                DTTBGI_REGEX_DOCTYPE = ClassDatabase.Return_Datatable("SELECT T1.DOCTYPE as DocType, T.* FROM TBGI_REGEX_DOCTYPE T, VWGI_DOCTYPE T1 WHERE T.DOCTYPE_ID = T1.DOCTYPE_ID")
+            oSql = "select * from TBDD_BASECONFIG"
+            DT = ClassDatabase.Return_Datatable(oSql)
+            If DT.Rows.Count = 1 Then
+                WMDrive = DT.Rows(0).Item("WM_DRIVE")
                 Return True
             Else
                 Return False
@@ -200,36 +221,10 @@ Public Class ClassInit
     End Sub
     Public Sub InitUserLogin()
         Try
-            Dim sql = "SELECT MAX(GUID) FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('@user'))"
+            Dim oSql As String
-            sql = sql.Replace("@user", Environment.UserName)
-            ' LOGGER.Info(">> Username: " & Environment.UserName)
 
-            USER_ID = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
+            oSql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','GLOBIX',{1})", Environment.UserName, 1)
-            Try
+            Dim DT_CHECKUSER_MODULE As DataTable = ClassDatabase.Return_Datatable(oSql)
-                Dim USERID = CInt(USER_ID)
-            Catch ex As Exception
-                LOGGER.Info("User '" & Environment.UserName & "' not configured in Useradministration! (DBNull)")
-                LOGGER.Error(ex.Message)
-                'MsgBox("Achtung: Sie sind nicht in der Userverwaltung hinterlegt." & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
-                'Me.Close()
-                START_INCOMPLETE = True
-                Throw New Exception("You are not configured in the Useradministration." & vbNewLine & "Please contact the system administrator!")
-                Exit Sub
-            End Try
-
-            Dim oUserDatatable As DataTable = ClassDatabase.Return_Datatable($"SELECT * FROM TBDD_USER WHERE GUID = {USER_ID}")
-            If Not IsNothing(oUserDatatable) AndAlso Not IsDBNull(oUserDatatable.Rows.Item(0)) Then
-                Dim oRow As DataRow = oUserDatatable.Rows.Item(0)
-                USER_SHORT_NAME = NotNull(oRow.Item("SHORTNAME"), String.Empty)
-                USER_PRENAME = NotNull(oRow.Item("PRENAME"), String.Empty)
-                USER_SURNAME = NotNull(oRow.Item("NAME"), String.Empty)
-                USER_EMAIL = NotNull(oRow.Item("EMAIL"), String.Empty)
-                USER_USERNAME = NotNull(oRow.Item("USERNAME"), String.Empty)
-            End If
-
-            'Check_User_Exists_in_GIGroups()
-            sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','GLOBIX',{1})", Environment.UserName, 1)
-            Dim DT_CHECKUSER_MODULE As DataTable = ClassDatabase.Return_Datatable(sql)
             If DT_CHECKUSER_MODULE.Rows.Count = 0 Then
                 LOGGER.Info("DT_CHECKUSER_MODULE.Rows.Count = 0")
                 START_INCOMPLETE = True
@@ -238,7 +233,23 @@ Public Class ClassInit
                 Exit Sub
             End If
             If DT_CHECKUSER_MODULE.Rows.Count = 1 Then
+                If DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID") = 0 And IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME")) Then
+                    LOGGER.Info("User '" & Environment.UserName & "' not configured in Useradministration!")
+                    START_INCOMPLETE = True
+                    Throw New Exception("You are not configured in the Useradministration." & vbNewLine & "Please contact the system administrator!")
+                    Exit Sub
+                End If
                 USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
+                USER_ID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_ID")
+                USER_SURNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SURNAME"))
+                USER_PRENAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_PRENAME"))
+                USER_SHORTNAME = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME"))
+                USER_EMAIL = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"))
+                USER_LANGUAGE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE")
+                USER_IN_MODULE = DT_CHECKUSER_MODULE.Rows(0).Item("MODULE_ACCESS")
+                USER_IS_ADMIN = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
+                USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN")
+                ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE)
                 If USER_IN_MODULE = False Then
                     LOGGER.Info(" - User: " & Environment.UserName & " nicht für Modul freigegben!")
                     START_INCOMPLETE = True
@@ -262,22 +273,22 @@ Public Class ClassInit
                 End If
                 USER_LANGUAGE = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE")
 
-                sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')"
+                oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND UPPER(MODULE) = UPPER('Global-Indexer')"
-                ClassDatabase.Execute_non_Query(sql, True)
+                ClassDatabase.Execute_non_Query(oSql, True)
-                sql = "INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,MODULE) VALUES (" & USER_ID & ",'Global-Indexer')"
+                oSql = "INSERT INTO TBDD_USER_MODULE_LOG_IN (USER_ID,MODULE) VALUES (" & USER_ID & ",'Global-Indexer')"
-                ClassDatabase.Execute_non_Query(sql)
+                ClassDatabase.Execute_non_Query(oSql)
-                sql = "SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE Upper(MODULE) = UPPER('Global-Indexer')"
+                oSql = "SELECT COUNT(*) AS Expr1 FROM TBDD_USER_MODULE_LOG_IN WHERE Upper(MODULE) = UPPER('Global-Indexer')"
-                Dim anzahl = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
+                ' Dim anzahl = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
-                LOGGER.Info(" >> Anzahl Angemeldete User: " & anzahl.ToString)
+                'LOGGER.Info(" >> Anzahl Angemeldete User: " & anzahl.ToString)
-                UserLoggedin = CInt(anzahl)
+                ' UserLoggedin = CInt(anzahl)
-                UserLoggedin += 1
+                ' UserLoggedin += 1
-                If LICENSE_COUNT < UserLoggedin And LICENSE_EXPIRED = False Then
+                If LICENSE_COUNT < USERCOUNT_LOGGED_IN And LICENSE_EXPIRED = False Then
-                    MsgBox("Die Anzahl der aktuell angemeldeten User (" & UserLoggedin.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
+                    MsgBox("Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der aktuellen Lizenzen!" & vbNewLine & "Anzahl der Lizenzen: " & LICENSE_COUNT.ToString & vbNewLine & "Bitte setzen Sie sich mit dem Systembetreuer in Verbindung!", MsgBoxStyle.Critical, "Achtung:")
-                    LOGGER.Info(" >> Die Anzahl der aktuell angemeldeten User (" & UserLoggedin.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Global Indexer!")
+                    LOGGER.Info(" >> Die Anzahl der aktuell angemeldeten User (" & USERCOUNT_LOGGED_IN.ToString & ") überschreitet die Anzahl der Lizenzen (" & LICENSE_COUNT & ") für Global Indexer!")
                     If USER_IS_ADMIN = False Then
                         'Anmeldung wieder herausnehmen
-                        sql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'Global-Indexer'"
+                        oSql = "DELETE FROM TBDD_USER_MODULE_LOG_IN WHERE USER_ID = " & USER_ID & " AND MODULE= 'Global-Indexer'"
-                        ClassDatabase.Execute_non_Query(sql, True)
+                        ClassDatabase.Execute_non_Query(oSql, True)
                         LOGGER.Info(" - Wieder abgemeldet")
                         START_INCOMPLETE = True
                     End If

Global_Indexer/ClassParamRefresh.vb

@@ -0,0 +1,53 @@
+Public Class ClassParamRefresh
+    Public Shared Sub Refresh_Params(DT_CHECKUSER As DataTable)
+        If DT_CHECKUSER.Rows.Count = 1 Then
+            USERCOUNT_LOGGED_IN = DT_CHECKUSER.Rows(0).Item("USERCOUNT_LOGGED_IN")
+            Try
+                WORKING_MODE = DT_CHECKUSER.Rows(0).Item("WORKING_MODE")
+            Catch ex As Exception
+                WORKING_MODE = ""
+            End Try
+            'Try
+            '    ADDITIONAL_TITLE = DT_CHECKUSER.Rows(0).Item("ADDITIONAL_TITLE")
+            '    If ADDITIONAL_TITLE = String.Empty Then
+            '        ADDITIONAL_TITLE = My.Application.Info.ProductName
+            '    End If
+            'Catch ex As Exception
+            '    ADDITIONAL_TITLE = My.Application.Info.ProductName
+            'End Try
+
+            Dim oSplitWorkMode As String() = WORKING_MODE.Split("#")
+
+            ' Use For Each loop over words and display them.
+            Dim oMode As String
+            For Each oMode In oSplitWorkMode
+                LOGGER.Debug($"oWorkingMode Parameter: {oMode}")
+                If oMode.StartsWith("IDB_CONID!") Then
+                    Dim CON_ID = oMode.Replace("GLOBIX.IDB_CONID!", "")
+                    Dim oConString = ClassDatabase.Get_ConnectionString(CON_ID)
+                    CONNECTION_STRING_IDB = oConString
+                    Dim oSQL = $"SELECT * FROM TBIDB_ATTRIBUTE"
+                    Dim oDT As DataTable = ClassDatabase.Return_Datatable_CS(oSQL, CONNECTION_STRING_IDB)
+                    If Not IsNothing(oDT) Then
+                        If oDT.Rows.Count > 0 Then
+                            IDB_ACTIVE = True
+                        Else
+                            LOGGER.Warn($"Got an IDB-ConnID [{CON_ID}] but check DTAttribute.Row.Count is [{oDT.Rows.Count}]!!")
+                        End If
+                    Else
+                        LOGGER.Warn($"Got an IDB-ConnID [{CON_ID}] but check DT Attribute is Nothing!!")
+                    End If
+                ElseIf oMode.StartsWith("IDB.LOG_INDEX") Then
+                    IDB_LOG_INDEX = oMode.Replace("IDB.LOG_INDEX!", "")
+                    'ElseIf oMode.StartsWith("PM.COLORSCHEME") Then
+                    '    Dim oColorScheme = oMode.Replace("PM.COLORSCHEME=", "")
+                    '    RIBBON_COLOR_SCHEME = oColorScheme.ToUpper
+
+                Else
+                    LOGGER.Info($"Wrong oMode: {oMode}")
+                End If
+            Next
+
+        End If
+    End Sub
+End Class

Global_Indexer/ClassPatterns.vb

@@ -39,7 +39,7 @@ Public Class ClassPatterns
 
     Public Const MAX_TRY_COUNT = 500
 
-    Private Shared regex As Regex = New Regex("{#(\w+)#([\w\d\s_-]+)}+")
+    Private Shared regex As Regex = New Regex("{#(\w+)#([\.\w\d\s_-]+)}+")
     Private Shared allPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_IDBA, PATTERN_USER, PATTERN_INT}
     Private Shared complexPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_IDBA}
     Private Shared simplePatterns As New List(Of String) From {PATTERN_USER, PATTERN_INT}
@@ -176,7 +176,7 @@ Public Class ClassPatterns
                         Continue For
                     End If
 
-                    LOGGER.Debug("Getting control metadata from object: [{0}]", oControl?.Tag?.ToString())
+                    LOGGER.Debug("Getting control metadata from Control: [{0}]", oControl.Name)
 
                     If oControl.Tag Is Nothing Then
                         LOGGER.Warn("No Metadata object found for control [{0}]. Skipping.", oControl.Name)
@@ -231,7 +231,7 @@ Public Class ClassPatterns
                                     Case "INTEGER"
                                         oValue = String.Join(",", oLookupControl.SelectedValues)
                                     Case "VARCHAR"
-                                        Dim oWrapped = oLookupControl.SelectedValues.Select(Function(v) $"'{v}'")
+                                        Dim oWrapped = oLookupControl.SelectedValues
                                         oValue = String.Join(",", oWrapped)
                                     Case Else
                                         LOGGER.Warn("Lookup Control with [{0}] is not supported!", oFoundType)
@@ -257,7 +257,7 @@ Public Class ClassPatterns
 
                 oTryCounter += 1
             End While
-            LOGGER.Debug("sql after ReplaceControlValues: " & input)
+            LOGGER.Debug("input after ReplaceControlValues [{input}]")
             Return result
         Catch ex As Exception
             LOGGER.Error(ex)

Global_Indexer/ClassPostprocessing.vb

@@ -62,51 +62,6 @@ Public Class ClassPostprocessing
         End Try
 
         Return String.Join(ClassConstants.VECTORSEPARATOR, oIndexValues.ToArray)
-
-        'Dim result As String = idxvalue
-        'Try
-        '    For Each row As DataRow In Datatable.Rows
-        '        Select Case row.Item("TYPE").ToString.ToUpper
-        '            Case "VBSPLIT"
-        '                LOGGER.Info(" ...Nachbearbeitung mit VBSPLIT")
-        '                Dim strSplit() As String
-        '                strSplit = result.Split(row.Item("TEXT1"))
-        '                For i As Integer = 0 To strSplit.Length - 1
-        '                    If i = CInt(row.Item("TEXT2")) Then
-        '                        LOGGER.Info(" ...Split-Ergebnis für Index (" & i.ToString & "): " & strSplit(i))
-        '                        result = strSplit(i).ToString
-        '                    End If
-        '                Next
-        '            Case "VBREPLACE"
-        '                If LogErrorsOnly = False Then
-        '                    LOGGER.Info(" ...Nachbearbeitung mit VBREPLACE")
-        '                    LOGGER.Info(" ...Ersetze '" & row.Item("TEXT1") & "' mit '" & row.Item("TEXT2") & "'")
-        '                    result = result.Replace(row.Item("TEXT1"), row.Item("TEXT2"))
-        '                End If
-
-        '                result = result.Replace(row.Item("TEXT1"), row.Item("TEXT2"))
-        '            Case "REG. EXPRESSION"
-        '                LOGGER.Info(" ...Nachbearbeitung mit RegEx")
-        '                Dim RegexList As New List(Of System.Text.RegularExpressions.Regex)
-        '                Dim Regex As New System.Text.RegularExpressions.Regex(row.Item("TEXT1"), System.Text.RegularExpressions.RegexOptions.IgnoreCase)
-        '                RegexList.Add(Regex)
-        '                '
-        '                Dim resultRegex = ClassPostprocessing.extractFromStringviaRE(result, RegexList)
-        '                If Not IsNothing(resultRegex) Then
-        '                    LOGGER.Info(" ...Ergebnis des RegEx: " & resultRegex.ToString)
-        '                    result = resultRegex.ToString
-        '                Else
-        '                    LOGGER.Info("Postprocessing RegEx konnte kein Ergebnis auswerten!")
-        '                End If
-        '        End Select
-        '    Next
-        '    Return result
-        'Catch ex As Exception
-        '    LOGGER.Info(" - Unvorhergesehener Unexpected error in Get_Nachbearbeitung_Wert - result: " & result & " - Fehler: " & vbNewLine & ex.Message)
-        '    MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Get_Nachbearbeitung_Wert:")
-        '    Return result
-        'End Try
-
     End Function
 
     ''' <summary>

Global_Indexer/ClassWindream.vb

@@ -8,6 +8,7 @@ Imports WINDREAMLib.WMSearchRelation
 Imports WMOBRWSLib
 Imports WMOSRCHLib
 Imports System.IO
+Imports System.Text.RegularExpressions
 
 Public Class ClassWindream
 
@@ -18,6 +19,8 @@ Public Class ClassWindream
     Const VARIABLEN = 2
     Const WMObjectStreamOpenModeReadWrite = 2
 
+    Const STREAM_BinaryObject = "BinaryObject"
+
     Public Const WMObjectVariableValueTypeUndefined = 0
     Public Const WMObjectVariableValueTypeString = 1
     Public Const WMObjectVariableValueTypeInteger = 2
@@ -38,12 +41,12 @@ Public Class ClassWindream
 
 #Region "+++++ Variablen +++++"
     Public Shared oConnect ' der Typ darf nicht festgelegt werden (warum auch immer... geht sonst nicht)
-    Public Shared oSession 'As WINDREAMLib.WMSession ' der Typ darf nicht festgelegt werden (warum auch immer... geht sonst nicht)
+    Public Shared _session 'As WINDREAMLib.WMSession ' der Typ darf nicht festgelegt werden (warum auch immer... geht sonst nicht)
     Public Shared oBrowser As New WMOBRWSLib.ServerBrowser
-    Public Shared oDokumentTypen As WINDREAMLib.WMObjects
+    Public Shared _DocumentTypes As WINDREAMLib.WMObjects
-    Private oController As New WMOSearchController
+    Private _SearchController As New WMOSearchController
     Public Shared _WDObjekttyp As String
-    Private Shared aktWMObject As WINDREAMLib.WMObject
+    Private Shared _currentWMObject As WINDREAMLib.WMObject
 #End Region
 
 
@@ -71,13 +74,13 @@ Public Class ClassWindream
                 Dim ProfileName = wdfLocation.Substring(wdfLocation.LastIndexOf("\") + 1)
                 Dim ProfilePath = wdfLocation.Substring(0, wdfLocation.Length - ProfileName.Length)
 
-                oController = New WMOSearchController
+                _SearchController = New WMOSearchController
 
-                Me.oController.CheckSearchProfile(wdfLocation.ToLower)
+                Me._SearchController.CheckSearchProfile(wdfLocation.ToLower)
-                Dim suchTyp = Me.oController.SearchProfileTargetProgID
+                Dim suchTyp = Me._SearchController.SearchProfileTargetProgID
                 Dim ExSettings As Object
                 Dim oSearch As Object
-                ExSettings = Me.oController.SearchProfileExSettings
+                ExSettings = Me._SearchController.SearchProfileExSettings
                 If ExSettings = 0 Then ExSettings = 7
 
                 Dim srchQuick As WMOSRCHLib.WMQuickSearch = CreateObject("WMOSrch.WMQuickSearch")
@@ -195,7 +198,7 @@ Public Class ClassWindream
         Try
             Try
                 ' Session-Objekt instanziieren und mit dem im Client ausgewählten Server belegen
-                oSession = CreateObject("Windream.WMSession", GetCurrentServer)
+                _session = CreateObject("Windream.WMSession", GetCurrentServer)
                 LOGGER.Info(" ...windream-Server: '" & GetCurrentServer() & "'")
                 ' Connection-Objekt instanziieren
                 oConnect = CreateObject("Windream.WMConnect")
@@ -224,8 +227,8 @@ Public Class ClassWindream
                 ' oConnect.Password "windream"
 
                 ' Verbindung mit Session-Objekt (und dem ausgewählten Server) aufbauen
-                oConnect.LoginSession(oSession)
+                oConnect.LoginSession(_session)
-                If oSession.aLoggedin = False Then
+                If _session.aLoggedin = False Then
                     MsgBox("Es konnte keine Verbindung mit dem windream-Server hergestellt werden", MsgBoxStyle.Exclamation, "Verbindung konnte nicht hergestellt werden")
                     Return False
                 End If
@@ -251,10 +254,10 @@ Public Class ClassWindream
                 'MsgBox(WMCtrl.WMServerName)
 
                 Try
-                    oSession.SwitchEvents(WMCOMEventWMSessionNeedIndex, False)
+                    _session.SwitchEvents(WMCOMEventWMSessionNeedIndex, False)
                     ' der Parameter WMEntityDocument definiert, dass nur Dokumenttypen und keine 
                     ' Ordnertypen ausgelesen werden
-                    oDokumentTypen = oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
+                    _DocumentTypes = _session.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
                 Catch ex As Exception
                     Return False
                 End Try
@@ -288,80 +291,18 @@ Public Class ClassWindream
     ''' <remarks></remarks>
     Public Shared Function GetObjecttypesAsObjects() As WMObjects
         Try
-            Return oDokumentTypen
+            Return _DocumentTypes
         Catch ex As Exception
             MsgBox("Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Unexpected error inm Auslesen der Objekttypen")
             Return Nothing
         End Try
     End Function
 
-    ''' <summary>
-    ''' Liefert alle Objekttypen des aktuellen Servers als Array aus Strings.
-    ''' </summary>
-    ''' <returns>Array mit allen Objekttypen als Strings</returns>
-    ''' <remarks></remarks>
-    Public Function GetObjecttypesAsStrings() As String()
 
-        Try
-            Dim objektTypenStr(Me.oDokumentTypen.Count) As String
-
-            For i As Integer = 0 To Me.oDokumentTypen.Count
-                objektTypenStr(i) = Me.oDokumentTypen.Item(i).aName
-            Next
-
-            Return objektTypenStr
-
-        Catch ex As Exception
-            MsgBox("Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Unexpected error inm Auslesen der Objekttypen als String")
-            Return Nothing
-        End Try
-
-    End Function
-    Public Function GetTypeOfIndex(ByVal indexname As String) As Integer
-        Try
-            Dim oAttribute = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname)
-            Dim vType = oAttribute.getVariableValue("dwAttrType")
-            Return vType
-        Catch ex As Exception
-            Return Nothing
-        End Try
-    End Function
-    Public Shared Function GetSystemIndices(ByVal name As String)
-        Dim oObjectType As WMObject
-        ' den Objekttyp laden
-        oObjectType = oSession.GetWMObjectByName(WMEntityObjectType, name)
-
-
-        Dim msg As String
-        Dim oSystemIndexes = oObjectType.GetVariableNames(1, False)
-        msg = "System indices (internal column names): " & vbNewLine
-        For Each oSystemIndex In oSystemIndexes
-            msg = msg & vbNewLine & oSystemIndex
-        Next
-        MsgBox(msg)
-
-
-    End Function
-    Public Shared Function GetTypIndexNames(ByVal name As String)
-        Dim oObjectType As WMObject
-        ' den Objekttyp laden
-        oObjectType = oSession.GetWMObjectByName(WMEntityObjectType, name)
-
-
-        Dim msg As String
-        Dim oSystemIndexes = oObjectType.GetVariableNames(2, False)
-        msg = "Type Indices (type Index names): " & vbNewLine
-        For Each oSystemIndex In oSystemIndexes
-            msg = msg & vbNewLine & oSystemIndex
-        Next
-        MsgBox(msg)
-
-
-    End Function
     ''' <summary>
     ''' Liefert alle Indexe eines Objekttypen.
     ''' </summary>
-    ''' <param name="name">Name des Objekttyps</param>
+    ''' <param name="Objecttype_name">Name des Objekttyps</param>
     ''' <returns>Array mit allen Objekttyp zugeordneten Indexen als String</returns>
     ''' <remarks></remarks>
     Public Shared Function GetIndicesByObjecttype(ByVal Objecttype_name As String) As String()
@@ -373,7 +314,7 @@ Public Class ClassWindream
             Dim oRelProperties As WMObjectRelationClass
 
             ' den Objekttyp laden
-            oObjectType = oSession.GetWMObjectByName(WMEntityObjectType, Objecttype_name)
+            oObjectType = _session.GetWMObjectByName(WMEntityObjectType, Objecttype_name)
 
             ' Beziehung zu Indizes des Objekttyp auslesen
             oIndexAttributes = oObjectType.GetWMObjectRelationByName("TypeAttributes")
@@ -406,31 +347,6 @@ Public Class ClassWindream
             Return Nothing
         End Try
     End Function
-    ''' <summary>
-    ''' Liefert einen Objekttyp als WMObject an Hand dessen Name.
-    ''' </summary>
-    ''' <param name="objekttypName">Name des Objekttyps</param>
-    ''' <returns>Objekttyp als WMObject</returns>
-    ''' <remarks></remarks>
-    Public Function GetObjecttypeByName(ByVal objekttypName As String) As WMObject
-        Try
-            ' alle Objekttypen auslesen
-            Dim oObjectTypes As WMObjects = Me.oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument)
-
-            ' alle Objekttypen durchlaufen und nach dem mit dem angegebenen Namen suchen
-            For Each oObjectType As WMObject In oObjectTypes
-                If oObjectType.aName = objekttypName Then
-                    Return oObjectType
-                End If
-            Next
-
-            Return Nothing
-
-        Catch ex As Exception
-            MsgBox("Es konnte ein Objekttyp nicht erstellt werden." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Exclamation, "Objekttyp konnte nicht erstellt werden")
-            Return Nothing
-        End Try
-    End Function
 
     ''' <summary>
     ''' Überprüft ob der angegebene Index im Objekttyp existiert
@@ -467,7 +383,7 @@ Public Class ClassWindream
     ''' <remarks></remarks>
     Public Shared Function IsLoggedIn() As Boolean
         Try
-            Return oSession.aLoggedin
+            Return _session.aLoggedin
         Catch ex As Exception
             MsgBox("Es konnte nicht erfolgreich geprüft werden, ob das Programm am windream-Server angemeldted ist." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Unexpected error in Loggedin-Prüfung")
         End Try
@@ -490,119 +406,52 @@ Public Class ClassWindream
         Return ""
     End Function
 
-
-    ''' <summary>
-    ''' Liefert das Windream-Laufwerk des windream-Servers, in Form '[Laufwerksbuchstabe]:'. (z.B. 'W:')
-    ''' </summary>
-    ''' <returns>Laufwerksbuchstabe mit Doppelpunkt als String</returns>
-    ''' <remarks></remarks>
-    'Public Function GetWindreamDriveLetter() As String
-
-    '    Try
-    '        Dim oControl As AISCONTROLDATACOMLib.AISControlData
-    '        Dim sDrive As String = ""
-
-    '        oControl = New AISCONTROLDATACOMLib.AISControlData
-
-    '        sDrive = oControl.GetStringValue(&H10040003)
-
-    '        Return sDrive & ":"
-
-    '    Catch ex As Exception
-    '        MsgBox("Fehlernachricht: " & ex.Message, MsgBoxStyle.Critical, "Unexpected error inm Auslesen des windream-Laufwerks")
-    '    End Try
-
-    '    Return ""
-    'End Function
-
-    ''' <summary>
-    ''' Liefert den Typen eines Indexes als Integer.
-    ''' </summary>
-    ''' <param name="indexname">Name des zu überprüfenden Indexfeldes</param>
-    ''' <returns>Liefert eine Zahl, die einen Typen beschreibt</returns>
-    ''' <remarks></remarks>
-
-    Public Function GetValuesfromAuswahlliste(ByVal _auswahlliste As String) As Object
-        Try
-            'Dim oAttribute = Me.oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname)
-            'Dim vType = oAttribute.getVariableValue("vItems")
-            'Return vType
-            Dim oChoiceList = oSession.GetWMObjectByName(WMEntityChoiceList, _auswahlliste)
-            If Err.Number = 0 And TypeName(oChoiceList) <> "Nothing" Then
-                Dim Values = oChoiceList
-                Values = oChoiceList.GetVariableValue("vItems")
-                Dim anz As Integer = 0
-
-                For Each CLItem In Values
-                    If oChoiceList.aName IsNot Nothing Then
-                        anz += 1
-                    End If
-                Next
-                Dim strListe(anz - 1)
-                Dim zahl As Integer = 0
-                For Each CLItem In Values
-                    If oChoiceList.aName IsNot Nothing Then
-                        strListe(zahl) = CLItem
-                        zahl += 1
-                    End If
-                Next
-                Return strListe
-            Else
-                MsgBox("Auswahlliste: " & _auswahlliste & " nicht gefunden!", MsgBoxStyle.Critical, "Fehler:")
-                Return Nothing
-            End If
-
-        Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler in GetValuesfromAuswahlliste:")
-            Return Nothing
-        End Try
-    End Function
 #End Region
-    Public Shared Function Stream_File(ByVal filenameQuelle As String, ByVal newfilename As String)
+    Public Shared Function Stream_File(ByVal SourceFilePath As String, ByVal NewFileName As String)
-        On Error Resume Next
+        _currentWMObject = Nothing
-        aktWMObject = Nothing
+
-        Dim Zielverzeichnis As String = Path.GetDirectoryName(newfilename)
+        Dim oWindreamFilename As String = NewFileName
-        If My.Computer.FileSystem.DirectoryExists(Zielverzeichnis) = False Then
+        Dim oFileName As String = NewFileName
-            My.Computer.FileSystem.CreateDirectory(Zielverzeichnis)
+        Dim oWDriveRegex As New Regex("^\w{1}:")
+
+        If oWDriveRegex.IsMatch(NewFileName) Then
+            oFileName = oWDriveRegex.Replace(NewFileName, vWLaufwerk)
+            oWindreamFilename = oWDriveRegex.Replace(NewFileName, String.Empty)
+        Else
+            oWindreamFilename = NewFileName.Replace(vWLaufwerk, String.Empty)
+        End If
+
+        'If NewFileName.StartsWith("W:") Then
+        '    oFileName = NewFileName.Replace("W:", vWLaufwerk)
+        '    oWindreamFilename = NewFileName.Replace("W:", String.Empty)
+        'Else
+        '    oWindreamFilename = NewFileName.Replace(vWLaufwerk, String.Empty)
+        'End If
+
+        Dim oSourceFilename As String = Path.GetFileName(SourceFilePath)
+        Dim oDestination As String = Path.GetDirectoryName(oFileName)
+
+        If My.Computer.FileSystem.DirectoryExists(oDestination) = False Then
+            My.Computer.FileSystem.CreateDirectory(oDestination)
             LOGGER.Info(" - Zielverzeichnis neu erzeugt!")
         End If
 
-        Const STREAM_BinaryObject = "BinaryObject"
-
         LOGGER.Info(" ...Stream_File wurde gestartet")
-        Dim windreamFilename As String = ""
+
         ' Objekt für Datei und Zielverzeichnis anlegen
-        Dim Quelldatei_Name As String = Path.GetFileName(filenameQuelle)
+
 
         LOGGER.Info(" ...Quelldatei gelesen")
-        '"Version-KZ entfernen
-        newfilename = newfilename.Replace("\\", "\")
-        windreamFilename = newfilename.Substring(2)
-        If windreamFilename.Contains("[%Version]") Then
-            windreamFilename = windreamFilename.Replace("[%Version]", "")
-            newfilename = windreamFilename
-        End If
 
-        If My.Computer.FileSystem.DirectoryExists(Zielverzeichnis) Then
+        If My.Computer.FileSystem.DirectoryExists(oDestination) Then
             LOGGER.Info(" ...targetPath existiert")
             ' Überprüfen ob der zu Kopieren notwendige Speicherplatz auf Ziellaufwerk vorhanden ist
-            Dim dvr As New DriveInfo(vWLaufwerk & ":")
-            Dim freeSpace = dvr.TotalFreeSpace
 
-            Dim info As New FileInfo(filenameQuelle)
+            Dim oFileInfo As New FileInfo(SourceFilePath)
-            ' Get length of the file.
+            Dim oFileLength As Long = oFileInfo.Length
-            Dim length As Long = info.Length
-            If freeSpace < length Then
-                If USER_LANGUAGE = "de-DE" Then
-                    MsgBox("Auf dem Zielverzeichnis ist nicht genug Speicherplatz zum Übertragen frei.", MsgBoxStyle.Exclamation, "Nicht genug Speicherplatz")
-                Else
-                    MsgBox("Not enough diskspace in Target-Directory.", MsgBoxStyle.Exclamation, "Not enough diskspace")
-                End If
 
-                Return -10
-            End If
 
-            LOGGER.Info(" ...Datei kopieren von '" & filenameQuelle & "' nach '" & newfilename & "'.")
+            LOGGER.Info(" ...Datei kopieren von '" & SourceFilePath & "' nach '" & NewFileName & "'.")
             Dim Connect
             Dim Session
             Dim WMObject
@@ -613,13 +462,6 @@ Public Class ClassWindream
             LOGGER.Info(" ...Connect definieren:  CreateObject('Windream.WMConnect')")
             Connect = CreateObject("Windream.WMConnect")
             aFileIO = New WMOTOOLLib.WMFileIO
-            'If My.Settings.DLL_WMOTOOL = "" Then
-            '    aFileIO = New WMOTOOLLib.WMFileIO
-            '    LOGGER.Info(" ...Direkter Verweis auf New WMOTOOLLib.WMFileIO")
-            'Else
-            '    aFileIO = CreateObject(My.Settings.DLL_WMOTOOL) 'WMOTool.WMFileIO oder WMOTOOLLib.WMFileIO
-            '    LOGGER.Info(" ...Verwendeter Verweis aus Anwendungsstring: '" & My.Settings.DLL_WMOTOOL & "'")
-            'End If
 
             wmbrwsr = CreateObject("WMOBrws.ServerBrowser")
             '==================================================================
@@ -642,7 +484,7 @@ Public Class ClassWindream
                 LOGGER.Info(" >> Login on dms-Server failed")
                 ' MsgBox("Login failed. ")
             End If
-            oSession = Session
+            _session = Session
             Const WMCOMEventWMSessionNeedIndex = 1
 
             'windream Objekte erstellen ohne Indexierungs-Event
@@ -650,10 +492,10 @@ Public Class ClassWindream
             '==================================================================
             ' check if files exist
             '==================================================================
-            LOGGER.Info(" ...ÜBERPRÜFTER DATEINAME => " & windreamFilename)
+            LOGGER.Info(" ...ÜBERPRÜFTER DATEINAME => " & oWindreamFilename)
             Dim wdFilexists As Boolean
             LOGGER.Info(" ...Versuch auf die Datei in W: zuzugreifen und zu sperren...")
-            wdFilexists = Session.WMObjectExists(WMEntityDocument, windreamFilename, 0, 0)
+            wdFilexists = Session.WMObjectExists(WMEntityDocument, oWindreamFilename, 0, 0)
             Err.Clear()
             If wdFilexists = False Then
                 LOGGER.Info(" ...Datei ist NICHT vorhanden, kann also einfach neu angelegt werden")
@@ -661,7 +503,7 @@ Public Class ClassWindream
                 '==================================================================
                 ' create an object
                 '==================================================================
-                WMObject = Session.GetNewWMObjectFS(WMEntityDocument, windreamFilename, WMObjectEditModeObject) 'WMEntityDocument, windreamFilename, WMObjectEditModeObject
+                WMObject = Session.GetNewWMObjectFS(WMEntityDocument, oWindreamFilename, WMObjectEditModeObject) 'WMEntityDocument, windreamFilename, WMObjectEditModeObject
                 If Err.Number > 0 Then
                     LOGGER.Info(" FEHLER: WMObject konnte nicht erzeugt werden - Error: '" & Err.Description & "'")
                     'MsgBox(Err.Description)
@@ -670,43 +512,54 @@ Public Class ClassWindream
             Else
                 ' wenn auf die Datei zugeriffen werden konnte ist sie bereits vorhanden -> Datum anhängen
                 LOGGER.Info(" ...Es konnte zugegriffen werden -> DATEI IST BEREITS VORHANDEN")
-                If CURRENT_DOKART_DUPLICATE_HANDLING = "Default" Or CURRENT_DOKART_DUPLICATE_HANDLING = "Question" Then
+
-                    ''##########
+
-                    Dim msg = String.Format("Eine Datei mit identischem Namen " & vbNewLine & "'{0}'" & vbNewLine & "existiert bereits!" & vbNewLine & "Wollen Sie die bestehende Datei ersetzen?", newfilename)
+                Select Case CURRENT_DOKART_DUPLICATE_HANDLING
+
+                    Case "New version"
+                        LOGGER.Info("Creating new version of file [{0}]", NewFileName)
+                        oWindreamFilename = ClassFilehandle.Versionierung_Datei(NewFileName).ToString.Substring(2)
+                        CURRENT_NEWFILENAME = oWindreamFilename
+                    Case "Question"
+                        Dim oMessage = $"Eine Datei mit identischem Namen {vbNewLine}'{NewFileName}'{vbNewLine}existiert bereits!{vbNewLine}Wollen Sie die bestehende Datei ersetzen?"
                         If USER_LANGUAGE <> "de-DE" Then
-                        msg = "There is already a file with the same name! Would You like to replace the file?"
+                            oMessage = $"There is already a file with the name {NewFileName}!{vbNewLine}Would You like to replace the file?"
                         End If
-                    Dim result As MsgBoxResult
+
-                    result = MessageBox.Show(msg, "File alredy exists:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+                        Dim oResult = MessageBox.Show(oMessage, "File exists", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-                    If result = MsgBoxResult.No Then
+
-                        windreamFilename = ClassFilehandle.Versionierung_Datei(newfilename).ToString.Substring(2)
+                        If oResult = DialogResult.No Then
+                            oWindreamFilename = ClassFilehandle.Versionierung_Datei(NewFileName).ToString.Substring(2)
                         Else
-                        If Delete_WDFile(windreamFilename) = False Then
+                            If Delete_WDFile(oWindreamFilename) = False Then
                                 Return False
                             End If
                         End If
-                ElseIf CURRENT_DOKART_DUPLICATE_HANDLING = "New version" Then
+                    Case Else
-                    windreamFilename = ClassFilehandle.Versionierung_Datei(newfilename).ToString.Substring(2)
+                        If Delete_WDFile(oWindreamFilename) = False Then
+                            Return False
                         End If
-                WMObject = Session.GetNewWMObjectFS(1, windreamFilename, 31) 'WMEntityDocument, windreamFilename, WMObjectEditModeObject
+                End Select
+
+                WMObject = Session.GetNewWMObjectFS(1, oWindreamFilename, 31) 'WMEntityDocument, windreamFilename, WMObjectEditModeObject
                 If Err.Number > 0 Then
                     LOGGER.Info(" FEHLER: Neues WMObject (Kopie) konnte nicht erzeugt werden - Error: '" & Err.Description & "'")
                     'MsgBox(Err.Description)
                 End If
                 LOGGER.Info(" ...WMObject zugewiesen")
             End If
-            LOGGER.Info(" ...ENDGÜLTIGER DATEINAME => " & windreamFilename)
+            LOGGER.Info(" ...ENDGÜLTIGER DATEINAME => " & oWindreamFilename)
             If WMObject IsNot Nothing Then
-                newfilename = vWLaufwerk & ":" & windreamFilename
+                'NewFileName = vWLaufwerk & ":" & oWindreamFilename
                 ' lock object for file system access (to change the file itself)
                 WMObject.lock()
                 ' set fileIO the local source file
-                aFileIO.bstrOriginalFileName = filenameQuelle
+                aFileIO.bstrOriginalFileName = SourceFilePath
                 If Err.Number > 0 Then
                     LOGGER.Info(" FEHLER: fileIO konnte nicht gesetzt werden - Datei wird wieder gelöscht - Error: '" & Err.Description & "'")
                     LOGGER.Info(" HINWEIS: Überprüfen Sie den Verweis auf die Bibliotheken 'WMOTool.WMFileIO' UND 'WMOTOOLLib.WMFileIO' und ändern diese in den Anwendungseinstellungen (DLL_WMOTOOL)'")
                     WMObject.Unlock()
-                    Delete_WDFile(windreamFilename)
+                    Delete_WDFile(oWindreamFilename)
 
                     Return False
                     ' MsgBox(Err.Description)
@@ -716,7 +569,7 @@ Public Class ClassWindream
                 If Err.Number > 0 Then
                     LOGGER.Info(" Unexpected error in OpenStream - Datei wird wieder gelöscht - Error: '" & Err.Description & "'")
                     WMObject.Unlock()
-                    Delete_WDFile(windreamFilename)
+                    Delete_WDFile(oWindreamFilename)
                     Return False
                     'MsgBox(Err.Description)
                 End If
@@ -726,7 +579,7 @@ Public Class ClassWindream
                 If Err.Number > 0 Then
                     LOGGER.Info(" Unexpected error in Zuweisen aWMStream zu aFileIO - Datei wird wieder gelöscht - Error: '" & Err.Description & "'")
                     WMObject.Unlock()
-                    Delete_WDFile(windreamFilename)
+                    Delete_WDFile(oWindreamFilename)
                     Return False
                     'MsgBox(Err.Description)
                 End If
@@ -735,7 +588,7 @@ Public Class ClassWindream
                 If Err.Number > 0 Then
                     LOGGER.Info(" Unexpected error in FileIO.ImportOriginal(True) - Datei wird wieder gelöscht - Error: '" & Err.Description & "'")
                     WMObject.Unlock()
-                    Delete_WDFile(windreamFilename)
+                    Delete_WDFile(oWindreamFilename)
                     Return False
                     ' MsgBox(Err.Description)
                 End If
@@ -745,7 +598,7 @@ Public Class ClassWindream
                 If Err.Number > 0 Then
                     LOGGER.Info(" Unexpected error in aWMStream.Close() - Datei wird wieder gelöscht - Error: '" & Err.Description & "'")
                     WMObject.Unlock()
-                    Delete_WDFile(windreamFilename)
+                    Delete_WDFile(oWindreamFilename)
                     Return False
                     'MsgBox(Err.Description)
                 End If
@@ -754,7 +607,7 @@ Public Class ClassWindream
                 If Err.Number > 0 Then
                     LOGGER.Info(" Unexpected error in WMObject.save - Datei wird wieder gelöscht - Error: '" & Err.Description & "'")
                     WMObject.Unlock()
-                    Delete_WDFile(windreamFilename)
+                    Delete_WDFile(oWindreamFilename)
                     Return False
                     'MsgBox(Err.Description)
                 End If
@@ -764,37 +617,41 @@ Public Class ClassWindream
                 If Err.Number > 0 Then
                     LOGGER.Info(" Unexpected error in WMObject.unlock - Datei wird wieder gelöscht - Error: '" & Err.Description & "'")
                     WMObject.Unlock()
-                    Delete_WDFile(windreamFilename)
+                    Delete_WDFile(oWindreamFilename)
                     Return False
                     'MsgBox(Err.Description)
                 End If
                 'DATEI GRÖSSE ERMITTELN - MANCHMAL KOMMT ES VOR DAS DATEIGRÖße 0 ist
-                Dim info2 As New FileInfo(newfilename)
+                Dim info2 As New FileInfo(oFileName)
                 Dim length1 As Long = info2.Length
                 LOGGER.Info(" ...Length der Zieldatei: " & length1.ToString)
-                If length > 0 And Err.Number = 0 Then
+                If oFileLength > 0 And Err.Number = 0 Then
-                    Dim p As String
+
-                    If windreamFilename.StartsWith("\") Then
+                    'Dim p As String
-                        If windreamFilename.StartsWith("\\") Then
+                    'If oWindreamFilename.StartsWith("\") Then
-                            p = windreamFilename.Replace("\\", "\")
+                    '    If oWindreamFilename.StartsWith("\\") Then
-                        Else
+                    '        p = oWindreamFilename.Replace("\\", "\")
-                            p = windreamFilename
+                    '    Else
-                        End If
+                    '        p = oWindreamFilename
-                    Else
+                    '    End If
-                        p = "\" & windreamFilename
+                    'Else
-                    End If
+                    '    p = "\" & oWindreamFilename
-                    CURRENT_NEWFILENAME = vWLaufwerk & ":" & p
+                    'End If
+                    'CURRENT_NEWFILENAME = vWLaufwerk & ":" & p
+
+                    CURRENT_NEWFILENAME = oFileName
+
                     LOGGER.Info(" >> Datei '" & CURRENT_NEWFILENAME & "' wurde erfolgreich importiert!")
-                    aktWMObject = WMObject
+                    _currentWMObject = WMObject
                     Return True
                 Else
-                    Delete_WDFile(windreamFilename)
+                    Delete_WDFile(oWindreamFilename)
-                    Console.WriteLine(Err.Number.ToString)
+                    LOGGER.Info("Error Number: [{0}]", Err.Number)
                     LOGGER.Info(" Unexpected error in Datei-Übertragen - FileLength ist 0, Übertragene Datei wurde gelöscht")
                     Return False
                 End If
             Else
-                LOGGER.Info(" Could not create a WMObject for file:'" & windreamFilename)
+                LOGGER.Info(" Could not create a WMObject for file:'" & oWindreamFilename)
                 If Not Err() Is Nothing Then
                     If Not Err.Description Is Nothing Then
                         LOGGER.Info(Err.Description)
@@ -815,7 +672,7 @@ Public Class ClassWindream
             End If
             Dim WMObject As WINDREAMLib.WMObject '= CreateObject("WINDREAMLib.WMObject")  'New WINDREAMLib.WMObject
             Try
-                WMObject = oSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, WD_File) 'WINDREAMLib.WMEntity.WMEntityDocument
+                WMObject = _session.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, WD_File) 'WINDREAMLib.WMEntity.WMEntityDocument
             Catch ex As Exception
                 LOGGER.Info(">> Could not create WMObject for file '" & WD_File & "' - so it is not existing")
                 LOGGER.Error(ex.Message)
@@ -848,7 +705,7 @@ Public Class ClassWindream
             ' den Dokumenttyp schreiben
             LOGGER.Info(" ## Indexieren wird gestartet ##")
             ' ein windream-Objekt der Datei anlegen
-            WMObject = aktWMObject 'oSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, WD_File)
+            WMObject = _currentWMObject 'oSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, WD_File)
             Try
                 LOGGER.Info(" ...Datei wird gesperrt")
                 ' die Datei sperren
@@ -873,7 +730,7 @@ Public Class ClassWindream
             If WMObject.aObjectType.aName = "Standard" Then
 
                 ' ihr den entsprechenden Dokumenttyp zuweisen
-                WMObject.aObjectType = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityObjectType, _WDObjekttyp)
+                WMObject.aObjectType = _session.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityObjectType, _WDObjekttyp)
                 ' WMObject.aObjectType = Me.selectedProfile.Dokumenttyp
                 LOGGER.Info(" ...Objekttyp wurde gesetzt")
             Else
@@ -963,7 +820,7 @@ Public Class ClassWindream
                     ' wenn der Datei noch kein Dokumenttyp zugewiesen wurde
                     If oDocument.aObjectType.aName <> _WDObjekttyp Then
                         ' ihr den entsprechenden Dokumenttyp zuweisen
-                        oDocument.aObjectType = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityObjectType, _WDObjekttyp)
+                        oDocument.aObjectType = _session.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityObjectType, _WDObjekttyp)
                         ' WMObject.aObjectType = Me.selectedProfile.Dokumenttyp
                         LOGGER.Info(" ...Objekttyp '" & oDocument.aObjectType.aName & "' wurde in '" & _WDObjekttyp & "' geändert.")
                     Else
@@ -986,7 +843,7 @@ Public Class ClassWindream
                             LOGGER.Info(" >> Indexierung von Index '" & indexname & "'")
                         End If
                         ' das entsprechende Attribut aus windream auslesen
-                        Dim oAttribute = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, Indizes(i))
+                        Dim oAttribute = _session.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, Indizes(i))
                         ' den Variablentyp (String, Integer, ...) auslesen 
                         Dim vType = oAttribute.getVariableValue("dwAttrType")
                         ' wenn in aValues an Position i ein Wert steht
@@ -1079,6 +936,11 @@ Public Class ClassWindream
                                     LOGGER.Info(" ...Typ des windream-Indexes: 4099 Vektor Kommazahl")
                                     'Vektor Kommazahl
                                     convertValue = CStr(value)
+                                Case 4100
+                                    vektor = True
+                                    LOGGER.Info(" ...Typ des windream-Indexes: 4100 Vektor Boolean")
+                                    'Vektor Kommazahl
+                                    convertValue = ToBoolean(value)
                                 Case 4101
                                     vektor = True
                                     LOGGER.Info(" ...Typ des windream-Indexes: 4101 Vektor Date")
@@ -1170,6 +1032,10 @@ Public Class ClassWindream
                                             Str = Str.ToString.Replace(" ", "")
                                             'Umwandeln in Double
                                             myArray(0) = CDbl(Str.Replace(".", ","))
+
+                                        Case 4100
+                                            ' Umwandeln in Boolean
+                                            myArray(0) = ToBoolean(value)
                                         Case 4101
                                             'Umwandeln in Date
                                             myArray(0) = CDate(value)
@@ -1374,7 +1240,7 @@ Public Class ClassWindream
                                 'Das Array anpassen
                                 ReDim Preserve ValueArray(Anzahl)
                                 'Den Wert im Array speichern
-                                ValueArray(Anzahl) = NewValue.ToString
+                                ValueArray(Anzahl) = NewValue '.ToString
                                 Anzahl += 1
                             Else
                                 LOGGER.Info(" >> Value '" & NewValue.ToString & "' bereits in Array enthalten")
@@ -1383,7 +1249,7 @@ Public Class ClassWindream
                             'Das Array anpassen
                             ReDim Preserve ValueArray(Anzahl)
                             'Den Wert im Array speichern
-                            ValueArray(Anzahl) = NewValue.ToString
+                            ValueArray(Anzahl) = NewValue '.ToString
                             Anzahl += 1
 
                         End If
@@ -1461,7 +1327,7 @@ Public Class ClassWindream
             Loop
             ' wenn die Datei existiert
             If fileExists Then
-                WMObject = oSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, filenameZiel)
+                WMObject = _session.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, filenameZiel)
 
                 ' eine Variable für den umgewandelten Indexwert anlegen (kein Typ, da noch unklar ist was reingeschrieben wird)
                 'Dim convertValue = Nothing
@@ -1472,7 +1338,7 @@ Public Class ClassWindream
                 Try
 
                     ' ein windream-Objekt der Datei anlegen
-                    WMObject = oSession.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, filenameZiel)
+                    WMObject = _session.GetWMObjectByPath(WINDREAMLib.WMEntity.WMEntityDocument, filenameZiel)
                     If LogErrorsOnly = False Then
                         LOGGER.Info(" - windream-Objekt der Datei erzeugt")
                         LOGGER.Info(" - Ziel: W:\" & filenameZiel)
@@ -1492,7 +1358,7 @@ Public Class ClassWindream
                     ' wenn der Datei noch kein Dokumenttyp zugewiesen wurde
                     If WMObject.aObjectType.aName = "Standard" Then
                         ' ihr den entsprechenden Dokumenttyp zuweisen
-                        WMObject.aObjectType = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityObjectType, _WDObjekttyp)
+                        WMObject.aObjectType = _session.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityObjectType, _WDObjekttyp)
                         ' WMObject.aObjectType = Me.selectedProfile.Dokumenttyp
                     End If
 
@@ -1873,7 +1739,7 @@ Public Class ClassWindream
     ''' <remarks></remarks>
     Public Shared Function GetTypeOfIndexAsIntByName(ByVal indexname As String) As Integer
         Try
-            Dim oAttribute = oSession.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname)
+            Dim oAttribute = _session.GetWMObjectByName(WINDREAMLib.WMEntity.WMEntityAttribute, indexname)
             Dim vType = oAttribute.getVariableValue("dwAttrType")
             Return vType
         Catch ex As Exception
@@ -1895,9 +1761,15 @@ Public Class ClassWindream
             Return input
         Catch ex As Exception
             LOGGER.Info("Fehler in CheckIndexValue: " & ex.Message)
-            LOGGER.Error(ex.message)
+            LOGGER.Error(ex.Message)
             Return Nothing
         End Try
 
     End Function
+
+    Private Shared Function ToBoolean(input As String) As Boolean
+        If String.IsNullOrEmpty(input) Then Return False
+        Return (input.Trim().ToLower() = "true") OrElse (input.Trim() = "1")
+    End Function
+
 End Class

Global_Indexer/Form1.Designer.vb

@@ -0,0 +1,60 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class Form1
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.SuspendLayout()
+        '
+        'DocumentViewer1
+        '
+        Me.DocumentViewer1.Location = New System.Drawing.Point(24, 39)
+        Me.DocumentViewer1.Name = "DocumentViewer1"
+        Me.DocumentViewer1.Size = New System.Drawing.Size(493, 387)
+        Me.DocumentViewer1.TabIndex = 0
+        '
+        'Button1
+        '
+        Me.Button1.Location = New System.Drawing.Point(566, 150)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(75, 23)
+        Me.Button1.TabIndex = 1
+        Me.Button1.Text = "Button1"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'Form1
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.Controls.Add(Me.Button1)
+        Me.Controls.Add(Me.DocumentViewer1)
+        Me.Name = "Form1"
+        Me.Text = "Form1"
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer
+    Friend WithEvents Button1 As Button
+End Class

Global_Indexer/Form1.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

Global_Indexer/Form1.vb

@@ -0,0 +1,8 @@
+Public Class Form1
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        DocumentViewer1.Init(LOGCONFIG, VIEWER_LICENSE)
+        '\\dd-sto01\DD-DFSR01\SharedObjects\Public\Projekte\2.JPG
+        '\\dd-gan.local.digitaldata.works\DD-DFSR01\SharedObjects\Public\Projekte\2.JPG
+        DocumentViewer1.LoadFile("\\dd-gan.local.digitaldata.works\DD-DFSR01\UserObjects\UserFiles\schreiberm\Desktop\SimpleIndexer\File1.pdf")
+    End Sub
+End Class

Global_Indexer/Global_Indexer.vbproj

@@ -160,19 +160,24 @@
     <Reference Include="DigitalData.Modules.Config">
       <HintPath>..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Filesystem">
+    <Reference Include="DigitalData.Modules.Filesystem, Version=1.0.1.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
+      <HintPath>..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="DigitalData.Modules.Logging">
+    <Reference Include="DigitalData.Modules.Logging, Version=2.0.0.1, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Windream">
+      <HintPath>..\..\DDMonorepo\Modules.Windream\bin\Debug\DigitalData.Modules.Windream.dll</HintPath>
     </Reference>
     <Reference Include="DLLLicenseManager, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll</HintPath>
     </Reference>
-    <Reference Include="Independentsoft.Msg.2.0.570.21482, Version=2.0.570.21482, Culture=neutral, PublicKeyToken=76be97fe952f1ec7, processorArchitecture=MSIL">
+    <Reference Include="Independentsoft.Msg, Version=2.0.570.21482, Culture=neutral, PublicKeyToken=76be97fe952f1ec7, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.2.0.570.21482.dll</HintPath>
+      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.dll</HintPath>
     </Reference>
     <Reference Include="Interop.WINDREAMLib">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
@@ -241,17 +246,24 @@
     <Compile Include="ClassFormFunctions.vb" />
     <Compile Include="ClassHelper.vb" />
     <Compile Include="ClassHotkey_Windream.vb" />
+    <Compile Include="ClassIDBData.vb" />
     <Compile Include="ClassIndexFunctions.vb" />
     <Compile Include="ClassInit.vb" />
     <Compile Include="ClassLayout.vb" />
     <Compile Include="ClassLicence.vb" />
     <Compile Include="ClassLogger.vb" />
+    <Compile Include="ClassParamRefresh.vb" />
     <Compile Include="ClassPatterns.vb" />
     <Compile Include="ClassPostprocessing.vb" />
     <Compile Include="ClassWindowAPI.vb" />
-    <Compile Include="ClassWindream.vb" />
     <Compile Include="ClassEmailHeaderExtractor.vb" />
     <Compile Include="clsHotkey.vb" />
+    <Compile Include="Form1.Designer.vb">
+      <DependentUpon>Form1.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Form1.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <Compile Include="frmAdministration.Designer.vb">
       <DependentUpon>frmAdministration.vb</DependentUpon>
     </Compile>
@@ -374,7 +386,7 @@
     </Compile>
     <Compile Include="ModuleCURRENT.vb" />
     <Compile Include="ModuleHelpers.vb" />
-    <Compile Include="ModuleMySettings.vb" />
+    <Compile Include="ModuleRuntime.vb" />
     <Compile Include="ModuleUserSavings.vb" />
     <Compile Include="ModuleWindowHandles.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
@@ -415,11 +427,15 @@
     <EmbeddedResource Include="AboutBox1.resx">
       <DependentUpon>AboutBox1.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Form1.resx">
+      <DependentUpon>Form1.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmAdministration.en-US.resx">
       <DependentUpon>frmAdministration.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="frmAdministration.resx">
       <DependentUpon>frmAdministration.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmConfig_Basic.de.resx">
       <DependentUpon>frmConfig_Basic.vb</DependentUpon>

Global_Indexer/ModuleCURRENT.vb

@@ -31,14 +31,14 @@ Module ModuleCURRENT
     Public USER_ID
     Public USER_IN_MODULE As Boolean = False
     Public USER_IS_ADMIN As Boolean = False
-    Public UserLoggedin As Integer = 0
 
-    Public USER_SHORT_NAME As String = ""
+    Public USER_SHORTNAME As String = ""
     Public USER_PRENAME As String = ""
     Public USER_SURNAME As String = ""
     Public USER_EMAIL As String = ""
     Public USER_LANGUAGE As String = "DE"
     Public USER_USERNAME As String = ""
+    Public USERCOUNT_LOGGED_IN As Integer = 0
 
     Public CURRENT_FOLDERWATCH As String = ""
     Public CURRENT_SCAN_FOLDERWATCH As String = ""

Global_Indexer/ModuleRuntime.vb

@@ -1,7 +1,7 @@
 Imports System.IO
 Imports System.Xml
-
+Imports DigitalData.Modules.Windream
-Module ModuleMySettings
+Module ModuleRuntime
     'Dim ConfigPath As String = Path.Combine(Application.UserAppDataPath(), "UserConfig.xml")
     Public Const USER_CONFIG_FILE = "UserConfig.xml"
     Public Const COMPUTER_CONFIG_FILE = "ComputerConfig.xml"
@@ -9,7 +9,19 @@ Module ModuleMySettings
     Public MyConnectionString As String = ""
     Public LogErrorsOnly As Boolean = True
     Public GI_withWindream As Boolean = False
-    Public vWLaufwerk As String = "W"
+    Public WMDrive As String = "W"
     'Public myPreviewActive As Boolean = True
     Public FW_started As Boolean = False
+    Public IDB_ACTIVE As Boolean = False
+    Public WORKING_MODE As String
+    Public CONNECTION_STRING_IDB As String
+
+    Public IDBData As ClassIDBData
+    Public IDB_USES_WMFILESTORE As Boolean = False
+    Public IDB_DOC_DATA_SQL As String
+    Public IDB_DT_DOC_DATA As DataTable
+    Public IDB_DOC_ID As Int64
+    Public IDB_LOG_INDEX As String
+
+    Public WINDREAM As Windream
 End Module

Global_Indexer/My Project/AssemblyInfo.vb

@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.0.0.8")>
+<Assembly: AssemblyVersion("2.0.0.28")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

Global_Indexer/MyDataset.Designer.vb

@@ -23141,36 +23141,47 @@ Namespace MyDatasetTableAdapters
             Me._adapter.TableMappings.Add(tableMapping)
             Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.DeleteCommand.Connection = Me.Connection
-            Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBDD_INDEX_MAN_POSTPROCESSING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @GUID)"
+            Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBDD_INDEX_MAN_POSTPROCESSING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUID)"
             Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
+            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.InsertCommand.Connection = Me.Connection
-            Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_INDEX_MAN_POSTPROCESSING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         (IDXMAN_ID, C"& _ 
+            Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBDD_INDEX_MAN_POSTPROCESSING] ([IDXMAN_ID], [VARIANT], [COMMENT], ["& _ 
-                "OMMENT, TYPE, FUNCTION1, FUNCTION2, TEXT1, TEXT2, TEXT3, SEQUENCE, ADDED_WHO, VA"& _ 
+                "TYPE], [FUNCTION1], [FUNCTION2], [TEXT1], [TEXT2], [TEXT3], [SEQUENCE], [ADDED_W"& _ 
-                "RIANT)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@IDXMAN_ID,@COMMENT,@TYPE,@FUNCTION1,@FUNCTION2,@TEXT1,@T"& _ 
+                "HO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@IDXMAN_ID, @VARIANT, "& _ 
-                "EXT2,@TEXT3,@SEQUENCE,@ADDED_WHO,@VARIANT)"
+                "@COMMENT, @TYPE, @FUNCTION1, @FUNCTION2, @TEXT1, @TEXT2, @TEXT3, @SEQUENCE, @ADD"& _ 
+                "ED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, IDXMAN_ID, VARI"& _ 
+                "ANT, COMMENT, TYPE, FUNCTION1, FUNCTION2, TEXT1, TEXT2, TEXT3, SEQUENCE, ADDED_W"& _ 
+                "HO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_INDEX_MAN_POSTPROCESSING WHE"& _ 
+                "RE (GUID = SCOPE_IDENTITY())"
             Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IDXMAN_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "IDXMAN_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IDXMAN_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "IDXMAN_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VARIANT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VARIANT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYPE", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FUNCTION1", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "FUNCTION1", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYPE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FUNCTION2", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "FUNCTION2", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FUNCTION1", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FUNCTION1", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT1", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT1", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FUNCTION2", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FUNCTION2", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT2", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT2", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT1", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT1", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT3", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT3", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT2", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT2", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT3", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT3", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VARIANT", Global.System.Data.SqlDbType.VarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "VARIANT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.UpdateCommand.Connection = Me.Connection
             Me._adapter.UpdateCommand.CommandText = "UPDATE       TBDD_INDEX_MAN_POSTPROCESSING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET                IDXMAN_ID = @IDXMA"& _ 
-                "N_ID, COMMENT = @COMMENT, TYPE = @TYPE, FUNCTION1 = @FUNCTION1, FUNCTION2 = @FUN"& _ 
+                "N_ID, VARIANT = @VARIANT, COMMENT = @COMMENT, TYPE = @TYPE, FUNCTION1 = @FUNCTIO"& _ 
-                "CTION2, TEXT1 = @TEXT1, TEXT2 = @TEXT2, TEXT3 = @TEXT3, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                      "& _ 
+                "N1, FUNCTION2 = @FUNCTION2, TEXT1 = @TEXT1, TEXT2 = @TEXT2, TEXT3 = @TEXT3, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"  "& _ 
-                "   SEQUENCE = @SEQUENCE, CHANGED_WHO = @CHANGED_WHO, VARIANT = @VARIANT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE  "& _ 
+                "                       SEQUENCE = @SEQUENCE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN "& _ 
-                "      (GUID = @GUID)"
+                "= @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE  "& _ 
+                "      (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, IDXMAN_ID, VARIANT, COMMENT, TYPE,"& _ 
+                " FUNCTION1, FUNCTION2, TEXT1, TEXT2, TEXT3, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHA"& _ 
+                "NGED_WHO, CHANGED_WHEN FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE (GUID = @GUID)"
             Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IDXMAN_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "IDXMAN_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VARIANT", Global.System.Data.SqlDbType.VarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "VARIANT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TYPE", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FUNCTION1", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "FUNCTION1", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -23179,8 +23190,11 @@ Namespace MyDatasetTableAdapters
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT2", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT2", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@TEXT3", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "TEXT3", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VARIANT", Global.System.Data.SqlDbType.VarChar, 20, Global.System.Data.ParameterDirection.Input, 0, 0, "VARIANT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
         End Sub
         
@@ -23197,20 +23211,10 @@ Namespace MyDatasetTableAdapters
             Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {}
             Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(0).Connection = Me.Connection
-            Me._commandCollection(0).CommandText = "SELECT        TBDD_INDEX_MAN_POSTPROCESSING.GUID, TBDD_INDEX_MAN_POSTPROCESSING.I"& _ 
+            Me._commandCollection(0).CommandText = "SELECT *"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_INDEX_MAN_POSTPROCESSING"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE IDXMAN_ID IN (SELECT GUID FRO"& _ 
-                "DXMAN_ID, TBDD_INDEX_MAN_POSTPROCESSING.COMMENT, TBDD_INDEX_MAN_POSTPROCESSING.T"& _ 
+                "M TBDD_INDEX_MAN WHERE DOK_ID = @DOK_ID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)
-                "YPE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TBDD_INDEX_MAN_POSTPROCESSING.FUNCTION1, TBDD_IN"& _ 
-                "DEX_MAN_POSTPROCESSING.FUNCTION2, TBDD_INDEX_MAN_POSTPROCESSING.TEXT1, TBDD_INDE"& _ 
-                "X_MAN_POSTPROCESSING.TEXT2, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TBDD_INDEX_MAN_POSTPROCES"& _ 
-                "SING.TEXT3, TBDD_INDEX_MAN_POSTPROCESSING.SEQUENCE, TBDD_INDEX_MAN_POSTPROCESSIN"& _ 
-                "G.ADDED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TBDD_INDEX_MAN_POSTPROCESSING.ADDED_WHEN"& _ 
-                ", TBDD_INDEX_MAN_POSTPROCESSING.CHANGED_WHO, TBDD_INDEX_MAN_POSTPROCESSING.CHANG"& _ 
-                "ED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TBDD_INDEX_MAN_POSTPROCESSING.VARIANT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ 
-                "           TBDD_INDEX_MAN_POSTPROCESSING INNER JOIN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TB"& _ 
-                "DD_INDEX_MAN ON TBDD_INDEX_MAN_POSTPROCESSING.IDXMAN_ID = TBDD_INDEX_MAN.GUID"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"W"& _ 
-                "HERE        (TBDD_INDEX_MAN.DOK_ID = @DOK_ID)"
             Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
-            Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOK_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOK_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOK_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -23266,6 +23270,209 @@ Namespace MyDatasetTableAdapters
         Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer
             Return Me.Adapter.Update(dataRows)
         End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Delete, true)>  _
+        Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer
+            Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer)
+            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State
+            If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
+                        <> Global.System.Data.ConnectionState.Open) Then
+                Me.Adapter.DeleteCommand.Connection.Open
+            End If
+            Try 
+                Dim returnValue As Integer = Me.Adapter.DeleteCommand.ExecuteNonQuery
+                Return returnValue
+            Finally
+                If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
+                    Me.Adapter.DeleteCommand.Connection.Close
+                End If
+            End Try
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)>  _
+        Public Overloads Overridable Function Insert(ByVal IDXMAN_ID As Integer, ByVal _VARIANT As String, ByVal COMMENT As String, ByVal TYPE As String, ByVal FUNCTION1 As String, ByVal FUNCTION2 As String, ByVal TEXT1 As String, ByVal TEXT2 As String, ByVal TEXT3 As String, ByVal SEQUENCE As Integer, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date)) As Integer
+            Me.Adapter.InsertCommand.Parameters(0).Value = CType(IDXMAN_ID,Integer)
+            If (_VARIANT Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("_VARIANT")
+            Else
+                Me.Adapter.InsertCommand.Parameters(1).Value = CType(_VARIANT,String)
+            End If
+            If (COMMENT Is Nothing) Then
+                Me.Adapter.InsertCommand.Parameters(2).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.InsertCommand.Parameters(2).Value = CType(COMMENT,String)
+            End If
+            If (TYPE Is Nothing) Then
+                Me.Adapter.InsertCommand.Parameters(3).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.InsertCommand.Parameters(3).Value = CType(TYPE,String)
+            End If
+            If (FUNCTION1 Is Nothing) Then
+                Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.InsertCommand.Parameters(4).Value = CType(FUNCTION1,String)
+            End If
+            If (FUNCTION2 Is Nothing) Then
+                Me.Adapter.InsertCommand.Parameters(5).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.InsertCommand.Parameters(5).Value = CType(FUNCTION2,String)
+            End If
+            If (TEXT1 Is Nothing) Then
+                Me.Adapter.InsertCommand.Parameters(6).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.InsertCommand.Parameters(6).Value = CType(TEXT1,String)
+            End If
+            If (TEXT2 Is Nothing) Then
+                Me.Adapter.InsertCommand.Parameters(7).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.InsertCommand.Parameters(7).Value = CType(TEXT2,String)
+            End If
+            If (TEXT3 Is Nothing) Then
+                Me.Adapter.InsertCommand.Parameters(8).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.InsertCommand.Parameters(8).Value = CType(TEXT3,String)
+            End If
+            Me.Adapter.InsertCommand.Parameters(9).Value = CType(SEQUENCE,Integer)
+            If (ADDED_WHO Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("ADDED_WHO")
+            Else
+                Me.Adapter.InsertCommand.Parameters(10).Value = CType(ADDED_WHO,String)
+            End If
+            If (ADDED_WHEN.HasValue = true) Then
+                Me.Adapter.InsertCommand.Parameters(11).Value = CType(ADDED_WHEN.Value,Date)
+            Else
+                Me.Adapter.InsertCommand.Parameters(11).Value = Global.System.DBNull.Value
+            End If
+            If (CHANGED_WHO Is Nothing) Then
+                Me.Adapter.InsertCommand.Parameters(12).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.InsertCommand.Parameters(12).Value = CType(CHANGED_WHO,String)
+            End If
+            If (CHANGED_WHEN.HasValue = true) Then
+                Me.Adapter.InsertCommand.Parameters(13).Value = CType(CHANGED_WHEN.Value,Date)
+            Else
+                Me.Adapter.InsertCommand.Parameters(13).Value = Global.System.DBNull.Value
+            End If
+            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
+            If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
+                        <> Global.System.Data.ConnectionState.Open) Then
+                Me.Adapter.InsertCommand.Connection.Open
+            End If
+            Try 
+                Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery
+                Return returnValue
+            Finally
+                If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
+                    Me.Adapter.InsertCommand.Connection.Close
+                End If
+            End Try
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)>  _
+        Public Overloads Overridable Function Update( _
+                    ByVal IDXMAN_ID As Integer,  _
+                    ByVal _VARIANT As String,  _
+                    ByVal COMMENT As String,  _
+                    ByVal TYPE As String,  _
+                    ByVal FUNCTION1 As String,  _
+                    ByVal FUNCTION2 As String,  _
+                    ByVal TEXT1 As String,  _
+                    ByVal TEXT2 As String,  _
+                    ByVal TEXT3 As String,  _
+                    ByVal SEQUENCE As Integer,  _
+                    ByVal ADDED_WHO As String,  _
+                    ByVal ADDED_WHEN As Global.System.Nullable(Of Date),  _
+                    ByVal CHANGED_WHO As String,  _
+                    ByVal CHANGED_WHEN As Global.System.Nullable(Of Date),  _
+                    ByVal Original_GUID As Integer,  _
+                    ByVal GUID As Integer) As Integer
+            Me.Adapter.UpdateCommand.Parameters(0).Value = CType(IDXMAN_ID,Integer)
+            If (_VARIANT Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("_VARIANT")
+            Else
+                Me.Adapter.UpdateCommand.Parameters(1).Value = CType(_VARIANT,String)
+            End If
+            If (COMMENT Is Nothing) Then
+                Me.Adapter.UpdateCommand.Parameters(2).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.UpdateCommand.Parameters(2).Value = CType(COMMENT,String)
+            End If
+            If (TYPE Is Nothing) Then
+                Me.Adapter.UpdateCommand.Parameters(3).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.UpdateCommand.Parameters(3).Value = CType(TYPE,String)
+            End If
+            If (FUNCTION1 Is Nothing) Then
+                Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.UpdateCommand.Parameters(4).Value = CType(FUNCTION1,String)
+            End If
+            If (FUNCTION2 Is Nothing) Then
+                Me.Adapter.UpdateCommand.Parameters(5).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.UpdateCommand.Parameters(5).Value = CType(FUNCTION2,String)
+            End If
+            If (TEXT1 Is Nothing) Then
+                Me.Adapter.UpdateCommand.Parameters(6).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.UpdateCommand.Parameters(6).Value = CType(TEXT1,String)
+            End If
+            If (TEXT2 Is Nothing) Then
+                Me.Adapter.UpdateCommand.Parameters(7).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.UpdateCommand.Parameters(7).Value = CType(TEXT2,String)
+            End If
+            If (TEXT3 Is Nothing) Then
+                Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.UpdateCommand.Parameters(8).Value = CType(TEXT3,String)
+            End If
+            Me.Adapter.UpdateCommand.Parameters(9).Value = CType(SEQUENCE,Integer)
+            If (ADDED_WHO Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("ADDED_WHO")
+            Else
+                Me.Adapter.UpdateCommand.Parameters(10).Value = CType(ADDED_WHO,String)
+            End If
+            If (ADDED_WHEN.HasValue = true) Then
+                Me.Adapter.UpdateCommand.Parameters(11).Value = CType(ADDED_WHEN.Value,Date)
+            Else
+                Me.Adapter.UpdateCommand.Parameters(11).Value = Global.System.DBNull.Value
+            End If
+            If (CHANGED_WHO Is Nothing) Then
+                Me.Adapter.UpdateCommand.Parameters(12).Value = Global.System.DBNull.Value
+            Else
+                Me.Adapter.UpdateCommand.Parameters(12).Value = CType(CHANGED_WHO,String)
+            End If
+            If (CHANGED_WHEN.HasValue = true) Then
+                Me.Adapter.UpdateCommand.Parameters(13).Value = CType(CHANGED_WHEN.Value,Date)
+            Else
+                Me.Adapter.UpdateCommand.Parameters(13).Value = Global.System.DBNull.Value
+            End If
+            Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(15).Value = CType(GUID,Integer)
+            Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
+            If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
+                        <> Global.System.Data.ConnectionState.Open) Then
+                Me.Adapter.UpdateCommand.Connection.Open
+            End If
+            Try 
+                Dim returnValue As Integer = Me.Adapter.UpdateCommand.ExecuteNonQuery
+                Return returnValue
+            Finally
+                If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
+                    Me.Adapter.UpdateCommand.Connection.Close
+                End If
+            End Try
+        End Function
     End Class
     
     '''<summary>

Global_Indexer/MyDataset.vb

@@ -1,6 +1,9 @@
 
 
 Partial Public Class MyDataset
+    Partial Public Class TBDD_INDEX_MANDataTable
+    End Class
+
     Partial Public Class TBDD_INDEX_MAN_POSTPROCESSINGDataTable
         Private Sub TBDD_INDEX_MAN_POSTPROCESSINGDataTable_ColumnChanging(sender As Object, e As DataColumnChangeEventArgs) Handles Me.ColumnChanging
             If (e.Column.ColumnName = Me.COMMENTColumn.ColumnName) Then

Global_Indexer/MyDataset.xsd

@@ -833,70 +833,73 @@ SELECT GUID, OBJECTTYPE, IDX_EMAIL_ID, IDX_EMAIL_FROM, IDX_EMAIL_TO, IDX_EMAIL_S
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBDD_INDEX_MAN_POSTPROCESSINGTableAdapter" GeneratorDataComponentClassName="TBDD_INDEX_MAN_POSTPROCESSINGTableAdapter" Name="TBDD_INDEX_MAN_POSTPROCESSING" UserDataComponentName="TBDD_INDEX_MAN_POSTPROCESSINGTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="false" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="DD_ECMConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>DELETE FROM TBDD_INDEX_MAN_POSTPROCESSING
-WHERE        (GUID = @GUID)</CommandText>
+WHERE        (GUID = @Original_GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO TBDD_INDEX_MAN_POSTPROCESSING
+                    <CommandText>INSERT INTO [TBDD_INDEX_MAN_POSTPROCESSING] ([IDXMAN_ID], [VARIANT], [COMMENT], [TYPE], [FUNCTION1], [FUNCTION2], [TEXT1], [TEXT2], [TEXT3], [SEQUENCE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN]) VALUES (@IDXMAN_ID, @VARIANT, @COMMENT, @TYPE, @FUNCTION1, @FUNCTION2, @TEXT1, @TEXT2, @TEXT3, @SEQUENCE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN);
-                         (IDXMAN_ID, COMMENT, TYPE, FUNCTION1, FUNCTION2, TEXT1, TEXT2, TEXT3, SEQUENCE, ADDED_WHO, VARIANT)
+SELECT GUID, IDXMAN_ID, VARIANT, COMMENT, TYPE, FUNCTION1, FUNCTION2, TEXT1, TEXT2, TEXT3, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE (GUID = SCOPE_IDENTITY())</CommandText>
-VALUES        (@IDXMAN_ID,@COMMENT,@TYPE,@FUNCTION1,@FUNCTION2,@TEXT1,@TEXT2,@TEXT3,@SEQUENCE,@ADDED_WHO,@VARIANT)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="IDXMAN_ID" ColumnName="IDXMAN_ID" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IDXMAN_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="IDXMAN_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IDXMAN_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IDXMAN_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@VARIANT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="VARIANT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="TYPE" ColumnName="TYPE" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="TYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FUNCTION1" ColumnName="FUNCTION1" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@FUNCTION1" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="FUNCTION1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="TYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FUNCTION2" ColumnName="FUNCTION2" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@FUNCTION2" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="FUNCTION2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@FUNCTION1" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="FUNCTION1" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="TEXT1" ColumnName="TEXT1" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@TEXT1" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="TEXT1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@FUNCTION2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="FUNCTION2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="TEXT2" ColumnName="TEXT2" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@TEXT2" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="TEXT2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@TEXT1" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="TEXT1" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="TEXT3" ColumnName="TEXT3" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@TEXT3" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="TEXT3" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@TEXT2" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="TEXT2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@TEXT3" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="TEXT3" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="VARIANT" ColumnName="VARIANT" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@VARIANT" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="VARIANT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT        TBDD_INDEX_MAN_POSTPROCESSING.GUID, TBDD_INDEX_MAN_POSTPROCESSING.IDXMAN_ID, TBDD_INDEX_MAN_POSTPROCESSING.COMMENT, TBDD_INDEX_MAN_POSTPROCESSING.TYPE, 
+                    <CommandText>SELECT *
-                         TBDD_INDEX_MAN_POSTPROCESSING.FUNCTION1, TBDD_INDEX_MAN_POSTPROCESSING.FUNCTION2, TBDD_INDEX_MAN_POSTPROCESSING.TEXT1, TBDD_INDEX_MAN_POSTPROCESSING.TEXT2, 
+FROM TBDD_INDEX_MAN_POSTPROCESSING
-                         TBDD_INDEX_MAN_POSTPROCESSING.TEXT3, TBDD_INDEX_MAN_POSTPROCESSING.SEQUENCE, TBDD_INDEX_MAN_POSTPROCESSING.ADDED_WHO, 
+WHERE IDXMAN_ID IN (SELECT GUID FROM TBDD_INDEX_MAN WHERE DOK_ID = @DOK_ID)
-                         TBDD_INDEX_MAN_POSTPROCESSING.ADDED_WHEN, TBDD_INDEX_MAN_POSTPROCESSING.CHANGED_WHO, TBDD_INDEX_MAN_POSTPROCESSING.CHANGED_WHEN, 
+</CommandText>
-                         TBDD_INDEX_MAN_POSTPROCESSING.VARIANT
-FROM            TBDD_INDEX_MAN_POSTPROCESSING INNER JOIN
-                         TBDD_INDEX_MAN ON TBDD_INDEX_MAN_POSTPROCESSING.IDXMAN_ID = TBDD_INDEX_MAN.GUID
-WHERE        (TBDD_INDEX_MAN.DOK_ID = @DOK_ID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="DOK_ID" ColumnName="DOK_ID" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@DOK_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="DOK_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="DOK_ID" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@DOK_ID" Precision="0" Scale="0" Size="4" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>UPDATE       TBDD_INDEX_MAN_POSTPROCESSING
-SET                IDXMAN_ID = @IDXMAN_ID, COMMENT = @COMMENT, TYPE = @TYPE, FUNCTION1 = @FUNCTION1, FUNCTION2 = @FUNCTION2, TEXT1 = @TEXT1, TEXT2 = @TEXT2, TEXT3 = @TEXT3, 
+SET                IDXMAN_ID = @IDXMAN_ID, VARIANT = @VARIANT, COMMENT = @COMMENT, TYPE = @TYPE, FUNCTION1 = @FUNCTION1, FUNCTION2 = @FUNCTION2, TEXT1 = @TEXT1, TEXT2 = @TEXT2, TEXT3 = @TEXT3, 
-                         SEQUENCE = @SEQUENCE, CHANGED_WHO = @CHANGED_WHO, VARIANT = @VARIANT
+                         SEQUENCE = @SEQUENCE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN
-WHERE        (GUID = @GUID)</CommandText>
+WHERE        (GUID = @Original_GUID); 
+SELECT GUID, IDXMAN_ID, VARIANT, COMMENT, TYPE, FUNCTION1, FUNCTION2, TEXT1, TEXT2, TEXT3, SEQUENCE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBDD_INDEX_MAN_POSTPROCESSING WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="IDXMAN_ID" ColumnName="IDXMAN_ID" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IDXMAN_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="IDXMAN_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="IDXMAN_ID" ColumnName="IDXMAN_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IDXMAN_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="IDXMAN_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="VARIANT" ColumnName="VARIANT" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@VARIANT" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="VARIANT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="TYPE" ColumnName="TYPE" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="TYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FUNCTION1" ColumnName="FUNCTION1" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@FUNCTION1" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="FUNCTION1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="TYPE" ColumnName="TYPE" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="TYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FUNCTION2" ColumnName="FUNCTION2" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@FUNCTION2" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="FUNCTION2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="FUNCTION1" ColumnName="FUNCTION1" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@FUNCTION1" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="FUNCTION1" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="TEXT1" ColumnName="TEXT1" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@TEXT1" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="TEXT1" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="FUNCTION2" ColumnName="FUNCTION2" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@FUNCTION2" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="FUNCTION2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="TEXT2" ColumnName="TEXT2" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@TEXT2" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="TEXT2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="TEXT1" ColumnName="TEXT1" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@TEXT1" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="TEXT1" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="TEXT3" ColumnName="TEXT3" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@TEXT3" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="TEXT3" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="TEXT2" ColumnName="TEXT2" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@TEXT2" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="TEXT2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="TEXT3" ColumnName="TEXT3" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@TEXT3" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="TEXT3" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="VARIANT" ColumnName="VARIANT" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@VARIANT" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="VARIANT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN_POSTPROCESSING" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -1691,7 +1694,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
   <xs:element name="MyDataset" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="MyDataset" msprop:Generator_UserDSName="MyDataset">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBDD_USER" msprop:Generator_TableClassName="TBDD_USERDataTable" msprop:Generator_TableVarName="tableTBDD_USER" msprop:Generator_RowChangedName="TBDD_USERRowChanged" msprop:Generator_TablePropName="TBDD_USER" msprop:Generator_RowDeletingName="TBDD_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USERRowDeleted" msprop:Generator_RowClassName="TBDD_USERRow" msprop:Generator_UserTableName="TBDD_USER" msprop:Generator_RowEvArgName="TBDD_USERRowChangeEvent">
+        <xs:element name="TBDD_USER" msprop:Generator_TableClassName="TBDD_USERDataTable" msprop:Generator_TableVarName="tableTBDD_USER" msprop:Generator_TablePropName="TBDD_USER" msprop:Generator_RowDeletingName="TBDD_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USERRowDeleted" msprop:Generator_UserTableName="TBDD_USER" msprop:Generator_RowChangedName="TBDD_USERRowChanged" msprop:Generator_RowEvArgName="TBDD_USERRowChangeEvent" msprop:Generator_RowClassName="TBDD_USERRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1756,7 +1759,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_DOKUMENTART" msprop:Generator_TableClassName="TBDD_DOKUMENTARTDataTable" msprop:Generator_TableVarName="tableTBDD_DOKUMENTART" msprop:Generator_RowChangedName="TBDD_DOKUMENTARTRowChanged" msprop:Generator_TablePropName="TBDD_DOKUMENTART" msprop:Generator_RowDeletingName="TBDD_DOKUMENTARTRowDeleting" msprop:Generator_RowChangingName="TBDD_DOKUMENTARTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_DOKUMENTARTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_DOKUMENTARTRowDeleted" msprop:Generator_RowClassName="TBDD_DOKUMENTARTRow" msprop:Generator_UserTableName="TBDD_DOKUMENTART" msprop:Generator_RowEvArgName="TBDD_DOKUMENTARTRowChangeEvent">
+        <xs:element name="TBDD_DOKUMENTART" msprop:Generator_TableClassName="TBDD_DOKUMENTARTDataTable" msprop:Generator_TableVarName="tableTBDD_DOKUMENTART" msprop:Generator_TablePropName="TBDD_DOKUMENTART" msprop:Generator_RowDeletingName="TBDD_DOKUMENTARTRowDeleting" msprop:Generator_RowChangingName="TBDD_DOKUMENTARTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_DOKUMENTARTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_DOKUMENTARTRowDeleted" msprop:Generator_UserTableName="TBDD_DOKUMENTART" msprop:Generator_RowChangedName="TBDD_DOKUMENTARTRowChanged" msprop:Generator_RowEvArgName="TBDD_DOKUMENTARTRowChangeEvent" msprop:Generator_RowClassName="TBDD_DOKUMENTARTRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1839,7 +1842,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_EINGANGSARTEN" msprop:Generator_TableClassName="TBDD_EINGANGSARTENDataTable" msprop:Generator_TableVarName="tableTBDD_EINGANGSARTEN" msprop:Generator_RowChangedName="TBDD_EINGANGSARTENRowChanged" msprop:Generator_TablePropName="TBDD_EINGANGSARTEN" msprop:Generator_RowDeletingName="TBDD_EINGANGSARTENRowDeleting" msprop:Generator_RowChangingName="TBDD_EINGANGSARTENRowChanging" msprop:Generator_RowEvHandlerName="TBDD_EINGANGSARTENRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_EINGANGSARTENRowDeleted" msprop:Generator_RowClassName="TBDD_EINGANGSARTENRow" msprop:Generator_UserTableName="TBDD_EINGANGSARTEN" msprop:Generator_RowEvArgName="TBDD_EINGANGSARTENRowChangeEvent">
+        <xs:element name="TBDD_EINGANGSARTEN" msprop:Generator_TableClassName="TBDD_EINGANGSARTENDataTable" msprop:Generator_TableVarName="tableTBDD_EINGANGSARTEN" msprop:Generator_TablePropName="TBDD_EINGANGSARTEN" msprop:Generator_RowDeletingName="TBDD_EINGANGSARTENRowDeleting" msprop:Generator_RowChangingName="TBDD_EINGANGSARTENRowChanging" msprop:Generator_RowEvHandlerName="TBDD_EINGANGSARTENRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_EINGANGSARTENRowDeleted" msprop:Generator_UserTableName="TBDD_EINGANGSARTEN" msprop:Generator_RowChangedName="TBDD_EINGANGSARTENRowChanged" msprop:Generator_RowEvArgName="TBDD_EINGANGSARTENRowChangeEvent" msprop:Generator_RowClassName="TBDD_EINGANGSARTENRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
@@ -1876,7 +1879,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_DOKART_MODULE" msprop:Generator_TableClassName="TBDD_DOKART_MODULEDataTable" msprop:Generator_TableVarName="tableTBDD_DOKART_MODULE" msprop:Generator_TablePropName="TBDD_DOKART_MODULE" msprop:Generator_RowDeletingName="TBDD_DOKART_MODULERowDeleting" msprop:Generator_RowChangingName="TBDD_DOKART_MODULERowChanging" msprop:Generator_RowEvHandlerName="TBDD_DOKART_MODULERowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_DOKART_MODULERowDeleted" msprop:Generator_UserTableName="TBDD_DOKART_MODULE" msprop:Generator_RowChangedName="TBDD_DOKART_MODULERowChanged" msprop:Generator_RowEvArgName="TBDD_DOKART_MODULERowChangeEvent" msprop:Generator_RowClassName="TBDD_DOKART_MODULERow">
+        <xs:element name="TBDD_DOKART_MODULE" msprop:Generator_TableClassName="TBDD_DOKART_MODULEDataTable" msprop:Generator_TableVarName="tableTBDD_DOKART_MODULE" msprop:Generator_RowChangedName="TBDD_DOKART_MODULERowChanged" msprop:Generator_TablePropName="TBDD_DOKART_MODULE" msprop:Generator_RowDeletingName="TBDD_DOKART_MODULERowDeleting" msprop:Generator_RowChangingName="TBDD_DOKART_MODULERowChanging" msprop:Generator_RowEvHandlerName="TBDD_DOKART_MODULERowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_DOKART_MODULERowDeleted" msprop:Generator_RowClassName="TBDD_DOKART_MODULERow" msprop:Generator_UserTableName="TBDD_DOKART_MODULE" msprop:Generator_RowEvArgName="TBDD_DOKART_MODULERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="ID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnID" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_UserColumnName="ID" type="xs:int" />
@@ -1890,7 +1893,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_MODULES" msprop:Generator_TableClassName="TBDD_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_MODULES" msprop:Generator_TablePropName="TBDD_MODULES" msprop:Generator_RowDeletingName="TBDD_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_MODULESRowDeleted" msprop:Generator_UserTableName="TBDD_MODULES" msprop:Generator_RowChangedName="TBDD_MODULESRowChanged" msprop:Generator_RowEvArgName="TBDD_MODULESRowChangeEvent" msprop:Generator_RowClassName="TBDD_MODULESRow">
+        <xs:element name="TBDD_MODULES" msprop:Generator_TableClassName="TBDD_MODULESDataTable" msprop:Generator_TableVarName="tableTBDD_MODULES" msprop:Generator_RowChangedName="TBDD_MODULESRowChanged" msprop:Generator_TablePropName="TBDD_MODULES" msprop:Generator_RowDeletingName="TBDD_MODULESRowDeleting" msprop:Generator_RowChangingName="TBDD_MODULESRowChanging" msprop:Generator_RowEvHandlerName="TBDD_MODULESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_MODULESRowDeleted" msprop:Generator_RowClassName="TBDD_MODULESRow" msprop:Generator_UserTableName="TBDD_MODULES" msprop:Generator_RowEvArgName="TBDD_MODULESRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1904,7 +1907,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_INDEX_MAN" msprop:Generator_TableClassName="TBDD_INDEX_MANDataTable" msprop:Generator_TableVarName="tableTBDD_INDEX_MAN" msprop:Generator_TablePropName="TBDD_INDEX_MAN" msprop:Generator_RowDeletingName="TBDD_INDEX_MANRowDeleting" msprop:Generator_RowChangingName="TBDD_INDEX_MANRowChanging" msprop:Generator_RowEvHandlerName="TBDD_INDEX_MANRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_INDEX_MANRowDeleted" msprop:Generator_UserTableName="TBDD_INDEX_MAN" msprop:Generator_RowChangedName="TBDD_INDEX_MANRowChanged" msprop:Generator_RowEvArgName="TBDD_INDEX_MANRowChangeEvent" msprop:Generator_RowClassName="TBDD_INDEX_MANRow">
+        <xs:element name="TBDD_INDEX_MAN" msprop:Generator_TableClassName="TBDD_INDEX_MANDataTable" msprop:Generator_TableVarName="tableTBDD_INDEX_MAN" msprop:Generator_RowChangedName="TBDD_INDEX_MANRowChanged" msprop:Generator_TablePropName="TBDD_INDEX_MAN" msprop:Generator_RowDeletingName="TBDD_INDEX_MANRowDeleting" msprop:Generator_RowChangingName="TBDD_INDEX_MANRowChanging" msprop:Generator_RowEvHandlerName="TBDD_INDEX_MANRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_INDEX_MANRowDeleted" msprop:Generator_RowClassName="TBDD_INDEX_MANRow" msprop:Generator_UserTableName="TBDD_INDEX_MAN" msprop:Generator_RowEvArgName="TBDD_INDEX_MANRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -1986,7 +1989,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_CONNECTION" msprop:Generator_TableClassName="TBDD_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBDD_CONNECTION" msprop:Generator_TablePropName="TBDD_CONNECTION" msprop:Generator_RowDeletingName="TBDD_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBDD_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CONNECTIONRowDeleted" msprop:Generator_UserTableName="TBDD_CONNECTION" msprop:Generator_RowChangedName="TBDD_CONNECTIONRowChanged" msprop:Generator_RowEvArgName="TBDD_CONNECTIONRowChangeEvent" msprop:Generator_RowClassName="TBDD_CONNECTIONRow">
+        <xs:element name="TBDD_CONNECTION" msprop:Generator_TableClassName="TBDD_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBDD_CONNECTION" msprop:Generator_RowChangedName="TBDD_CONNECTIONRowChanged" msprop:Generator_TablePropName="TBDD_CONNECTION" msprop:Generator_RowDeletingName="TBDD_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBDD_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBDD_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_CONNECTIONRowDeleted" msprop:Generator_RowClassName="TBDD_CONNECTIONRow" msprop:Generator_UserTableName="TBDD_CONNECTION" msprop:Generator_RowEvArgName="TBDD_CONNECTIONRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -2059,7 +2062,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWDDINDEX_MAN" msprop:Generator_TableClassName="VWDDINDEX_MANDataTable" msprop:Generator_TableVarName="tableVWDDINDEX_MAN" msprop:Generator_TablePropName="VWDDINDEX_MAN" msprop:Generator_RowDeletingName="VWDDINDEX_MANRowDeleting" msprop:Generator_RowChangingName="VWDDINDEX_MANRowChanging" msprop:Generator_RowEvHandlerName="VWDDINDEX_MANRowChangeEventHandler" msprop:Generator_RowDeletedName="VWDDINDEX_MANRowDeleted" msprop:Generator_UserTableName="VWDDINDEX_MAN" msprop:Generator_RowChangedName="VWDDINDEX_MANRowChanged" msprop:Generator_RowEvArgName="VWDDINDEX_MANRowChangeEvent" msprop:Generator_RowClassName="VWDDINDEX_MANRow">
+        <xs:element name="VWDDINDEX_MAN" msprop:Generator_TableClassName="VWDDINDEX_MANDataTable" msprop:Generator_TableVarName="tableVWDDINDEX_MAN" msprop:Generator_RowChangedName="VWDDINDEX_MANRowChanged" msprop:Generator_TablePropName="VWDDINDEX_MAN" msprop:Generator_RowDeletingName="VWDDINDEX_MANRowDeleting" msprop:Generator_RowChangingName="VWDDINDEX_MANRowChanging" msprop:Generator_RowEvHandlerName="VWDDINDEX_MANRowChangeEventHandler" msprop:Generator_RowDeletedName="VWDDINDEX_MANRowDeleted" msprop:Generator_RowClassName="VWDDINDEX_MANRow" msprop:Generator_UserTableName="VWDDINDEX_MAN" msprop:Generator_RowEvArgName="VWDDINDEX_MANRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2172,7 +2175,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWDDINDEX_AUTOM" msprop:Generator_TableClassName="VWDDINDEX_AUTOMDataTable" msprop:Generator_TableVarName="tableVWDDINDEX_AUTOM" msprop:Generator_TablePropName="VWDDINDEX_AUTOM" msprop:Generator_RowDeletingName="VWDDINDEX_AUTOMRowDeleting" msprop:Generator_RowChangingName="VWDDINDEX_AUTOMRowChanging" msprop:Generator_RowEvHandlerName="VWDDINDEX_AUTOMRowChangeEventHandler" msprop:Generator_RowDeletedName="VWDDINDEX_AUTOMRowDeleted" msprop:Generator_UserTableName="VWDDINDEX_AUTOM" msprop:Generator_RowChangedName="VWDDINDEX_AUTOMRowChanged" msprop:Generator_RowEvArgName="VWDDINDEX_AUTOMRowChangeEvent" msprop:Generator_RowClassName="VWDDINDEX_AUTOMRow">
+        <xs:element name="VWDDINDEX_AUTOM" msprop:Generator_TableClassName="VWDDINDEX_AUTOMDataTable" msprop:Generator_TableVarName="tableVWDDINDEX_AUTOM" msprop:Generator_RowChangedName="VWDDINDEX_AUTOMRowChanged" msprop:Generator_TablePropName="VWDDINDEX_AUTOM" msprop:Generator_RowDeletingName="VWDDINDEX_AUTOMRowDeleting" msprop:Generator_RowChangingName="VWDDINDEX_AUTOMRowChanging" msprop:Generator_RowEvHandlerName="VWDDINDEX_AUTOMRowChangeEventHandler" msprop:Generator_RowDeletedName="VWDDINDEX_AUTOMRowDeleted" msprop:Generator_RowClassName="VWDDINDEX_AUTOMRow" msprop:Generator_UserTableName="VWDDINDEX_AUTOM" msprop:Generator_RowEvArgName="VWDDINDEX_AUTOMRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2268,7 +2271,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_INDEX_AUTOM" msprop:Generator_TableClassName="TBDD_INDEX_AUTOMDataTable" msprop:Generator_TableVarName="tableTBDD_INDEX_AUTOM" msprop:Generator_RowChangedName="TBDD_INDEX_AUTOMRowChanged" msprop:Generator_TablePropName="TBDD_INDEX_AUTOM" msprop:Generator_RowDeletingName="TBDD_INDEX_AUTOMRowDeleting" msprop:Generator_RowChangingName="TBDD_INDEX_AUTOMRowChanging" msprop:Generator_RowEvHandlerName="TBDD_INDEX_AUTOMRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_INDEX_AUTOMRowDeleted" msprop:Generator_RowClassName="TBDD_INDEX_AUTOMRow" msprop:Generator_UserTableName="TBDD_INDEX_AUTOM" msprop:Generator_RowEvArgName="TBDD_INDEX_AUTOMRowChangeEvent">
+        <xs:element name="TBDD_INDEX_AUTOM" msprop:Generator_TableClassName="TBDD_INDEX_AUTOMDataTable" msprop:Generator_TableVarName="tableTBDD_INDEX_AUTOM" msprop:Generator_TablePropName="TBDD_INDEX_AUTOM" msprop:Generator_RowDeletingName="TBDD_INDEX_AUTOMRowDeleting" msprop:Generator_RowChangingName="TBDD_INDEX_AUTOMRowChanging" msprop:Generator_RowEvHandlerName="TBDD_INDEX_AUTOMRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_INDEX_AUTOMRowDeleted" msprop:Generator_UserTableName="TBDD_INDEX_AUTOM" msprop:Generator_RowChangedName="TBDD_INDEX_AUTOMRowChanged" msprop:Generator_RowEvArgName="TBDD_INDEX_AUTOMRowChangeEvent" msprop:Generator_RowClassName="TBDD_INDEX_AUTOMRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2323,7 +2326,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBTempFiles2Index" msprop:Generator_TableClassName="TBTempFiles2IndexDataTable" msprop:Generator_TableVarName="tableTBTempFiles2Index" msprop:Generator_TablePropName="TBTempFiles2Index" msprop:Generator_RowDeletingName="TBTempFiles2IndexRowDeleting" msprop:Generator_RowChangingName="TBTempFiles2IndexRowChanging" msprop:Generator_RowEvHandlerName="TBTempFiles2IndexRowChangeEventHandler" msprop:Generator_RowDeletedName="TBTempFiles2IndexRowDeleted" msprop:Generator_UserTableName="TBTempFiles2Index" msprop:Generator_RowChangedName="TBTempFiles2IndexRowChanged" msprop:Generator_RowEvArgName="TBTempFiles2IndexRowChangeEvent" msprop:Generator_RowClassName="TBTempFiles2IndexRow">
+        <xs:element name="TBTempFiles2Index" msprop:Generator_TableClassName="TBTempFiles2IndexDataTable" msprop:Generator_TableVarName="tableTBTempFiles2Index" msprop:Generator_RowChangedName="TBTempFiles2IndexRowChanged" msprop:Generator_TablePropName="TBTempFiles2Index" msprop:Generator_RowDeletingName="TBTempFiles2IndexRowDeleting" msprop:Generator_RowChangingName="TBTempFiles2IndexRowChanging" msprop:Generator_RowEvHandlerName="TBTempFiles2IndexRowChangeEventHandler" msprop:Generator_RowDeletedName="TBTempFiles2IndexRowDeleted" msprop:Generator_RowClassName="TBTempFiles2IndexRow" msprop:Generator_UserTableName="TBTempFiles2Index" msprop:Generator_RowEvArgName="TBTempFiles2IndexRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Filestring" msprop:Generator_ColumnVarNameInTable="columnFilestring" msprop:Generator_ColumnPropNameInRow="Filestring" msprop:Generator_ColumnPropNameInTable="FilestringColumn" msprop:Generator_UserColumnName="Filestring" type="xs:string" minOccurs="0" />
@@ -2331,7 +2334,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBGI_CONFIGURATION" msprop:Generator_TableClassName="TBGI_CONFIGURATIONDataTable" msprop:Generator_TableVarName="tableTBGI_CONFIGURATION" msprop:Generator_TablePropName="TBGI_CONFIGURATION" msprop:Generator_RowDeletingName="TBGI_CONFIGURATIONRowDeleting" msprop:Generator_RowChangingName="TBGI_CONFIGURATIONRowChanging" msprop:Generator_RowEvHandlerName="TBGI_CONFIGURATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBGI_CONFIGURATIONRowDeleted" msprop:Generator_UserTableName="TBGI_CONFIGURATION" msprop:Generator_RowChangedName="TBGI_CONFIGURATIONRowChanged" msprop:Generator_RowEvArgName="TBGI_CONFIGURATIONRowChangeEvent" msprop:Generator_RowClassName="TBGI_CONFIGURATIONRow">
+        <xs:element name="TBGI_CONFIGURATION" msprop:Generator_TableClassName="TBGI_CONFIGURATIONDataTable" msprop:Generator_TableVarName="tableTBGI_CONFIGURATION" msprop:Generator_RowChangedName="TBGI_CONFIGURATIONRowChanged" msprop:Generator_TablePropName="TBGI_CONFIGURATION" msprop:Generator_RowDeletingName="TBGI_CONFIGURATIONRowDeleting" msprop:Generator_RowChangingName="TBGI_CONFIGURATIONRowChanging" msprop:Generator_RowEvHandlerName="TBGI_CONFIGURATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBGI_CONFIGURATIONRowDeleted" msprop:Generator_RowClassName="TBGI_CONFIGURATIONRow" msprop:Generator_UserTableName="TBGI_CONFIGURATION" msprop:Generator_RowEvArgName="TBGI_CONFIGURATIONRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" default="1" />
@@ -2381,7 +2384,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBGI_OBJECTTYPE_EMAIL_INDEX" msprop:Generator_TableClassName="TBGI_OBJECTTYPE_EMAIL_INDEXDataTable" msprop:Generator_TableVarName="tableTBGI_OBJECTTYPE_EMAIL_INDEX" msprop:Generator_RowChangedName="TBGI_OBJECTTYPE_EMAIL_INDEXRowChanged" msprop:Generator_TablePropName="TBGI_OBJECTTYPE_EMAIL_INDEX" msprop:Generator_RowDeletingName="TBGI_OBJECTTYPE_EMAIL_INDEXRowDeleting" msprop:Generator_RowChangingName="TBGI_OBJECTTYPE_EMAIL_INDEXRowChanging" msprop:Generator_RowEvHandlerName="TBGI_OBJECTTYPE_EMAIL_INDEXRowChangeEventHandler" msprop:Generator_RowDeletedName="TBGI_OBJECTTYPE_EMAIL_INDEXRowDeleted" msprop:Generator_RowClassName="TBGI_OBJECTTYPE_EMAIL_INDEXRow" msprop:Generator_UserTableName="TBGI_OBJECTTYPE_EMAIL_INDEX" msprop:Generator_RowEvArgName="TBGI_OBJECTTYPE_EMAIL_INDEXRowChangeEvent">
+        <xs:element name="TBGI_OBJECTTYPE_EMAIL_INDEX" msprop:Generator_TableClassName="TBGI_OBJECTTYPE_EMAIL_INDEXDataTable" msprop:Generator_TableVarName="tableTBGI_OBJECTTYPE_EMAIL_INDEX" msprop:Generator_TablePropName="TBGI_OBJECTTYPE_EMAIL_INDEX" msprop:Generator_RowDeletingName="TBGI_OBJECTTYPE_EMAIL_INDEXRowDeleting" msprop:Generator_RowChangingName="TBGI_OBJECTTYPE_EMAIL_INDEXRowChanging" msprop:Generator_RowEvHandlerName="TBGI_OBJECTTYPE_EMAIL_INDEXRowChangeEventHandler" msprop:Generator_RowDeletedName="TBGI_OBJECTTYPE_EMAIL_INDEXRowDeleted" msprop:Generator_UserTableName="TBGI_OBJECTTYPE_EMAIL_INDEX" msprop:Generator_RowChangedName="TBGI_OBJECTTYPE_EMAIL_INDEXRowChanged" msprop:Generator_RowEvArgName="TBGI_OBJECTTYPE_EMAIL_INDEXRowChangeEvent" msprop:Generator_RowClassName="TBGI_OBJECTTYPE_EMAIL_INDEXRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2453,7 +2456,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_INDEX_MAN_POSTPROCESSING" msprop:Generator_TableClassName="TBDD_INDEX_MAN_POSTPROCESSINGDataTable" msprop:Generator_TableVarName="tableTBDD_INDEX_MAN_POSTPROCESSING" msprop:Generator_TablePropName="TBDD_INDEX_MAN_POSTPROCESSING" msprop:Generator_RowDeletingName="TBDD_INDEX_MAN_POSTPROCESSINGRowDeleting" msprop:Generator_RowChangingName="TBDD_INDEX_MAN_POSTPROCESSINGRowChanging" msprop:Generator_RowEvHandlerName="TBDD_INDEX_MAN_POSTPROCESSINGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_INDEX_MAN_POSTPROCESSINGRowDeleted" msprop:Generator_UserTableName="TBDD_INDEX_MAN_POSTPROCESSING" msprop:Generator_RowChangedName="TBDD_INDEX_MAN_POSTPROCESSINGRowChanged" msprop:Generator_RowEvArgName="TBDD_INDEX_MAN_POSTPROCESSINGRowChangeEvent" msprop:Generator_RowClassName="TBDD_INDEX_MAN_POSTPROCESSINGRow">
+        <xs:element name="TBDD_INDEX_MAN_POSTPROCESSING" msprop:Generator_TableClassName="TBDD_INDEX_MAN_POSTPROCESSINGDataTable" msprop:Generator_TableVarName="tableTBDD_INDEX_MAN_POSTPROCESSING" msprop:Generator_RowChangedName="TBDD_INDEX_MAN_POSTPROCESSINGRowChanged" msprop:Generator_TablePropName="TBDD_INDEX_MAN_POSTPROCESSING" msprop:Generator_RowDeletingName="TBDD_INDEX_MAN_POSTPROCESSINGRowDeleting" msprop:Generator_RowChangingName="TBDD_INDEX_MAN_POSTPROCESSINGRowChanging" msprop:Generator_RowEvHandlerName="TBDD_INDEX_MAN_POSTPROCESSINGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_INDEX_MAN_POSTPROCESSINGRowDeleted" msprop:Generator_RowClassName="TBDD_INDEX_MAN_POSTPROCESSINGRow" msprop:Generator_UserTableName="TBDD_INDEX_MAN_POSTPROCESSING" msprop:Generator_RowEvArgName="TBDD_INDEX_MAN_POSTPROCESSINGRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2534,7 +2537,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWHDD_INDEX_MAN" msprop:Generator_TableClassName="TBWHDD_INDEX_MANDataTable" msprop:Generator_TableVarName="tableTBWHDD_INDEX_MAN" msprop:Generator_RowChangedName="TBWHDD_INDEX_MANRowChanged" msprop:Generator_TablePropName="TBWHDD_INDEX_MAN" msprop:Generator_RowDeletingName="TBWHDD_INDEX_MANRowDeleting" msprop:Generator_RowChangingName="TBWHDD_INDEX_MANRowChanging" msprop:Generator_RowEvHandlerName="TBWHDD_INDEX_MANRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWHDD_INDEX_MANRowDeleted" msprop:Generator_RowClassName="TBWHDD_INDEX_MANRow" msprop:Generator_UserTableName="TBWHDD_INDEX_MAN" msprop:Generator_RowEvArgName="TBWHDD_INDEX_MANRowChangeEvent">
+        <xs:element name="TBWHDD_INDEX_MAN" msprop:Generator_TableClassName="TBWHDD_INDEX_MANDataTable" msprop:Generator_TableVarName="tableTBWHDD_INDEX_MAN" msprop:Generator_TablePropName="TBWHDD_INDEX_MAN" msprop:Generator_RowDeletingName="TBWHDD_INDEX_MANRowDeleting" msprop:Generator_RowChangingName="TBWHDD_INDEX_MANRowChanging" msprop:Generator_RowEvHandlerName="TBWHDD_INDEX_MANRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWHDD_INDEX_MANRowDeleted" msprop:Generator_UserTableName="TBWHDD_INDEX_MAN" msprop:Generator_RowChangedName="TBWHDD_INDEX_MANRowChanged" msprop:Generator_RowEvArgName="TBWHDD_INDEX_MANRowChangeEvent" msprop:Generator_RowClassName="TBWHDD_INDEX_MANRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2548,7 +2551,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBTEMP_INDEXRESULTS" msprop:Generator_TableClassName="TBTEMP_INDEXRESULTSDataTable" msprop:Generator_TableVarName="tableTBTEMP_INDEXRESULTS" msprop:Generator_TablePropName="TBTEMP_INDEXRESULTS" msprop:Generator_RowDeletingName="TBTEMP_INDEXRESULTSRowDeleting" msprop:Generator_RowChangingName="TBTEMP_INDEXRESULTSRowChanging" msprop:Generator_RowEvHandlerName="TBTEMP_INDEXRESULTSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBTEMP_INDEXRESULTSRowDeleted" msprop:Generator_UserTableName="TBTEMP_INDEXRESULTS" msprop:Generator_RowChangedName="TBTEMP_INDEXRESULTSRowChanged" msprop:Generator_RowEvArgName="TBTEMP_INDEXRESULTSRowChangeEvent" msprop:Generator_RowClassName="TBTEMP_INDEXRESULTSRow">
+        <xs:element name="TBTEMP_INDEXRESULTS" msprop:Generator_TableClassName="TBTEMP_INDEXRESULTSDataTable" msprop:Generator_TableVarName="tableTBTEMP_INDEXRESULTS" msprop:Generator_RowChangedName="TBTEMP_INDEXRESULTSRowChanged" msprop:Generator_TablePropName="TBTEMP_INDEXRESULTS" msprop:Generator_RowDeletingName="TBTEMP_INDEXRESULTSRowDeleting" msprop:Generator_RowChangingName="TBTEMP_INDEXRESULTSRowChanging" msprop:Generator_RowEvHandlerName="TBTEMP_INDEXRESULTSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBTEMP_INDEXRESULTSRowDeleted" msprop:Generator_RowClassName="TBTEMP_INDEXRESULTSRow" msprop:Generator_UserTableName="TBTEMP_INDEXRESULTS" msprop:Generator_RowEvArgName="TBTEMP_INDEXRESULTSRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Indexname" msprop:Generator_ColumnVarNameInTable="columnIndexname" msprop:Generator_ColumnPropNameInRow="Indexname" msprop:Generator_ColumnPropNameInTable="IndexnameColumn" msprop:Generator_UserColumnName="Indexname" type="xs:string" minOccurs="0" />
@@ -2557,7 +2560,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_GROUPS_USER" msprop:Generator_TableClassName="TBDD_GROUPS_USERDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_USER" msprop:Generator_TablePropName="TBDD_GROUPS_USER" msprop:Generator_RowDeletingName="TBDD_GROUPS_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_USERRowDeleted" msprop:Generator_UserTableName="TBDD_GROUPS_USER" msprop:Generator_RowChangedName="TBDD_GROUPS_USERRowChanged" msprop:Generator_RowEvArgName="TBDD_GROUPS_USERRowChangeEvent" msprop:Generator_RowClassName="TBDD_GROUPS_USERRow">
+        <xs:element name="TBDD_GROUPS_USER" msprop:Generator_TableClassName="TBDD_GROUPS_USERDataTable" msprop:Generator_TableVarName="tableTBDD_GROUPS_USER" msprop:Generator_RowChangedName="TBDD_GROUPS_USERRowChanged" msprop:Generator_TablePropName="TBDD_GROUPS_USER" msprop:Generator_RowDeletingName="TBDD_GROUPS_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_GROUPS_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_GROUPS_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_GROUPS_USERRowDeleted" msprop:Generator_RowClassName="TBDD_GROUPS_USERRow" msprop:Generator_UserTableName="TBDD_GROUPS_USER" msprop:Generator_RowEvArgName="TBDD_GROUPS_USERRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementStep="2" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2582,7 +2585,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWGI_USER_GROUPS_RELATION" msprop:Generator_TableClassName="VWGI_USER_GROUPS_RELATIONDataTable" msprop:Generator_TableVarName="tableVWGI_USER_GROUPS_RELATION" msprop:Generator_TablePropName="VWGI_USER_GROUPS_RELATION" msprop:Generator_RowDeletingName="VWGI_USER_GROUPS_RELATIONRowDeleting" msprop:Generator_RowChangingName="VWGI_USER_GROUPS_RELATIONRowChanging" msprop:Generator_RowEvHandlerName="VWGI_USER_GROUPS_RELATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="VWGI_USER_GROUPS_RELATIONRowDeleted" msprop:Generator_UserTableName="VWGI_USER_GROUPS_RELATION" msprop:Generator_RowChangedName="VWGI_USER_GROUPS_RELATIONRowChanged" msprop:Generator_RowEvArgName="VWGI_USER_GROUPS_RELATIONRowChangeEvent" msprop:Generator_RowClassName="VWGI_USER_GROUPS_RELATIONRow">
+        <xs:element name="VWGI_USER_GROUPS_RELATION" msprop:Generator_TableClassName="VWGI_USER_GROUPS_RELATIONDataTable" msprop:Generator_TableVarName="tableVWGI_USER_GROUPS_RELATION" msprop:Generator_RowChangedName="VWGI_USER_GROUPS_RELATIONRowChanged" msprop:Generator_TablePropName="VWGI_USER_GROUPS_RELATION" msprop:Generator_RowDeletingName="VWGI_USER_GROUPS_RELATIONRowDeleting" msprop:Generator_RowChangingName="VWGI_USER_GROUPS_RELATIONRowChanging" msprop:Generator_RowEvHandlerName="VWGI_USER_GROUPS_RELATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="VWGI_USER_GROUPS_RELATIONRowDeleted" msprop:Generator_RowClassName="VWGI_USER_GROUPS_RELATIONRow" msprop:Generator_UserTableName="VWGI_USER_GROUPS_RELATION" msprop:Generator_RowEvArgName="VWGI_USER_GROUPS_RELATIONRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2621,7 +2624,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBHOTKEY_PROFILE" msprop:Generator_TableClassName="TBHOTKEY_PROFILEDataTable" msprop:Generator_TableVarName="tableTBHOTKEY_PROFILE" msprop:Generator_TablePropName="TBHOTKEY_PROFILE" msprop:Generator_RowDeletingName="TBHOTKEY_PROFILERowDeleting" msprop:Generator_RowChangingName="TBHOTKEY_PROFILERowChanging" msprop:Generator_RowEvHandlerName="TBHOTKEY_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="TBHOTKEY_PROFILERowDeleted" msprop:Generator_UserTableName="TBHOTKEY_PROFILE" msprop:Generator_RowChangedName="TBHOTKEY_PROFILERowChanged" msprop:Generator_RowEvArgName="TBHOTKEY_PROFILERowChangeEvent" msprop:Generator_RowClassName="TBHOTKEY_PROFILERow">
+        <xs:element name="TBHOTKEY_PROFILE" msprop:Generator_TableClassName="TBHOTKEY_PROFILEDataTable" msprop:Generator_TableVarName="tableTBHOTKEY_PROFILE" msprop:Generator_RowChangedName="TBHOTKEY_PROFILERowChanged" msprop:Generator_TablePropName="TBHOTKEY_PROFILE" msprop:Generator_RowDeletingName="TBHOTKEY_PROFILERowDeleting" msprop:Generator_RowChangingName="TBHOTKEY_PROFILERowChanging" msprop:Generator_RowEvHandlerName="TBHOTKEY_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="TBHOTKEY_PROFILERowDeleted" msprop:Generator_RowClassName="TBHOTKEY_PROFILERow" msprop:Generator_UserTableName="TBHOTKEY_PROFILE" msprop:Generator_RowEvArgName="TBHOTKEY_PROFILERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2693,7 +2696,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBHOTKEY_PATTERNS" msprop:Generator_TableClassName="TBHOTKEY_PATTERNSDataTable" msprop:Generator_TableVarName="tableTBHOTKEY_PATTERNS" msprop:Generator_TablePropName="TBHOTKEY_PATTERNS" msprop:Generator_RowDeletingName="TBHOTKEY_PATTERNSRowDeleting" msprop:Generator_RowChangingName="TBHOTKEY_PATTERNSRowChanging" msprop:Generator_RowEvHandlerName="TBHOTKEY_PATTERNSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBHOTKEY_PATTERNSRowDeleted" msprop:Generator_UserTableName="TBHOTKEY_PATTERNS" msprop:Generator_RowChangedName="TBHOTKEY_PATTERNSRowChanged" msprop:Generator_RowEvArgName="TBHOTKEY_PATTERNSRowChangeEvent" msprop:Generator_RowClassName="TBHOTKEY_PATTERNSRow">
+        <xs:element name="TBHOTKEY_PATTERNS" msprop:Generator_TableClassName="TBHOTKEY_PATTERNSDataTable" msprop:Generator_TableVarName="tableTBHOTKEY_PATTERNS" msprop:Generator_RowChangedName="TBHOTKEY_PATTERNSRowChanged" msprop:Generator_TablePropName="TBHOTKEY_PATTERNS" msprop:Generator_RowDeletingName="TBHOTKEY_PATTERNSRowDeleting" msprop:Generator_RowChangingName="TBHOTKEY_PATTERNSRowChanging" msprop:Generator_RowEvHandlerName="TBHOTKEY_PATTERNSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBHOTKEY_PATTERNSRowDeleted" msprop:Generator_RowClassName="TBHOTKEY_PATTERNSRow" msprop:Generator_UserTableName="TBHOTKEY_PATTERNS" msprop:Generator_RowEvArgName="TBHOTKEY_PATTERNSRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2732,7 +2735,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBMYHOTKEYS" msprop:Generator_TableClassName="TBMYHOTKEYSDataTable" msprop:Generator_TableVarName="tableTBMYHOTKEYS" msprop:Generator_TablePropName="TBMYHOTKEYS" msprop:Generator_RowDeletingName="TBMYHOTKEYSRowDeleting" msprop:Generator_RowChangingName="TBMYHOTKEYSRowChanging" msprop:Generator_RowEvHandlerName="TBMYHOTKEYSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMYHOTKEYSRowDeleted" msprop:Generator_UserTableName="TBMYHOTKEYS" msprop:Generator_RowChangedName="TBMYHOTKEYSRowChanged" msprop:Generator_RowEvArgName="TBMYHOTKEYSRowChangeEvent" msprop:Generator_RowClassName="TBMYHOTKEYSRow">
+        <xs:element name="TBMYHOTKEYS" msprop:Generator_TableClassName="TBMYHOTKEYSDataTable" msprop:Generator_TableVarName="tableTBMYHOTKEYS" msprop:Generator_RowChangedName="TBMYHOTKEYSRowChanged" msprop:Generator_TablePropName="TBMYHOTKEYS" msprop:Generator_RowDeletingName="TBMYHOTKEYSRowDeleting" msprop:Generator_RowChangingName="TBMYHOTKEYSRowChanging" msprop:Generator_RowEvHandlerName="TBMYHOTKEYSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMYHOTKEYSRowDeleted" msprop:Generator_RowClassName="TBMYHOTKEYSRow" msprop:Generator_UserTableName="TBMYHOTKEYS" msprop:Generator_RowEvArgName="TBMYHOTKEYSRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2746,7 +2749,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBHOTKEY_USER_PROFILE" msprop:Generator_TableClassName="TBHOTKEY_USER_PROFILEDataTable" msprop:Generator_TableVarName="tableTBHOTKEY_USER_PROFILE" msprop:Generator_RowChangedName="TBHOTKEY_USER_PROFILERowChanged" msprop:Generator_TablePropName="TBHOTKEY_USER_PROFILE" msprop:Generator_RowDeletingName="TBHOTKEY_USER_PROFILERowDeleting" msprop:Generator_RowChangingName="TBHOTKEY_USER_PROFILERowChanging" msprop:Generator_RowEvHandlerName="TBHOTKEY_USER_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="TBHOTKEY_USER_PROFILERowDeleted" msprop:Generator_RowClassName="TBHOTKEY_USER_PROFILERow" msprop:Generator_UserTableName="TBHOTKEY_USER_PROFILE" msprop:Generator_RowEvArgName="TBHOTKEY_USER_PROFILERowChangeEvent">
+        <xs:element name="TBHOTKEY_USER_PROFILE" msprop:Generator_TableClassName="TBHOTKEY_USER_PROFILEDataTable" msprop:Generator_TableVarName="tableTBHOTKEY_USER_PROFILE" msprop:Generator_TablePropName="TBHOTKEY_USER_PROFILE" msprop:Generator_RowDeletingName="TBHOTKEY_USER_PROFILERowDeleting" msprop:Generator_RowChangingName="TBHOTKEY_USER_PROFILERowChanging" msprop:Generator_RowEvHandlerName="TBHOTKEY_USER_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="TBHOTKEY_USER_PROFILERowDeleted" msprop:Generator_UserTableName="TBHOTKEY_USER_PROFILE" msprop:Generator_RowChangedName="TBHOTKEY_USER_PROFILERowChanged" msprop:Generator_RowEvArgName="TBHOTKEY_USER_PROFILERowChangeEvent" msprop:Generator_RowClassName="TBHOTKEY_USER_PROFILERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2792,7 +2795,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBHOTKEY_PATTERNS_REWORK" msprop:Generator_TableClassName="TBHOTKEY_PATTERNS_REWORKDataTable" msprop:Generator_TableVarName="tableTBHOTKEY_PATTERNS_REWORK" msprop:Generator_RowChangedName="TBHOTKEY_PATTERNS_REWORKRowChanged" msprop:Generator_TablePropName="TBHOTKEY_PATTERNS_REWORK" msprop:Generator_RowDeletingName="TBHOTKEY_PATTERNS_REWORKRowDeleting" msprop:Generator_RowChangingName="TBHOTKEY_PATTERNS_REWORKRowChanging" msprop:Generator_RowEvHandlerName="TBHOTKEY_PATTERNS_REWORKRowChangeEventHandler" msprop:Generator_RowDeletedName="TBHOTKEY_PATTERNS_REWORKRowDeleted" msprop:Generator_RowClassName="TBHOTKEY_PATTERNS_REWORKRow" msprop:Generator_UserTableName="TBHOTKEY_PATTERNS_REWORK" msprop:Generator_RowEvArgName="TBHOTKEY_PATTERNS_REWORKRowChangeEvent">
+        <xs:element name="TBHOTKEY_PATTERNS_REWORK" msprop:Generator_TableClassName="TBHOTKEY_PATTERNS_REWORKDataTable" msprop:Generator_TableVarName="tableTBHOTKEY_PATTERNS_REWORK" msprop:Generator_TablePropName="TBHOTKEY_PATTERNS_REWORK" msprop:Generator_RowDeletingName="TBHOTKEY_PATTERNS_REWORKRowDeleting" msprop:Generator_RowChangingName="TBHOTKEY_PATTERNS_REWORKRowChanging" msprop:Generator_RowEvHandlerName="TBHOTKEY_PATTERNS_REWORKRowChangeEventHandler" msprop:Generator_RowDeletedName="TBHOTKEY_PATTERNS_REWORKRowDeleted" msprop:Generator_UserTableName="TBHOTKEY_PATTERNS_REWORK" msprop:Generator_RowChangedName="TBHOTKEY_PATTERNS_REWORKRowChanged" msprop:Generator_RowEvArgName="TBHOTKEY_PATTERNS_REWORKRowChangeEvent" msprop:Generator_RowClassName="TBHOTKEY_PATTERNS_REWORKRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2852,7 +2855,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBHOTKEY_WINDOW_HOOK" msprop:Generator_TableClassName="TBHOTKEY_WINDOW_HOOKDataTable" msprop:Generator_TableVarName="tableTBHOTKEY_WINDOW_HOOK" msprop:Generator_TablePropName="TBHOTKEY_WINDOW_HOOK" msprop:Generator_RowDeletingName="TBHOTKEY_WINDOW_HOOKRowDeleting" msprop:Generator_RowChangingName="TBHOTKEY_WINDOW_HOOKRowChanging" msprop:Generator_RowEvHandlerName="TBHOTKEY_WINDOW_HOOKRowChangeEventHandler" msprop:Generator_RowDeletedName="TBHOTKEY_WINDOW_HOOKRowDeleted" msprop:Generator_UserTableName="TBHOTKEY_WINDOW_HOOK" msprop:Generator_RowChangedName="TBHOTKEY_WINDOW_HOOKRowChanged" msprop:Generator_RowEvArgName="TBHOTKEY_WINDOW_HOOKRowChangeEvent" msprop:Generator_RowClassName="TBHOTKEY_WINDOW_HOOKRow">
+        <xs:element name="TBHOTKEY_WINDOW_HOOK" msprop:Generator_TableClassName="TBHOTKEY_WINDOW_HOOKDataTable" msprop:Generator_TableVarName="tableTBHOTKEY_WINDOW_HOOK" msprop:Generator_RowChangedName="TBHOTKEY_WINDOW_HOOKRowChanged" msprop:Generator_TablePropName="TBHOTKEY_WINDOW_HOOK" msprop:Generator_RowDeletingName="TBHOTKEY_WINDOW_HOOKRowDeleting" msprop:Generator_RowChangingName="TBHOTKEY_WINDOW_HOOKRowChanging" msprop:Generator_RowEvHandlerName="TBHOTKEY_WINDOW_HOOKRowChangeEventHandler" msprop:Generator_RowDeletedName="TBHOTKEY_WINDOW_HOOKRowDeleted" msprop:Generator_RowClassName="TBHOTKEY_WINDOW_HOOKRow" msprop:Generator_UserTableName="TBHOTKEY_WINDOW_HOOK" msprop:Generator_RowEvArgName="TBHOTKEY_WINDOW_HOOKRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2884,7 +2887,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBGI_FILES_USER" msprop:Generator_TableClassName="TBGI_FILES_USERDataTable" msprop:Generator_TableVarName="tableTBGI_FILES_USER" msprop:Generator_RowChangedName="TBGI_FILES_USERRowChanged" msprop:Generator_TablePropName="TBGI_FILES_USER" msprop:Generator_RowDeletingName="TBGI_FILES_USERRowDeleting" msprop:Generator_RowChangingName="TBGI_FILES_USERRowChanging" msprop:Generator_RowEvHandlerName="TBGI_FILES_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBGI_FILES_USERRowDeleted" msprop:Generator_RowClassName="TBGI_FILES_USERRow" msprop:Generator_UserTableName="TBGI_FILES_USER" msprop:Generator_RowEvArgName="TBGI_FILES_USERRowChangeEvent">
+        <xs:element name="TBGI_FILES_USER" msprop:Generator_TableClassName="TBGI_FILES_USERDataTable" msprop:Generator_TableVarName="tableTBGI_FILES_USER" msprop:Generator_TablePropName="TBGI_FILES_USER" msprop:Generator_RowDeletingName="TBGI_FILES_USERRowDeleting" msprop:Generator_RowChangingName="TBGI_FILES_USERRowChanging" msprop:Generator_RowEvHandlerName="TBGI_FILES_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBGI_FILES_USERRowDeleted" msprop:Generator_UserTableName="TBGI_FILES_USER" msprop:Generator_RowChangedName="TBGI_FILES_USERRowChanged" msprop:Generator_RowEvArgName="TBGI_FILES_USERRowChangeEvent" msprop:Generator_RowClassName="TBGI_FILES_USERRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2922,7 +2925,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBGI_HISTORY" msprop:Generator_TableClassName="TBGI_HISTORYDataTable" msprop:Generator_TableVarName="tableTBGI_HISTORY" msprop:Generator_TablePropName="TBGI_HISTORY" msprop:Generator_RowDeletingName="TBGI_HISTORYRowDeleting" msprop:Generator_RowChangingName="TBGI_HISTORYRowChanging" msprop:Generator_RowEvHandlerName="TBGI_HISTORYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBGI_HISTORYRowDeleted" msprop:Generator_UserTableName="TBGI_HISTORY" msprop:Generator_RowChangedName="TBGI_HISTORYRowChanged" msprop:Generator_RowEvArgName="TBGI_HISTORYRowChangeEvent" msprop:Generator_RowClassName="TBGI_HISTORYRow">
+        <xs:element name="TBGI_HISTORY" msprop:Generator_TableClassName="TBGI_HISTORYDataTable" msprop:Generator_TableVarName="tableTBGI_HISTORY" msprop:Generator_RowChangedName="TBGI_HISTORYRowChanged" msprop:Generator_TablePropName="TBGI_HISTORY" msprop:Generator_RowDeletingName="TBGI_HISTORYRowDeleting" msprop:Generator_RowChangingName="TBGI_HISTORYRowChanging" msprop:Generator_RowEvHandlerName="TBGI_HISTORYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBGI_HISTORYRowDeleted" msprop:Generator_RowClassName="TBGI_HISTORYRow" msprop:Generator_UserTableName="TBGI_HISTORY" msprop:Generator_RowEvArgName="TBGI_HISTORYRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2944,7 +2947,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBAD_Users" msprop:Generator_TableClassName="TBAD_UsersDataTable" msprop:Generator_TableVarName="tableTBAD_Users" msprop:Generator_RowChangedName="TBAD_UsersRowChanged" msprop:Generator_TablePropName="TBAD_Users" msprop:Generator_RowDeletingName="TBAD_UsersRowDeleting" msprop:Generator_RowChangingName="TBAD_UsersRowChanging" msprop:Generator_RowEvHandlerName="TBAD_UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="TBAD_UsersRowDeleted" msprop:Generator_RowClassName="TBAD_UsersRow" msprop:Generator_UserTableName="TBAD_Users" msprop:Generator_RowEvArgName="TBAD_UsersRowChangeEvent">
+        <xs:element name="TBAD_Users" msprop:Generator_TableClassName="TBAD_UsersDataTable" msprop:Generator_TableVarName="tableTBAD_Users" msprop:Generator_TablePropName="TBAD_Users" msprop:Generator_RowDeletingName="TBAD_UsersRowDeleting" msprop:Generator_RowChangingName="TBAD_UsersRowChanging" msprop:Generator_RowEvHandlerName="TBAD_UsersRowChangeEventHandler" msprop:Generator_RowDeletedName="TBAD_UsersRowDeleted" msprop:Generator_UserTableName="TBAD_Users" msprop:Generator_RowChangedName="TBAD_UsersRowChanged" msprop:Generator_RowEvArgName="TBAD_UsersRowChangeEvent" msprop:Generator_RowClassName="TBAD_UsersRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="Select" msprop:Generator_ColumnVarNameInTable="columnSelect" msprop:Generator_ColumnPropNameInRow="_Select" msprop:Generator_ColumnPropNameInTable="SelectColumn" msprop:Generator_UserColumnName="Select" type="xs:boolean" default="false" minOccurs="0" />
@@ -2956,7 +2959,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBGI_REGEX_DOCTYPE" msprop:Generator_TableClassName="TBGI_REGEX_DOCTYPEDataTable" msprop:Generator_TableVarName="tableTBGI_REGEX_DOCTYPE" msprop:Generator_TablePropName="TBGI_REGEX_DOCTYPE" msprop:Generator_RowDeletingName="TBGI_REGEX_DOCTYPERowDeleting" msprop:Generator_RowChangingName="TBGI_REGEX_DOCTYPERowChanging" msprop:Generator_RowEvHandlerName="TBGI_REGEX_DOCTYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBGI_REGEX_DOCTYPERowDeleted" msprop:Generator_UserTableName="TBGI_REGEX_DOCTYPE" msprop:Generator_RowChangedName="TBGI_REGEX_DOCTYPERowChanged" msprop:Generator_RowEvArgName="TBGI_REGEX_DOCTYPERowChangeEvent" msprop:Generator_RowClassName="TBGI_REGEX_DOCTYPERow">
+        <xs:element name="TBGI_REGEX_DOCTYPE" msprop:Generator_TableClassName="TBGI_REGEX_DOCTYPEDataTable" msprop:Generator_TableVarName="tableTBGI_REGEX_DOCTYPE" msprop:Generator_RowChangedName="TBGI_REGEX_DOCTYPERowChanged" msprop:Generator_TablePropName="TBGI_REGEX_DOCTYPE" msprop:Generator_RowDeletingName="TBGI_REGEX_DOCTYPERowDeleting" msprop:Generator_RowChangingName="TBGI_REGEX_DOCTYPERowChanging" msprop:Generator_RowEvHandlerName="TBGI_REGEX_DOCTYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBGI_REGEX_DOCTYPERowDeleted" msprop:Generator_RowClassName="TBGI_REGEX_DOCTYPERow" msprop:Generator_UserTableName="TBGI_REGEX_DOCTYPE" msprop:Generator_RowEvArgName="TBGI_REGEX_DOCTYPERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -3092,21 +3095,21 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_TBDD_DOKUMENTART_EINGID" msdata:parent="TBDD_EINGANGSARTEN" msdata:child="TBDD_DOKUMENTART" msdata:parentkey="GUID" msdata:childkey="EINGANGSART_ID" msprop:Generator_UserChildTable="TBDD_DOKUMENTART" msprop:Generator_ChildPropName="GetTBDD_DOKUMENTARTRows" msprop:Generator_UserRelationName="FK_TBDD_DOKUMENTART_EINGID" msprop:Generator_ParentPropName="TBDD_EINGANGSARTENRow" msprop:Generator_RelationVarName="relationFK_TBDD_DOKUMENTART_EINGID" msprop:Generator_UserParentTable="TBDD_EINGANGSARTEN" />
+      <msdata:Relationship name="FK_TBDD_DOKUMENTART_EINGID" msdata:parent="TBDD_EINGANGSARTEN" msdata:child="TBDD_DOKUMENTART" msdata:parentkey="GUID" msdata:childkey="EINGANGSART_ID" msprop:Generator_UserChildTable="TBDD_DOKUMENTART" msprop:Generator_ChildPropName="GetTBDD_DOKUMENTARTRows" msprop:Generator_UserRelationName="FK_TBDD_DOKUMENTART_EINGID" msprop:Generator_RelationVarName="relationFK_TBDD_DOKUMENTART_EINGID" msprop:Generator_UserParentTable="TBDD_EINGANGSARTEN" msprop:Generator_ParentPropName="TBDD_EINGANGSARTENRow" />
-      <msdata:Relationship name="FK_TBDD_INDEX_MAN_CID" msdata:parent="TBDD_CONNECTION" msdata:child="TBDD_INDEX_MAN" msdata:parentkey="GUID" msdata:childkey="CONNECTION_ID" msprop:Generator_UserChildTable="TBDD_INDEX_MAN" msprop:Generator_ChildPropName="GetTBDD_INDEX_MANRows" msprop:Generator_UserRelationName="FK_TBDD_INDEX_MAN_CID" msprop:Generator_RelationVarName="relationFK_TBDD_INDEX_MAN_CID" msprop:Generator_UserParentTable="TBDD_CONNECTION" msprop:Generator_ParentPropName="TBDD_CONNECTIONRow" />
+      <msdata:Relationship name="FK_TBDD_INDEX_MAN_CID" msdata:parent="TBDD_CONNECTION" msdata:child="TBDD_INDEX_MAN" msdata:parentkey="GUID" msdata:childkey="CONNECTION_ID" msprop:Generator_UserChildTable="TBDD_INDEX_MAN" msprop:Generator_ChildPropName="GetTBDD_INDEX_MANRows" msprop:Generator_UserRelationName="FK_TBDD_INDEX_MAN_CID" msprop:Generator_ParentPropName="TBDD_CONNECTIONRow" msprop:Generator_RelationVarName="relationFK_TBDD_INDEX_MAN_CID" msprop:Generator_UserParentTable="TBDD_CONNECTION" />
-      <msdata:Relationship name="FK_TBDD_INDEX_AUTOM_DOCID" msdata:parent="TBDD_DOKUMENTART" msdata:child="TBDD_INDEX_AUTOM" msdata:parentkey="GUID" msdata:childkey="DOCTYPE_ID" msprop:Generator_UserChildTable="TBDD_INDEX_AUTOM" msprop:Generator_ChildPropName="GetTBDD_INDEX_AUTOMRows" msprop:Generator_UserRelationName="FK_TBDD_INDEX_AUTOM_DOCID" msprop:Generator_RelationVarName="relationFK_TBDD_INDEX_AUTOM_DOCID" msprop:Generator_UserParentTable="TBDD_DOKUMENTART" msprop:Generator_ParentPropName="TBDD_DOKUMENTARTRow" />
+      <msdata:Relationship name="FK_TBDD_INDEX_AUTOM_DOCID" msdata:parent="TBDD_DOKUMENTART" msdata:child="TBDD_INDEX_AUTOM" msdata:parentkey="GUID" msdata:childkey="DOCTYPE_ID" msprop:Generator_UserChildTable="TBDD_INDEX_AUTOM" msprop:Generator_ChildPropName="GetTBDD_INDEX_AUTOMRows" msprop:Generator_UserRelationName="FK_TBDD_INDEX_AUTOM_DOCID" msprop:Generator_ParentPropName="TBDD_DOKUMENTARTRow" msprop:Generator_RelationVarName="relationFK_TBDD_INDEX_AUTOM_DOCID" msprop:Generator_UserParentTable="TBDD_DOKUMENTART" />
-      <msdata:Relationship name="FKTBDD_INDEX_MAN_POSTPROCESSING_IDXID" msdata:parent="TBDD_INDEX_MAN" msdata:child="TBDD_INDEX_MAN_POSTPROCESSING" msdata:parentkey="GUID" msdata:childkey="IDXMAN_ID" msprop:Generator_UserChildTable="TBDD_INDEX_MAN_POSTPROCESSING" msprop:Generator_ChildPropName="GetTBDD_INDEX_MAN_POSTPROCESSINGRows" msprop:Generator_UserRelationName="FKTBDD_INDEX_MAN_POSTPROCESSING_IDXID" msprop:Generator_ParentPropName="TBDD_INDEX_MANRow" msprop:Generator_RelationVarName="relationFKTBDD_INDEX_MAN_POSTPROCESSING_IDXID" msprop:Generator_UserParentTable="TBDD_INDEX_MAN" />
+      <msdata:Relationship name="FKTBDD_INDEX_MAN_POSTPROCESSING_IDXID" msdata:parent="TBDD_INDEX_MAN" msdata:child="TBDD_INDEX_MAN_POSTPROCESSING" msdata:parentkey="GUID" msdata:childkey="IDXMAN_ID" msprop:Generator_UserChildTable="TBDD_INDEX_MAN_POSTPROCESSING" msprop:Generator_ChildPropName="GetTBDD_INDEX_MAN_POSTPROCESSINGRows" msprop:Generator_UserRelationName="FKTBDD_INDEX_MAN_POSTPROCESSING_IDXID" msprop:Generator_RelationVarName="relationFKTBDD_INDEX_MAN_POSTPROCESSING_IDXID" msprop:Generator_UserParentTable="TBDD_INDEX_MAN" msprop:Generator_ParentPropName="TBDD_INDEX_MANRow" />
-      <msdata:Relationship name="FKTBDD_INDEX_MAN_POSTPROCESSING_IDXID1" msdata:parent="TBWHDD_INDEX_MAN" msdata:child="TBDD_INDEX_MAN_POSTPROCESSING" msdata:parentkey="GUID" msdata:childkey="IDXMAN_ID" msprop:Generator_UserChildTable="TBDD_INDEX_MAN_POSTPROCESSING" msprop:Generator_ChildPropName="GetTBDD_INDEX_MAN_POSTPROCESSINGRows" msprop:Generator_UserRelationName="FKTBDD_INDEX_MAN_POSTPROCESSING_IDXID1" msprop:Generator_ParentPropName="TBWHDD_INDEX_MANRow" msprop:Generator_RelationVarName="relationFKTBDD_INDEX_MAN_POSTPROCESSING_IDXID1" msprop:Generator_UserParentTable="TBWHDD_INDEX_MAN" />
+      <msdata:Relationship name="FKTBDD_INDEX_MAN_POSTPROCESSING_IDXID1" msdata:parent="TBWHDD_INDEX_MAN" msdata:child="TBDD_INDEX_MAN_POSTPROCESSING" msdata:parentkey="GUID" msdata:childkey="IDXMAN_ID" msprop:Generator_UserChildTable="TBDD_INDEX_MAN_POSTPROCESSING" msprop:Generator_ChildPropName="GetTBDD_INDEX_MAN_POSTPROCESSINGRows" msprop:Generator_UserRelationName="FKTBDD_INDEX_MAN_POSTPROCESSING_IDXID1" msprop:Generator_RelationVarName="relationFKTBDD_INDEX_MAN_POSTPROCESSING_IDXID1" msprop:Generator_UserParentTable="TBWHDD_INDEX_MAN" msprop:Generator_ParentPropName="TBWHDD_INDEX_MANRow" />
-      <msdata:Relationship name="FK_TBDD_GROUPS_USER_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_ParentPropName="TBDD_USERRow" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" />
+      <msdata:Relationship name="FK_TBDD_GROUPS_USER_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBDD_GROUPS_USER" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBDD_GROUPS_USER" msprop:Generator_ChildPropName="GetTBDD_GROUPS_USERRows" msprop:Generator_UserRelationName="FK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_RelationVarName="relationFK_TBDD_GROUPS_USER_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" msprop:Generator_ParentPropName="TBDD_USERRow" />
-      <msdata:Relationship name="FK_TBDD_INDEX_MAN_DAID" msdata:parent="TBDD_DOKUMENTART" msdata:child="TBDD_INDEX_MAN" msdata:parentkey="GUID" msdata:childkey="DOK_ID" msprop:Generator_UserChildTable="TBDD_INDEX_MAN" msprop:Generator_ChildPropName="GetTBDD_INDEX_MANRows" msprop:Generator_UserRelationName="FK_TBDD_INDEX_MAN_DAID" msprop:Generator_ParentPropName="TBDD_DOKUMENTARTRow" msprop:Generator_RelationVarName="relationFK_TBDD_INDEX_MAN_DAID" msprop:Generator_UserParentTable="TBDD_DOKUMENTART" />
+      <msdata:Relationship name="FK_TBDD_INDEX_MAN_DAID" msdata:parent="TBDD_DOKUMENTART" msdata:child="TBDD_INDEX_MAN" msdata:parentkey="GUID" msdata:childkey="DOK_ID" msprop:Generator_UserChildTable="TBDD_INDEX_MAN" msprop:Generator_ChildPropName="GetTBDD_INDEX_MANRows" msprop:Generator_UserRelationName="FK_TBDD_INDEX_MAN_DAID" msprop:Generator_RelationVarName="relationFK_TBDD_INDEX_MAN_DAID" msprop:Generator_UserParentTable="TBDD_DOKUMENTART" msprop:Generator_ParentPropName="TBDD_DOKUMENTARTRow" />
-      <msdata:Relationship name="FK_TBHOTKEY_PATTERNS_PROFILE_ID" msdata:parent="TBHOTKEY_PROFILE" msdata:child="TBHOTKEY_PATTERNS" msdata:parentkey="GUID" msdata:childkey="HKPROFILE_ID" msprop:Generator_UserChildTable="TBHOTKEY_PATTERNS" msprop:Generator_ChildPropName="GetTBHOTKEY_PATTERNSRows" msprop:Generator_UserRelationName="FK_TBHOTKEY_PATTERNS_PROFILE_ID" msprop:Generator_ParentPropName="TBHOTKEY_PROFILERow" msprop:Generator_RelationVarName="relationFK_TBHOTKEY_PATTERNS_PROFILE_ID" msprop:Generator_UserParentTable="TBHOTKEY_PROFILE" />
+      <msdata:Relationship name="FK_TBHOTKEY_PATTERNS_PROFILE_ID" msdata:parent="TBHOTKEY_PROFILE" msdata:child="TBHOTKEY_PATTERNS" msdata:parentkey="GUID" msdata:childkey="HKPROFILE_ID" msprop:Generator_UserChildTable="TBHOTKEY_PATTERNS" msprop:Generator_ChildPropName="GetTBHOTKEY_PATTERNSRows" msprop:Generator_UserRelationName="FK_TBHOTKEY_PATTERNS_PROFILE_ID" msprop:Generator_RelationVarName="relationFK_TBHOTKEY_PATTERNS_PROFILE_ID" msprop:Generator_UserParentTable="TBHOTKEY_PROFILE" msprop:Generator_ParentPropName="TBHOTKEY_PROFILERow" />
-      <msdata:Relationship name="FK_TBHOTKEY_PATTERNS_PROFILE_ID1" msdata:parent="TBMYHOTKEYS" msdata:child="TBHOTKEY_PATTERNS" msdata:parentkey="GUID" msdata:childkey="HKPROFILE_ID" msprop:Generator_UserChildTable="TBHOTKEY_PATTERNS" msprop:Generator_ChildPropName="GetTBHOTKEY_PATTERNSRows" msprop:Generator_UserRelationName="FK_TBHOTKEY_PATTERNS_PROFILE_ID1" msprop:Generator_RelationVarName="relationFK_TBHOTKEY_PATTERNS_PROFILE_ID1" msprop:Generator_UserParentTable="TBMYHOTKEYS" msprop:Generator_ParentPropName="TBMYHOTKEYSRow" />
+      <msdata:Relationship name="FK_TBHOTKEY_PATTERNS_PROFILE_ID1" msdata:parent="TBMYHOTKEYS" msdata:child="TBHOTKEY_PATTERNS" msdata:parentkey="GUID" msdata:childkey="HKPROFILE_ID" msprop:Generator_UserChildTable="TBHOTKEY_PATTERNS" msprop:Generator_ChildPropName="GetTBHOTKEY_PATTERNSRows" msprop:Generator_UserRelationName="FK_TBHOTKEY_PATTERNS_PROFILE_ID1" msprop:Generator_ParentPropName="TBMYHOTKEYSRow" msprop:Generator_RelationVarName="relationFK_TBHOTKEY_PATTERNS_PROFILE_ID1" msprop:Generator_UserParentTable="TBMYHOTKEYS" />
-      <msdata:Relationship name="FK_TBHOTKEY_USER_PROFILE_PROFILE_ID" msdata:parent="TBHOTKEY_PROFILE" msdata:child="TBHOTKEY_USER_PROFILE" msdata:parentkey="GUID" msdata:childkey="HKPROFILE_ID" msprop:Generator_UserChildTable="TBHOTKEY_USER_PROFILE" msprop:Generator_ChildPropName="GetTBHOTKEY_USER_PROFILERows" msprop:Generator_UserRelationName="FK_TBHOTKEY_USER_PROFILE_PROFILE_ID" msprop:Generator_RelationVarName="relationFK_TBHOTKEY_USER_PROFILE_PROFILE_ID" msprop:Generator_UserParentTable="TBHOTKEY_PROFILE" msprop:Generator_ParentPropName="TBHOTKEY_PROFILERow" />
+      <msdata:Relationship name="FK_TBHOTKEY_USER_PROFILE_PROFILE_ID" msdata:parent="TBHOTKEY_PROFILE" msdata:child="TBHOTKEY_USER_PROFILE" msdata:parentkey="GUID" msdata:childkey="HKPROFILE_ID" msprop:Generator_UserChildTable="TBHOTKEY_USER_PROFILE" msprop:Generator_ChildPropName="GetTBHOTKEY_USER_PROFILERows" msprop:Generator_UserRelationName="FK_TBHOTKEY_USER_PROFILE_PROFILE_ID" msprop:Generator_ParentPropName="TBHOTKEY_PROFILERow" msprop:Generator_RelationVarName="relationFK_TBHOTKEY_USER_PROFILE_PROFILE_ID" msprop:Generator_UserParentTable="TBHOTKEY_PROFILE" />
-      <msdata:Relationship name="FK_TBHOTKEY_USER_PROFILE_PROFILE_ID1" msdata:parent="TBMYHOTKEYS" msdata:child="TBHOTKEY_USER_PROFILE" msdata:parentkey="GUID" msdata:childkey="HKPROFILE_ID" msprop:Generator_UserChildTable="TBHOTKEY_USER_PROFILE" msprop:Generator_ChildPropName="GetTBHOTKEY_USER_PROFILERows" msprop:Generator_UserRelationName="FK_TBHOTKEY_USER_PROFILE_PROFILE_ID1" msprop:Generator_RelationVarName="relationFK_TBHOTKEY_USER_PROFILE_PROFILE_ID1" msprop:Generator_UserParentTable="TBMYHOTKEYS" msprop:Generator_ParentPropName="TBMYHOTKEYSRow" />
+      <msdata:Relationship name="FK_TBHOTKEY_USER_PROFILE_PROFILE_ID1" msdata:parent="TBMYHOTKEYS" msdata:child="TBHOTKEY_USER_PROFILE" msdata:parentkey="GUID" msdata:childkey="HKPROFILE_ID" msprop:Generator_UserChildTable="TBHOTKEY_USER_PROFILE" msprop:Generator_ChildPropName="GetTBHOTKEY_USER_PROFILERows" msprop:Generator_UserRelationName="FK_TBHOTKEY_USER_PROFILE_PROFILE_ID1" msprop:Generator_ParentPropName="TBMYHOTKEYSRow" msprop:Generator_RelationVarName="relationFK_TBHOTKEY_USER_PROFILE_PROFILE_ID1" msprop:Generator_UserParentTable="TBMYHOTKEYS" />
-      <msdata:Relationship name="FK_TBHOTKEY_USER_PROFILE_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBHOTKEY_USER_PROFILE" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBHOTKEY_USER_PROFILE" msprop:Generator_ChildPropName="GetTBHOTKEY_USER_PROFILERows" msprop:Generator_UserRelationName="FK_TBHOTKEY_USER_PROFILE_USER_ID" msprop:Generator_RelationVarName="relationFK_TBHOTKEY_USER_PROFILE_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" msprop:Generator_ParentPropName="TBDD_USERRow" />
+      <msdata:Relationship name="FK_TBHOTKEY_USER_PROFILE_USER_ID" msdata:parent="TBDD_USER" msdata:child="TBHOTKEY_USER_PROFILE" msdata:parentkey="GUID" msdata:childkey="USER_ID" msprop:Generator_UserChildTable="TBHOTKEY_USER_PROFILE" msprop:Generator_ChildPropName="GetTBHOTKEY_USER_PROFILERows" msprop:Generator_UserRelationName="FK_TBHOTKEY_USER_PROFILE_USER_ID" msprop:Generator_ParentPropName="TBDD_USERRow" msprop:Generator_RelationVarName="relationFK_TBHOTKEY_USER_PROFILE_USER_ID" msprop:Generator_UserParentTable="TBDD_USER" />
-      <msdata:Relationship name="FK_TBHOTKEY_PATTERNS_REWORK_HKPATTERN_ID" msdata:parent="TBHOTKEY_PATTERNS" msdata:child="TBHOTKEY_PATTERNS_REWORK" msdata:parentkey="GUID" msdata:childkey="HKPATTERN_ID" msprop:Generator_UserChildTable="TBHOTKEY_PATTERNS_REWORK" msprop:Generator_ChildPropName="GetTBHOTKEY_PATTERNS_REWORKRows" msprop:Generator_UserRelationName="FK_TBHOTKEY_PATTERNS_REWORK_HKPATTERN_ID" msprop:Generator_RelationVarName="relationFK_TBHOTKEY_PATTERNS_REWORK_HKPATTERN_ID" msprop:Generator_UserParentTable="TBHOTKEY_PATTERNS" msprop:Generator_ParentPropName="TBHOTKEY_PATTERNSRow" />
+      <msdata:Relationship name="FK_TBHOTKEY_PATTERNS_REWORK_HKPATTERN_ID" msdata:parent="TBHOTKEY_PATTERNS" msdata:child="TBHOTKEY_PATTERNS_REWORK" msdata:parentkey="GUID" msdata:childkey="HKPATTERN_ID" msprop:Generator_UserChildTable="TBHOTKEY_PATTERNS_REWORK" msprop:Generator_ChildPropName="GetTBHOTKEY_PATTERNS_REWORKRows" msprop:Generator_UserRelationName="FK_TBHOTKEY_PATTERNS_REWORK_HKPATTERN_ID" msprop:Generator_ParentPropName="TBHOTKEY_PATTERNSRow" msprop:Generator_RelationVarName="relationFK_TBHOTKEY_PATTERNS_REWORK_HKPATTERN_ID" msprop:Generator_UserParentTable="TBHOTKEY_PATTERNS" />
-      <msdata:Relationship name="FK_TBHOTKEY_WINDOW_HOOK_PROFILE_ID" msdata:parent="TBHOTKEY_PROFILE" msdata:child="TBHOTKEY_WINDOW_HOOK" msdata:parentkey="GUID" msdata:childkey="HKPROFILE_ID" msprop:Generator_UserChildTable="TBHOTKEY_WINDOW_HOOK" msprop:Generator_ChildPropName="GetTBHOTKEY_WINDOW_HOOKRows" msprop:Generator_UserRelationName="FK_TBHOTKEY_WINDOW_HOOK_PROFILE_ID" msprop:Generator_ParentPropName="TBHOTKEY_PROFILERow" msprop:Generator_RelationVarName="relationFK_TBHOTKEY_WINDOW_HOOK_PROFILE_ID" msprop:Generator_UserParentTable="TBHOTKEY_PROFILE" />
+      <msdata:Relationship name="FK_TBHOTKEY_WINDOW_HOOK_PROFILE_ID" msdata:parent="TBHOTKEY_PROFILE" msdata:child="TBHOTKEY_WINDOW_HOOK" msdata:parentkey="GUID" msdata:childkey="HKPROFILE_ID" msprop:Generator_UserChildTable="TBHOTKEY_WINDOW_HOOK" msprop:Generator_ChildPropName="GetTBHOTKEY_WINDOW_HOOKRows" msprop:Generator_UserRelationName="FK_TBHOTKEY_WINDOW_HOOK_PROFILE_ID" msprop:Generator_RelationVarName="relationFK_TBHOTKEY_WINDOW_HOOK_PROFILE_ID" msprop:Generator_UserParentTable="TBHOTKEY_PROFILE" msprop:Generator_ParentPropName="TBHOTKEY_PROFILERow" />
-      <msdata:Relationship name="FK_TBGI_REGEX_DOCTYPE_DTID" msdata:parent="TBDD_DOKUMENTART" msdata:child="TBGI_REGEX_DOCTYPE" msdata:parentkey="GUID" msdata:childkey="DOCTYPE_ID" msprop:Generator_UserChildTable="TBGI_REGEX_DOCTYPE" msprop:Generator_ChildPropName="GetTBGI_REGEX_DOCTYPERows" msprop:Generator_UserRelationName="FK_TBGI_REGEX_DOCTYPE_DTID" msprop:Generator_ParentPropName="TBDD_DOKUMENTARTRow" msprop:Generator_RelationVarName="relationFK_TBGI_REGEX_DOCTYPE_DTID" msprop:Generator_UserParentTable="TBDD_DOKUMENTART" />
+      <msdata:Relationship name="FK_TBGI_REGEX_DOCTYPE_DTID" msdata:parent="TBDD_DOKUMENTART" msdata:child="TBGI_REGEX_DOCTYPE" msdata:parentkey="GUID" msdata:childkey="DOCTYPE_ID" msprop:Generator_UserChildTable="TBGI_REGEX_DOCTYPE" msprop:Generator_ChildPropName="GetTBGI_REGEX_DOCTYPERows" msprop:Generator_UserRelationName="FK_TBGI_REGEX_DOCTYPE_DTID" msprop:Generator_RelationVarName="relationFK_TBGI_REGEX_DOCTYPE_DTID" msprop:Generator_UserParentTable="TBDD_DOKUMENTART" msprop:Generator_ParentPropName="TBDD_DOKUMENTARTRow" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>

Global_Indexer/MyDataset.xss

@@ -4,26 +4,24 @@
      Changes to this file may cause incorrect behavior and will be lost if
      the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="23" ViewPortY="362" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
+<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-22" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
   <Shapes>
     <Shape ID="DesignTable:TBDD_USER" ZOrder="8" X="765" Y="247" Height="305" Width="213" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
     <Shape ID="DesignTable:TBDD_DOKUMENTART" ZOrder="10" X="119" Y="308" Height="381" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
     <Shape ID="DesignTable:TBDD_EINGANGSARTEN" ZOrder="28" X="431" Y="313" Height="210" Width="286" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:TBDD_DOKART_MODULE" ZOrder="45" X="1381" Y="161" Height="134" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:TBDD_DOKART_MODULE" ZOrder="42" X="1381" Y="161" Height="134" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:TBDD_MODULES" ZOrder="44" X="1096" Y="325" Height="115" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
+    <Shape ID="DesignTable:TBDD_MODULES" ZOrder="41" X="1096" Y="325" Height="115" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
-    <Shape ID="DesignTable:TBDD_INDEX_MAN" ZOrder="37" X="464" Y="656" Height="360" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
+    <Shape ID="DesignTable:TBDD_INDEX_MAN" ZOrder="2" X="456" Y="638" Height="360" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
-    <Shape ID="DesignTable:TBDD_CONNECTION" ZOrder="43" X="433" Y="81" Height="305" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBDD_CONNECTION" ZOrder="40" X="433" Y="81" Height="305" Width="264" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:VWDDINDEX_MAN" ZOrder="6" X="1040" Y="444" Height="381" Width="256" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="313" />
-    <Shape ID="DesignTable:VWDDINDEX_AUTOM" ZOrder="41" X="1361" Y="319" Height="305" Width="272" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:VWDDINDEX_AUTOM" ZOrder="38" X="1361" Y="319" Height="305" Width="272" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:TBDD_INDEX_AUTOM" ZOrder="7" X="668" Y="605" Height="305" Width="272" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBGI_CONFIGURATION" ZOrder="38" X="1071" Y="621" Height="229" Width="279" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
+    <Shape ID="DesignTable:TBGI_CONFIGURATION" ZOrder="35" X="1071" Y="621" Height="229" Width="279" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:TBGI_OBJECTTYPE_EMAIL_INDEX" ZOrder="29" X="117" Y="665" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
-    <Shape ID="DesignTable:TBDD_INDEX_MAN_POSTPROCESSING" ZOrder="35" X="743" Y="69" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBDD_INDEX_MAN_POSTPROCESSING" ZOrder="1" X="743" Y="69" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBWHDD_INDEX_MAN" ZOrder="33" X="133" Y="112" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBWHDD_INDEX_MAN" ZOrder="32" X="133" Y="112" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBDD_GROUPS" ZOrder="3" X="1096" Y="109" Height="210" Width="233" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
+    <Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="5" X="1014" Y="-1" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:TBDD_GROUPS_USER" ZOrder="4" X="1014" Y="-1" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
     <Shape ID="DesignTable:VWGI_USER_GROUPS_RELATION" ZOrder="9" X="845" Y="494" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:VWGI_DOCTYPE_GROUP" ZOrder="5" X="259" Y="220" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
     <Shape ID="DesignTable:TBHOTKEY_PROFILE" ZOrder="17" X="-12" Y="311" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
     <Shape ID="DesignTable:TBHOTKEY_PATTERNS" ZOrder="16" X="221" Y="-36" Height="320" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="252" />
     <Shape ID="DesignTable:TBMYHOTKEYS" ZOrder="20" X="25" Y="-1" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
@@ -32,13 +30,13 @@
     <Shape ID="DesignTable:TBHOTKEY_WINDOW_HOOK" ZOrder="15" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
     <Shape ID="DesignTable:TBGI_FILES_USER" ZOrder="14" X="1181" Y="7" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
     <Shape ID="DesignTable:TBGI_HISTORY" ZOrder="12" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBTempFiles2Index" ZOrder="39" X="915" Y="82" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:TBGI_REGEX_DOCTYPE" ZOrder="4" X="1027" Y="881" Height="210" Width="276" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:TBTEMP_INDEXRESULTS" ZOrder="32" X="639" Y="943" Height="67" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
+    <Shape ID="DesignTable:TBTempFiles2Index" ZOrder="36" X="915" Y="82" Height="106" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
+    <Shape ID="DesignTable:TBTEMP_INDEXRESULTS" ZOrder="31" X="639" Y="943" Height="67" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
     <Shape ID="DesignTable:TBAD_Users" ZOrder="11" X="1363" Y="639" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
-    <Shape ID="DesignTable:TBGI_REGEX_DOCTYPE" ZOrder="2" X="1027" Y="881" Height="210" Width="276" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
   </Shapes>
   <Connectors>
-    <Connector ID="DesignRelation:FK_TBDD_DOKUMENTART_EINGID" ZOrder="46" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_DOKUMENTART_EINGID" ZOrder="43" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>431</X>
@@ -50,19 +48,19 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_INDEX_MAN_CID" ZOrder="42" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_INDEX_MAN_CID" ZOrder="39" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>543</X>
+          <X>535</X>
           <Y>386</Y>
         </Point>
         <Point>
-          <X>543</X>
+          <X>535</X>
-          <Y>656</Y>
+          <Y>638</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_INDEX_AUTOM_DOCID" ZOrder="40" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_INDEX_AUTOM_DOCID" ZOrder="37" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>397</X>
@@ -74,14 +72,14 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FKTBDD_INDEX_MAN_POSTPROCESSING_IDXID" ZOrder="36" LineWidth="11">
+    <Connector ID="DesignRelation:FKTBDD_INDEX_MAN_POSTPROCESSING_IDXID" ZOrder="34" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>605</X>
+          <X>597</X>
-          <Y>656</Y>
+          <Y>638</Y>
         </Point>
         <Point>
-          <X>605</X>
+          <X>597</X>
           <Y>148</Y>
         </Point>
         <Point>
@@ -90,7 +88,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FKTBDD_INDEX_MAN_POSTPROCESSING_IDXID1" ZOrder="34" LineWidth="11">
+    <Connector ID="DesignRelation:FKTBDD_INDEX_MAN_POSTPROCESSING_IDXID1" ZOrder="33" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>959</X>
@@ -102,22 +100,6 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_GROUP_ID" ZOrder="31" LineWidth="11">
-      <RoutePoints>
-        <Point>
-          <X>1096</X>
-          <Y>262</Y>
-        </Point>
-        <Point>
-          <X>1047</X>
-          <Y>262</Y>
-        </Point>
-        <Point>
-          <X>1047</X>
-          <Y>228</Y>
-        </Point>
-      </RoutePoints>
-    </Connector>
     <Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_USER_ID" ZOrder="30" LineWidth="11">
       <RoutePoints>
         <Point>
@@ -137,20 +119,12 @@
     <Connector ID="DesignRelation:FK_TBDD_INDEX_MAN_DAID" ZOrder="27" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>94</X>
+          <X>397</X>
-          <Y>0</Y>
+          <Y>663</Y>
         </Point>
         <Point>
-          <X>94</X>
+          <X>456</X>
-          <Y>-30</Y>
+          <Y>663</Y>
-        </Point>
-        <Point>
-          <X>94</X>
-          <Y>-30</Y>
-        </Point>
-        <Point>
-          <X>94</X>
-          <Y>0</Y>
         </Point>
       </RoutePoints>
     </Connector>
@@ -278,7 +252,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBGI_REGEX_DOCTYPE_DTID" ZOrder="1" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBGI_REGEX_DOCTYPE_DTID" ZOrder="3" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>380</X>

Global_Indexer/frmAdministration.Designer.vb

@@ -118,12 +118,6 @@ Partial Class frmAdministration
         Me.BarButtonItem26 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem27 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem28 = New DevExpress.XtraBars.BarButtonItem()
-        Me.RibbonPageCategoryUserGroups = New DevExpress.XtraBars.Ribbon.RibbonPageCategory()
-        Me.RibbonPageUserGroups = New DevExpress.XtraBars.Ribbon.RibbonPage()
-        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageCategoryMisc = New DevExpress.XtraBars.Ribbon.RibbonPageCategory()
-        Me.RibbonPageEmail = New DevExpress.XtraBars.Ribbon.RibbonPage()
-        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -131,6 +125,8 @@ Partial Class frmAdministration
         Me.RibbonPageGroupManualIndexFunctions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupAutoIndex = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroupProfileRegex = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageEmail = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.Label12 = New System.Windows.Forms.Label()
         Me.XtraTabControl3 = New DevExpress.XtraTab.XtraTabControl()
@@ -222,12 +218,12 @@ Partial Class frmAdministration
         Me.XtraTabPageAutoIndex = New DevExpress.XtraTab.XtraTabPage()
         Me.Label6 = New System.Windows.Forms.Label()
         Me.ListBoxControl4 = New DevExpress.XtraEditors.ListBoxControl()
+        Me.TBDD_INDEX_AUTOMBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.btnAddWindowsVariable = New System.Windows.Forms.Button()
         Me.lblWindowParameter = New System.Windows.Forms.Label()
         Me.lbFileparameter = New System.Windows.Forms.ListBox()
         Me.lblValue = New System.Windows.Forms.Label()
         Me.INDEXNAME_AutoIndexCMB = New System.Windows.Forms.ComboBox()
-        Me.TBDD_INDEX_AUTOMBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.btnSQLViewAuto = New System.Windows.Forms.Button()
         Me.SQL_ACTIVECheckBox = New System.Windows.Forms.CheckBox()
         Me.GUIDAUTO_INDEXTextbox = New System.Windows.Forms.TextBox()
@@ -527,8 +523,7 @@ Partial Class frmAdministration
         resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
         Me.RibbonControl1.MaxItemId = 38
         Me.RibbonControl1.Name = "RibbonControl1"
-        Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryUserGroups, Me.RibbonPageCategoryMisc})
+        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageEmail})
-        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
         Me.RibbonControl1.ShowToolbarCustomizeItem = False
         Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
@@ -750,53 +745,6 @@ Partial Class frmAdministration
         Me.BarButtonItem28.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem28.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarButtonItem28.Name = "BarButtonItem28"
         '
-        'RibbonPageCategoryUserGroups
-        '
-        Me.RibbonPageCategoryUserGroups.Appearance.BackColor = System.Drawing.Color.SeaGreen
-        Me.RibbonPageCategoryUserGroups.Appearance.Options.UseBackColor = True
-        Me.RibbonPageCategoryUserGroups.AutoStretchPageHeaders = True
-        Me.RibbonPageCategoryUserGroups.Name = "RibbonPageCategoryUserGroups"
-        Me.RibbonPageCategoryUserGroups.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageUserGroups})
-        resources.ApplyResources(Me.RibbonPageCategoryUserGroups, "RibbonPageCategoryUserGroups")
-        '
-        'RibbonPageUserGroups
-        '
-        Me.RibbonPageUserGroups.Appearance.BackColor = System.Drawing.Color.SeaGreen
-        Me.RibbonPageUserGroups.Appearance.Options.UseBackColor = True
-        Me.RibbonPageUserGroups.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3})
-        Me.RibbonPageUserGroups.Name = "RibbonPageUserGroups"
-        resources.ApplyResources(Me.RibbonPageUserGroups, "RibbonPageUserGroups")
-        '
-        'RibbonPageGroup3
-        '
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem6)
-        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
-        resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
-        '
-        'RibbonPageCategoryMisc
-        '
-        Me.RibbonPageCategoryMisc.Appearance.BackColor = System.Drawing.Color.DarkCyan
-        Me.RibbonPageCategoryMisc.Appearance.Options.UseBackColor = True
-        Me.RibbonPageCategoryMisc.AutoStretchPageHeaders = True
-        Me.RibbonPageCategoryMisc.Name = "RibbonPageCategoryMisc"
-        Me.RibbonPageCategoryMisc.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageEmail})
-        resources.ApplyResources(Me.RibbonPageCategoryMisc, "RibbonPageCategoryMisc")
-        '
-        'RibbonPageEmail
-        '
-        Me.RibbonPageEmail.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4})
-        Me.RibbonPageEmail.Name = "RibbonPageEmail"
-        resources.ApplyResources(Me.RibbonPageEmail, "RibbonPageEmail")
-        '
-        'RibbonPageGroup4
-        '
-        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem9)
-        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem10)
-        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem11)
-        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem12)
-        Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
-        resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
-        '
         'RibbonPageStart
         '
         Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2, Me.RibbonPageGroup1, Me.RibbonPageGroupManualIndex, Me.RibbonPageGroupManualIndexFunctions, Me.RibbonPageGroupAutoIndex, Me.RibbonPageGroupProfileRegex})
@@ -860,6 +808,21 @@ Partial Class frmAdministration
         Me.RibbonPageGroupProfileRegex.Name = "RibbonPageGroupProfileRegex"
         resources.ApplyResources(Me.RibbonPageGroupProfileRegex, "RibbonPageGroupProfileRegex")
         '
+        'RibbonPageEmail
+        '
+        Me.RibbonPageEmail.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4})
+        Me.RibbonPageEmail.Name = "RibbonPageEmail"
+        resources.ApplyResources(Me.RibbonPageEmail, "RibbonPageEmail")
+        '
+        'RibbonPageGroup4
+        '
+        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem9)
+        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem10)
+        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem11)
+        Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonItem12)
+        Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
+        resources.ApplyResources(Me.RibbonPageGroup4, "RibbonPageGroup4")
+        '
         'RibbonStatusBar1
         '
         Me.RibbonStatusBar1.ItemLinks.Add(Me.txtStatus)
@@ -1771,6 +1734,11 @@ Partial Class frmAdministration
         resources.ApplyResources(Me.ListBoxControl4, "ListBoxControl4")
         Me.ListBoxControl4.Name = "ListBoxControl4"
         '
+        'TBDD_INDEX_AUTOMBindingSource
+        '
+        Me.TBDD_INDEX_AUTOMBindingSource.DataMember = "TBDD_INDEX_AUTOM"
+        Me.TBDD_INDEX_AUTOMBindingSource.DataSource = Me.MyDataset
+        '
         'btnAddWindowsVariable
         '
         Me.btnAddWindowsVariable.Image = Global.Global_Indexer.My.Resources.Resources.arrow_previous_16xLG
@@ -1802,11 +1770,6 @@ Partial Class frmAdministration
         Me.INDEXNAME_AutoIndexCMB.FormattingEnabled = True
         Me.INDEXNAME_AutoIndexCMB.Name = "INDEXNAME_AutoIndexCMB"
         '
-        'TBDD_INDEX_AUTOMBindingSource
-        '
-        Me.TBDD_INDEX_AUTOMBindingSource.DataMember = "TBDD_INDEX_AUTOM"
-        Me.TBDD_INDEX_AUTOMBindingSource.DataSource = Me.MyDataset
-        '
         'btnSQLViewAuto
         '
         resources.ApplyResources(Me.btnSQLViewAuto, "btnSQLViewAuto")
@@ -2152,6 +2115,7 @@ Partial Class frmAdministration
         '
         Me.SEQUENCENumericUpDown.DataBindings.Add(New System.Windows.Forms.Binding("Value", Me.TBDD_DOKUMENTARTBindingSource, "SEQUENCE", True))
         resources.ApplyResources(Me.SEQUENCENumericUpDown, "SEQUENCENumericUpDown")
+        Me.SEQUENCENumericUpDown.Maximum = New Decimal(New Integer() {999, 0, 0, 0})
         Me.SEQUENCENumericUpDown.Name = "SEQUENCENumericUpDown"
         '
         'GEANDERTWERTextBox
@@ -2946,9 +2910,6 @@ Partial Class frmAdministration
     Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
     Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageCategoryUserGroups As DevExpress.XtraBars.Ribbon.RibbonPageCategory
-    Friend WithEvents RibbonPageUserGroups As DevExpress.XtraBars.Ribbon.RibbonPage
-    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl
     Friend WithEvents Label12 As Label
@@ -2970,7 +2931,6 @@ Partial Class frmAdministration
     Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents txtStatus As DevExpress.XtraBars.BarStaticItem
     Friend WithEvents RibbonPage8 As DevExpress.XtraBars.Ribbon.RibbonPage
-    Friend WithEvents RibbonPageCategoryMisc As DevExpress.XtraBars.Ribbon.RibbonPageCategory
     Friend WithEvents RibbonPageEmail As DevExpress.XtraBars.Ribbon.RibbonPage
     Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents BarButtonItem9 As DevExpress.XtraBars.BarButtonItem

Global_Indexer/frmAdministration.resx

@@ -343,7 +343,7 @@
 </value>
   </data>
   <data name="BarButtonItem8.Caption" xml:space="preserve">
-    <value>Duplizieren</value>
+    <value>Profil kopieren</value>
   </data>
   <data name="BarButtonItem8.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -820,24 +820,6 @@
   <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="RibbonPageGroup3.Text" xml:space="preserve">
-    <value>Gruppenzuordnung</value>
-  </data>
-  <data name="RibbonPageUserGroups.Text" xml:space="preserve">
-    <value>Profil-Zuordnung</value>
-  </data>
-  <data name="RibbonPageCategoryUserGroups.Text" xml:space="preserve">
-    <value>Profil-Einstellungen</value>
-  </data>
-  <data name="RibbonPageGroup4.Text" xml:space="preserve">
-    <value>E-Mail Indexierung</value>
-  </data>
-  <data name="RibbonPageEmail.Text" xml:space="preserve">
-    <value>E-Mail Indexierung</value>
-  </data>
-  <data name="RibbonPageCategoryMisc.Text" xml:space="preserve">
-    <value>Weitere Einstellungen</value>
-  </data>
   <data name="RibbonPageGroup2.Text" xml:space="preserve">
     <value>Grundeinstellungen</value>
   </data>
@@ -857,7 +839,13 @@
     <value>Automatische Profilauswahl</value>
   </data>
   <data name="RibbonPageStart.Text" xml:space="preserve">
-    <value>Start</value>
+    <value>Profil-Verwaltung</value>
+  </data>
+  <data name="RibbonPageGroup4.Text" xml:space="preserve">
+    <value>E-Mail Indexierung</value>
+  </data>
+  <data name="RibbonPageEmail.Text" xml:space="preserve">
+    <value>E-Mail Indexierung</value>
   </data>
   <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
     <value>1376, 158</value>
@@ -3534,7 +3522,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei
     <value>1</value>
   </data>
   <data name="btnAddWindowsVariable.Location" type="System.Drawing.Point, System.Drawing">
-    <value>678, 87</value>
+    <value>677, 85</value>
   </data>
   <data name="btnAddWindowsVariable.Size" type="System.Drawing.Size, System.Drawing">
     <value>31, 22</value>
@@ -3660,7 +3648,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei
     <value>False</value>
   </data>
   <data name="INDEXNAME_AutoIndexCMB.Location" type="System.Drawing.Point, System.Drawing">
-    <value>259, 89</value>
+    <value>259, 86</value>
   </data>
   <data name="INDEXNAME_AutoIndexCMB.Size" type="System.Drawing.Size, System.Drawing">
     <value>198, 21</value>
@@ -3780,7 +3768,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei
     <value>Tahoma, 8.25pt</value>
   </data>
   <data name="GUIDAUTO_INDEXTextbox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>163, 87</value>
+    <value>163, 86</value>
   </data>
   <data name="GUIDAUTO_INDEXTextbox.Size" type="System.Drawing.Size, System.Drawing">
     <value>90, 21</value>
@@ -3834,7 +3822,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei
     <value>False</value>
   </data>
   <data name="VALUETextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>463, 89</value>
+    <value>463, 86</value>
   </data>
   <data name="VALUETextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>209, 21</value>
@@ -4164,7 +4152,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei
     <value>False</value>
   </data>
   <data name="INDEXNAME_AutoIndexTXT.Location" type="System.Drawing.Point, System.Drawing">
-    <value>259, 89</value>
+    <value>259, 86</value>
   </data>
   <data name="INDEXNAME_AutoIndexTXT.Size" type="System.Drawing.Size, System.Drawing">
     <value>198, 21</value>
@@ -7506,42 +7494,6 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei
   <data name="&gt;&gt;BarButtonItem28.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;RibbonPageCategoryUserGroups.Name" xml:space="preserve">
-    <value>RibbonPageCategoryUserGroups</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageCategoryUserGroups.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageCategory, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageUserGroups.Name" xml:space="preserve">
-    <value>RibbonPageUserGroups</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageUserGroups.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageGroup3.Name" xml:space="preserve">
-    <value>RibbonPageGroup3</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageGroup3.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageCategoryMisc.Name" xml:space="preserve">
-    <value>RibbonPageCategoryMisc</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageCategoryMisc.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageCategory, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageEmail.Name" xml:space="preserve">
-    <value>RibbonPageEmail</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageEmail.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageGroup4.Name" xml:space="preserve">
-    <value>RibbonPageGroup4</value>
-  </data>
-  <data name="&gt;&gt;RibbonPageGroup4.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;RibbonPageStart.Name" xml:space="preserve">
     <value>RibbonPageStart</value>
   </data>
@@ -7584,6 +7536,18 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei
   <data name="&gt;&gt;RibbonPageGroupProfileRegex.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;RibbonPageEmail.Name" xml:space="preserve">
+    <value>RibbonPageEmail</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageEmail.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup4.Name" xml:space="preserve">
+    <value>RibbonPageGroup4</value>
+  </data>
+  <data name="&gt;&gt;RibbonPageGroup4.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;viewAssignedGroups.Name" xml:space="preserve">
     <value>viewAssignedGroups</value>
   </data>

Global_Indexer/frmAdministration.vb

@@ -7,7 +7,8 @@ Public Class frmAdministration
     Public Shared _aktDokart_Id As Integer
 
     Private GroupToDelete As Integer = Nothing
-
+    Private SourceAttributes As List(Of String)
+    Private SourceObjectTypes As List(Of String)
     Private IsInsert As Boolean = False
     Dim frmloaded As Boolean = False
     Private Sub TBDD_DOKUMENTARTBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs)
@@ -48,8 +49,7 @@ Public Class frmAdministration
         oDragDropManager.AddGridView(viewAssignedUsers)
         oDragDropManager.AddGridView(viewAvailableUsers)
 
-        RibbonPageCategoryUserGroups.Visible = False
+        RibbonPageEmail.Visible = False
-        RibbonPageCategoryMisc.Visible = False
 
         Dim oDatatable As New DataTable()
         oDatatable.Columns.Add("VALUE_TEXT")
@@ -72,26 +72,35 @@ Public Class frmAdministration
         Catch ex As Exception
             MsgBox("Error in frmAdministration_Load: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
         End Try
-        If GI_withWindream = True Then
+        If IDB_ACTIVE = False Then
-            If ClassWindream.Init() = True Then
+            WINDREAM_DIRECTCheckBox.Visible = True
-            End If
+        Else
+            WINDREAM_DIRECTCheckBox.Visible = False
         End If
+        'If GI_withWindream = True Then
+        '    If ClassWindream.Init() = True Then
+        '    End If
+        'End If
     End Sub
     Private Sub ObjektTypenEintragen()
         Try
             pnlObjekttype_Config.Enabled = False
 
-            Dim oDokumentTyp As WINDREAMLib.WMObject
             ' Combobox leeren
             Me.OBJEKTTYPComboBox.Items.Clear()
             ListBoxControl1.Items.Clear()
             ' alle Objekttypen durchlaufen
-            For Each oDokumentTyp In ClassWindream.GetObjecttypesAsObjects
+            If SourceObjectTypes Is Nothing Then
+                SourceObjectTypes = WINDREAM.ObjectTypes
+            End If
+
+            For Each otype As String In SourceObjectTypes
                 ' und in die Combobox eintragen
-                Me.OBJEKTTYPComboBox.Items.Add(oDokumentTyp.aName)
+                Me.OBJEKTTYPComboBox.Items.Add(otype)
-                ListBoxControl1.Items.Add(oDokumentTyp.aName)
+                ListBoxControl1.Items.Add(otype)
             Next
 
+
             pnlObjekttype_Config.Enabled = True
         Catch ex As Exception
             MsgBox("Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Unexpected error inm Eintragen der Objekttypen")
@@ -189,7 +198,10 @@ Public Class frmAdministration
             End Try
 
             If MyDataset.TBDD_DOKUMENTART.GetChanges Is Nothing = False Then
+                If Not IsInsert Then
                     Me.GEANDERTWERTextBox.Text = Environment.UserName
+                End If
+
                 Try
                     Me.TBDD_DOKUMENTARTBindingSource.EndEdit()
                 Catch ex As Exception
@@ -199,23 +211,28 @@ Public Class frmAdministration
                         MsgBox("Error in EndEdit 2 documenttype: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
                     End If
                 End Try
+
                 TBDD_DOKUMENTARTTableAdapter.Update(MyDataset.TBDD_DOKUMENTART)
-                txtStatus.Caption = $"Profil gespeichert - {Now.ToString}"
+
                 If IsInsert = True Then
                     Dim oNewID As Integer
                     oNewID = ClassDatabase.Execute_Scalar("SELECT MAX(GUID) FROM TBDD_DOKUMENTART", MyConnectionString)
                     If IsNumeric(oNewID) Then
-                        Dim osql = $" EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'GLOBIX',{oNewID}"
+                        Dim osql = $" EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'GLOBIX', {oNewID}"
-                        ClassDatabase.Execute_non_Query(osql)
+                        If ClassDatabase.Execute_non_Query(osql) = False Then
+                            MsgBox("Fehler beim zuweisen des neuen Profils zum Modul Global-Indexer!", MsgBoxStyle.Critical, Text)
+                        End If
+                    End If
                 End If
 
-                End If
+                SetStatus("Profil gespeichert!")
+            Else
+                ClearStatus()
             End If
             IsInsert = False
         Catch ex As Exception
             MsgBox("Error in Save_Dokumentart: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
         End Try
-
     End Sub
     Private Sub btnNamenkonvention_Click(sender As Object, e As EventArgs) Handles btnNamenkonvention.Click
         Save_Dokumentart()
@@ -235,11 +252,18 @@ Public Class frmAdministration
             CURRENT_DOKART_ID = DOKART_GUIDTextBox.Text
             Load_TabData()
 
-
             gridAssignedGroups.DataSource = ClassDatatables.GetAssignedGroups(CURRENT_DOKART_ID)
             gridAvailableGroups.DataSource = ClassDatatables.GetAvailableGroups(CURRENT_DOKART_ID)
             gridAssignedUsers.DataSource = ClassDatatables.GetAssignedUsers(CURRENT_DOKART_ID)
             gridAvailableUsers.DataSource = ClassDatatables.GetAvailableUsers(CURRENT_DOKART_ID)
+
+            If TextBox3.Text = String.Empty Then
+                TextBox5.Enabled = False
+                TextBox1.Enabled = False
+            Else
+                TextBox5.Enabled = True
+                TextBox1.Enabled = True
+            End If
         End If
     End Sub
 
@@ -262,7 +286,7 @@ Public Class frmAdministration
 
         MyDataset.TBDD_DOKUMENTART.ERSTELLTWERColumn.DefaultValue = Environment.UserName
         MyDataset.TBDD_DOKUMENTART.OBJEKTTYPColumn.DefaultValue = ""
-        MyDataset.TBDD_DOKUMENTART.NAMENKONVENTIONColumn.DefaultValue = "[%vOFilename]-[%vYY_MM_DD]-[%Version]"
+        MyDataset.TBDD_DOKUMENTART.NAMENKONVENTIONColumn.DefaultValue = "[%vOFilename]-[%vYY_MM_DD]"
         MyDataset.TBDD_DOKUMENTART.DUPLICATE_HANDLINGColumn.DefaultValue = "New version"
         IsInsert = True
     End Sub
@@ -288,13 +312,19 @@ Public Class frmAdministration
     End Sub
     Sub load_WDIndices()
         Try
-            If Me.OBJEKTTYPComboBox.SelectedIndex <> -1 Then
+            If OBJEKTTYPComboBox.Text <> "" Then
                 Me.WD_INDEXComboBox.Items.Clear()
                 Me.WD_INDEXComboBox.Items.Add("")
-                Dim indexe = ClassWindream.GetIndicesByObjecttype(OBJEKTTYPComboBox.Text)
+                Me.INDEXNAME_AutoIndexCMB.Items.Clear()
-                If indexe IsNot Nothing Then
+
-                    For Each index As String In indexe
+                If SourceAttributes Is Nothing Then
+                    SourceAttributes = WINDREAM.GetIndiciesByObjecttype(OBJEKTTYPComboBox.Text)
+                End If
+
+                If SourceAttributes IsNot Nothing Then
+                    For Each index As String In SourceAttributes
                         Me.WD_INDEXComboBox.Items.Add(index)
+                        INDEXNAME_AutoIndexCMB.Items.Add(index)
                     Next
                 End If
             End If
@@ -302,21 +332,8 @@ Public Class frmAdministration
             MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in load_WDIndices: ")
         End Try
     End Sub
-    Sub load_WDIndices2AutoIndizes()
+
-        Try
+
-            If Me.OBJEKTTYPComboBox.SelectedIndex <> -1 Then
-                Me.INDEXNAME_AutoIndexCMB.Items.Clear()
-                Dim indexe = ClassWindream.GetIndicesByObjecttype(OBJEKTTYPComboBox.Text)
-                If indexe IsNot Nothing Then
-                    For Each index As String In indexe
-                        Me.INDEXNAME_AutoIndexCMB.Items.Add(index)
-                    Next
-                End If
-            End If
-        Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in load_WDIndices2AutoIndizes: ")
-        End Try
-    End Sub
     Private Sub frmAdministration_Shown(sender As Object, e As EventArgs) Handles Me.Shown
         If DOKART_GUIDTextBox.Text <> "" Then
             Load_Dokart()
@@ -374,7 +391,6 @@ Public Class frmAdministration
         If WINDREAM_DIRECTCheckBox.Checked = True Then
             INDEXNAME_AutoIndexTXT.Visible = False
             INDEXNAME_AutoIndexCMB.Visible = True
-            load_WDIndices2AutoIndizes()
         Else
             INDEXNAME_AutoIndexTXT.Visible = True
             INDEXNAME_AutoIndexCMB.Visible = False
@@ -401,12 +417,15 @@ Public Class frmAdministration
     End Sub
     Sub Save_IndexMan()
         Try
+            If Not IsInsert Then
+                CHANGED_WHOTextBox.Text = Environment.UserName
+            End If
+
             Me.TBDD_INDEX_MANBindingSource.EndEdit()
             If MyDataset.TBDD_INDEX_MAN.GetChanges Is Nothing = False Then
-                CHANGED_WHOTextBox.Text = Environment.UserName
                 Me.TBDD_INDEX_MANBindingSource.EndEdit()
                 TBDD_INDEX_MANTableAdapter.Update(MyDataset.TBDD_INDEX_MAN)
-                SetStatus("Index erfolgreich gespeichert!")
+                SetStatus("Manueller Index erfolgreich gespeichert!")
             Else
                 ClearStatus()
             End If
@@ -422,7 +441,9 @@ Public Class frmAdministration
                 CHANGED_WHOTextBox3.Text = Environment.UserName
                 Me.TBDD_INDEX_AUTOMBindingSource.EndEdit()
                 TBDD_INDEX_AUTOMTableAdapter.Update(MyDataset.TBDD_INDEX_AUTOM)
-                SetStatus("Index erfolgreich gespeichert!")
+                SetStatus("Automatischer Index erfolgreich gespeichert!")
+            Else
+                ClearStatus()
             End If
             IsInsert = False
         Catch ex As Exception
@@ -434,12 +455,12 @@ Public Class frmAdministration
         If frmloaded = True Then
             If SUGGESTIONCheckBox.CheckState = CheckState.Checked Then
                 btnSQLView.Visible = True
-                MULTISELECTCheckBox.Visible = True
+                'MULTISELECTCheckBox.Visible = True
                 VKT_ADD_ITEMCheckbox.Visible = True
                 VKT_PREVENT_MULTIPLE_VALUESCheckbox.Visible = True
             Else
                 btnSQLView.Visible = False
-                MULTISELECTCheckBox.Visible = False
+                'MULTISELECTCheckBox.Visible = False
                 VKT_ADD_ITEMCheckbox.Visible = False
                 VKT_PREVENT_MULTIPLE_VALUESCheckbox.Visible = False
             End If
@@ -453,23 +474,21 @@ Public Class frmAdministration
             RibbonControl1.SelectedPage = RibbonPageStart
         End If
 
-        If oSelectedPageName = XtraTabPageUsersGroups.Name Then
+        If oSelectedPageName = XtraTabPageUsersGroups.Name And DOKART_GUIDTextBox.Text <> "" Then
-            RibbonPageCategoryUserGroups.Visible = True
+            gridAssignedGroups.DataSource = ClassDatatables.GetAssignedGroups(DOKART_GUIDTextBox.Text)
-            RibbonControl1.SelectedPage = RibbonPageUserGroups
+            gridAvailableGroups.DataSource = ClassDatatables.GetAvailableGroups(DOKART_GUIDTextBox.Text)
-        Else
+            gridAssignedUsers.DataSource = ClassDatatables.GetAssignedUsers(DOKART_GUIDTextBox.Text)
-            RibbonPageCategoryUserGroups.Visible = False
+            gridAvailableUsers.DataSource = ClassDatatables.GetAvailableUsers(DOKART_GUIDTextBox.Text)
         End If
 
         If oSelectedPageName = XtraTabPageEmail.Name Then
-            RibbonPageCategoryMisc.Visible = True
+            RibbonPageEmail.Visible = True
 
             If oSelectedPageName = XtraTabPageEmail.Name Then
                 RibbonControl1.SelectedPage = RibbonPageEmail
             End If
-
-
         Else
-            RibbonPageCategoryMisc.Visible = False
+            RibbonPageEmail.Visible = False
         End If
 
         Select Case XtraTabControl1.SelectedTabPageIndex
@@ -490,10 +509,14 @@ Public Class frmAdministration
             IDX_EMAIL_SUBJECTComboBox.Items.Clear()
             IDX_EMAIL_TOComboBox.Items.Clear()
             IDX_CHECK_ATTACHMENTComboBox.Items.Clear()
-            Dim indexe = ClassWindream.GetIndicesByObjecttype(Otype)
+            If SourceAttributes Is Nothing Then
-            If indexe IsNot Nothing Then
+                SourceAttributes = WINDREAM.GetIndiciesByObjecttype(Otype)
-                For Each index As String In indexe
+            End If
-                    Select Case ClassWindream.GetTypeOfIndexAsIntByName(index)
+
+
+            If SourceAttributes IsNot Nothing Then
+                For Each index As String In SourceAttributes
+                    Select Case WINDREAM.GetIndexType(index)
                         Case 4 'Boolean
                             Me.IDX_CHECK_ATTACHMENTComboBox.Items.Add(index)
                         Case Else
@@ -513,13 +536,15 @@ Public Class frmAdministration
     End Sub
     Private Sub ObjektTypenListBoxEintragen()
         Try
-            Dim oDokumentTyp As WINDREAMLib.WMObject
             ' Combobox leeren
             ListBoxControl1.Items.Clear()
             ' alle Objekttypen durchlaufen
-            For Each oDokumentTyp In ClassWindream.GetObjecttypesAsObjects
+            If SourceObjectTypes Is Nothing Then
+                SourceObjectTypes = WINDREAM.ObjectTypes
+            End If
+            For Each oDokumentTyp In SourceObjectTypes
                 ' und in die Combobox eintragen
-                ListBoxControl1.Items.Add(oDokumentTyp.aName)
+                ListBoxControl1.Items.Add(oDokumentTyp)
             Next
         Catch ex As Exception
             MsgBox("Error in ObjektTypenListBoxEintragen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -576,10 +601,7 @@ Public Class frmAdministration
             lblWDINDEX.Visible = True
             OBJEKTTYPComboBox.Visible = True
             WD_INDEXComboBox.Visible = True
-
-            If ClassWindream.Init() = True Then
             ObjektTypenEintragen()
-            End If
         Else
             lblObjekttyp.Visible = False
             lblWDINDEX.Visible = False
@@ -664,9 +686,9 @@ Public Class frmAdministration
                 lbFileparameter.Visible = True
                 btnAddWindowsVariable.Visible = True
             End If
-            If IsInsert = False Then
+            'If IsInsert = False Then
-                Save_IndexAuto()
+            '    Save_IndexAuto()
-            End If
+            'End If
         End If
     End Sub
 
@@ -800,15 +822,21 @@ Public Class frmAdministration
     End Sub
     Sub Save_PostProcessing()
         Try
+            If Not IsInsert Then
+                CHANGED_WHOTextBox4.Text = Environment.UserName
+            End If
+
             TBDD_INDEX_MAN_POSTPROCESSINGBindingSource.EndEdit()
             If MyDataset.TBDD_INDEX_MAN_POSTPROCESSING.GetChanges Is Nothing = False Then
-                CHANGED_WHOTextBox4.Text = Environment.UserName
+
                 TBDD_INDEX_MAN_POSTPROCESSINGBindingSource.EndEdit()
                 Me.TBDD_INDEX_MAN_POSTPROCESSINGTableAdapter.Update(MyDataset.TBDD_INDEX_MAN_POSTPROCESSING)
-                SetStatus("Funktion erfolgreich gespeichert!")
+                SetStatus("Nachbearbeitungsfunktion erfolgreich gespeichert!")
             Else
                 ClearStatus()
             End If
+
+            IsInsert = False
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Save Post Processing: ")
         End Try
@@ -817,9 +845,11 @@ Public Class frmAdministration
     Private Sub TBDD_INDEX_MAN_POSTPROCESSINGBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBDD_INDEX_MAN_POSTPROCESSINGBindingSource.AddingNew
         Save_Dokumentart()
         EnableControls(XtraTabPageManualIndexFunctions)
+        MyDataset.TBDD_INDEX_MAN_POSTPROCESSING.ADDED_WHENColumn.DefaultValue = DateTime.Now
         MyDataset.TBDD_INDEX_MAN_POSTPROCESSING.ADDED_WHOColumn.DefaultValue = Environment.UserName
         MyDataset.TBDD_INDEX_MAN_POSTPROCESSING.SEQUENCEColumn.DefaultValue = 1
         MyDataset.TBDD_INDEX_MAN_POSTPROCESSING.COMMENTColumn.DefaultValue = "Funktions Name"
+        IsInsert = True
     End Sub
     Sub EnableControls(Control As Control, Optional Value As Boolean = True)
         For Each oSubControl As Control In Control.Controls
@@ -857,7 +887,8 @@ Public Class frmAdministration
             txtcrFoldermanuell.Text = ""
         End If
         Me.TBDD_DOKUMENTARTTableAdapter.cmdUpdateFolderIndex(Environment.UserName, FOLDER_FOR_INDEXTextBox.Text, DOKART_GUIDTextBox.Text)
-        txtStatus.Caption = $"Profil gespeichert - {Now.ToString}"
+
+        SetStatus("Profil gespeichert")
     End Sub
     Private Sub cmbCrFolderIndex_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbCrFolderIndex.SelectedIndexChanged
         cmbCrFolderDate.SelectedIndex = -1
@@ -961,11 +992,11 @@ Public Class frmAdministration
     Private Sub WD_INDEXComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles WD_INDEXComboBox.SelectedIndexChanged
         _indexIsVectorField = indexIsVectorField()
         MULTISELECTCheckBox.Visible = _indexIsVectorField
-        VKT_PREVENT_MULTIPLE_VALUESCheckbox.Visible = _indexIsVectorField
+        'VKT_PREVENT_MULTIPLE_VALUESCheckbox.Visible = _indexIsVectorField
 
         If Not _indexIsVectorField Then
             MULTISELECTCheckBox.Checked = False
-            VKT_PREVENT_MULTIPLE_VALUESCheckbox.Checked = False
+            'VKT_PREVENT_MULTIPLE_VALUESCheckbox.Checked = False
         End If
     End Sub
 
@@ -978,7 +1009,7 @@ Public Class frmAdministration
             End If
 
             ' Vektorindexe fangen bei 4000 an
-            Return ClassWindream.GetTypeOfIndexAsIntByName(selectedIndexName) > 4000
+            Return WINDREAM.GetIndexType(selectedIndexName) > 4000
         Catch ex As Exception
             Return False
         End Try
@@ -986,7 +1017,13 @@ Public Class frmAdministration
 
     Private Sub TBGI_REGEX_DOCTYPEBindingSource_AddingNew(sender As Object, e As AddingNewEventArgs) Handles TBGI_REGEX_DOCTYPEBindingSource.AddingNew
         MyDataset.TBGI_REGEX_DOCTYPE.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        MyDataset.TBGI_REGEX_DOCTYPE.ADDED_WHENColumn.DefaultValue = Date.Now()
         MyDataset.TBGI_REGEX_DOCTYPE.DOCTYPE_IDColumn.DefaultValue = DOKART_GUIDTextBox.Text
+
+        TextBox5.Enabled = True
+        TextBox1.Enabled = True
+
+        IsInsert = True
     End Sub
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
@@ -1041,7 +1078,8 @@ Public Class frmAdministration
                 Dim del As String = " EXEC PRDD_GLOBIX_DELETE_DOCTYPE " & DOKART_GUIDTextBox.Text
                 If ClassDatabase.Execute_non_Query(del, True) = True Then
                     Load_Dokart()
-
+                    MaybeDisableUserAndEmailTabs()
+                    TBDD_DOKUMENTARTBindingSource.ResetBindings(True)
 
                     If USER_LANGUAGE = "de-DE" Then
                         MsgBox("Das Profil wurde erfolgreich gelöscht!", MsgBoxStyle.Information)
@@ -1055,7 +1093,15 @@ Public Class frmAdministration
             End Try
         End If
     End Sub
-
+    Private Sub MaybeDisableUserAndEmailTabs()
+        If MyDataset.TBDD_DOKUMENTART.Rows.Count = 0 Then
+            XtraTabPageUsersGroups.PageEnabled = False
+            XtraTabPageEmail.PageEnabled = False
+        Else
+            XtraTabPageUsersGroups.PageEnabled = True
+            XtraTabPageEmail.PageEnabled = True
+        End If
+    End Sub
     Private Sub BarButtonItem8_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem8.ItemClick
         Dim result As MsgBoxResult
 
@@ -1163,6 +1209,10 @@ Public Class frmAdministration
     End Sub
 
     Private Sub BarButtonItem13_ItemClick_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem13.ItemClick
+        If Not IsInsert Then
+            TextBox4.Text = Environment.UserName
+        End If
+
         Try
             Me.TBGI_REGEX_DOCTYPEBindingSource.EndEdit()
         Catch ex As Exception
@@ -1171,14 +1221,18 @@ Public Class frmAdministration
         End Try
 
         If MyDataset.TBGI_REGEX_DOCTYPE.GetChanges Is Nothing = False Then
-            TextBox4.Text = Environment.UserName
             Try
                 Me.TBGI_REGEX_DOCTYPEBindingSource.EndEdit()
             Catch ex As Exception
                 MsgBox("Error in Save Regex2: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation)
             End Try
             TBGI_REGEX_DOCTYPETableAdapter.Update(MyDataset.TBGI_REGEX_DOCTYPE)
+            SetStatus("Profilzuordnung gespeichert!")
+        Else
+            ClearStatus()
         End If
+
+        IsInsert = False
     End Sub
 
     Private Sub BarButtonItem14_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem14.ItemClick
@@ -1194,6 +1248,10 @@ Public Class frmAdministration
 
     Private Sub BarButtonItem16_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem16.ItemClick
         TBDD_INDEX_MANBindingSource.AddNew()
+
+        If WINDREAM_DIRECTCheckBox.Checked = True Then
+            load_WDIndices()
+        End If
     End Sub
 
     Private Sub BarButtonItem17_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem17.ItemClick
@@ -1227,7 +1285,9 @@ Public Class frmAdministration
     End Sub
 
     Private Sub BarButtonItem18_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem18.ItemClick
-        Load_INDEXMAN(Me.DOKART_GUIDTextBox.Text)
+        If DOKART_GUIDTextBox.Text <> String.Empty Then
+            Load_INDEXMAN(DOKART_GUIDTextBox.Text)
+        End If
     End Sub
 
     Private Sub BarButtonItem20_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem20.ItemClick
@@ -1267,6 +1327,10 @@ Public Class frmAdministration
 
     Private Sub BarButtonItem24_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem24.ItemClick
         TBDD_INDEX_AUTOMBindingSource.AddNew()
+
+        If WINDREAM_DIRECTCheckBox.Checked = True Then
+            load_WDIndices()
+        End If
     End Sub
 
     Private Sub ToolStripButton17_Click(sender As Object, e As EventArgs)
@@ -1343,6 +1407,8 @@ Public Class frmAdministration
 
     Private Sub BarButtonItem28_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem28.ItemClick
         TBGI_REGEX_DOCTYPEBindingSource.AddNew()
+
+
         EnableControls(XtraTabPageProfileRegex)
     End Sub
 

Global_Indexer/frmHotKey_Add.vb

@@ -3,14 +3,14 @@
     Private Control_Sequence As Integer
     Private Sub ObjektTypenEintragen()
         Try
-            Dim oDokumentTyp As WINDREAMLib.WMObject
             ' Combobox leeren
             Me.cmbObjekttyp.Items.Clear()
             ' alle Objekttypen durchlaufen
-            For Each oDokumentTyp In ClassWindream.GetObjecttypesAsObjects
+            For Each otype As String In WINDREAM.ObjectTypes
                 ' und in die Combobox eintragen
-                Me.cmbObjekttyp.Items.Add(oDokumentTyp.aName)
+                Me.cmbObjekttyp.Items.Add(otype)
             Next
+
         Catch ex As Exception
             MsgBox("Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Unexpected error inm Eintragen der Objekttypen")
         End Try
@@ -40,13 +40,11 @@
         GroupBox1.Visible = True
         GroupBox2_Controls.Visible = False
         GroupBoxMainWindow.Visible = False
-        If ClassWindream.Init() = True Then
+        If IDB_ACTIVE = False Then
             ObjektTypenEintragen()
-        Else
-            MsgBox("Windream konnte nicht initiiert werden! Formular wird geschlossen - Check logfile", MsgBoxStyle.Information)
-            Me.Close()
         End If
 
+
     End Sub
     Sub load_users()
         Try

Global_Indexer/frmIndex.designer.vb

@@ -164,7 +164,9 @@ Partial Class frmIndex
         '
         'BarCheckItem1
         '
+        Me.BarCheckItem1.BindableChecked = True
         resources.ApplyResources(Me.BarCheckItem1, "BarCheckItem1")
+        Me.BarCheckItem1.Checked = True
         Me.BarCheckItem1.Id = 5
         Me.BarCheckItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarCheckItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.BarCheckItem1.Name = "BarCheckItem1"

Global_Indexer/frmIndex.resx

@@ -639,7 +639,7 @@
     <value>DocumentViewer1</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.0.3.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
     <value>SplitContainer1.Panel2</value>

Global_Indexer/frmIndex.vb

@@ -28,6 +28,8 @@ Public Class frmIndex
 
     Private NewFileString As String
     Private CancelAttempts As Integer = 0
+    Private Const MaxCancelAttempts = 2
+
     Private Property ViewerString As String
 
 #End Region
@@ -74,13 +76,14 @@ Public Class frmIndex
     End Sub
 
     Sub addLabel(indexname As String, hinweis As String, ylbl As Integer, anz As String)
-        Dim lbl As New Label
+        Dim lbl As New Label With {
-        lbl.Name = "lbl" & indexname
+            .Name = "lbl" & indexname,
-        lbl.Size = New Size(CInt(hinweis.Length * 15), 18) 'CInt(hinweis.Length * 9)
+            .AutoSize = True,
-        lbl.Text = hinweis
+            .Text = hinweis,
+            .Location = New Point(11, ylbl)
+        }
 
         pnlIndex.Controls.Add(lbl)
-        lbl.Location = New Point(11, ylbl)
     End Sub
 
     Function Indexwert_checkValueDB(indexname As String, wert As String)
@@ -143,7 +146,7 @@ Public Class frmIndex
             For Each DR In DT.Rows
                 If DR.Item("INDEXNAME").ToString.ToLower = indexname.ToLower Then
                     If DR.Item("Indexiert") = True Then
-                        LOGGER.Info(" >>Manueller Index: " & indexname)
+                        LOGGER.Info("## Manueller Index: " & indexname)
                         Select Case RequestFor
                             Case "FILE"
                                 If DR.Item("Indexwert_File").ToString <> String.Empty Then
@@ -152,11 +155,11 @@ Public Class frmIndex
                                     Return DR.Item("Indexwert_File")
                                 Else
                                     If DR.Item("Indexwert").ToString <> String.Empty Then
-                                        LOGGER.Info(" >>Zurückgegebener manueller Indexwert: " & DR.Item("Indexwert"))
+                                        LOGGER.Info("Zurückgegebener manueller Indexwert: " & DR.Item("Indexwert"))
                                         Return DR.Item("Indexwert")
                                     Else
                                         If opt = False Then
-                                            LOGGER.Info(" >> Achtung, der Indexwert des manuellen Indexes '" & indexname & "' ist String.empty!")
+                                            LOGGER.Info("Achtung, der Indexwert des manuellen Indexes '" & indexname & "' ist String.empty!")
                                             ShowNotice("Indexiert = True - Der Index: " & DR.Item("INDEXNAME") & " wurde nicht ordnungsgemäss indexiert! - Automatischer Index konnte nicht gesetzt werden!")
                                             Return Nothing
                                         Else
@@ -172,7 +175,7 @@ Public Class frmIndex
                                 Else
                                     'Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & indexname & "')", MyConnectionString, True)
                                     If opt = False Then
-                                        LOGGER.Info(" >> Achtung, der Indexwert des manuellen Indexes '" & indexname & "' ist String.empty!")
+                                        LOGGER.Info("Achtung, der Indexwert des manuellen Indexes '" & indexname & "' ist String.empty!")
                                         ShowNotice("Indexiert = True - Der Index: " & DR.Item("INDEXNAME") & " wurde nicht ordnungsgemäss indexiert! - Automatischer Index konnte nicht gesetzt werden!")
                                         Return Nothing
                                     Else
@@ -234,7 +237,7 @@ Public Class frmIndex
         End Try
     End Function
 
-    Function GetAutomaticIndexSQLValue(vsqlstatement As String, vconnectionID As Integer, vProvider As String) As String
+    Function GetAutomaticIndexSQLValue(SQLCommand As String, vconnectionID As Integer, vProvider As String) As String
         Try
             Dim oConnectionString As String
             oConnectionString = ClassFormFunctions.GetConnectionString(vconnectionID)
@@ -243,9 +246,9 @@ Public Class frmIndex
                 Dim oErgebnis
                 'Welcher Provider? 
                 If vProvider.ToLower = "oracle" Then
-                    oErgebnis = ClassDatabase.OracleExecute_Scalar(vsqlstatement, oConnectionString)
+                    oErgebnis = ClassDatabase.OracleExecute_Scalar(SQLCommand, oConnectionString)
                 Else 'im Moment nur SQL-Server
-                    oErgebnis = ClassDatabase.Execute_Scalar(vsqlstatement, oConnectionString)
+                    oErgebnis = ClassDatabase.Execute_Scalar(SQLCommand, oConnectionString)
                 End If
 
                 If LogErrorsOnly = False Then
@@ -273,7 +276,7 @@ Public Class frmIndex
     Function CheckWrite_IndexeMan(dokartid As Integer)
         '#### Zuerst manuelle Werte indexieren ####
         Try
-            LOGGER.Info(" >> In CheckWrite_IndexeMan")
+            LOGGER.Info("In CheckWrite_IndexeMan")
             Dim result As Boolean = False
             For Each oControl As Control In Me.pnlIndex.Controls
                 ' MsgBox(ctrl.Name)
@@ -430,7 +433,9 @@ Public Class frmIndex
 
     Function Name_Generieren()
         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 = ClassDatabase.Return_Datatable(sql)
             For Each row As DataRow In DT1.Rows
                 FILE_DELIMITER = row.Item("FILE_DELIMITER")
@@ -462,25 +467,25 @@ Public Class frmIndex
             Dim oMatchelements As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(oNamenkonvention)
             '####
             If oMatchelements.Count = 0 Then
-                LOGGER.Info(" >> No RegularExpression Fileds on Nameconvention!")
+                LOGGER.Debug("No RegularExpression Fileds on Nameconvention!")
             End If
             ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
             For Each oElement As System.Text.RegularExpressions.Match In oMatchelements
                 Select Case oElement.Value.Substring(2, 1).ToUpper
                     'Manueller Indexwert
                     Case "M"
-                        LOGGER.Info(" >>Manueller Index wird geprüft...")
+                        LOGGER.Debug("NameGenerieren: Manueller Index wird geprüft...")
                         Dim Indexname = oElement.Value.Substring(3, oElement.Value.Length - 4)
                         Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & Indexname & "')", MyConnectionString, True)
-                        Dim value As String = GetManIndex_Value(Indexname, "FILE", optional_index)
+                        Dim oManValue As String = GetManIndex_Value(Indexname, "FILE", optional_index)
-                        If value <> String.Empty Then
+                        If oManValue <> String.Empty Then
-                            Dim firstVectorValue = value.Split(ClassConstants.VECTORSEPARATOR).First()
+                            Dim firstVectorValue = oManValue.Split(ClassConstants.VECTORSEPARATOR).First()
 
                             oNamenkonvention = oNamenkonvention.Replace(oElement.Value, firstVectorValue)
                             NewFileString = oNamenkonvention
                             sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString
                             AnzahlIndexe += 1
-                            sql_history_Index_Values = sql_history_Index_Values & ", '" & value.Replace("'", "''") & "'"
+                            sql_history_Index_Values = sql_history_Index_Values & ", '" & oManValue.Replace("'", "''") & "'"
                         Else
 
                             If optional_index = True Then
@@ -499,16 +504,16 @@ Public Class frmIndex
                                 '    AnzahlIndexe += 1
                                 '    sql_history_Index_Values = sql_history_Index_Values & ", '" & System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE).Replace("'", "''") & "'"
                                 'Else
-                                oNamenkonvention = oNamenkonvention.Replace("_" & oElement.Value, value)
+                                oNamenkonvention = oNamenkonvention.Replace("_" & oElement.Value, oManValue)
-                                oNamenkonvention = oNamenkonvention.Replace("-" & oElement.Value, value)
+                                oNamenkonvention = oNamenkonvention.Replace("-" & oElement.Value, oManValue)
                                 NewFileString = oNamenkonvention
                                 sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString
                                 AnzahlIndexe += 1
-                                sql_history_Index_Values = sql_history_Index_Values & ", '" & value.Replace("'", "''") & "'"
+                                sql_history_Index_Values = sql_history_Index_Values & ", '" & oManValue.Replace("'", "''") & "'"
                                 ' End If
 
                             Else
-                                LOGGER.Info(" >> Der Indexvalue für Index '" & Indexname & "' ist String.Empty")
+                                LOGGER.Debug("Der Indexvalue für Index '" & Indexname & "' ist String.Empty")
                                 err = True
                             End If
 
@@ -565,7 +570,7 @@ Public Class frmIndex
                             Case "Username".ToUpper
                                 oNamenkonvention = oNamenkonvention.Replace(oElement.Value, Environment.UserName)
                             Case "Usercode".ToUpper
-                                oNamenkonvention = oNamenkonvention.Replace(oElement.Value, USER_SHORT_NAME)
+                                oNamenkonvention = oNamenkonvention.Replace(oElement.Value, USER_SHORTNAME)
                             Case ""
                         End Select
                         If datetemp <> "" Then
@@ -591,7 +596,7 @@ Public Class frmIndex
                                 Loop
                             End If
                         Catch ex As Exception
-                            LOGGER.Info(" - Unexpected error in Umbenennnen der Datei - Fehler: " & vbNewLine & ex.Message)
+                            LOGGER.Warn(" - Unexpected error in NameGenerieren - Fehler: " & vbNewLine & ex.Message)
                             LOGGER.Error(ex.Message)
                             MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Umbenennnen der Datei:")
                             err = True
@@ -602,8 +607,8 @@ Public Class frmIndex
                 End Select
             Next
 
-
+            CURRENT_NEWFILENAME = oFilesystem.GetCleanFilename(NewFileString)
-            CURRENT_NEWFILENAME = ClassFilehandle.CleanFilename(NewFileString, "")
+            'CURRENT_NEWFILENAME = ClassFilehandle.CleanFilename(NewFileString, "")
             CURRENT_NEWFILENAME = oRAWZielordner & "\" & CURRENT_NEWFILENAME
 
             If CURRENT_NEWFILENAME.EndsWith("_") Then
@@ -639,6 +644,8 @@ Public Class frmIndex
                 folder_Created = True
             End If
             'False oder True zurückgeben
+            LOGGER.Debug("#### ENDE Name_Generieren ####")
+            LOGGER.Debug("")
             If err = False Then
                 Return True
             Else
@@ -659,11 +666,11 @@ Public Class frmIndex
             'Manuelle Indexe Indexieren
             Dim DTMan As DataTable = MyDataset.VWDDINDEX_MAN
             If DTMan.Rows.Count > 0 Then
-
                 Dim Count As Integer = 0
                 For Each row As DataRow In DTMan.Rows
                     Dim idxvalue = row.Item("Indexwert")
                     Dim indexname = row.Item("WD_INDEX").ToString
+                    LOGGER.Debug($"Write_Indizes - Index [{indexname}]...")
                     Dim optional_Index = CBool(row.Item("OPTIONAL"))
                     Dim indexiert = CBool(row.Item("Indexiert"))
                     If indexiert And idxvalue.ToString <> "" And idxvalue <> "EMPTY_OI" Then
@@ -690,17 +697,29 @@ Public Class frmIndex
                                 End If
                             End If
 
-                            LOGGER.Info(" >> Manueller Indexvalue: " & idxvalue.ToString)
+                            LOGGER.Debug($"Manueller Indexvalue [{idxvalue.ToString}]...NOW THE INDEXING...")
                             Count += 1
 
-                            ' den Typ des Zielindexes auslesen
-                            Dim indexType As Integer = ClassWindream.GetTypeOfIndexAsIntByName(indexname)
 
-                            If indexType < ClassWindream.WMObjectVariableValueTypeVector Then
+                            ' den Typ des Zielindexes auslesen
-                                indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_NEWFILENAME, indexname, idxvalue)
+                            Dim oIndexType As Integer = WINDREAM.GetIndexType(indexname)
+                            LOGGER.Debug($"oIndexType [{oIndexType.ToString}]...")
+                            If oIndexType < WINDREAM.WMObjectVariableValueTypeVector Then
+                                LOGGER.Debug($"Indexing  oIndexType < WINDREAM.WMObjectVariableValueTypeVector...")
+                                indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, idxvalue, CURR_DOKART_OBJECTTYPE)
                             Else
-                                Dim indexArray = Split(idxvalue, ClassConstants.VECTORSEPARATOR)
+                                Dim oSplitArray = Split(idxvalue, ClassConstants.VECTORSEPARATOR)
-                                indexierung_erfolgreich = ClassWindream.Indexiere(CURRENT_NEWFILENAME.Substring(2), indexname, indexArray)
+                                Dim oListofString As New List(Of String)
+                                If oSplitArray.Count = 0 Then
+                                    oListofString.Add(idxvalue)
+                                Else
+                                    For Each oStr In oSplitArray
+                                        oListofString.Add(oStr)
+                                    Next
+                                End If
+
+
+                                indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, oListofString, CURR_DOKART_OBJECTTYPE)
                             End If
 
                             'indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_NEWFILENAME, indexname, idxvalue)
@@ -710,13 +729,13 @@ Public Class frmIndex
                                 Exit For
                             End If
                         Else
-                            If LogErrorsOnly = False Then
+
-                                LOGGER.Info(" >> No Indexing: indexname: " & indexname)
+                            LOGGER.Debug("No Indexing: indexname: " & indexname)
-                                LOGGER.Info(" >> No Indexing: is optional? " & optional_Index.ToString)
+                            LOGGER.Debug("No Indexing: is optional? " & optional_Index.ToString)
-                            End If
                         End If
                     Else
-                        LOGGER.Info(" >> Indexvalue is empty or field is not indexed - Indexname:  " & indexname)
+                        LOGGER.Debug("Indexvalue is empty or field is not indexed - Indexname:  " & indexname)
+                        LOGGER.Info("Indexvalue is empty or field is not indexed - Indexname:  " & indexname)
                     End If
                 Next
 
@@ -731,21 +750,29 @@ Public Class frmIndex
                     Dim indexname = row.Item("INDEXNAME").ToString
                     If indexiert = True And Indexvalue <> "" Then
                         If Indexvalue <> "EMPTY_OI" Then
-                            LOGGER.Info(" >> Auto Indexname: " & indexname.ToString)
+                            LOGGER.Info("Auto Indexname: " & indexname.ToString)
-                            LOGGER.Info(" >> Indexvalue: " & Indexvalue.ToString)
+                            LOGGER.Info("Indexvalue: " & Indexvalue.ToString)
                             Count += 1
 
                             ' den Typ des Zielindexes auslesen
-                            Dim indexType As Integer = ClassWindream.GetTypeOfIndexAsIntByName(indexname)
+                            Dim indexType As Integer = WINDREAM.GetIndexType(indexname)
 
-                            If indexType < ClassWindream.WMObjectVariableValueTypeVector Then
+                            If indexType < WINDREAM.WMObjectVariableValueTypeVector Then
-                                indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_NEWFILENAME, indexname, Indexvalue)
+                                indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, Indexvalue, CURR_DOKART_OBJECTTYPE)
                             Else
-                                Dim indexArray = Split(Indexvalue, ClassConstants.VECTORSEPARATOR)
+                                Dim oSplitArray = Split(Indexvalue, ClassConstants.VECTORSEPARATOR)
-                                indexierung_erfolgreich = ClassWindream.Indexiere(CURRENT_NEWFILENAME.Substring(2), indexname, indexArray)
+                                Dim oListofString As New List(Of String)
+                                If oSplitArray.Count = 0 Then
+                                    oListofString.Add(Indexvalue)
+                                Else
+                                    For Each oStr In oSplitArray
+                                        oListofString.Add(oStr)
+                                    Next
+                                End If
+                                indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, oListofString, CURR_DOKART_OBJECTTYPE)
                             End If
 
-                            indexierung_erfolgreich = ClassWindream.DateiIndexieren(CURRENT_NEWFILENAME, indexname, Indexvalue)
+                            'indexierung_erfolgreich = WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, Indexvalue, CURR_DOKART_OBJECTTYPE)
                             If indexierung_erfolgreich = False Then
                                 MsgBox("Error in indexing file - See log", MsgBoxStyle.Critical)
                                 Return False
@@ -768,10 +795,8 @@ Public Class frmIndex
                     Return False
                 End If
             End If
-
-
         Catch ex As Exception
-            LOGGER.Info("Unvorhergesehener Unexpected error in Write_Indizes - Fehler: " & vbNewLine & ex.Message)
+            LOGGER.Info("Unexpected error in Write_Indizes - Fehler: " & vbNewLine & ex.Message)
             LOGGER.Error(ex.Message)
             MsgBox("Error in Write_Indizes:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return False
@@ -780,8 +805,8 @@ Public Class frmIndex
     End Function
     Private Function WriteIndex2File(indexname As String, indexvalue As String)
         Try
-            LOGGER.Info(" >> Indexvalue: " & indexvalue.ToString)
+            LOGGER.Info("Indexvalue: " & indexvalue.ToString)
-            Return ClassWindream.DateiIndexieren(CURRENT_NEWFILENAME, indexname, indexvalue)
+            Return WINDREAM.SetFileIndex(CURRENT_NEWFILENAME, indexname, indexvalue, CURR_DOKART_OBJECTTYPE)
         Catch ex As Exception
             MsgBox("Error in WriteIndex2File:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return False
@@ -798,11 +823,11 @@ Public Class frmIndex
             Dim msgInternetAccountName = msg.InternetAccountName
             If LogErrorsOnly = False Then
                 LOGGER.Info("")
-                LOGGER.Info(" >> msgInternetAccountName: " & msgInternetAccountName)
+                LOGGER.Info("msgInternetAccountName: " & msgInternetAccountName)
-                LOGGER.Info(" >> SenderName: " & msg.SenderName)
+                LOGGER.Info("SenderName: " & msg.SenderName)
-                LOGGER.Info(" >> SenderEmailAddress: " & msg.SenderEmailAddress)
+                LOGGER.Info("SenderEmailAddress: " & msg.SenderEmailAddress)
-                LOGGER.Info(" >> ReceivedByName: " & msg.ReceivedByName)
+                LOGGER.Info("ReceivedByName: " & msg.ReceivedByName)
-                LOGGER.Info(" >> ReceivedByEmailAddress: " & msg.ReceivedByEmailAddress)
+                LOGGER.Info("ReceivedByEmailAddress: " & msg.ReceivedByEmailAddress)
                 LOGGER.Info("")
             End If
             _step = "2"
@@ -837,9 +862,9 @@ Public Class frmIndex
                     finalize_pattern = rowregex.Item("REGEX")
                 End If
             Next
-            Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & ClassWindream._WDObjekttyp & "'")
+            Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "'")
             If IsNothing(DT) Then
-                LOGGER.Info(" >> SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & ClassWindream._WDObjekttyp & "' RESULTED in NOTHING")
+                LOGGER.Info("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "' RESULTED in NOTHING")
                 Return False
             End If
             If DT.Rows.Count = 1 Then
@@ -899,7 +924,7 @@ Public Class frmIndex
                         _step = "4.2"
                         If IsNothing(msgDisplayTo) Then
                             _step = "4.3"
-                            LOGGER.Info(" >> DisplayTo in email is nothing - default will be set")
+                            LOGGER.Info("DisplayTo in email is nothing - default will be set")
                             emailTo = "NO RECIPIENT"
                         Else
                             _step = "4.4"
@@ -907,7 +932,7 @@ Public Class frmIndex
                         End If
                         If IsNothing(msgInternetAccountName) Then
                             _step = "4.5"
-                            LOGGER.Info(" >> InternetAccountName in email is nothing - default will be set")
+                            LOGGER.Info("InternetAccountName in email is nothing - default will be set")
                             emailFrom = ""
                         Else
                             _step = "4.6"
@@ -915,7 +940,7 @@ Public Class frmIndex
                         End If
                     Else
                         _step = "5"
-                        LOGGER.Info(" >> emailTo and From Extraction via messageheader.")
+                        LOGGER.Info("emailTo and From Extraction via messageheader.")
                         emailFrom = ClassEmailHeaderExtractor.extractFromHeader(headers, fromPattern) 'FromRegexList)
 
                         emailTo = ClassEmailHeaderExtractor.extractFromHeader(headers, toPattern) ' extractToAddress(headers, ToRegexList)
@@ -923,10 +948,10 @@ Public Class frmIndex
                         'Handler für leere emailTo-Adresse
                         If IsNothing(emailTo) Then
                             _step = "5.1"
-                            LOGGER.Info(" >> emailTo couldn't be extracted from messageheader...")
+                            LOGGER.Info("emailTo couldn't be extracted from messageheader...")
                             If (headers.Contains("exc") Or headers.Contains("exchange")) Then
                                 _step = "5.2"
-                                LOGGER.Info(" >> ...try with LDAP-option")
+                                LOGGER.Info("...try with LDAP-option")
                                 Dim _email = GetUserEmailfromLDAP(msgDisplayTo)
                                 _step = "5.3"
                                 If _email <> "" Then
@@ -948,7 +973,7 @@ Public Class frmIndex
                                     emailTo = CURR_MISSING_MANUAL_VALUE
                                 Else
                                     _step = "5.4.3"
-                                    LOGGER.Info(" >> no exchange patterns found in headers!")
+                                    LOGGER.Info("no exchange patterns found in headers!")
                                     MsgBox("Could't get 'emailto' from messageHeader and exhange-Patterns weren't found." & vbNewLine & "Please check the dropped email and Configuration of Email-Indexing!", MsgBoxStyle.Exclamation)
                                     Return False
                                 End If
@@ -964,7 +989,7 @@ Public Class frmIndex
                             emailFrom = emailFrom.Replace(">", "")
                         Else
                             _step = "6.1.x"
-                            LOGGER.Info(" >> emailFrom is Nothing?!")
+                            LOGGER.Info("emailFrom is Nothing?!")
                         End If
 
                         If Not IsNothing(emailTo) Then
@@ -988,20 +1013,20 @@ Public Class frmIndex
                             Next
                         Else
                             _step = "6.3"
-                            LOGGER.Info(" >> emailTo is Nothing?!")
+                            LOGGER.Info("emailTo is Nothing?!")
                         End If
 
-                        LOGGER.Info(" >> Headers-Content: ")
+                        LOGGER.Info("Headers-Content: ")
                         LOGGER.Info(headers.ToString)
                     End If
                     'Handler für leere emailFrom-Adresse
                     If IsNothing(emailFrom) Then
                         _step = "7"
-                        LOGGER.Info(" >> emailFrom couldn't be extracted from messageheader...")
+                        LOGGER.Info("emailFrom couldn't be extracted from messageheader...")
                         If Not IsNothing(msg.SenderEmailAddress) Then
                             If msg.SenderEmailAddress <> String.Empty Then
                                 _step = "7.1"
-                                LOGGER.Info(" >> emailFrom via msg.SenderEmailAddress will be used instead!")
+                                LOGGER.Info("emailFrom via msg.SenderEmailAddress will be used instead!")
                                 emailFrom = msg.SenderEmailAddress.ToString.Replace("'", "")
                             End If
                         End If
@@ -1021,8 +1046,8 @@ Public Class frmIndex
                         End If
                     End If
 
-                    LOGGER.Info(" >> emailFrom: " & emailFrom)
+                    LOGGER.Info("emailFrom: " & emailFrom)
-                    LOGGER.Info(" >> emailTo: " & emailTo)
+                    LOGGER.Info("emailTo: " & emailTo)
                     'FROM
                     If Not IsNothing(emailFrom) Then
                         indexierung_erfolgreich = WriteIndex2File(DT.Rows(0).Item("IDX_EMAIL_FROM").ToString, emailFrom)
@@ -1031,7 +1056,7 @@ Public Class frmIndex
                             Return False
                         End If
                     Else
-                        LOGGER.Info(" >> emailFrom is still Nothing?!")
+                        LOGGER.Info("emailFrom is still Nothing?!")
                         _step = "7.4"
                     End If
                     'TO
@@ -1042,14 +1067,14 @@ Public Class frmIndex
                             Return False
                         End If
                     Else
-                        LOGGER.Info(" >> emailTo is still Nothing?!")
+                        LOGGER.Info("emailTo is still Nothing?!")
                         _step = "7.5"
                     End If
 
                     ' Dim subj As String = ClassFormFunctions.CleanInput(msg.Subject)
                     Dim subj As String = msg.Subject
                     If IsNothing(subj) Or subj = "" Then
-                        LOGGER.Info(" >> msg subject is empty...DEFAULT will be set")
+                        LOGGER.Info("msg subject is empty...DEFAULT will be set")
                         subj = "No subject"
                         MsgBox("Attention: Email was send without a subject - Default value 'No subject' will be used!", MsgBoxStyle.Exclamation)
                     Else
@@ -1059,16 +1084,16 @@ Public Class frmIndex
                         End If
                     End If
 
-                    LOGGER.Info(" >> Now all email-items will be indexed!")
+                    LOGGER.Info("Now all email-items will be indexed!")
 
-                    LOGGER.Info(" >> subj: " & subj)
+                    LOGGER.Info("subj: " & subj)
                     indexierung_erfolgreich = WriteIndex2File(DT.Rows(0).Item("IDX_EMAIL_SUBJECT").ToString, subj)
                     CURRENT_MESSAGESUBJECT = subj
                     If indexierung_erfolgreich = False Then
                         MsgBox("Error in SetEmailIndices [Subject]  - See log", MsgBoxStyle.Critical)
                         Return False
                     End If
-                    LOGGER.Info(" >> MessageDeliveryTime: " & msg.MessageDeliveryTime)
+                    LOGGER.Info("MessageDeliveryTime: " & msg.MessageDeliveryTime)
                     indexierung_erfolgreich = WriteIndex2File(DT.Rows(0).Item("IDX_EMAIL_DATE_IN").ToString, msg.MessageDeliveryTime)
                     CURRENT_MESSAGEDATE = msg.MessageDeliveryTime
                     If indexierung_erfolgreich = False Then
@@ -1126,7 +1151,7 @@ Public Class frmIndex
     Private Function SetAttachmentIndices()
         Dim indexierung_erfolgreich As Boolean = True
         Try
-            Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & ClassWindream._WDObjekttyp & "'")
+            Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBGI_OBJECTTYPE_EMAIL_INDEX WHERE OBJECTTYPE = '" & CURR_DOKART_OBJECTTYPE & "'")
             If DT.Rows.Count = 1 Then
 
                 If Not CURRENT_MESSAGEID Is Nothing Then
@@ -1171,8 +1196,22 @@ Public Class frmIndex
 
     Private Function SINGLEFILE_2_WINDREAM(_Objekttyp As String)
         Try
-            ClassWindream._WDObjekttyp = _Objekttyp
+            CURR_DOKART_OBJECTTYPE = _Objekttyp
-            Dim streamresult = ClassWindream.Stream_File(CURRENT_WORKFILE, CURRENT_NEWFILENAME)
+            Dim oWMCheckPath = WINDREAM.VersionWMFilename(CURRENT_NEWFILENAME, System.IO.Path.GetExtension(CURRENT_NEWFILENAME))
+            If CURRENT_NEWFILENAME.ToUpper <> oWMCheckPath.ToString.ToUpper Then
+                LOGGER.Info($"Target [{CURRENT_NEWFILENAME}] already existed!! - NewWMFilename [{oWMCheckPath}]")
+                CURRENT_NEWFILENAME = oWMCheckPath
+            End If
+            Dim streamresult = WINDREAM.NewFileStream(CURRENT_WORKFILE, CURRENT_NEWFILENAME)
+
+            If CONFIG.Config.DeleteOriginalFile = True Then
+                Try
+                    My.Computer.FileSystem.DeleteFile(CURRENT_WORKFILE)
+                Catch ex As Exception
+                    LOGGER.Error(ex)
+                End Try
+            End If
+
             Return streamresult
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Error in SINGLEFILE_2_WINDREAM:")
@@ -1195,7 +1234,11 @@ Public Class frmIndex
             Loop
         End If
         'Die Datei wird nun verschoben
+        If CONFIG.Config.DeleteOriginalFile = True Then
             My.Computer.FileSystem.MoveFile(CURRENT_WORKFILE, CURRENT_NEWFILENAME)
+        Else
+            My.Computer.FileSystem.CopyFile(CURRENT_WORKFILE, CURRENT_NEWFILENAME)
+        End If
 
         Dim Insert_String As String
         Try
@@ -1343,7 +1386,13 @@ Public Class frmIndex
             'TODO: Load License from DB
             DocumentViewer1.Init(LOGCONFIG, VIEWER_LICENSE)
 
+            If DropType Is Nothing Then
+                LOGGER.Debug("File with Id [{0}] was not found in TBGI_FILES_USER. Exiting.", CURRENT_WORKFILE_GUID)
+                CancelAttempts = MaxCancelAttempts
+                Close()
+            Else
                 CURRENT_DROPTYPE = DropType.Replace("|", "")
+
                 If DropType = "|DROPFROMFSYSTEM|" Then
                     checkItemDeleteSource.Enabled = True
                     checkItemDeleteSource.Checked = CURR_DELETE_ORIGIN
@@ -1358,14 +1407,14 @@ Public Class frmIndex
                 ElseIf DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Then
                     Select Case DropType
                         Case "|FW_MSGONLY|"
-                        LOGGER.Info(" >> .msg-file from folderwatch")
+                            LOGGER.Info(".msg-file from folderwatch")
                             If USER_LANGUAGE <> "de-DE" Then
                                 Me.Text = "Indexing of msg-File (without Attachments) - from Folderwatch"
                             Else
                                 Me.Text = "Indexierung der msg-Datei (ohne Anhang) - aus Folderwatch"
                             End If
                         Case "|OUTLOOK_MESSAGE|"
-                        LOGGER.Info(" >> .msg-file through dragdrop")
+                            LOGGER.Info(".msg-file through dragdrop")
                             If USER_LANGUAGE <> "de-DE" Then
                                 Me.Text = "Indexing of msg-File (without Attachments)"
                             Else
@@ -1396,6 +1445,7 @@ Public Class frmIndex
                     End If
                 End If
 
+                BarCheckItem1.Checked = TopMost
 
                 labelFilePath.Caption = CURRENT_WORKFILE
 
@@ -1406,6 +1456,8 @@ Public Class frmIndex
                 SplitContainer1.SplitterDistance = CONFIG.Config.SplitterDistanceViewer
 
                 Load_String()
+
+                DTTBGI_REGEX_DOCTYPE = ClassDatabase.Return_Datatable("SELECT DISTINCT T1.DOCTYPE as DocType, T.* FROM TBGI_REGEX_DOCTYPE T, VWGI_DOCTYPE T1 WHERE T.DOCTYPE_ID = T1.DOCTYPE_ID")
                 MULTIFILES = ClassDatabase.Execute_Scalar("SELECT COUNT(*) FROM TBGI_FILES_USER WHERE WORKED = 0 AND GUID <> " & CURRENT_WORKFILE_GUID & " AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')", MyConnectionString, True)
                 MULTIINDEXING_ACTIVE = False
                 If MULTIFILES > 0 Then
@@ -1424,6 +1476,9 @@ Public Class frmIndex
 
                     BarButtonItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
                 End If
+            End If
+
+
         Catch ex As Exception
             LOGGER.Info(" - Unexpected error in Öffnen des Formulares - Fehler: " & vbNewLine & ex.Message)
             LOGGER.Error(ex.Message)
@@ -1454,13 +1509,17 @@ Public Class frmIndex
 
         FormLoaded = True
 
+        Try
+
+
+            ' Letzte Auswahl merken überschreibt die automatische selektion
             If CONFIG.Config.ProfilePreselection Then
+                checkItemPreselection.Checked = True
+
                 If CURRENT_LASTDOKART <> "" Then
                     cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(CURRENT_LASTDOKART)
                 End If
-        End If
+            Else
-
-        Try
                 If DTTBGI_REGEX_DOCTYPE.Rows.Count > 0 Then
                     For Each oRoW As DataRow In DTTBGI_REGEX_DOCTYPE.Rows
                         Dim oOnlyFilename = Path.GetFileName(CURRENT_WORKFILE)
@@ -1471,6 +1530,7 @@ Public Class frmIndex
                         End If
                     Next
                 End If
+            End If
         Catch ex As Exception
             LOGGER.Info(" - Unexpected error DTTBGI_REGEX_DOCTYPE - ErrorMessage: " & vbNewLine & ex.Message)
             LOGGER.Error(ex.Message)
@@ -1481,7 +1541,7 @@ Public Class frmIndex
     Sub Refresh_Dokart()
         Try
             Dim sql = String.Format("select * from VWGI_DOCTYPE where UPPER(USERNAME) = UPPER('{0}') ORDER BY SEQUENCE", Environment.UserName)
-            LOGGER.Info(" >> SQL DoctypeList: " & sql)
+            LOGGER.Info("SQL DoctypeList: " & sql)
             DT_DOKART = ClassDatabase.Return_Datatable(sql)
             cmbDokumentart.DataSource = DT_DOKART
             cmbDokumentart.ValueMember = DT_DOKART.Columns("DOCTYPE_ID").ColumnName
@@ -1532,7 +1592,7 @@ Public Class frmIndex
         End Try
     End Sub
     '    <STAThread()> _
-    Function Check_HistoryValues(Indexname As String, Dokart As String)
+    Function Check_HistoryValues(Indexname As String, Dokart As String) As String
         Try
             Dim result = Nothing
             Dim DT As DataTable = MyDataset.TBTEMP_INDEXRESULTS
@@ -1548,6 +1608,7 @@ Public Class frmIndex
             End If
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Check_HistoryValues:")
+            Return Nothing
         End Try
     End Function
 
@@ -1569,6 +1630,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 = NotNull(oRow.Item("CONNECTION_ID"), 0)
 
                 If oDataType <> "BOOLEAN" Then
                     addLabel(oControlName, oRow.Item("COMMENT").ToString, oLabelPosition, oControlCount)
@@ -1585,8 +1647,8 @@ Public Class frmIndex
                             pnlIndex.Controls.Add(chk)
                         End If
                     Case "INTEGER"
-                        If oRow.Item("SUGGESTION") = True And oRow.Item("SQL_RESULT").ToString.Length > 0 Then
+                        If (oRow.Item("SUGGESTION") = True And oRow.Item("SQL_RESULT").ToString.Length > 0) Or MultiSelect = True Then
-                            Dim oControl = oControls.AddVorschlag_ComboBox(oControlName, oControlPosition, oRow.Item("CONNECTION_ID"), oRow.Item("SQL_RESULT"), MultiSelect, oDataType, DefaultValue, AddNewItems, PreventDuplicates)
+                            Dim oControl = oControls.AddVorschlag_ComboBox(oControlName, oControlPosition, oConnectionId, oRow.Item("SQL_RESULT"), MultiSelect, oDataType, DefaultValue, AddNewItems, PreventDuplicates)
                             If Not IsNothing(oControl) Then
                                 pnlIndex.Controls.Add(oControl)
                             End If
@@ -1598,8 +1660,8 @@ Public Class frmIndex
                             End If
                         End If
                     Case "VARCHAR"
-                        If oRow.Item("SUGGESTION") = True And oRow.Item("SQL_RESULT").ToString.Length > 0 Then
+                        If (oRow.Item("SUGGESTION") = True And oRow.Item("SQL_RESULT").ToString.Length > 0) Or MultiSelect = True Then
-                            Dim oControl = oControls.AddVorschlag_ComboBox(oControlName, oControlPosition, oRow.Item("CONNECTION_ID"), oRow.Item("SQL_RESULT"), MultiSelect, oDataType, DefaultValue, AddNewItems, PreventDuplicates)
+                            Dim oControl = oControls.AddVorschlag_ComboBox(oControlName, oControlPosition, oConnectionId, oRow.Item("SQL_RESULT"), MultiSelect, oDataType, DefaultValue, AddNewItems, PreventDuplicates)
                             If Not IsNothing(oControl) Then
                                 pnlIndex.Controls.Add(oControl)
                             End If
@@ -1722,7 +1784,7 @@ Public Class frmIndex
                     Dim oPlaceholderResult As String
                     Dim oValue As String = ClassHelper.NotNull(oAutoIndexRow.Item("VALUE"), "")
 
-                    oPlaceholderResult = GetPlaceholderValue(oValue, CURRENT_WORKFILE, USER_SHORT_NAME)
+                    oPlaceholderResult = GetPlaceholderValue(oValue, CURRENT_WORKFILE, USER_SHORTNAME)
 
                     If Not IsNothing(oPlaceholderResult) Then
                         oValue = oPlaceholderResult
@@ -1745,7 +1807,7 @@ Public Class frmIndex
                     Dim oManualIndexResult As String = Nothing
 
                     ' Einfachen Platzhalter Wert erzeugen
-                    oPlaceholderResult = GetPlaceholderValue(oIndexValue, CURRENT_WORKFILE, USER_SHORT_NAME)
+                    oPlaceholderResult = GetPlaceholderValue(oIndexValue, CURRENT_WORKFILE, USER_SHORTNAME)
 
                     ' Einfachen Platzhalter ersetzen
                     If Not IsNothing(oPlaceholderResult) Then
@@ -1765,10 +1827,14 @@ Public Class frmIndex
                         oSqlResult = oSqlResult.Replace(oMatch.Value, oManualIndexResult)
                     End If
                 Next
-                If oSqlResult <> String.Empty Then
-                    LOGGER.Info(" oSqlResult afrer first Replace: " & oSqlResult)
-                End If
 
+
+                'TODO: Replace Windream Patterns?
+                oSqlResult = ClassPatterns.ReplaceControlValues(oSqlResult, pnlIndex)
+                oSqlResult = ClassPatterns.ReplaceInternalValues(oSqlResult)
+                If oSqlResult <> String.Empty Then
+                    LOGGER.Debug("oSqlResult after Replace [" & oSqlResult & "]")
+                End If
                 ' Ergebnis: Es wurden alle einfachen Platzhalter ersetzt, jetzt haben wir einen SQL Befehl, 
                 ' der nur noch vektorfelder-platzhalter enthält   
 
@@ -1834,7 +1900,7 @@ Public Class frmIndex
         '        For Each DR_AUTOINDEX As DataRow In DT_INDEXAUTOM.Rows
         '            Dim optionalIndex As Boolean
         '            Dim indexname As String = DR_AUTOINDEX.Item("INDEXNAME")
-        '            LOGGER.Info(" >> Build Automatischer Index '" & indexname & "'")
+        '            LOGGER.Info("Build Automatischer Index '" & indexname & "'")
         '            If DR_AUTOINDEX.Item("SQL_RESULT").ToString <> String.Empty And CBool(DR_AUTOINDEX.Item("SQL_ACTIVE")) = True Then
         '                ' Regulären Ausdruck zum Auslesen der windream-Indexe definieren
         '                Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
@@ -1848,12 +1914,12 @@ Public Class frmIndex
         '                For Each element As System.Text.RegularExpressions.Match In elemente
 
         '                    ' MsgBox(element.Value.ToUpper)
-        '                    LOGGER.Info(" >> Element: '" & element.Value & "'")
+        '                    LOGGER.Info("Element: '" & element.Value & "'")
         '                    '' wenn es sich nicht um dedizeirte Werte handelt (es sollen ja nur die Indexe ausgelesen werden)
         '                    'If Not element.Value.ToUpper = "[%SPALTE]" And Not element.Value.ToUpper = "[%VIEW]" Then
         '                    'die Zeichen [% und ] entfernen (liefert den wirklichen windream-Index)
         '                    Dim elementOhneSonderzeichen As String = element.Value.Substring(2, element.Value.Length - 3)
-        '                    LOGGER.Info(" >> elementOhneSonderzeichen: '" & elementOhneSonderzeichen & "'")
+        '                    LOGGER.Info("elementOhneSonderzeichen: '" & elementOhneSonderzeichen & "'")
         '                    optionalIndex = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & elementOhneSonderzeichen & "')", MyConnectionString, True)
         '                    If elementOhneSonderzeichen.StartsWith("$") Then 'windowsParameter
         '                        Dim result = ""
@@ -1889,7 +1955,7 @@ Public Class frmIndex
         '                            MsgBox("Unexpected error in Replacement WindowsFilePatterns: " & vbNewLine & ex.Message & vbNewLine & vbNewLine & "Routine will continue - Please check logfile", MsgBoxStyle.Exclamation, )
         '                        End Try
         '                        If result <> "" Then
-        '                            LOGGER.Info(" >> file-related parameter found: '" & elementOhneSonderzeichen & "' - Result: '" & result & "'")
+        '                            LOGGER.Info("file-related parameter found: '" & elementOhneSonderzeichen & "' - Result: '" & result & "'")
         '                            SqlString = SqlString.Replace(element.Value, result)
         '                        Else
         '                            LOGGER.Info(">> Attention: file-related parameter '" & elementOhneSonderzeichen & "' returned an empty string!")
@@ -1906,11 +1972,11 @@ Public Class frmIndex
         '                    End If
 
         '                Next
-        '                LOGGER.Info(" >> Replaced and complete SQL-result: " & SqlString)
+        '                LOGGER.Info("Replaced and complete SQL-result: " & SqlString)
-        '                LOGGER.Info(" >> Ausführen SQL....")
+        '                LOGGER.Info("Ausführen SQL....")
         '                Dim automatischerValue As String = ""
         '                automatischerValue = GetAutomaticIndexSQLValue(SqlString, DR_AUTOINDEX.Item("CONNECTION_ID"), DR_AUTOINDEX.Item("SQL_PROVIDER"))
-        '                LOGGER.Info(" >> Ergebnis SQL: '" & automatischerValue & "'")
+        '                LOGGER.Info("Ergebnis SQL: '" & automatischerValue & "'")
         '                If automatischerValue <> String.Empty Then
         '                    DR_AUTOINDEX.Item("Indexiert") = True
         '                    DR_AUTOINDEX.Item("Indexwert") = automatischerValue
@@ -1932,7 +1998,7 @@ Public Class frmIndex
         '                        Dim DEFAULTVALUE As String = DR_AUTOINDEX.Item("VALUE")
         '                        'Indexierung mit WindowsVariable
         '                        If DEFAULTVALUE.StartsWith("$") Then
-        '                            LOGGER.Info(" >> Indexierung mit einer Windowsvariable: '" & DEFAULTVALUE & "'")
+        '                            LOGGER.Info("Indexierung mit einer Windowsvariable: '" & DEFAULTVALUE & "'")
         '                            Select Case DEFAULTVALUE.ToUpper
         '                                Case "$filename_ext".ToUpper
         '                                    DEFAULTVALUE = Path.GetFileName(CURRENT_WORKFILE)
@@ -1958,9 +2024,9 @@ Public Class frmIndex
         '                                    DEFAULTVALUE = USER_SHORT_NAME
 
         '                            End Select
-        '                            LOGGER.Info(" >> Ergebnis der Windowsvariable: '" & DEFAULTVALUE & "'")
+        '                            LOGGER.Info("Ergebnis der Windowsvariable: '" & DEFAULTVALUE & "'")
         '                        Else
-        '                            LOGGER.Info(" >> Indexierung mit einem Festen Wert: '" & DEFAULTVALUE & "'")
+        '                            LOGGER.Info("Indexierung mit einem Festen Wert: '" & DEFAULTVALUE & "'")
         '                        End If
         '                        'Den Wert in der Zwischentabelle speichern
         '                        DR_AUTOINDEX.Item("Indexiert") = True
@@ -2014,25 +2080,24 @@ Public Class frmIndex
     Private Function WORK_FILE()
         Try
             Me.VWDDINDEX_MANTableAdapter.Fill(Me.MyDataset.VWDDINDEX_MAN, CURRENT_DOKART_ID)
-            LOGGER.Info(" >> Manuelle Indexe geladen")
+            LOGGER.Debug("Manuelle Indexe geladen")
 
             If MyDataset.VWDDINDEX_MAN.Rows.Count > 0 Then
                 CURRENT_DOKART_ID = Me.cmbDokumentart.SelectedValue
                 If CheckWrite_IndexeMan(Me.cmbDokumentart.SelectedValue) = True Then
                     '##### Manuelle Indexe indexiert #####
-                    LOGGER.Info(" >> Datei " & CURRENT_WORKFILE & " wird nun indexiert...")
+                    LOGGER.Info("Datei [" & CURRENT_WORKFILE & "] wird nun indexiert...")
                     If FillIndexe_Autom(Me.cmbDokumentart.SelectedValue) = True Then
-                        LOGGER.Info(" ...FillIndexe_Autom durchlaufen")
+                        LOGGER.Debug(" ...FillIndexe_Autom durchlaufen")
 
                         'Den Zielnamen zusammenbauen
                         If Name_Generieren() = True Then
-                            LOGGER.Info(" ...Name_Generieren durchlaufen")
                             'Dokumentenviewer ausblenden um keinen Zugriffsfehler zu produzieren
                             DocumentViewer1.Done()
-                            LOGGER.Info(" ...Viewer geschlossen")
+                            LOGGER.Debug(" ...Viewer geschlossen")
                             'Die Datei verschieben
                             If Move_File2_Target() = True Then
-                                LOGGER.Info(" ...Move_File2_Target durchlaufen")
+                                LOGGER.Debug(" ...Move_File2_Target durchlaufen")
                                 'Die Originaldatei löschen
                                 If DropType = "|DROPFROMFSYSTEM|" Then
                                     If CURR_DELETE_ORIGIN = True Then
@@ -2057,7 +2122,7 @@ Public Class frmIndex
                                 End If
 
                                 CURRENT_LASTDOKART = cmbDokumentart.Text
-                                LOGGER.Info(" >> Datei '" & CURRENT_NEWFILENAME & "' erfolgreich erzeugt.")
+                                LOGGER.Info("Datei '" & CURRENT_NEWFILENAME & "' erfolgreich erzeugt.")
                                 Dim oDEL As String = "DELETE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID
                                 ClassDatabase.Execute_non_Query(oDEL, True)
                                 Return True
@@ -2154,7 +2219,7 @@ Public Class frmIndex
                             MsgBox("All files were successfully processed through Multiindexing", MsgBoxStyle.Information, "Success")
                         End If
 
-                        DTACTUAL_FILES.Clear()
+                        'DTACTUAL_FILES.Clear()
                         Me.Close()
                     End If
                 End If
@@ -2187,7 +2252,7 @@ Public Class frmIndex
                 End If
             End If
 
-            If CBool(CURR_DOKART_WD_DIRECT) = False Then
+            If CURR_DOKART_WD_DIRECT = False Then
                 'Datei verschieben
                 err = Move_Rename_Only(CURRENT_WORKFILE, CURRENT_NEWFILENAME, CURR_WORKFILE_EXTENSION, VERSION_DELIMITER)
             Else
@@ -2208,10 +2273,6 @@ Public Class frmIndex
                     exp2WD = SINGLEFILE_2_WINDREAM(CURR_DOKART_OBJECTTYPE)
                 End If
                 If exp2WD = True Then
-                    'Prüfen ob Session da ist - wenn nicht nochmal neu initiieren
-                    If ClassWindream.oSession Is Nothing Then
-                        ClassWindream.Init()
-                    End If
                     'Kein Fehler in Export2windream
                     err = False
                     If Write_Indizes() = True Then
@@ -2279,58 +2340,63 @@ Public Class frmIndex
         End Try
     End Function
 
-    Private Function CreateFolderForIndex(myDynamicFolder As String)
+    Private Function CreateFolderForIndex(DynamicFolderConfig As String)
         Try
-            Dim ORootFolder As String = Path.GetDirectoryName(CURRENT_NEWFILENAME)
+            Dim oRootFolder As String = Path.GetDirectoryName(CURRENT_NEWFILENAME)
+            Dim oFilesystem As New DigitalData.Modules.Filesystem.File(LOGCONFIG)
 
             '######
-            Dim p_reg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
+            Dim oRegexString As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
             ' einen Regulären Ausdruck laden
-            Dim regularExpression As Regex = New Regex(p_reg)
+            Dim oRegex As Regex = New Regex(oRegexString)
             ' die Vorkommen im Folder-String auslesen
-            Dim elemente As MatchCollection = regularExpression.Matches(myDynamicFolder)
+            Dim oMatches As MatchCollection = oRegex.Matches(DynamicFolderConfig)
             '####
             ' alle Vorkommen innerhalb des Ordnerstrings durchlaufen
-            For Each element As Match In elemente
+            For Each oMatch As Match In oMatches
-                LOGGER.Info(" >> Elementname in FolderString: '" & element.ToString & "'")
+                LOGGER.Info("Elementname in FolderString: '" & oMatch.ToString & "'")
-                Select Case element.Value.Substring(2, 1).ToUpper
+                Select Case oMatch.Value.Substring(2, 1).ToUpper
 
                     'Manueller Indexwert
                     Case "M"
-                        Dim ManIndexname = element.Value.Substring(3, element.Value.Length - 4)
+                        Dim oManIndexName = oMatch.Value.Substring(3, oMatch.Value.Length - 4)
-                        Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & ManIndexname & "')", MyConnectionString, True)
+                        Dim oIsOptional As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & oManIndexName & "')", MyConnectionString, True)
-                        LOGGER.Info(" >> Versuch den Indexwert aus '" & ManIndexname & "' auszulesen.")
+                        LOGGER.Info("Versuch den Indexwert aus '" & oManIndexName & "' auszulesen.")
-                        Dim ManIndex_Value As String = GetManIndex_Value(ManIndexname, "FILE", optional_index)
+                        Dim oManIndexValue As String = GetManIndex_Value(oManIndexName, "FILE", oIsOptional)
-                        LOGGER.Info(" >> Ergebnis/Wert für neuen Ordner: '" & ManIndexname & "'")
+                        LOGGER.Info("Ergebnis/Wert für neuen Ordner: '" & oManIndexName & "'")
-                        If Not ManIndex_Value = String.Empty Then
+                        If Not oManIndexValue = String.Empty Then
-                            If IsDate(ManIndex_Value) Then
+                            If IsDate(oManIndexValue) Then
-                                ManIndex_Value = CDate(ManIndex_Value).ToString("yyyyMMdd")
+                                oManIndexValue = CDate(oManIndexValue).ToString("yyyyMMdd")
                             End If
-                            ManIndex_Value = ClassFilehandle.CleanFilename(ManIndex_Value, "")
-                            myDynamicFolder = myDynamicFolder.Replace(element.ToString, ManIndex_Value)
 
-                            LOGGER.Info(" >> FolderPattern: '" & myDynamicFolder & "'")
+                            oManIndexValue = oFilesystem.GetCleanPath(oManIndexValue)
+                            'oManIndexValue = ClassFilehandle.CleanFilename(oManIndexValue, "")
+                            DynamicFolderConfig = DynamicFolderConfig.Replace(oMatch.ToString, oManIndexValue)
+
+                            LOGGER.Info("FolderPattern: '" & DynamicFolderConfig & "'")
                         Else
 
-                            If optional_index = True Then
+                            If oIsOptional = True Then
-                                LOGGER.Info(" >> Optionaler Indexwert ist NICHT gefüllt")
+                                LOGGER.Info("Optionaler Indexwert ist NICHT gefüllt")
                             Else
                                 LOGGER.Info(" - Achtung Ausnahme in 'CrFolderForIndex': der Index ist leer!")
                                 Return True
                             End If
                         End If
                     Case "A"
-                        Dim AutoIndexname = element.Value.Substring(3, element.Value.Length - 4)
+                        Dim oAutoIndexName = oMatch.Value.Substring(3, oMatch.Value.Length - 4)
-                        LOGGER.Info(" >> Versuch den Auto-Indexwert aus '" & AutoIndexname & "' auszulesen.")
+                        LOGGER.Info("Versuch den Auto-Indexwert aus '" & oAutoIndexName & "' auszulesen.")
-                        Dim AutoIndex_Value As String = GetAutoIndex_Value(AutoIndexname)
+                        Dim oAutoIndexValue As String = GetAutoIndex_Value(oAutoIndexName)
-                        LOGGER.Info(" >> Ergebnis/Wert für neuen Ordner: '" & AutoIndexname & "'")
+                        LOGGER.Info("Ergebnis/Wert für neuen Ordner: '" & oAutoIndexName & "'")
-                        If Not AutoIndex_Value = String.Empty Then
+                        If Not oAutoIndexValue = String.Empty Then
-                            AutoIndex_Value = ClassFilehandle.CleanFilename(AutoIndex_Value, "")
+
-                            If AutoIndex_Value = "EMPTY_OI" Then
+                            oAutoIndexValue = oFilesystem.GetCleanPath(oAutoIndexValue)
-                                myDynamicFolder = myDynamicFolder.Replace(element.ToString, "")
+                            'oAutoIndexValue = ClassFilehandle.CleanFilename(oAutoIndexValue, "")
+                            If oAutoIndexValue = "EMPTY_OI" Then
+                                DynamicFolderConfig = DynamicFolderConfig.Replace(oMatch.ToString, "")
                             Else
-                                myDynamicFolder = myDynamicFolder.Replace(element.ToString, AutoIndex_Value)
+                                DynamicFolderConfig = DynamicFolderConfig.Replace(oMatch.ToString, oAutoIndexValue)
-                                LOGGER.Info(" >> FolderPattern: '" & myDynamicFolder & "'")
+                                LOGGER.Info("FolderPattern: '" & DynamicFolderConfig & "'")
                             End If
 
                         Else
@@ -2346,7 +2412,7 @@ Public Class frmIndex
                         If _day.Length = 1 Then
                             _day = "0" & _day
                         End If
-                        Dim type = element.Value.Substring(3, element.Value.Length - 4)
+                        Dim type = oMatch.Value.Substring(3, oMatch.Value.Length - 4)
                         If type.StartsWith("_") Then
                             type = type.Replace("_", "")
                         End If
@@ -2360,28 +2426,25 @@ Public Class frmIndex
                             Case "YYYY-MM"
                                 oElementTemp = My.Computer.Clock.LocalTime.Year & "-" & _Month
                         End Select
-                        myDynamicFolder = myDynamicFolder.Replace(element.ToString, oElementTemp)
+                        DynamicFolderConfig = DynamicFolderConfig.Replace(oMatch.ToString, oElementTemp)
-                        LOGGER.Info(" >> FolderPatter nach V-Element: '" & myDynamicFolder & "'")
+                        LOGGER.Info("FolderPatter nach V-Element: '" & DynamicFolderConfig & "'")
                     Case Else
-                        LOGGER.Info(" - Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper)
+                        LOGGER.Info(" - Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & oMatch.Value.ToUpper)
 
                         If USER_LANGUAGE = "de-DE" Then
-                            MsgBox("Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper, MsgBoxStyle.Exclamation, "Unexpected error in Name generieren:")
+                            MsgBox("Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & oMatch.Value.ToUpper, MsgBoxStyle.Exclamation, "Unexpected error in Name generieren:")
                         Else
-                            MsgBox("Attention - One element in Namingconvention could not be matched!" & vbNewLine & "Elementname: " & element.Value.ToUpper, MsgBoxStyle.Exclamation, "Unexpected error in Name generieren:")
+                            MsgBox("Attention - One element in Namingconvention could not be matched!" & vbNewLine & "Elementname: " & oMatch.Value.ToUpper, MsgBoxStyle.Exclamation, "Unexpected error in Name generieren:")
                         End If
                 End Select
             Next
 
 
+            LOGGER.Info("Den Root-Folder zusammenfügen>> ")
 
-            LOGGER.Info(" >> Den Root-Folder zusammenfügen>> ")
+            Dim oNewFullPath As String = System.IO.Path.Combine(oRootFolder, DynamicFolderConfig)
-            Dim oNewFullpath As String = ORootFolder & "\" & myDynamicFolder & "\"
-            oNewFullpath = oNewFullpath.Replace("\\", "\")
 
-            oNewFullpath = Path.Combine(ORootFolder, myDynamicFolder)
+            LOGGER.Info("Fullpath (mit evtl. Sonderzeichen (SZ)) '" & oNewFullpath & "'")
-
-            LOGGER.Info(" >> Fullpath (mit evtl. Sonderzeichen (SZ)) '" & oNewFullpath & "'")
             Dim invalidPathChars() As Char = Path.GetInvalidPathChars()
             For Each sonderChar As Char In invalidPathChars
                 'Sonderzeichen ausser Whitespace entfernen
@@ -2391,13 +2454,13 @@ Public Class frmIndex
                     End If
                 End If
             Next sonderChar
-            LOGGER.Info(" >> Fullpath (ohne SZ) '" & oNewFullpath & "'")
+            LOGGER.Info("Fullpath (ohne SZ) '" & oNewFullpath & "'")
             If Directory.Exists(oNewFullpath) = False Then
                 Try
                     Directory.CreateDirectory(oNewFullpath)
-                    LOGGER.Info(" >> Folder '" & oNewFullpath & "' wurde angelegt")
+                    LOGGER.Info("Folder '" & oNewFullpath & "' wurde angelegt")
                 Catch ex As Exception
-                    LOGGER.Info(" >> Error in CreateFolderforIndex-Method - Root Folder '" & oNewFullpath & "' could not be created. " & ex.Message)
+                    LOGGER.Info("Error in CreateFolderforIndex-Method - Root Folder '" & oNewFullpath & "' could not be created. " & ex.Message)
                     LOGGER.Error(ex.Message)
                     MsgBox("Attention: Root Folder '" & oNewFullpath & "' could not be created." & vbNewLine & ex.Message, MsgBoxStyle.Critical)
                     Return False
@@ -2410,7 +2473,7 @@ Public Class frmIndex
             Return True
         Catch ex As Exception
             MsgBox("Unexpected Error in CreateFolderforIndex-Method:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            LOGGER.Info(" >> Fehler in CrFolderForIndex: " & ex.Message)
+            LOGGER.Info("Fehler in CrFolderForIndex: " & ex.Message)
             Return False
         End Try
     End Function
@@ -2503,6 +2566,8 @@ Public Class frmIndex
         ClearError()
         ClearNotice()
 
+
+
         Me.Cursor = Cursors.WaitCursor
         ClassHelper.Refresh_RegexTable()
         For Each rowregex As DataRow In CURRENT_DT_REGEX.Rows
@@ -2535,7 +2600,10 @@ Public Class frmIndex
                             MsgBox("All files were successfully processed through Multiindexing", MsgBoxStyle.Information, "Success")
                         End If
 
-                        DTACTUAL_FILES.Clear()
+                        'DTACTUAL_FILES.Clear()
+
+                        DocumentViewer1.CloseDocument()
+                        DocumentViewer1.Done()
 
                         CancelAttempts = 2
                         Me.Close()
@@ -2553,6 +2621,9 @@ Public Class frmIndex
                     End If
                 End If
 
+                DocumentViewer1.CloseDocument()
+                DocumentViewer1.Done()
+
                 CancelAttempts = 2
                 Me.Close()
             End If
@@ -2591,7 +2662,14 @@ Public Class frmIndex
     End Sub
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
+        ClassDatabase.Execute_non_Query($"DELETE FROM TBGI_FILES_USER WHERE GUID = {CURRENT_WORKFILE_GUID}", True)
+
         CancelAttempts = 2
         Close()
     End Sub
+
+    Private Sub checkItemPreselection_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkItemPreselection.CheckedChanged
+        CONFIG.Config.ProfilePreselection = checkItemPreselection.Checked
+        CONFIG.Save()
+    End Sub
 End Class

Global_Indexer/frmNamenkonvention.designer.vb

@@ -40,7 +40,6 @@ Partial Class frmNamenkonvention
         Me.Button2 = New System.Windows.Forms.Button()
         Me.btnVersionTZ = New System.Windows.Forms.Button()
         Me.btnTrennzeichen = New System.Windows.Forms.Button()
-        Me.btnVersion = New System.Windows.Forms.Button()
         Me.btndelete = New System.Windows.Forms.Button()
         Me.btnOK = New System.Windows.Forms.Button()
         Me.btnclose = New System.Windows.Forms.Button()
@@ -74,13 +73,13 @@ Partial Class frmNamenkonvention
         '
         'GroupBox1
         '
-        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
         Me.GroupBox1.Controls.Add(Me.btnAddIndexA)
         Me.GroupBox1.Controls.Add(Me.btnAddIndexM)
         Me.GroupBox1.Controls.Add(Me.cmbIndex_A)
         Me.GroupBox1.Controls.Add(Me.cmbIndex_m)
         Me.GroupBox1.Controls.Add(Me.Label3)
         Me.GroupBox1.Controls.Add(Me.Label2)
+        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.TabStop = False
         '
@@ -98,10 +97,10 @@ Partial Class frmNamenkonvention
         '
         'cmbIndex_A
         '
-        resources.ApplyResources(Me.cmbIndex_A, "cmbIndex_A")
         Me.cmbIndex_A.DataSource = Me.TBDD_INDEX_AUTOMBindingSource
         Me.cmbIndex_A.DisplayMember = "INDEXNAME"
         Me.cmbIndex_A.FormattingEnabled = True
+        resources.ApplyResources(Me.cmbIndex_A, "cmbIndex_A")
         Me.cmbIndex_A.Name = "cmbIndex_A"
         Me.cmbIndex_A.ValueMember = "GUID"
         '
@@ -117,10 +116,10 @@ Partial Class frmNamenkonvention
         '
         'cmbIndex_m
         '
-        resources.ApplyResources(Me.cmbIndex_m, "cmbIndex_m")
         Me.cmbIndex_m.DataSource = Me.TBDD_INDEX_MANBindingSource
         Me.cmbIndex_m.DisplayMember = "NAME"
         Me.cmbIndex_m.FormattingEnabled = True
+        resources.ApplyResources(Me.cmbIndex_m, "cmbIndex_m")
         Me.cmbIndex_m.Name = "cmbIndex_m"
         Me.cmbIndex_m.ValueMember = "GUID"
         '
@@ -141,11 +140,10 @@ Partial Class frmNamenkonvention
         '
         'GroupBox2
         '
-        resources.ApplyResources(Me.GroupBox2, "GroupBox2")
         Me.GroupBox2.Controls.Add(Me.Button2)
         Me.GroupBox2.Controls.Add(Me.btnVersionTZ)
         Me.GroupBox2.Controls.Add(Me.btnTrennzeichen)
-        Me.GroupBox2.Controls.Add(Me.btnVersion)
+        resources.ApplyResources(Me.GroupBox2, "GroupBox2")
         Me.GroupBox2.Name = "GroupBox2"
         Me.GroupBox2.TabStop = False
         '
@@ -167,30 +165,24 @@ Partial Class frmNamenkonvention
         Me.btnTrennzeichen.Name = "btnTrennzeichen"
         Me.btnTrennzeichen.UseVisualStyleBackColor = True
         '
-        'btnVersion
-        '
-        resources.ApplyResources(Me.btnVersion, "btnVersion")
-        Me.btnVersion.Name = "btnVersion"
-        Me.btnVersion.UseVisualStyleBackColor = True
-        '
         'btndelete
         '
-        resources.ApplyResources(Me.btndelete, "btndelete")
         Me.btndelete.Image = Global.Global_Indexer.My.Resources.Resources.delete2
+        resources.ApplyResources(Me.btndelete, "btndelete")
         Me.btndelete.Name = "btndelete"
         Me.btndelete.UseVisualStyleBackColor = True
         '
         'btnOK
         '
-        resources.ApplyResources(Me.btnOK, "btnOK")
         Me.btnOK.Image = Global.Global_Indexer.My.Resources.Resources.save_16xLG
+        resources.ApplyResources(Me.btnOK, "btnOK")
         Me.btnOK.Name = "btnOK"
         Me.btnOK.UseVisualStyleBackColor = True
         '
         'btnclose
         '
-        resources.ApplyResources(Me.btnclose, "btnclose")
         Me.btnclose.Image = Global.Global_Indexer.My.Resources.Resources.Close_16xLG
+        resources.ApplyResources(Me.btnclose, "btnclose")
         Me.btnclose.Name = "btnclose"
         Me.btnclose.UseVisualStyleBackColor = True
         '
@@ -215,6 +207,7 @@ Partial Class frmNamenkonvention
         Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
         Me.TableAdapterManager.TBGI_CONFIGURATIONTableAdapter = Nothing
         Me.TableAdapterManager.TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter = Nothing
+        Me.TableAdapterManager.TBGI_REGEX_DOCTYPETableAdapter = Nothing
         Me.TableAdapterManager.TBHOTKEY_PATTERNS_REWORKTableAdapter = Nothing
         Me.TableAdapterManager.TBHOTKEY_PATTERNSTableAdapter = Nothing
         Me.TableAdapterManager.TBHOTKEY_PROFILETableAdapter = Nothing
@@ -307,7 +300,6 @@ Partial Class frmNamenkonvention
     Friend WithEvents Label2 As System.Windows.Forms.Label
     Friend WithEvents btnAddIndexA As System.Windows.Forms.Button
     Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
-    Friend WithEvents btnVersion As System.Windows.Forms.Button
     Friend WithEvents btndelete As System.Windows.Forms.Button
     Friend WithEvents btnOK As System.Windows.Forms.Button
     Friend WithEvents btnclose As System.Windows.Forms.Button

Global_Indexer/frmNamenkonvention.en-US.resx

@@ -125,6 +125,9 @@
     <value>Define the Nameconvention for the selected Documenttype. 
 You can assemble the filename from the Indicies and Textpatterns below.</value>
   </data>
+  <data name="GroupBox1.Text" xml:space="preserve">
+    <value>Indicies:</value>
+  </data>
   <data name="btnAddIndexA.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
@@ -153,8 +156,8 @@ You can assemble the filename from the Indicies and Textpatterns below.</value>
   <data name="Label2.Text" xml:space="preserve">
     <value>Manual Index:</value>
   </data>
-  <data name="GroupBox1.Text" xml:space="preserve">
+  <data name="GroupBox2.Text" xml:space="preserve">
-    <value>Indicies:</value>
+    <value>Variables:</value>
   </data>
   <data name="Button2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -165,7 +168,7 @@ You can assemble the filename from the Indicies and Textpatterns below.</value>
 </value>
   </data>
   <data name="Button2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 139</value>
+    <value>6, 107</value>
   </data>
   <data name="Button2.Text" xml:space="preserve">
     <value>Add original filename</value>
@@ -179,10 +182,10 @@ You can assemble the filename from the Indicies and Textpatterns below.</value>
 </value>
   </data>
   <data name="btnVersionTZ.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 91</value>
+    <value>6, 59</value>
   </data>
   <data name="btnVersionTZ.Text" xml:space="preserve">
-    <value>Add Versionseperator:</value>
+    <value>Add Versionseparator:</value>
   </data>
   <data name="btnTrennzeichen.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -192,25 +195,14 @@ You can assemble the filename from the Indicies and Textpatterns below.</value>
         TkSuQmCC
 </value>
   </data>
+  <data name="btnTrennzeichen.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 24</value>
+  </data>
   <data name="btnTrennzeichen.Size" type="System.Drawing.Size, System.Drawing">
     <value>163, 29</value>
   </data>
   <data name="btnTrennzeichen.Text" xml:space="preserve">
-    <value>Add Fileseperator:</value>
+    <value>Add Fileseparator:</value>
-  </data>
-  <data name="btnVersion.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAAFxJREFUOE/NjFEKgDAMQ3e23v88/Y1YOslqhE1hGHgfS5fXAHxCliuMD4q7o5Kn
-        yJTAzC72CM5PTBUwfXMT8OiJnwuYOmL6ZhBwlCBPkT2CSp4iUvAGWa4gy3nQDiNEflNl/3oXAAAAAElF
-        TkSuQmCC
-</value>
-  </data>
-  <data name="btnVersion.Text" xml:space="preserve">
-    <value>Add Version:</value>
-  </data>
-  <data name="GroupBox2.Text" xml:space="preserve">
-    <value>Variables:</value>
   </data>
   <data name="btnOK.Text" xml:space="preserve">
     <value>Save</value>

Global_Indexer/frmNamenkonvention.vb

@@ -47,7 +47,7 @@
 
     End Sub
 
-    Private Sub btnVersion_Click(sender As Object, e As EventArgs) Handles btnVersion.Click
+    Private Sub btnVersion_Click(sender As Object, e As EventArgs)
         If txtnamenKonv.Text.Contains("[%Version]") Then
             If USER_LANGUAGE = "de-DE" Then
                 MsgBox("Versionstag ist bereits enthalten!", MsgBoxStyle.Exclamation)

Global_Indexer/frmStart.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmStart
     Inherits DevExpress.XtraEditors.XtraForm
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class frmStart
     'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
     'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmStart))
@@ -223,18 +223,18 @@ Partial Class frmStart
         'frmStart
         '
         Me.AllowDrop = True
+        Me.Appearance.Options.UseFont = True
         resources.ApplyResources(Me, "$this")
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.BackColor = System.Drawing.SystemColors.ControlLight
         Me.Controls.Add(Me.btnChoosefiles)
         Me.Controls.Add(Me.LabelControl1)
         Me.Controls.Add(Me.StatusStrip1)
         Me.Controls.Add(Me.MenuStrip1)
         Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
+        Me.IconOptions.Icon = CType(resources.GetObject("frmStart.IconOptions.Icon"), System.Drawing.Icon)
         Me.MaximizeBox = False
         Me.Name = "frmStart"
         Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide
-        Me.TopMost = True
         Me.MenuStrip1.ResumeLayout(False)
         Me.MenuStrip1.PerformLayout()
         Me.StatusStrip1.ResumeLayout(False)

Global_Indexer/frmStart.resx

@@ -121,43 +121,6 @@
     <value>400, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="MenuStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="MenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>295, 24</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="MenuStrip1.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="MenuStrip1.Text" xml:space="preserve">
-    <value>MenuStrip1</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip1.Name" xml:space="preserve">
-    <value>MenuStrip1</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip1.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="KonfigurationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>108, 20</value>
-  </data>
-  <data name="KonfigurationToolStripMenuItem.Text" xml:space="preserve">
-    <value>Konfiguration</value>
-  </data>
-  <data name="AdministrationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>221, 22</value>
-  </data>
-  <data name="AdministrationToolStripMenuItem.Text" xml:space="preserve">
-    <value>Administration</value>
-  </data>
   <data name="GlobalIndexerEinstellungenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>232, 22</value>
   </data>
@@ -170,6 +133,12 @@
   <data name="HotkeyEisntellungenToolStripMenuItem.Text" xml:space="preserve">
     <value>Hotkey - Einstellungen</value>
   </data>
+  <data name="AdministrationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>221, 22</value>
+  </data>
+  <data name="AdministrationToolStripMenuItem.Text" xml:space="preserve">
+    <value>Administration</value>
+  </data>
   <data name="ToolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
     <value>218, 6</value>
   </data>
@@ -197,9 +166,49 @@
   <data name="InfoToolStripMenuItem.Text" xml:space="preserve">
     <value>Info</value>
   </data>
+  <data name="KonfigurationToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>108, 20</value>
+  </data>
+  <data name="KonfigurationToolStripMenuItem.Text" xml:space="preserve">
+    <value>Konfiguration</value>
+  </data>
+  <data name="MenuStrip1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="MenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>295, 24</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="MenuStrip1.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="MenuStrip1.Text" xml:space="preserve">
+    <value>MenuStrip1</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.Name" xml:space="preserve">
+    <value>MenuStrip1</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip1.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>515, 17</value>
   </metadata>
+  <data name="tslblFW.Size" type="System.Drawing.Size, System.Drawing">
+    <value>133, 17</value>
+  </data>
+  <data name="tslblFW.Text" xml:space="preserve">
+    <value>FolderWatch ist aktiv</value>
+  </data>
+  <data name="tslblFW.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
   <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 137</value>
   </data>
@@ -224,15 +233,6 @@
   <data name="&gt;&gt;StatusStrip1.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="tslblFW.Size" type="System.Drawing.Size, System.Drawing">
-    <value>133, 17</value>
-  </data>
-  <data name="tslblFW.Text" xml:space="preserve">
-    <value>FolderWatch ist aktiv</value>
-  </data>
-  <data name="tslblFW.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
   <metadata name="TimerFolderWatch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1072, 17</value>
   </metadata>
@@ -639,7 +639,7 @@ auf dieses Fenster oder...</value>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 8.25pt</value>
   </data>
-  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="frmStart.IconOptions.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAEAgIUAAAEAGAD4zwAAFgAAACgAAACAAAAACgEAAAEAGAAAAAAAAAAAAEgAAABIAAAAAAAAAAAA
         AAAAAABGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqpGHqoA
@@ -1682,6 +1682,6 @@ auf dieses Fenster oder...</value>
     <value>frmStart</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>

Global_Indexer/frmStart.vb

@@ -252,9 +252,7 @@ Public Class frmStart
             Next
             Show()
         Catch ex As Exception
-            If Not ex.Message.StartsWith("Die Auflistung wurde geändert") Then
             MsgBox("Unexpected Error in Check_Dropped_Files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            End If
         End Try
     End Sub
 
@@ -262,15 +260,11 @@ Public Class frmStart
         Try
             Hide()
             IndexForm.ShowDialog()
-
-            'AddHandler frmIndex.FormClosed, Sub()
-            '                                    Show()
-            '                                    BringToFront()
-            '                                End Sub
-
         Catch ex As Exception
             LOGGER.Error(ex)
             MsgBox(ex.Message, MsgBoxStyle.Critical)
+        Finally
+            Show()
         End Try
     End Sub
 
@@ -324,7 +318,7 @@ Public Class frmStart
             IndexForm = New frmIndex()
 
             'Lizenz abgellaufen, überprüfen ob User Admin ist
-            If LICENSE_COUNT < UserLoggedin Then
+            If LICENSE_COUNT < USERCOUNT_LOGGED_IN Then
                 If USER_IS_ADMIN = True Then
                     LOGGER.Info(">> User is Admin - Timer will be started")
                     If USER_LANGUAGE = "de-DE" Then
@@ -653,7 +647,7 @@ Public Class frmStart
         End If
     End Sub
     Private Sub TimerClose3Minutes_Tick(sender As Object, e As EventArgs) Handles TimerClose3Minutes.Tick
-        If LICENSE_EXPIRED = True Or LICENSE_COUNT < UserLoggedin Then
+        If LICENSE_EXPIRED = True Or LICENSE_COUNT < USERCOUNT_LOGGED_IN Then
             If USER_LANGUAGE = "de-DE" Then
                 MsgBox("Global Indexer wird nun geschlossen, weil keine neue Lizenzdaten eingegeben wurden!", MsgBoxStyle.Information)
             Else
@@ -736,4 +730,11 @@ Public Class frmStart
         End Try
     End Sub
 
+    Private Sub frmStart_KeyUp(sender As Object, e As KeyEventArgs) Handles Me.KeyUp
+        If e.KeyCode = Keys.F12 Then
+            If START_INCOMPLETE Then
+                frmLicense.ShowDialog()
+            End If
+        End If
+    End Sub
 End Class

SetupVS19/Product.wxs

@@ -115,6 +115,7 @@
         <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll" KeyPath="no" />
         <File Id="DocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" Source="DigitalData.Controls.DocumentViewer.dll" KeyPath="no" />
         <File Id="LookupGrid" Name="DigitalData.Controls.LookupGrid.dll" Source="DigitalData.Controls.LookupGrid.dll" KeyPath="no" />
+        <File Id="Windream" Name="DigitalData.Modules.Windream.dll" Source="DigitalData.Modules.Windream.dll" KeyPath="no" />
       </Component>
 
       <Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">