Version 2.0.0.13

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,7 +181,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)
 
             Return False
@@ -212,7 +212,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 +221,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 +264,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 +289,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/ClassInit.vb

@@ -5,12 +5,12 @@ Imports DigitalData.Modules.Config
 
 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)

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

@@ -18,6 +18,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 +40,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
-    Private oController As New WMOSearchController
+    Public Shared _DocumentTypes As WINDREAMLib.WMObjects
+    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 +73,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)
-                Dim suchTyp = Me.oController.SearchProfileTargetProgID
+                Me._SearchController.CheckSearchProfile(wdfLocation.ToLower)
+                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 +197,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 +226,8 @@ Public Class ClassWindream
                 ' oConnect.Password "windream"
 
                 ' Verbindung mit Session-Objekt (und dem ausgewählten Server) aufbauen
-                oConnect.LoginSession(oSession)
-                If oSession.aLoggedin = False Then
+                oConnect.LoginSession(_session)
+                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 +253,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 +290,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 +313,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 +346,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 +382,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,320 +405,281 @@ 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)
-        On Error Resume Next
-        aktWMObject = Nothing
-        Dim Zielverzeichnis As String = Path.GetDirectoryName(newfilename)
-        If My.Computer.FileSystem.DirectoryExists(Zielverzeichnis) = False Then
-            My.Computer.FileSystem.CreateDirectory(Zielverzeichnis)
+    Public Shared Function Stream_File(ByVal SourceFilePath As String, ByVal NewFileName As String)
+        _currentWMObject = Nothing
+
+        Dim oWindreamFilename As String = NewFileName
+        Dim oFileName As String = NewFileName
+
+        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 oWindreamFilename.Contains("[%Version]") Then
+        '    oWindreamFilename = oWindreamFilename.Replace("[%Version]", "")
+        '    NewFileName = oWindreamFilename
+        'End If
+
+        'If NewFileName.StartsWith("W:") Then
+        '    NewFileName = NewFileName.Replace("W:", vWLaufwerk)
+        '    oWindreamFilename = NewFileName.Replace(vWLaufwerk, String.Empty)
+        'End If
+
+        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)
-            ' Get length of the file.
-            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
+            Dim oFileInfo As New FileInfo(SourceFilePath)
+            Dim oFileLength As Long = oFileInfo.Length
 
-                Return -10
-            End If
+            'If vWLaufwerk.Count = 1 Then
+            '    Dim oDriveInfo As New DriveInfo(vWLaufwerk & ":")
+            '    Dim oFreeSpace = oDriveInfo.TotalFreeSpace
 
-            LOGGER.Info(" ...Datei kopieren von '" & filenameQuelle & "' nach '" & newfilename & "'.")
-            Dim Connect
-            Dim Session
-            Dim WMObject
-            Dim aFileIO
-            Dim aWMStream
-            Dim wmbrwsr
-            Dim dmsServer As String
-            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 & "'")
+            '    If oFreeSpace < oFileLength 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
             'End If
 
-            wmbrwsr = CreateObject("WMOBrws.ServerBrowser")
-            '==================================================================
-            ' get the current DMS-server to log in
-            '==================================================================
-            dmsServer = wmbrwsr.GetCurrentServer
-            '==================================================================
-            ' create a session
-            '==================================================================
-            Session = CreateObject("Windream.WMSession", dmsServer)
-            '==================================================================
-            ' login session
-            '==================================================================
-            Connect.LoginSession(Session)
-            Dim LoggedIn = Session.aLoggedin
-            If LoggedIn Then
-                LOGGER.Info(" ...Login ok. You are logged in as '" & Connect.UserName & "' on Server '" & dmsServer)
-                'MsgBox("Login ok. You are logged in as '" + Connect.UserName + "' on Server '" + dmsServer + "'")
-            Else
-                LOGGER.Info(" >> Login on dms-Server failed")
-                ' MsgBox("Login failed. ")
-            End If
-            oSession = Session
-            Const WMCOMEventWMSessionNeedIndex = 1
-
-            'windream Objekte erstellen ohne Indexierungs-Event
-            Session.SwitchEvents(WMCOMEventWMSessionNeedIndex, False)
-            '==================================================================
-            ' check if files exist
-            '==================================================================
-            LOGGER.Info(" ...ÜBERPRÜFTER DATEINAME => " & windreamFilename)
-            Dim wdFilexists As Boolean
-            LOGGER.Info(" ...Versuch auf die Datei in W: zuzugreifen und zu sperren...")
-            wdFilexists = Session.WMObjectExists(WMEntityDocument, windreamFilename, 0, 0)
-            Err.Clear()
-            If wdFilexists = False Then
-                LOGGER.Info(" ...Datei ist NICHT vorhanden, kann also einfach neu angelegt werden")
+            LOGGER.Info(" ...Datei kopieren von '" & SourceFilePath & "' nach '" & NewFileName & "'.")
+                Dim Connect
+                Dim Session
+                Dim WMObject
+                Dim aFileIO
+                Dim aWMStream
+                Dim wmbrwsr
+                Dim dmsServer As String
+                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")
                 '==================================================================
-                ' create an object
+                ' get the current DMS-server to log in
                 '==================================================================
-                WMObject = Session.GetNewWMObjectFS(WMEntityDocument, windreamFilename, WMObjectEditModeObject) 'WMEntityDocument, windreamFilename, WMObjectEditModeObject
-                If Err.Number > 0 Then
-                    LOGGER.Info(" FEHLER: WMObject konnte nicht erzeugt werden - Error: '" & Err.Description & "'")
-                    'MsgBox(Err.Description)
+                dmsServer = wmbrwsr.GetCurrentServer
+                '==================================================================
+                ' create a session
+                '==================================================================
+                Session = CreateObject("Windream.WMSession", dmsServer)
+                '==================================================================
+                ' login session
+                '==================================================================
+                Connect.LoginSession(Session)
+                Dim LoggedIn = Session.aLoggedin
+                If LoggedIn Then
+                    LOGGER.Info(" ...Login ok. You are logged in as '" & Connect.UserName & "' on Server '" & dmsServer)
+                    'MsgBox("Login ok. You are logged in as '" + Connect.UserName + "' on Server '" + dmsServer + "'")
+                Else
+                    LOGGER.Info(" >> Login on dms-Server failed")
+                    ' MsgBox("Login failed. ")
                 End If
-                '  MsgBox("Created file: " + windreamFilename)
-            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)
-                    If USER_LANGUAGE <> "de-DE" Then
-                        msg = "There is already a file with the same name! Would You like to replace the file?"
+                _session = Session
+                Const WMCOMEventWMSessionNeedIndex = 1
+
+                'windream Objekte erstellen ohne Indexierungs-Event
+                Session.SwitchEvents(WMCOMEventWMSessionNeedIndex, False)
+                '==================================================================
+                ' check if files exist
+                '==================================================================
+                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, oWindreamFilename, 0, 0)
+                Err.Clear()
+                If wdFilexists = False Then
+                    LOGGER.Info(" ...Datei ist NICHT vorhanden, kann also einfach neu angelegt werden")
+
+                    '==================================================================
+                    ' create an object
+                    '==================================================================
+                    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)
                     End If
-                    Dim result As MsgBoxResult
-                    result = MessageBox.Show(msg, "File alredy exists:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
-                    If result = MsgBoxResult.No Then
-                        windreamFilename = ClassFilehandle.Versionierung_Datei(newfilename).ToString.Substring(2)
-                    Else
-                        If Delete_WDFile(windreamFilename) = False Then
+                    '  MsgBox("Created file: " + windreamFilename)
+                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")
+
+                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)
+                    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
+                            oMessage = $"There is already a file with the name {NewFileName}!{vbNewLine}Would You like to replace the file?"
+                        End If
+
+                        Dim oResult = MessageBox.Show(oMessage, "File exists", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+
+                        If oResult = DialogResult.No Then
+                            oWindreamFilename = ClassFilehandle.Versionierung_Datei(NewFileName).ToString.Substring(2)
+                        Else
+                            If Delete_WDFile(oWindreamFilename) = False Then
+                                Return False
+                            End If
+                        End If
+                    Case Else
+                        If Delete_WDFile(oWindreamFilename) = False Then
                             Return False
                         End If
+                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
-                ElseIf CURRENT_DOKART_DUPLICATE_HANDLING = "New version" Then
-                    windreamFilename = ClassFilehandle.Versionierung_Datei(newfilename).ToString.Substring(2)
+                    LOGGER.Info(" ...WMObject zugewiesen")
                 End If
-                WMObject = Session.GetNewWMObjectFS(1, windreamFilename, 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)
-            If WMObject IsNot Nothing Then
-                newfilename = vWLaufwerk & ":" & windreamFilename
+                LOGGER.Info(" ...ENDGÜLTIGER DATEINAME => " & oWindreamFilename)
+                If WMObject IsNot Nothing Then
+                '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
-                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)
+                    ' set fileIO the local source file
+                    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(oWindreamFilename)
 
-                    Return False
-                    ' MsgBox(Err.Description)
-                End If
-                ' open the windream object's file stream for writing
-                aWMStream = WMObject.OpenStream(STREAM_BinaryObject, WMObjectStreamOpenModeReadWrite)
-                If Err.Number > 0 Then
-                    LOGGER.Info(" Unexpected error in OpenStream - Datei wird wieder gelöscht - Error: '" & Err.Description & "'")
-                    WMObject.Unlock()
-                    Delete_WDFile(windreamFilename)
-                    Return False
-                    'MsgBox(Err.Description)
-                End If
-                LOGGER.Info(" ...oWMStream erzeugt")
-                ' give fileIO helper object the windream stream
-                aFileIO.aWMStream = aWMStream
-                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)
-                    Return False
-                    'MsgBox(Err.Description)
-                End If
-                ' let fileIO object import the original file into windream
-                aFileIO.ImportOriginal(True)
-                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)
-                    Return False
-                    ' MsgBox(Err.Description)
-                End If
-                LOGGER.Info(" ...Inhalt der Datei konnte übertragen werden")
-                ' close the windream file stream
-                aWMStream.Close()
-                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)
-                    Return False
-                    'MsgBox(Err.Description)
-                End If
-                ' save new windream object
-                WMObject.save()
-                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)
-                    Return False
-                    'MsgBox(Err.Description)
-                End If
-                LOGGER.Info(" ...Datei konnte gespeichert werden")
-                ' unlock the windream object
-                WMObject.unlock()
-                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)
-                    Return False
-                    'MsgBox(Err.Description)
-                End If
+                        Return False
+                        ' MsgBox(Err.Description)
+                    End If
+                    ' open the windream object's file stream for writing
+                    aWMStream = WMObject.OpenStream(STREAM_BinaryObject, WMObjectStreamOpenModeReadWrite)
+                    If Err.Number > 0 Then
+                        LOGGER.Info(" Unexpected error in OpenStream - Datei wird wieder gelöscht - Error: '" & Err.Description & "'")
+                        WMObject.Unlock()
+                        Delete_WDFile(oWindreamFilename)
+                        Return False
+                        'MsgBox(Err.Description)
+                    End If
+                    LOGGER.Info(" ...oWMStream erzeugt")
+                    ' give fileIO helper object the windream stream
+                    aFileIO.aWMStream = aWMStream
+                    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(oWindreamFilename)
+                        Return False
+                        'MsgBox(Err.Description)
+                    End If
+                    ' let fileIO object import the original file into windream
+                    aFileIO.ImportOriginal(True)
+                    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(oWindreamFilename)
+                        Return False
+                        ' MsgBox(Err.Description)
+                    End If
+                    LOGGER.Info(" ...Inhalt der Datei konnte übertragen werden")
+                    ' close the windream file stream
+                    aWMStream.Close()
+                    If Err.Number > 0 Then
+                        LOGGER.Info(" Unexpected error in aWMStream.Close() - Datei wird wieder gelöscht - Error: '" & Err.Description & "'")
+                        WMObject.Unlock()
+                        Delete_WDFile(oWindreamFilename)
+                        Return False
+                        'MsgBox(Err.Description)
+                    End If
+                    ' save new windream object
+                    WMObject.save()
+                    If Err.Number > 0 Then
+                        LOGGER.Info(" Unexpected error in WMObject.save - Datei wird wieder gelöscht - Error: '" & Err.Description & "'")
+                        WMObject.Unlock()
+                        Delete_WDFile(oWindreamFilename)
+                        Return False
+                        'MsgBox(Err.Description)
+                    End If
+                    LOGGER.Info(" ...Datei konnte gespeichert werden")
+                    ' unlock the windream object
+                    WMObject.unlock()
+                    If Err.Number > 0 Then
+                        LOGGER.Info(" Unexpected error in WMObject.unlock - Datei wird wieder gelöscht - Error: '" & Err.Description & "'")
+                        WMObject.Unlock()
+                        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
-                    Dim p As String
-                    If windreamFilename.StartsWith("\") Then
-                        If windreamFilename.StartsWith("\\") Then
-                            p = windreamFilename.Replace("\\", "\")
-                        Else
-                            p = windreamFilename
-                        End If
-                    Else
-                        p = "\" & windreamFilename
-                    End If
-                    CURRENT_NEWFILENAME = vWLaufwerk & ":" & p
+                If oFileLength > 0 And Err.Number = 0 Then
+
+                    'Dim p As String
+                    'If oWindreamFilename.StartsWith("\") Then
+                    '    If oWindreamFilename.StartsWith("\\") Then
+                    '        p = oWindreamFilename.Replace("\\", "\")
+                    '    Else
+                    '        p = oWindreamFilename
+                    '    End If
+                    'Else
+                    '    p = "\" & oWindreamFilename
+                    '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)
-                    Console.WriteLine(Err.Number.ToString)
+                    Delete_WDFile(oWindreamFilename)
+                    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:'" & oWindreamFilename)
+                    If Not Err() Is Nothing Then
+                        If Not Err.Description Is Nothing Then
+                            LOGGER.Info(Err.Description)
+                        End If
+                    End If
+                    Return False
                 End If
             Else
-                LOGGER.Info(" Could not create a WMObject for file:'" & windreamFilename)
-                If Not Err() Is Nothing Then
-                    If Not Err.Description Is Nothing Then
-                        LOGGER.Info(Err.Description)
-                    End If
-                End If
-                Return False
-            End If
-        Else
-            LOGGER.Info("...targetPath existiert NICHT")
+                LOGGER.Info("...targetPath existiert NICHT")
             Return False
         End If
 
@@ -815,7 +691,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 +724,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 +749,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 +839,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 +862,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
@@ -1461,7 +1337,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 +1348,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 +1368,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 +1749,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,7 +1771,7 @@ 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
 

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.13")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

Global_Indexer/MyDataset.Designer.vb

@@ -3563,6 +3563,7 @@ Partial Public Class MyDataset
             Me.columnDOK_ID.AllowDBNull = false
             Me.columnNAME.AllowDBNull = false
             Me.columnNAME.MaxLength = 50
+            Me.columnWD_INDEX.AllowDBNull = false
             Me.columnWD_INDEX.MaxLength = 50
             Me.columnCOMMENT.MaxLength = 150
             Me.columnDATATYPE.DefaultValue = CType("VARCHAR",String)
@@ -13048,11 +13049,7 @@ Partial Public Class MyDataset
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Public Property WD_INDEX() As String
             Get
-                Try 
-                    Return CType(Me(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn),String)
-                Catch e As Global.System.InvalidCastException
-                    Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte WD_INDEX in Tabelle TBDD_INDEX_MAN ist DBNull.", e)
-                End Try
+                Return CType(Me(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn),String)
             End Get
             Set
                 Me(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn) = value
@@ -13307,18 +13304,6 @@ Partial Public Class MyDataset
             End Set
         End Property
         
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
-        Public Function IsWD_INDEXNull() As Boolean
-            Return Me.IsNull(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn)
-        End Function
-        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
-        Public Sub SetWD_INDEXNull()
-            Me(Me.tableTBDD_INDEX_MAN.WD_INDEXColumn) = Global.System.Convert.DBNull
-        End Sub
-        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Public Function IsCOMMENTNull() As Boolean
@@ -20947,7 +20932,7 @@ Namespace MyDatasetTableAdapters
                 Me.Adapter.InsertCommand.Parameters(1).Value = CType(NAME,String)
             End If
             If (WD_INDEX Is Nothing) Then
-                Me.Adapter.InsertCommand.Parameters(2).Value = Global.System.DBNull.Value
+                Throw New Global.System.ArgumentNullException("WD_INDEX")
             Else
                 Me.Adapter.InsertCommand.Parameters(2).Value = CType(WD_INDEX,String)
             End If
@@ -21045,7 +21030,7 @@ Namespace MyDatasetTableAdapters
                 Me.Adapter.UpdateCommand.Parameters(1).Value = CType(NAME,String)
             End If
             If (WD_INDEX Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(2).Value = Global.System.DBNull.Value
+                Throw New Global.System.ArgumentNullException("WD_INDEX")
             Else
                 Me.Adapter.UpdateCommand.Parameters(2).Value = CType(WD_INDEX,String)
             End If

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

@@ -379,7 +379,7 @@ SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALU
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="DOK_ID" ColumnName="DOK_ID" DataSourceName="DD_ECM_TEST.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="NAME" ColumnName="NAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="WD_INDEX" ColumnName="WD_INDEX" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@WD_INDEX" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="WD_INDEX" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="WD_INDEX" ColumnName="WD_INDEX" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@WD_INDEX" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="WD_INDEX" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN" DataTypeServer="varchar(150)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="150" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="DATATYPE" ColumnName="DATATYPE" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@DATATYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="DATATYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="SUGGESTION" ColumnName="SUGGESTION" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SUGGESTION" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SUGGESTION" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -421,7 +421,7 @@ SELECT GUID, DOK_ID, NAME, WD_INDEX, COMMENT, DATATYPE, SUGGESTION, DEFAULT_VALU
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="DOK_ID" ColumnName="DOK_ID" DataSourceName="DD_ECM_TEST.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="NAME" ColumnName="NAME" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="WD_INDEX" ColumnName="WD_INDEX" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@WD_INDEX" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="WD_INDEX" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="WD_INDEX" ColumnName="WD_INDEX" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@WD_INDEX" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="WD_INDEX" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN" DataTypeServer="varchar(150)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="150" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="DATATYPE" ColumnName="DATATYPE" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@DATATYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="DATATYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="SUGGESTION" ColumnName="SUGGESTION" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_MAN" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SUGGESTION" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SUGGESTION" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1691,7 +1691,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 +1756,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 +1839,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 +1876,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 +1890,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 +1904,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" />
@@ -1916,7 +1916,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="WD_INDEX" msprop:Generator_ColumnVarNameInTable="columnWD_INDEX" msprop:Generator_ColumnPropNameInRow="WD_INDEX" msprop:Generator_ColumnPropNameInTable="WD_INDEXColumn" msprop:Generator_UserColumnName="WD_INDEX" minOccurs="0">
+              <xs:element name="WD_INDEX" msprop:Generator_ColumnVarNameInTable="columnWD_INDEX" msprop:Generator_ColumnPropNameInRow="WD_INDEX" msprop:Generator_ColumnPropNameInTable="WD_INDEXColumn" msprop:Generator_UserColumnName="WD_INDEX">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="50" />
@@ -1986,7 +1986,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 +2059,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 +2172,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 +2268,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 +2323,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 +2331,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 +2381,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 +2453,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 +2534,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 +2548,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 +2557,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 +2582,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 +2621,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 +2693,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 +2732,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 +2746,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 +2792,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 +2852,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 +2884,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 +2922,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 +2944,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 +2956,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 +3092,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_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_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="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_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="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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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_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,41 +4,39 @@
      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="-10" ViewPortY="225" 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_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_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_CONNECTION" ZOrder="43" 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: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_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: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: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_USER" ZOrder="7" X="765" Y="247" Height="305" Width="213" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
+    <Shape ID="DesignTable:TBDD_DOKUMENTART" ZOrder="9" X="119" Y="308" Height="381" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />
+    <Shape ID="DesignTable:TBDD_EINGANGSARTEN" ZOrder="27" 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="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="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="1" X="456" Y="638" Height="360" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="292" />
+    <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="5" X="1040" Y="444" Height="381" Width="256" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="313" />
+    <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="6" X="668" Y="605" Height="305" Width="272" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <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="28" 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="33" 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="31" X="133" Y="112" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
     <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" />
-    <Shape ID="DesignTable:TBHOTKEY_USER_PROFILE" ZOrder="21" X="30" Y="178" Height="90" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
-    <Shape ID="DesignTable:TBHOTKEY_PATTERNS_REWORK" ZOrder="19" X="415" Y="-3" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="39" />
-    <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: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: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" />
+    <Shape ID="DesignTable:VWGI_USER_GROUPS_RELATION" ZOrder="8" X="845" Y="494" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
+    <Shape ID="DesignTable:TBHOTKEY_PROFILE" ZOrder="16" X="-12" Y="311" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBHOTKEY_PATTERNS" ZOrder="15" X="221" Y="-36" Height="320" Width="196" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="252" />
+    <Shape ID="DesignTable:TBMYHOTKEYS" ZOrder="19" X="25" Y="-1" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBHOTKEY_USER_PROFILE" ZOrder="20" X="30" Y="178" Height="90" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBHOTKEY_PATTERNS_REWORK" ZOrder="18" X="415" Y="-3" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="39" />
+    <Shape ID="DesignTable:TBHOTKEY_WINDOW_HOOK" ZOrder="14" 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="13" X="1181" Y="7" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBGI_HISTORY" ZOrder="11" X="0" Y="0" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="0" />
+    <Shape ID="DesignTable:TBGI_REGEX_DOCTYPE" ZOrder="3" X="1027" Y="881" Height="210" Width="276" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <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="30" X="639" Y="943" Height="67" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
+    <Shape ID="DesignTable:TBAD_Users" ZOrder="10" X="1363" Y="639" Height="143" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
   </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>
-          <Y>656</Y>
+          <X>535</X>
+          <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>
-          <Y>656</Y>
+          <X>597</X>
+          <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="32" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>959</X>
@@ -102,23 +100,7 @@
         </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">
+    <Connector ID="DesignRelation:FK_TBDD_GROUPS_USER_USER_ID" ZOrder="29" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>951</X>
@@ -134,27 +116,19 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBDD_INDEX_MAN_DAID" ZOrder="27" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBDD_INDEX_MAN_DAID" ZOrder="26" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>94</X>
-          <Y>0</Y>
+          <X>397</X>
+          <Y>663</Y>
         </Point>
         <Point>
-          <X>94</X>
-          <Y>-30</Y>
-        </Point>
-        <Point>
-          <X>94</X>
-          <Y>-30</Y>
-        </Point>
-        <Point>
-          <X>94</X>
-          <Y>0</Y>
+          <X>456</X>
+          <Y>663</Y>
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBHOTKEY_PATTERNS_PROFILE_ID" ZOrder="26" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBHOTKEY_PATTERNS_PROFILE_ID" ZOrder="25" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>129</X>
@@ -170,7 +144,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBHOTKEY_PATTERNS_PROFILE_ID1" ZOrder="25" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBHOTKEY_PATTERNS_PROFILE_ID1" ZOrder="24" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>183</X>
@@ -182,7 +156,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBHOTKEY_USER_PROFILE_PROFILE_ID" ZOrder="24" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBHOTKEY_USER_PROFILE_PROFILE_ID" ZOrder="23" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>88</X>
@@ -202,7 +176,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBHOTKEY_USER_PROFILE_PROFILE_ID1" ZOrder="23" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBHOTKEY_USER_PROFILE_PROFILE_ID1" ZOrder="22" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>117</X>
@@ -222,7 +196,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBHOTKEY_USER_PROFILE_USER_ID" ZOrder="22" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBHOTKEY_USER_PROFILE_USER_ID" ZOrder="21" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>765</X>
@@ -238,7 +212,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBHOTKEY_PATTERNS_REWORK_HKPATTERN_ID" ZOrder="18" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBHOTKEY_PATTERNS_REWORK_HKPATTERN_ID" ZOrder="17" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>409</X>
@@ -258,7 +232,7 @@
         </Point>
       </RoutePoints>
     </Connector>
-    <Connector ID="DesignRelation:FK_TBHOTKEY_WINDOW_HOOK_PROFILE_ID" ZOrder="13" LineWidth="11">
+    <Connector ID="DesignRelation:FK_TBHOTKEY_WINDOW_HOOK_PROFILE_ID" ZOrder="12" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>38</X>
@@ -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="2" LineWidth="11">
       <RoutePoints>
         <Point>
           <X>380</X>

Global_Indexer/frmAdministration.vb

@@ -199,23 +199,26 @@ 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}"
-                        ClassDatabase.Execute_non_Query(osql)
+                        Dim osql = $" EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'GLOBIX', {oNewID}"
+                        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
+
+                txtStatus.Caption = $"Profil gespeichert - {Now.ToString}"
             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 +238,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 +272,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
@@ -664,9 +674,9 @@ Public Class frmAdministration
                 lbFileparameter.Visible = True
                 btnAddWindowsVariable.Visible = True
             End If
-            If IsInsert = False Then
-                Save_IndexAuto()
-            End If
+            'If IsInsert = False Then
+            '    Save_IndexAuto()
+            'End If
         End If
     End Sub
 
@@ -986,7 +996,11 @@ 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
     End Sub
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
@@ -1227,7 +1241,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
@@ -1343,6 +1359,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/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.0.1, 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
@@ -234,7 +236,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 +245,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
@@ -768,8 +770,6 @@ 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.Error(ex.Message)
@@ -1173,6 +1173,15 @@ Public Class frmIndex
         Try
             ClassWindream._WDObjekttyp = _Objekttyp
             Dim streamresult = ClassWindream.Stream_File(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 +1204,11 @@ Public Class frmIndex
             Loop
         End If
         'Die Datei wird nun verschoben
-        My.Computer.FileSystem.MoveFile(CURRENT_WORKFILE, CURRENT_NEWFILENAME)
+        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,87 +1356,97 @@ Public Class frmIndex
             'TODO: Load License from DB
             DocumentViewer1.Init(LOGCONFIG, VIEWER_LICENSE)
 
-            CURRENT_DROPTYPE = DropType.Replace("|", "")
-            If DropType = "|DROPFROMFSYSTEM|" Then
-                checkItemDeleteSource.Enabled = True
-                checkItemDeleteSource.Checked = CURR_DELETE_ORIGIN
-
-                'chkdelete_origin.Visible = True
-                'chkdelete_origin.Checked = CURR_DELETE_ORIGIN
-                If USER_LANGUAGE <> "de-DE" Then
-                    Me.Text = "Indexing of dropped file"
-                Else
-                    Me.Text = "Indexierung der gedroppten Datei"
-                End If
-            ElseIf DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Then
-                Select Case DropType
-                    Case "|FW_MSGONLY|"
-                        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")
-                        If USER_LANGUAGE <> "de-DE" Then
-                            Me.Text = "Indexing of msg-File (without Attachments)"
-                        Else
-                            Me.Text = "Indexierung der msg-Datei (ohne Anhang)"
-                        End If
-                End Select
-
-            ElseIf DropType = "|MSGONLY|" Then
-                If USER_LANGUAGE = "de-DE" Then
-                    Me.Text = "Indexierung der msg-Datei (ohne Anhang)"
-                Else
-                    Me.Text = "Indexing of msg-File (without Attachments)"
-                End If
-            ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then
-                CURRENT_ISATTACHMENT = True
-
-                If USER_LANGUAGE = "de-DE" Then
-                    Me.Text = "Indexierung eines Email-Attachments"
-                Else
-                    Me.Text = "Indexing of email-Attachment"
-                End If
-            ElseIf DropType = "|FW_SIMPLEINDEXER|" Then
-
-                If USER_LANGUAGE = "de-DE" Then
-                    Me.Text = "Indexierung einer Folderwatch-Datei"
-                Else
-                    Me.Text = "Indexing of Folderwatch-File"
-                End If
-            End If
-
-
-            labelFilePath.Caption = CURRENT_WORKFILE
-
-            ClassWindowLocation.LoadFormLocationSize(Me)
-
-            SetFilePreview(CONFIG.Config.FilePreview)
-
-            SplitContainer1.SplitterDistance = CONFIG.Config.SplitterDistanceViewer
-
-            Load_String()
-            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
-                If USER_LANGUAGE = "de-DE" Then
-                    checkMultiindex.Text = "Multi-Indexing - Alle nachfolgenden Dateien (" & MULTIFILES & ") identisch indexieren"
-                Else
-                    checkMultiindex.Text = "Multi-Indexing - All following files (" & MULTIFILES & ") will be indexed identically"
-                End If
-
-                checkMultiindex.Checked = False
-                checkMultiindex.Visible = True
-
-                BarButtonItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+            If DropType Is Nothing Then
+                LOGGER.Warn("File with Id [{0}] was not found in TBGI_FILES_USER. Exiting.")
+                CancelAttempts = MaxCancelAttempts
+                Close()
             Else
-                checkMultiindex.Visible = False
+                CURRENT_DROPTYPE = DropType.Replace("|", "")
 
-                BarButtonItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+                If DropType = "|DROPFROMFSYSTEM|" Then
+                    checkItemDeleteSource.Enabled = True
+                    checkItemDeleteSource.Checked = CURR_DELETE_ORIGIN
+
+                    'chkdelete_origin.Visible = True
+                    'chkdelete_origin.Checked = CURR_DELETE_ORIGIN
+                    If USER_LANGUAGE <> "de-DE" Then
+                        Me.Text = "Indexing of dropped file"
+                    Else
+                        Me.Text = "Indexierung der gedroppten Datei"
+                    End If
+                ElseIf DropType = "|OUTLOOK_MESSAGE|" Or DropType = "|FW_MSGONLY|" Then
+                    Select Case DropType
+                        Case "|FW_MSGONLY|"
+                            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")
+                            If USER_LANGUAGE <> "de-DE" Then
+                                Me.Text = "Indexing of msg-File (without Attachments)"
+                            Else
+                                Me.Text = "Indexierung der msg-Datei (ohne Anhang)"
+                            End If
+                    End Select
+
+                ElseIf DropType = "|MSGONLY|" Then
+                    If USER_LANGUAGE = "de-DE" Then
+                        Me.Text = "Indexierung der msg-Datei (ohne Anhang)"
+                    Else
+                        Me.Text = "Indexing of msg-File (without Attachments)"
+                    End If
+                ElseIf DropType = "|ATTMNTEXTRACTED|" Or DropType = "|OUTLOOK_ATTACHMENT|" Then
+                    CURRENT_ISATTACHMENT = True
+
+                    If USER_LANGUAGE = "de-DE" Then
+                        Me.Text = "Indexierung eines Email-Attachments"
+                    Else
+                        Me.Text = "Indexing of email-Attachment"
+                    End If
+                ElseIf DropType = "|FW_SIMPLEINDEXER|" Then
+
+                    If USER_LANGUAGE = "de-DE" Then
+                        Me.Text = "Indexierung einer Folderwatch-Datei"
+                    Else
+                        Me.Text = "Indexing of Folderwatch-File"
+                    End If
+                End If
+
+                BarCheckItem1.Checked = TopMost
+
+                labelFilePath.Caption = CURRENT_WORKFILE
+
+                ClassWindowLocation.LoadFormLocationSize(Me)
+
+                SetFilePreview(CONFIG.Config.FilePreview)
+
+                SplitContainer1.SplitterDistance = CONFIG.Config.SplitterDistanceViewer
+
+                Load_String()
+                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
+                    If USER_LANGUAGE = "de-DE" Then
+                        checkMultiindex.Text = "Multi-Indexing - Alle nachfolgenden Dateien (" & MULTIFILES & ") identisch indexieren"
+                    Else
+                        checkMultiindex.Text = "Multi-Indexing - All following files (" & MULTIFILES & ") will be indexed identically"
+                    End If
+
+                    checkMultiindex.Checked = False
+                    checkMultiindex.Visible = True
+
+                    BarButtonItem1.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+                Else
+                    checkMultiindex.Visible = False
+
+                    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)
@@ -1455,6 +1478,8 @@ Public Class frmIndex
         FormLoaded = True
 
         If CONFIG.Config.ProfilePreselection Then
+            checkItemPreselection.Checked = True
+
             If CURRENT_LASTDOKART <> "" Then
                 cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(CURRENT_LASTDOKART)
             End If
@@ -1769,6 +1794,10 @@ Public Class frmIndex
                     LOGGER.Info(" oSqlResult afrer first Replace: " & oSqlResult)
                 End If
 
+                'TODO: Replace Windream Patterns?
+                oSqlResult = ClassPatterns.ReplaceControlValues(oSqlResult, pnlIndex)
+                oSqlResult = ClassPatterns.ReplaceInternalValues(oSqlResult)
+
                 ' Ergebnis: Es wurden alle einfachen Platzhalter ersetzt, jetzt haben wir einen SQL Befehl, 
                 ' der nur noch vektorfelder-platzhalter enthält   
 
@@ -2154,7 +2183,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 +2216,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
@@ -2209,7 +2238,7 @@ Public Class frmIndex
                 End If
                 If exp2WD = True Then
                     'Prüfen ob Session da ist - wenn nicht nochmal neu initiieren
-                    If ClassWindream.oSession Is Nothing Then
+                    If ClassWindream._session Is Nothing Then
                         ClassWindream.Init()
                     End If
                     'Kein Fehler in Export2windream
@@ -2503,6 +2532,9 @@ Public Class frmIndex
         ClearError()
         ClearNotice()
 
+        DocumentViewer1.CloseDocument()
+        DocumentViewer1.Done()
+
         Me.Cursor = Cursors.WaitCursor
         ClassHelper.Refresh_RegexTable()
         For Each rowregex As DataRow In CURRENT_DT_REGEX.Rows
@@ -2535,7 +2567,7 @@ Public Class frmIndex
                             MsgBox("All files were successfully processed through Multiindexing", MsgBoxStyle.Information, "Success")
                         End If
 
-                        DTACTUAL_FILES.Clear()
+                        'DTACTUAL_FILES.Clear()
 
                         CancelAttempts = 2
                         Me.Close()
@@ -2594,4 +2626,9 @@ Public Class frmIndex
         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/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
+            MsgBox("Unexpected Error in Check_Dropped_Files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         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