Version 2.4.2.6

Global_Indexer/ClassEmailHeaderExtractor.vb

@@ -1,112 +1,105 @@
-Imports Independentsoft
+Imports Limilabs.Mail
+Imports Limilabs.Mail.MSG
 Imports System.Text.RegularExpressions
 
 Public Class ClassEmailHeaderExtractor
-    ''' <summary>
-    ''' Extrahiert die Headerinformationen aus einer .msg Datei mithilfe der MSG.NET Klasse
-    ''' </summary>
-    ''' <param name="path">Der Pfad einer .msg Datei</param>
-    ''' <returns>Headerinformationen als String oder Nothing wenn ein Fehler aufgetreten ist.</returns>
-    Public Shared Function getMessageHeaders(path As String)
-        Try
-            Dim msg As New Msg.Message(path)
-            Dim headers = msg.TransportMessageHeaders.Replace(vbCrLf, " ")
-            Return headers
-        Catch ex As Exception
-            Return Nothing
-        End Try
-    End Function
+    '''' <summary>
+    '''' Extrahiert die Headerinformationen aus einem msg Objekt mithilfe der MSG.NET Klasse
+    '''' </summary>
+    '''' <param name="msg">Eine Email vom Typ Msg.Message</param>
+    '''' <returns>Headerinformationen als String oder Nothing wenn ein Fehler aufgetreten ist.</returns>
+    'Public Shared Function getMessageHeaders(msg As Msg.Message)
+    '    Try
+    '        Dim headers = msg.TransportMessageHeaders.Replace(vbCrLf, " ")
+    '        Return headers
+    '    Catch ex As Exception
+    '        Return Nothing
+    '    End Try
+    'End Function
 
-    ''' <summary>
-    ''' Extrahiert die Headerinformationen aus einem msg Objekt mithilfe der MSG.NET Klasse
-    ''' </summary>
-    ''' <param name="msg">Eine Email vom Typ Msg.Message</param>
-    ''' <returns>Headerinformationen als String oder Nothing wenn ein Fehler aufgetreten ist.</returns>
-    Public Shared Function getMessageHeaders(msg As Msg.Message)
-        Try
-            Dim headers = msg.TransportMessageHeaders?.Replace(vbCrLf, " ")
-            Return headers
-        Catch ex As Exception
-            Return Nothing
-        End Try
-    End Function
+    '''' <summary>
+    '''' Extrahiert aus den Headerinformationen anhand einer Liste von Regular Expressions eine Absenderadresse.
+    '''' </summary>
+    '''' <param name="messageHeaders">Headerinformationen die von getMessageHeaders erzeugt wurden.</param>
+    '''' <param name="RegexList">Eine Liste von Regular Expressions</param>
+    '''' <param name="RegexGroup">Die Ergebnisgruppe, die die Adresse enthält</param>
+    '''' <returns>Eine Emailadresse oder Nothing, wenn keine der Regular Expressions ein Ergebnis lieferte.</returns>
+    'Public Shared Function extractFromAddress(messageHeaders As String, RegexList As List(Of Regex), Optional RegexGroup As Integer = 1)
+    '    If IsNothing(messageHeaders) Then
+    '        Return Nothing
+    '    End If
 
-    ''' <summary>
-    ''' Extrahiert aus den Headerinformationen anhand einer Liste von Regular Expressions eine Absenderadresse.
-    ''' </summary>
-    ''' <param name="messageHeaders">Headerinformationen die von getMessageHeaders erzeugt wurden.</param>
-    ''' <param name="RegexList">Eine Liste von Regular Expressions</param>
-    ''' <param name="RegexGroup">Die Ergebnisgruppe, die die Adresse enthält</param>
-    ''' <returns>Eine Emailadresse oder Nothing, wenn keine der Regular Expressions ein Ergebnis lieferte.</returns>
-    Public Shared Function extractFromAddress(messageHeaders As String, RegexList As List(Of Regex), Optional RegexGroup As Integer = 1)
-        If IsNothing(messageHeaders) Then
-            Return Nothing
-        End If
+    '    For Each rx In RegexList
+    '        Dim match As Match = rx.Match(messageHeaders)
+    '        Dim email As String = match.Groups(RegexGroup).Value
 
-        For Each rx In RegexList
-            Dim match As Match = rx.Match(messageHeaders)
-            Dim email As String = match.Groups(RegexGroup).Value
+    '        If Not String.IsNullOrWhiteSpace(email) Then
+    '            Return email
+    '        End If
+    '    Next
 
-            If Not String.IsNullOrWhiteSpace(email) Then
-                Return email
-            End If
-        Next
+    '    Return Nothing
+    'End Function
+    'Public Shared Function extractFromHeader(messageHeaders As String, Regex As String)
+    '    Try
+    '        Dim result = Nothing
+    '        Dim i As Integer = 0
+    '        If IsNothing(messageHeaders) Then
+    '            Return Nothing
+    '        End If
+    '        ' einen Regulären Ausdruck laden
+    '        Dim strRegex As String = Regex
+    '        Dim myRegex As New Regex(strRegex, RegexOptions.IgnorePatternWhitespace Or RegexOptions.IgnoreCase)
+    '        Dim strTargetString As String = messageHeaders.Trim
+    '        ' die Vorkommen im String auslesen
+    '        For Each myMatch As Match In myRegex.Matches(strTargetString)
+    '            If myMatch.Success Then
+    '                LOGGER.Debug("Match success. Matched Value: [{0}]", myMatch.Value)
 
-        Return Nothing
-    End Function
-    Public Shared Function extractFromHeader(messageHeaders As String, Regex As String)
-        Try
-            Dim result
-            Dim i As Integer = 0
-            If IsNothing(messageHeaders) Then
-                Return Nothing
-            End If
-            ' einen Regulären Ausdruck laden
-            Dim strRegex As String = Regex
-            Dim myRegex As New Regex(strRegex, RegexOptions.IgnorePatternWhitespace Or RegexOptions.IgnoreCase)
-            Dim strTargetString As String = messageHeaders.Trim
-            ' die Vorkommen im String auslesen
-            For Each myMatch As Match In myRegex.Matches(strTargetString)
-                If myMatch.Success Then
-                    If myMatch.Value <> "" Then
-                        If i = 0 Then
-                            result = myMatch.Value.ToString
-                        Else
-                            result = result & ";" & myMatch.Value.ToString
-                        End If
-                        i += 1
-                    End If
-                End If
-            Next
-            Return result
-        Catch ex As Exception
-            MsgBox("Unexpected Error in extractFromHeader: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-            Return Nothing
-        End Try
+    '                If myMatch.Value <> "" Then
+    '                    If i = 0 Then
+    '                        result = myMatch.Value.ToString
+    '                    Else
+    '                        result = result & ";" & myMatch.Value.ToString
+    '                    End If
+    '                    i += 1
+    '                End If
+    '            Else
+    '                LOGGER.Debug("Match failed!")
+    '            End If
+    '        Next
 
-    End Function
+    '        LOGGER.Debug("Extracted value: [{0}]", result)
 
-    ''' <summary>
-    ''' Extrahiert aus den Headerinformationen anhand einer Liste von Regular Expressions eine Empfängeradresse.
-    ''' </summary>
-    ''' <param name="messageHeaders">Headerinformationen die von getMessageHeaders erzeugt wurden.</param>
-    ''' <param name="RegexList">Eine Liste von Regular Expressions</param>
-    ''' <param name="RegexGroup">Die Ergebnisgruppe, die die Adresse enthält</param>
-    ''' <returns>Eine Emailadresse oder Nothing, wenn keine der Regular Expressions ein Ergebnis lieferte.</returns>
-    Public Shared Function extractToAddress(messageHeaders As String, RegexList As List(Of Regex), Optional RegexGroup As Integer = 1)
-        If IsNothing(messageHeaders) Then
-            Return Nothing
-        End If
+    '        Return result
+    '    Catch ex As Exception
+    '        LOGGER.Error(ex)
+    '        MsgBox("Unexpected Error in extractFromHeader: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+    '        Return Nothing
+    '    End Try
+    'End Function
 
-        For Each rx In RegexList
-            Dim match As Match = rx.Match(messageHeaders)
-            Dim email As String = match.Groups(RegexGroup).Value
+    '''' <summary>
+    '''' Extrahiert aus den Headerinformationen anhand einer Liste von Regular Expressions eine Empfängeradresse.
+    '''' </summary>
+    '''' <param name="messageHeaders">Headerinformationen die von getMessageHeaders erzeugt wurden.</param>
+    '''' <param name="RegexList">Eine Liste von Regular Expressions</param>
+    '''' <param name="RegexGroup">Die Ergebnisgruppe, die die Adresse enthält</param>
+    '''' <returns>Eine Emailadresse oder Nothing, wenn keine der Regular Expressions ein Ergebnis lieferte.</returns>
+    'Public Shared Function extractToAddress(messageHeaders As String, RegexList As List(Of Regex), Optional RegexGroup As Integer = 1)
+    '    If IsNothing(messageHeaders) Then
+    '        Return Nothing
+    '    End If
 
-            If Not String.IsNullOrWhiteSpace(email) Then
-                Return email
-            End If
-        Next
+    '    For Each rx In RegexList
+    '        Dim match As Match = rx.Match(messageHeaders)
+    '        Dim email As String = match.Groups(RegexGroup).Value
 
-        Return Nothing
-    End Function
+    '        If Not String.IsNullOrWhiteSpace(email) Then
+    '            Return email
+    '        End If
+    '    Next
+
+    '    Return Nothing
+    'End Function
 End Class

Global_Indexer/ClassFileDrop.vb

@@ -53,7 +53,7 @@ Public Class ClassFileDrop
                 Loop
                 stmInput.Close()
                 'Sonderzeichen entfernen
-                Dim Tempfilename = ClassFilehandle.InvalidCharacters(stbFileName.ToString)
+                Dim Tempfilename = DigitalData.Modules.Language.Utils.RemoveInvalidCharacters(stbFileName.ToString)
                 Dim anhaenge = e.Data.GetDataPresent("FileContents")
                 'Dim path As String = "C:\VBProjekte\Dateien"
                 '// put the zip file into the temp directory
@@ -93,61 +93,68 @@ Public Class ClassFileDrop
                 End If
             End If
             If e.Data.GetDataPresent("FileGroupDescriptor") Then
-                    Dim oApp As Outlook.Application
+                Dim oApp As Outlook.Application
+                Try
+                    oApp = New Outlook.Application()
+                Catch ex As Exception
+                    LOGGER.Error(ex)
+                    MsgBox("Unexpected error in Initialisieren von Outlook-API:" & vbNewLine & ex.Message & vbNewLine & vbNewLine & "Evtl ist Outlook nicht in der dafür vorgesehenen For")
+                    Return False
+                End Try
+
+                LOGGER.Info(" Drop of msg")
+                'supports a drop of a Outlook message 
+                Dim myobj As Outlook.MailItem
+                For i As Integer = 1 To oApp.ActiveExplorer.Selection.Count
+                    myobj = oApp.ActiveExplorer.Selection.Item(i)
+                    Dim subj As String = myobj.Subject
+                    If subj = "" Then
+                        subj = "NO_SUBJECT"
+                    End If
+                    If subj.Contains("\") Then
+                        subj = subj.Replace("\", "-")
+                    End If
+                    If subj.Contains("/") Then
+                        subj = subj.Replace("/", "-")
+                    End If
+
+                    'Sonderzeichen entfernen
+                    subj = DigitalData.Modules.Language.Utils.RemoveInvalidCharacters(subj)
+                    'hardcode a destination path for testing
+                    Dim oFilename As String = IO.Path.Combine(Path.GetTempPath, subj + ".msg")
+
+                    oFilename = oFilename.Replace("?", "")
+                    oFilename = oFilename.Replace("!", "")
+                    oFilename = oFilename.Replace("%", "")
+                    oFilename = oFilename.Replace("$", "")
+                    LOGGER.Info("Drop of msg - File:" & oFilename)
                     Try
-                        oApp = New Outlook.Application()
+                        myobj.SaveAs(oFilename)
                     Catch ex As Exception
                         LOGGER.Error(ex)
-                        MsgBox("Unexpected error in Initialisieren von Outlook-API:" & vbNewLine & ex.Message & vbNewLine & vbNewLine & "Evtl ist Outlook nicht in der dafür vorgesehenen For")
-                        Return False
-                    End Try
-
-                    LOGGER.Info(" Drop of msg")
-                    'supports a drop of a Outlook message 
-                    Dim myobj As Outlook.MailItem
-                    For i As Integer = 1 To oApp.ActiveExplorer.Selection.Count
-                        myobj = oApp.ActiveExplorer.Selection.Item(i)
-                        Dim subj As String = myobj.Subject
-                        If subj = "" Then
-                            subj = "NO_SUBJECT"
-                        End If
-                        If subj.Contains("\") Then
-                            subj = subj.Replace("\", "-")
-                        End If
-                        If subj.Contains("/") Then
-                            subj = subj.Replace("/", "-")
-                        End If
-                        'Sonderzeichen entfernen
-                        subj = ClassFilehandle.InvalidCharacters(subj)
-                        'hardcode a destination path for testing
-                        Dim oFilename As String = IO.Path.Combine(Path.GetTempPath, subj + ".msg")
-                        oFilename = oFilename.Replace("?", "")
-                        oFilename = oFilename.Replace("!", "")
-                        oFilename = oFilename.Replace("%", "")
-                        oFilename = oFilename.Replace("$", "")
-                        LOGGER.Info("Drop of msg - File:" & oFilename)
-                        Try
-                            myobj.SaveAs(oFilename)
-                        Catch ex As Exception
-                            LOGGER.Error(ex)
-                            MsgBox("Die Email konnte aufgrund einer Sicherheitseinstellung im Outlook nicht abgelegt werden! " &
+                        MsgBox("Die Email konnte aufgrund einer Sicherheitseinstellung im Outlook nicht abgelegt werden! " &
                                    "Bitte wenden Sie sich an Ihren Administrator, " &
                                    "um den programmatischen Zugriff auf Outlook zuzulassen. " &
                                    "Weitere Informationen finden Sie im Log.", MsgBoxStyle.Critical, "Global Indexer")
-                        End Try
+                    End Try
 
-                        ReDim Preserve files_dropped(i)
-                        files_dropped(i) = "|OUTLOOK_MESSAGE|" & oFilename
-                    Next
-                    Return True
+                    ReDim Preserve files_dropped(i)
+                    files_dropped(i) = "|OUTLOOK_MESSAGE|" & oFilename
+                Next
+
+
+                Return True
                 'Drop eines Outlook Attachments
             End If
+
         Catch ex As Exception
             MsgBox("Error in Drop-File" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             Return False
         End Try
+
     End Function
 
+
     'Private Sub DragDrop_HandleTobit(e As DragEventArgs)
     '    If e.Data.GetDataPresent("#TobitMsgData") Then
     '        Dim Quellpfad As String = ""

Global_Indexer/ClassFilehandle.vb

@@ -1,29 +1,17 @@
 Imports System.IO
+Imports System.Guid
 Imports System.Text.RegularExpressions
 Imports DevExpress.XtraEditors
-Imports Independentsoft
+Imports DigitalData.Modules.Language
+Imports Limilabs.Mail
 
 Public Class ClassFilehandle
-    ''' <summary>
-    ''' Diese Funktion entfernt alle Zeichen aus dem übergebenen String
-    ''' die in Dateinamen nicht erlaubt sind.
-    ''' </summary>
-    ''' <param name="Input">Der zu prüfende String</param>
-    ''' <returns>String ohne nichterlaubte Zeichen</returns>
-    Public Shared Function InvalidCharacters(Input As String) As String
-        Dim replacement = ""
-        'Return System.Text.RegularExpressions.Regex.Replace(Input, "[\\/:*?""<>|\r\n]", "", System.Text.RegularExpressions.RegexOptions.Singleline)
-        Dim regexSearch = New String(Path.GetInvalidFileNameChars()) & New String(Path.GetInvalidPathChars())
-        Dim r = New Regex(String.Format("[{0}]", Regex.Escape(regexSearch)))
-        Return r.Replace(Input, replacement)
-    End Function
     Public Shared Function Decide_FileHandle(pFilename As String, pHandletype As String)
         Try
-            If pFilename.EndsWith(".msg") Then
+            If pFilename.ToUpper.EndsWith(".MSG") Or pFilename.ToUpper.EndsWith(".EML") Then
                 CURRENT_MESSAGEID = ""
-                Dim oMsg As New Msg.Message(pFilename)
-                If oMsg.Attachments.Count > 0 Then
-
+                Dim oMail As IMail = EMAIL.Load_Email(pFilename)
+                If oMail.Attachments.Count > 0 Then
                     Dim oTitle As String
                     Dim oMessage As String
 
@@ -41,11 +29,8 @@ Public Class ClassFilehandle
                     oResult = MessageBox.Show(oMessage, oTitle, MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1, MessageBoxOptions.DefaultDesktopOnly)
 
                     If oResult = MsgBoxResult.Yes Then
-                        If pHandletype.StartsWith("|FW") Then
-                            Return Email_Decay(pFilename, True)
-                        Else
-                            Return Email_Decay(pFilename)
-                        End If
+                        Dim oIsFolderWatch = pHandletype.StartsWith("|FW")
+                        Return Save_EmailAndAttachmentsToDisk(pFilename, oIsFolderWatch)
                     End If
                 End If
             End If
@@ -65,91 +50,144 @@ Public Class ClassFilehandle
             Return False
         End Try
     End Function
-    Private Shared Function Email_Decay(msgname As String, Optional FW As Boolean = False)
+
+    Private Shared Function Save_EmailAndAttachmentsToDisk(pEmailFilePath As String, Optional pFolderWatch As Boolean = False) As Boolean
         Try
-            Dim msgonly As String = "|MSGONLY|"
-            Dim ATT_EXTR As String = "|ATTMNTEXTRACTED|"
-            If FW = True Then
-                msgonly = "|FW_MSGONLY|"
-                ATT_EXTR = "|FW_ATTMNTEXTRACTED|"
+            Dim oMessageOnlyMarker As String = "|MSGONLY|"
+            Dim oExtractedAttachmentMarker As String = "|ATTMNTEXTRACTED|"
+            If pFolderWatch = True Then
+                oMessageOnlyMarker = "|FW_MSGONLY|"
+                oExtractedAttachmentMarker = "|FW_ATTMNTEXTRACTED|"
             End If
-            Dim erfolgreich As Boolean = False
-            Dim msg As New Msg.Message(msgname)
+            Dim oSuccess As Boolean = False
 
-            If Not msg.InternetMessageId Is Nothing Then
-                CURRENT_MESSAGEID = msg.InternetMessageId
+            LOGGER.Info("Converting file to Eml if needed: [{0}]", pEmailFilePath)
+            Dim oEmail As IMail = EMAIL.Load_Email(pEmailFilePath)
+
+            If oEmail.MessageID IsNot Nothing Then
+                CURRENT_MESSAGEID = oEmail.MessageID
             Else
-                LOGGER.Info(">> Email_Decay: Es konnte keine Message-ID gelesen werden. Eine GUID wird erzeugt!")
-                Dim sGUID As String
-                sGUID = System.Guid.NewGuid.ToString()
-                CURRENT_MESSAGEID = sGUID
+                LOGGER.Info("Es konnte keine Message-ID gelesen werden. Eine GUID wird erzeugt!")
+                CURRENT_MESSAGEID = NewGuid.ToString()
             End If
 
-            'Nur die MSGDatei ablegen
-            Dim tempfile As String = Path.Combine(Path.GetTempPath, Path.GetFileNameWithoutExtension(msgname) & "_excl_att.msg")
+            Dim oEmailFilePathWithoutAttachments = EMAIL.Remove_AttachmentsFromEmail(pEmailFilePath, "_excl_attachments")
+            TEMP_FILES.Add(oEmailFilePathWithoutAttachments)
 
-            If File.Exists(tempfile) Then
-                File.Delete(tempfile)
-            End If
-            Dim _msgEXAtt As New Msg.Message(msgname)
-            _msgEXAtt.Attachments.Clear()
-            _msgEXAtt.Save(tempfile)
-            'Datei in Array zum Templöschen speichern
-            TEMP_FILES.Add(tempfile)
+            If Insert_GI_File(oEmailFilePathWithoutAttachments, oMessageOnlyMarker) = True Then
+                oSuccess = True
 
-            If Insert_GI_File(tempfile, msgonly) = True Then
-                erfolgreich = True
-                'Hier nun die Anhänge herauslösen
-                Dim _msg As New Msg.Message(msgname)
-                Dim i1 As Integer = 1
+                Dim oAttachments As List(Of String) = EMAIL.Save_AttachmentsToDisk(pEmailFilePath)
 
-                LOGGER.Info(">> Anzahl der Attachments: " & _msg.Attachments.Count)
-                For Each attachment As Independentsoft.Msg.Attachment In _msg.Attachments
-                    If erfolgreich = False Then
+                LOGGER.Debug("Saved [{0}] attachments to disk.", oAttachments.Count)
+
+                For Each oAttachment In oAttachments
+                    TEMP_FILES.Add(oAttachment)
+                    LOGGER.Debug("Saved attachment [{0}].", oAttachment)
+                    oSuccess = Insert_GI_File(oAttachment, oExtractedAttachmentMarker)
+
+                    If oSuccess = False Then
+                        LOGGER.Warn("Saving attachment to disk failed: [{0}]", oAttachment)
                         Exit For
                     End If
-                    Dim attachment_name As String
-                    If attachment.LongFileName Is Nothing Then
-                        attachment_name = attachment.DisplayName
-                    Else
-                        attachment_name = attachment.LongFileName
-                    End If
-                    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)
-                        tempfile = ClassFilehandle.Versionierung_Datei(tempfile)
-                        If tempfile <> "" Then
-                            attachment.Save(tempfile)
-                            'Datei in Array zum Templöschen speichern
-                            TEMP_FILES.Add(tempfile)
-                            LOGGER.Info(">> Attachment (" & i1 & "):" & tempfile)
-                            'nun der Insert des Anhanges
-                            erfolgreich = Insert_GI_File(tempfile, ATT_EXTR)
-                            i1 += 1
-                        End If
-                    End If
                 Next
             End If
-            Return erfolgreich
+
+            Return oSuccess
         Catch ex As Exception
-            MsgBox("Error in Email_Decay: " & ex.Message, MsgBoxStyle.Critical)
+            LOGGER.Warn("Saving email to disk failed (Email_Decay)")
+            LOGGER.Error(ex)
+
+            Return False
         End Try
     End Function
 
+    'Private Shared Function Email_Decay(msgname As String, Optional FW As Boolean = False)
+    '    Try
+    '        Dim msgonly As String = "|MSGONLY|"
+    '        Dim ATT_EXTR As String = "|ATTMNTEXTRACTED|"
+    '        If FW = True Then
+    '            msgonly = "|FW_MSGONLY|"
+    '            ATT_EXTR = "|FW_ATTMNTEXTRACTED|"
+    '        End If
+    '        Dim erfolgreich As Boolean = False
+    '        Dim msg As New MSG.Message(msgname)
+
+    '        If msg.InternetMessageId IsNot Nothing Then
+    '            CURRENT_MESSAGEID = msg.InternetMessageId
+    '        Else
+    '            LOGGER.Info("Es konnte keine Message-ID gelesen werden. Eine GUID wird erzeugt!")
+    '            Dim sGUID As String
+    '            sGUID = System.Guid.NewGuid.ToString()
+    '            CURRENT_MESSAGEID = sGUID
+    '        End If
+
+    '        'Nur die MSGDatei ablegen
+    '        Dim tempfile As String = Path.Combine(Path.GetTempPath, Path.GetFileNameWithoutExtension(msgname) & "_excl_att.msg")
+
+    '        If File.Exists(tempfile) Then
+    '            File.Delete(tempfile)
+    '        End If
+    '        Dim _msgEXAtt As New Msg.Message(msgname)
+    '        _msgEXAtt.Attachments.Clear()
+    '        _msgEXAtt.Save(tempfile)
+    '        'Datei in Array zum Templöschen speichern
+    '        TEMP_FILES.Add(tempfile)
+
+    '        If Insert_GI_File(tempfile, msgonly) = True Then
+    '            erfolgreich = True
+    '            'Hier nun die Anhänge herauslösen
+    '            Dim _msg As New Msg.Message(msgname)
+    '            Dim i1 As Integer = 1
+
+    '            LOGGER.Info(">> Anzahl der Attachments: " & _msg.Attachments.Count)
+    '            For Each attachment As Independentsoft.Msg.Attachment In _msg.Attachments
+    '                If erfolgreich = False Then
+    '                    Exit For
+    '                End If
+    '                Dim attachment_name As String
+    '                If attachment.LongFileName Is Nothing Then
+    '                    attachment_name = attachment.DisplayName
+    '                Else
+    '                    attachment_name = attachment.LongFileName
+    '                End If
+    '                If attachment.EmbeddedMessage IsNot Nothing Then
+    '                    attachment_name = Utils.RemoveInvalidCharacters(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.IsEmbedded = False
+    '                        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 = Utils.RemoveInvalidCharacters(attachment_name)
+    '                    tempfile = Path.Combine(Path.GetTempPath, attachment_name)
+    '                    tempfile = ClassFilehandle.Versionierung_Datei(tempfile)
+    '                    If tempfile <> "" Then
+    '                        attachment.Save(tempfile)
+    '                        'Datei in Array zum Templöschen speichern
+    '                        TEMP_FILES.Add(tempfile)
+    '                        LOGGER.Info(">> Attachment (" & i1 & "):" & tempfile)
+    '                        'nun der Insert des Anhanges
+    '                        erfolgreich = Insert_GI_File(tempfile, ATT_EXTR)
+    '                        i1 += 1
+    '                    End If
+    '                End If
+    '            Next
+    '        End If
+    '        Return erfolgreich
+    '    Catch ex As Exception
+    '        MsgBox("Error in Email_Decay: " & ex.Message, MsgBoxStyle.Critical)
+    '    End Try
+    'End Function
+
     Private Shared Function Insert_GI_File(filename As String, handleType As String)
         Try
             filename = filename.Replace("'", "''")
@@ -157,7 +195,7 @@ Public Class ClassFilehandle
             Dim oHash As String = String.Empty
 
             If File.Exists(filename) Then
-                If filename.ToUpper.EndsWith(".MSG") And (handleType = "|OUTLOOK_MESSAGE|" Or handleType = "|MSGONLY|") Then
+                If (filename.ToUpper.EndsWith(".MSG") Or filename.ToUpper.EndsWith(".EML")) And (handleType = "|OUTLOOK_MESSAGE|" Or handleType = "|MSGONLY|") Then
                     oHash = FILESYSTEM.GetChecksumFromString(filename)
                 Else
                     oHash = FILESYSTEM.GetChecksum(filename)
@@ -202,7 +240,7 @@ Public Class ClassFilehandle
         Try
             Dim version As Integer = 1
 
-            Dim Stammname As String = Path.GetDirectoryName(Dateiname) & "\" & Path.GetFileNameWithoutExtension(Dateiname)
+            Dim Stammname As String = Path.GetDirectoryName(Dateiname) & "\" & Path.GetFileNameWithoutExtension(Dateiname).Trim()
             extension = Path.GetExtension(Dateiname)
 
             Dim _neuername As String = Stammname

Global_Indexer/ClassFolderWatcher.vb

@@ -1,5 +1,4 @@
 Imports System.IO
-Imports Independentsoft
 Imports System.Threading
 
 Public Class ClassFolderWatcher

Global_Indexer/ClassInit.vb

@@ -1,9 +1,10 @@
 Imports System.ComponentModel
-Imports DLLLicenseManager
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Windream
 Imports DigitalData.Modules.Filesystem
+Imports DigitalData.Modules.Messaging
+Imports DLLLicenseManager
 
 Public Class ClassInit
     Public _lizenzManager As ClassLicenseManager
@@ -67,6 +68,7 @@ Public Class ClassInit
         configResult = Load_BasicConfig()
 
         FILESYSTEM = New File(LOGCONFIG)
+        EMAIL = New Email2(LOGCONFIG)
 
         If configResult = False Then
             If USER_LANGUAGE = "de-DE" Then

Global_Indexer/Global_Indexer.vbproj

@@ -167,10 +167,17 @@
       <HintPath>..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="DigitalData.Modules.Language, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDMonorepo\Modules.Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Logging, Version=2.0.0.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.Messaging">
+      <HintPath>..\..\DDMonorepo\Modules.Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
+    </Reference>
     <Reference Include="DigitalData.Modules.Windows">
       <HintPath>..\..\DDMonorepo\Windows\bin\Debug\DigitalData.Modules.Windows.dll</HintPath>
     </Reference>
@@ -182,10 +189,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll</HintPath>
     </Reference>
-    <Reference Include="Independentsoft.Msg, Version=2.0.570.21482, Culture=neutral, PublicKeyToken=76be97fe952f1ec7, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.dll</HintPath>
-    </Reference>
     <Reference Include="Interop.WINDREAMLib">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath>
       <EmbedInteropTypes>False</EmbedInteropTypes>
@@ -194,6 +197,10 @@
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll</HintPath>
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="Mail, Version=3.0.21189.1553, Culture=neutral, PublicKeyToken=6dc438ab78a525b3, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>P:\Visual Studio Projekte\Bibliotheken\Limilabs\Mail.dll\Mail.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
@@ -467,6 +474,7 @@
     </EmbeddedResource>
     <EmbeddedResource Include="frmIndexFileList.en-US.resx">
       <DependentUpon>frmIndexFileList.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="frmIndexFileList.en.resx">
       <DependentUpon>frmIndexFileList.vb</DependentUpon>
@@ -768,6 +776,9 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="globe_handdrawn.ico" />
+    <Content Include="MailLicense.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Resources\DD_Icons_ICO_GLOBIX_1.ico" />
     <None Include="Resources\itemtypechecked.svg" />
     <None Include="Resources\trackingchanges_next.svg" />

Global_Indexer/MailLicense.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<License>
+  <Id>4dc5ef40-f1a9-468b-994c-b7ed600ad878</Id>
+  <ProductName>Mail.dll</ProductName>
+  <SubscriptionUntil>2022-07-29</SubscriptionUntil>
+  <RegisteredTo>Digital Data GmbH</RegisteredTo>
+  <LicenseType>single developer</LicenseType>
+  <BuyerName>Digital Data GmbH</BuyerName>
+  <Signature xmlns="http://www.w3.org/2000/09/xmldsig#">
+    <SignedInfo>
+      <CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315" />
+      <SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
+      <Reference URI="">
+        <Transforms>
+          <Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
+        </Transforms>
+        <DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+        <DigestValue>75MRtl4ipYelIZYlpT8O7QDX9Zc=</DigestValue>
+      </Reference>
+    </SignedInfo>
+    <SignatureValue>Raxfkz6DfQVs/sMvH+F2nH0eHXD8FoUFSdP3t7AgBUdpABJQx86srlyuMSEhXPlc1THCqPouEVob4RsWnd9OXvTiPPSOUSK9zuNG6uz93KLAhpSD5PraAgBCF4jwZArlAp7aCNfZpHqQ3w6TRHS+CfravUU0AHHG3MZ1ZcRkGuo=</SignatureValue>
+  </Signature>
+</License>

Global_Indexer/ModuleCURRENT.vb

@@ -1,6 +1,7 @@
 Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Filesystem
+Imports DigitalData.Modules.Messaging
 
 Module ModuleCURRENT
     Public ERROR_STATE As String
@@ -16,6 +17,7 @@ Module ModuleCURRENT
     Public LOGCONFIG As LogConfig
     Public LOGGER As Logger
     Public FILESYSTEM As File
+    Public EMAIL As Email2
 
     Public CURRENT_DOKART_ID As Integer
     Public CURRENT_DOKART_DUPLICATE_HANDLING As String = "Default"

Global_Indexer/My Project/AssemblyInfo.vb

@@ -15,7 +15,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")> 
 <Assembly: AssemblyProduct("Global Indexer")>
 <Assembly: AssemblyCopyright("Copyright © 2021")>
-<Assembly: AssemblyTrademark("2400")>
+<Assembly: AssemblyTrademark("2420")>
 
 <Assembly: ComVisible(False)> 
 
@@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.4.0.12")>
+<Assembly: AssemblyVersion("2.4.2.6")>
 <Assembly: AssemblyFileVersion("1.0.0.0")>
 
 <Assembly: NeutralResourcesLanguageAttribute("")> 

Global_Indexer/MyDataset.Designer.vb

@@ -18230,78 +18230,55 @@ Namespace MyDatasetTableAdapters
             Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SQL_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.InsertCommand.Connection = Me.Connection
-            Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBDD_INDEX_AUTOM] ([DOCTYPE_ID], [INDEXNAME], [VALUE], [CONNECTION_I"& _ 
-                "D], [COMMENT], [ACTIVE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN"& _ 
-                "], [SQL_RESULT], [SQL_ACTIVE]) VALUES (@DOCTYPE_ID, @INDEXNAME, @VALUE, @CONNECT"& _ 
-                "ION_ID, @COMMENT, @ACTIVE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN,"& _ 
-                " @SQL_RESULT, @SQL_ACTIVE);"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTI"& _ 
-                "ON_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RE"& _ 
-                "SULT, SQL_ACTIVE FROM TBDD_INDEX_AUTOM WHERE (GUID = SCOPE_IDENTITY()) ORDER BY "& _ 
-                "SEQUENCE"
+            Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_INDEX_AUTOM"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         (DOCTYPE_ID, INDEXNAME, VA"& _ 
+                "LUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED"& _ 
+                "_WHEN, SQL_RESULT, SQL_ACTIVE, SEQUENCE)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@DOCTYPE_ID,@INDEXNAME,"& _ 
+                "@VALUE,@CONNECTION_ID,@COMMENT,@ACTIVE,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHAN"& _ 
+                "GED_WHEN,@SQL_RESULT,@SQL_ACTIVE,@SEQUENCE); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE_ID, INDEXNAM"& _ 
+                "E, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CH"& _ 
+                "ANGED_WHEN, SQL_RESULT, SQL_ACTIVE FROM TBDD_INDEX_AUTOM WHERE (GUID = SCOPE_IDE"& _ 
+                "NTITY()) ORDER BY SEQUENCE"
             Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INDEXNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEXNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALUE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RESULT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RESULT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INDEXNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEXNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALUE", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 400, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RESULT", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RESULT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.UpdateCommand.Connection = Me.Connection
-            Me._adapter.UpdateCommand.CommandText = "UPDATE [TBDD_INDEX_AUTOM] SET [DOCTYPE_ID] = @DOCTYPE_ID, [INDEXNAME] = @INDEXNAM"& _ 
-                "E, [VALUE] = @VALUE, [CONNECTION_ID] = @CONNECTION_ID, [COMMENT] = @COMMENT, [AC"& _ 
-                "TIVE] = @ACTIVE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_"& _ 
-                "WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [SQL_RESULT] = @SQL_RESULT,"& _ 
-                " [SQL_ACTIVE] = @SQL_ACTIVE WHERE (([GUID] = @Original_GUID) AND ([DOCTYPE_ID] ="& _ 
-                " @Original_DOCTYPE_ID) AND ([INDEXNAME] = @Original_INDEXNAME) AND ((@IsNull_VAL"& _ 
-                "UE = 1 AND [VALUE] IS NULL) OR ([VALUE] = @Original_VALUE)) AND ([CONNECTION_ID]"& _ 
-                " = @Original_CONNECTION_ID) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR "& _ 
-                "([COMMENT] = @Original_COMMENT)) AND ([ACTIVE] = @Original_ACTIVE) AND ([ADDED_W"& _ 
-                "HO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL"& _ 
-                ") OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [C"& _ 
-                "HANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_C"& _ 
-                "HANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANG"& _ 
-                "ED_WHEN)) AND ([SQL_RESULT] = @Original_SQL_RESULT) AND ([SQL_ACTIVE] = @Origina"& _ 
-                "l_SQL_ACTIVE));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMME"& _ 
-                "NT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_AC"& _ 
-                "TIVE FROM TBDD_INDEX_AUTOM WHERE (GUID = @GUID) ORDER BY SEQUENCE"
+            Me._adapter.UpdateCommand.CommandText = "UPDATE       TBDD_INDEX_AUTOM"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET                DOCTYPE_ID = @DOCTYPE_ID, INDEX"& _ 
+                "NAME = @INDEXNAME, VALUE = @VALUE, CONNECTION_ID = @CONNECTION_ID, COMMENT = @CO"& _ 
+                "MMENT, ACTIVE = @ACTIVE, ADDED_WHO = @ADDED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         ADDE"& _ 
+                "D_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN, "& _ 
+                "SQL_RESULT = @SQL_RESULT, SQL_ACTIVE = @SQL_ACTIVE, SEQUENCE = @SEQUENCE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ 
+                "       (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CON"& _ 
+                "NECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, S"& _ 
+                "QL_RESULT, SQL_ACTIVE FROM TBDD_INDEX_AUTOM WHERE (GUID = @GUID) ORDER BY SEQUEN"& _ 
+                "CE"
             Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INDEXNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEXNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALUE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RESULT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RESULT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_INDEXNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEXNAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_VALUE", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VALUE", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_VALUE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VALUE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SQL_RESULT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RESULT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SQL_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INDEXNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEXNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALUE", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COMMENT", Global.System.Data.SqlDbType.VarChar, 400, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RESULT", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RESULT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -18317,9 +18294,10 @@ Namespace MyDatasetTableAdapters
             Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {}
             Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(0).Connection = Me.Connection
-            Me._commandCollection(0).CommandText = "SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_"& _ 
-                "WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_ACTIVE FROM TBDD_IND"& _ 
-                "EX_AUTOM WHERE (DOCTYPE_ID = @DOCTYPE_ID) ORDER BY SEQUENCE"
+            Me._commandCollection(0).CommandText = "SELECT        GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE,"& _ 
+                " ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_ACTIVE, SEQUE"& _ 
+                "NCE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBDD_INDEX_AUTOM"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (DOCTYPE_ID = @DOCTYPE_ID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _ 
+                "ORDER BY SEQUENCE"
             Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text
             Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
         End Sub
@@ -18457,7 +18435,7 @@ Namespace MyDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
          Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)>  _
-        Public Overloads Overridable Function Insert(ByVal DOCTYPE_ID As Integer, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Short, ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal SQL_RESULT As String, ByVal SQL_ACTIVE As Boolean) As Integer
+        Public Overloads Overridable Function Insert(ByVal DOCTYPE_ID As Integer, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Short, ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal SQL_RESULT As String, ByVal SQL_ACTIVE As Boolean, ByVal SEQUENCE As Byte) As Integer
             Me.Adapter.InsertCommand.Parameters(0).Value = CType(DOCTYPE_ID,Integer)
             If (INDEXNAME Is Nothing) Then
                 Throw New Global.System.ArgumentNullException("INDEXNAME")
@@ -18502,6 +18480,7 @@ Namespace MyDatasetTableAdapters
                 Me.Adapter.InsertCommand.Parameters(10).Value = CType(SQL_RESULT,String)
             End If
             Me.Adapter.InsertCommand.Parameters(11).Value = CType(SQL_ACTIVE,Boolean)
+            Me.Adapter.InsertCommand.Parameters(12).Value = CType(SEQUENCE,Byte)
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
             If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then
@@ -18521,33 +18500,7 @@ Namespace MyDatasetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
          Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)>  _
-        Public Overloads Overridable Function Update( _
-                    ByVal DOCTYPE_ID As Integer,  _
-                    ByVal INDEXNAME As String,  _
-                    ByVal VALUE As String,  _
-                    ByVal CONNECTION_ID As Short,  _
-                    ByVal COMMENT As String,  _
-                    ByVal ACTIVE As Boolean,  _
-                    ByVal ADDED_WHO As String,  _
-                    ByVal ADDED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal CHANGED_WHO As String,  _
-                    ByVal CHANGED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal SQL_RESULT As String,  _
-                    ByVal SQL_ACTIVE As Boolean,  _
-                    ByVal Original_GUID As Integer,  _
-                    ByVal Original_DOCTYPE_ID As Integer,  _
-                    ByVal Original_INDEXNAME As String,  _
-                    ByVal Original_VALUE As String,  _
-                    ByVal Original_CONNECTION_ID As Short,  _
-                    ByVal Original_COMMENT As String,  _
-                    ByVal Original_ACTIVE As Boolean,  _
-                    ByVal Original_ADDED_WHO As String,  _
-                    ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal Original_CHANGED_WHO As String,  _
-                    ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal Original_SQL_RESULT As String,  _
-                    ByVal Original_SQL_ACTIVE As Boolean,  _
-                    ByVal GUID As Integer) As Integer
+        Public Overloads Overridable Function Update(ByVal DOCTYPE_ID As Integer, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Short, ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Global.System.Nullable(Of Date), ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal SQL_RESULT As String, ByVal SQL_ACTIVE As Boolean, ByVal SEQUENCE As Byte, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer
             Me.Adapter.UpdateCommand.Parameters(0).Value = CType(DOCTYPE_ID,Integer)
             If (INDEXNAME Is Nothing) Then
                 Throw New Global.System.ArgumentNullException("INDEXNAME")
@@ -18592,62 +18545,9 @@ Namespace MyDatasetTableAdapters
                 Me.Adapter.UpdateCommand.Parameters(10).Value = CType(SQL_RESULT,String)
             End If
             Me.Adapter.UpdateCommand.Parameters(11).Value = CType(SQL_ACTIVE,Boolean)
-            Me.Adapter.UpdateCommand.Parameters(12).Value = CType(Original_GUID,Integer)
-            Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_DOCTYPE_ID,Integer)
-            If (Original_INDEXNAME Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("Original_INDEXNAME")
-            Else
-                Me.Adapter.UpdateCommand.Parameters(14).Value = CType(Original_INDEXNAME,String)
-            End If
-            If (Original_VALUE Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(15).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(16).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.UpdateCommand.Parameters(15).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_VALUE,String)
-            End If
-            Me.Adapter.UpdateCommand.Parameters(17).Value = CType(Original_CONNECTION_ID,Short)
-            If (Original_COMMENT Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(18).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(19).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.UpdateCommand.Parameters(18).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(19).Value = CType(Original_COMMENT,String)
-            End If
-            Me.Adapter.UpdateCommand.Parameters(20).Value = CType(Original_ACTIVE,Boolean)
-            If (Original_ADDED_WHO Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("Original_ADDED_WHO")
-            Else
-                Me.Adapter.UpdateCommand.Parameters(21).Value = CType(Original_ADDED_WHO,String)
-            End If
-            If (Original_ADDED_WHEN.HasValue = true) Then
-                Me.Adapter.UpdateCommand.Parameters(22).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(23).Value = CType(Original_ADDED_WHEN.Value,Date)
-            Else
-                Me.Adapter.UpdateCommand.Parameters(22).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(23).Value = Global.System.DBNull.Value
-            End If
-            If (Original_CHANGED_WHO Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(24).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(25).Value = Global.System.DBNull.Value
-            Else
-                Me.Adapter.UpdateCommand.Parameters(24).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(25).Value = CType(Original_CHANGED_WHO,String)
-            End If
-            If (Original_CHANGED_WHEN.HasValue = true) Then
-                Me.Adapter.UpdateCommand.Parameters(26).Value = CType(0,Object)
-                Me.Adapter.UpdateCommand.Parameters(27).Value = CType(Original_CHANGED_WHEN.Value,Date)
-            Else
-                Me.Adapter.UpdateCommand.Parameters(26).Value = CType(1,Object)
-                Me.Adapter.UpdateCommand.Parameters(27).Value = Global.System.DBNull.Value
-            End If
-            If (Original_SQL_RESULT Is Nothing) Then
-                Throw New Global.System.ArgumentNullException("Original_SQL_RESULT")
-            Else
-                Me.Adapter.UpdateCommand.Parameters(28).Value = CType(Original_SQL_RESULT,String)
-            End If
-            Me.Adapter.UpdateCommand.Parameters(29).Value = CType(Original_SQL_ACTIVE,Boolean)
-            Me.Adapter.UpdateCommand.Parameters(30).Value = CType(GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(12).Value = CType(SEQUENCE,Byte)
+            Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(14).Value = CType(GUID,Integer)
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
             If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then
@@ -18662,39 +18562,6 @@ Namespace MyDatasetTableAdapters
                 End If
             End Try
         End Function
-        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"),  _
-         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
-         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)>  _
-        Public Overloads Overridable Function Update( _
-                    ByVal DOCTYPE_ID As Integer,  _
-                    ByVal INDEXNAME As String,  _
-                    ByVal VALUE As String,  _
-                    ByVal CONNECTION_ID As Short,  _
-                    ByVal COMMENT As String,  _
-                    ByVal ACTIVE As Boolean,  _
-                    ByVal ADDED_WHO As String,  _
-                    ByVal ADDED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal CHANGED_WHO As String,  _
-                    ByVal CHANGED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal SQL_RESULT As String,  _
-                    ByVal SQL_ACTIVE As Boolean,  _
-                    ByVal Original_GUID As Integer,  _
-                    ByVal Original_DOCTYPE_ID As Integer,  _
-                    ByVal Original_INDEXNAME As String,  _
-                    ByVal Original_VALUE As String,  _
-                    ByVal Original_CONNECTION_ID As Short,  _
-                    ByVal Original_COMMENT As String,  _
-                    ByVal Original_ACTIVE As Boolean,  _
-                    ByVal Original_ADDED_WHO As String,  _
-                    ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal Original_CHANGED_WHO As String,  _
-                    ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date),  _
-                    ByVal Original_SQL_RESULT As String,  _
-                    ByVal Original_SQL_ACTIVE As Boolean) As Integer
-            Return Me.Update(DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_ACTIVE, Original_GUID, Original_DOCTYPE_ID, Original_INDEXNAME, Original_VALUE, Original_CONNECTION_ID, Original_COMMENT, Original_ACTIVE, Original_ADDED_WHO, Original_ADDED_WHEN, Original_CHANGED_WHO, Original_CHANGED_WHEN, Original_SQL_RESULT, Original_SQL_ACTIVE, Original_GUID)
-        End Function
     End Class
     
     '''<summary>

Global_Indexer/MyDataset.xsd

@@ -657,27 +657,33 @@ ORDER BY SEQUENCE</CommandText>
                 </DeleteCommand>
                 <InsertCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>INSERT INTO [TBDD_INDEX_AUTOM] ([DOCTYPE_ID], [INDEXNAME], [VALUE], [CONNECTION_ID], [COMMENT], [ACTIVE], [ADDED_WHO], [ADDED_WHEN], [CHANGED_WHO], [CHANGED_WHEN], [SQL_RESULT], [SQL_ACTIVE]) VALUES (@DOCTYPE_ID, @INDEXNAME, @VALUE, @CONNECTION_ID, @COMMENT, @ACTIVE, @ADDED_WHO, @ADDED_WHEN, @CHANGED_WHO, @CHANGED_WHEN, @SQL_RESULT, @SQL_ACTIVE);
+                    <CommandText>INSERT INTO TBDD_INDEX_AUTOM
+                         (DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_ACTIVE, SEQUENCE)
+VALUES        (@DOCTYPE_ID,@INDEXNAME,@VALUE,@CONNECTION_ID,@COMMENT,@ACTIVE,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@SQL_RESULT,@SQL_ACTIVE,@SEQUENCE); 
 SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_ACTIVE FROM TBDD_INDEX_AUTOM WHERE (GUID = SCOPE_IDENTITY()) ORDER BY SEQUENCE</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@DOCTYPE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="DOCTYPE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@INDEXNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="INDEXNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int16" Direction="Input" ParameterName="@CONNECTION_ID" Precision="0" ProviderType="SmallInt" Scale="0" Size="0" SourceColumn="CONNECTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SQL_RESULT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SQL_RESULT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@SQL_ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="SQL_ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="DOCTYPE_ID" ColumnName="DOCTYPE_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@DOCTYPE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="DOCTYPE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="INDEXNAME" ColumnName="INDEXNAME" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@INDEXNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="INDEXNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="VALUE" ColumnName="VALUE" DataSourceName="" DataTypeServer="varchar(2000)" DbType="AnsiString" Direction="Input" ParameterName="@VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="2000" SourceColumn="VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CONNECTION_ID" ColumnName="CONNECTION_ID" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@CONNECTION_ID" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="CONNECTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="" DataTypeServer="varchar(400)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="400" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SQL_RESULT" ColumnName="SQL_RESULT" DataSourceName="" DataTypeServer="varchar(2000)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_RESULT" Precision="0" ProviderType="VarChar" Scale="0" Size="2000" SourceColumn="SQL_RESULT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SQL_ACTIVE" ColumnName="SQL_ACTIVE" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SQL_ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SQL_ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="" DataTypeServer="tinyint" DbType="Byte" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="TinyInt" Scale="0" Size="1" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_ACTIVE FROM TBDD_INDEX_AUTOM WHERE (DOCTYPE_ID = @DOCTYPE_ID) ORDER BY SEQUENCE</CommandText>
+                    <CommandText>SELECT        GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_ACTIVE, SEQUENCE
+FROM            TBDD_INDEX_AUTOM
+WHERE        (DOCTYPE_ID = @DOCTYPE_ID)
+ORDER BY SEQUENCE</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="DOCTYPE_ID" ColumnName="DOCTYPE_ID" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_AUTOM" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@DOCTYPE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="DOCTYPE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
@@ -685,40 +691,27 @@ SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED
                 </SelectCommand>
                 <UpdateCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBDD_INDEX_AUTOM] SET [DOCTYPE_ID] = @DOCTYPE_ID, [INDEXNAME] = @INDEXNAME, [VALUE] = @VALUE, [CONNECTION_ID] = @CONNECTION_ID, [COMMENT] = @COMMENT, [ACTIVE] = @ACTIVE, [ADDED_WHO] = @ADDED_WHO, [ADDED_WHEN] = @ADDED_WHEN, [CHANGED_WHO] = @CHANGED_WHO, [CHANGED_WHEN] = @CHANGED_WHEN, [SQL_RESULT] = @SQL_RESULT, [SQL_ACTIVE] = @SQL_ACTIVE WHERE (([GUID] = @Original_GUID) AND ([DOCTYPE_ID] = @Original_DOCTYPE_ID) AND ([INDEXNAME] = @Original_INDEXNAME) AND ((@IsNull_VALUE = 1 AND [VALUE] IS NULL) OR ([VALUE] = @Original_VALUE)) AND ([CONNECTION_ID] = @Original_CONNECTION_ID) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([ACTIVE] = @Original_ACTIVE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([SQL_RESULT] = @Original_SQL_RESULT) AND ([SQL_ACTIVE] = @Original_SQL_ACTIVE));
+                    <CommandText>UPDATE       TBDD_INDEX_AUTOM
+SET                DOCTYPE_ID = @DOCTYPE_ID, INDEXNAME = @INDEXNAME, VALUE = @VALUE, CONNECTION_ID = @CONNECTION_ID, COMMENT = @COMMENT, ACTIVE = @ACTIVE, ADDED_WHO = @ADDED_WHO, 
+                         ADDED_WHEN = @ADDED_WHEN, CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN, SQL_RESULT = @SQL_RESULT, SQL_ACTIVE = @SQL_ACTIVE, SEQUENCE = @SEQUENCE
+WHERE        (GUID = @Original_GUID); 
 SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_ACTIVE FROM TBDD_INDEX_AUTOM WHERE (GUID = @GUID) ORDER BY SEQUENCE</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@DOCTYPE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="DOCTYPE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@INDEXNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="INDEXNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int16" Direction="Input" ParameterName="@CONNECTION_ID" Precision="0" ProviderType="SmallInt" Scale="0" Size="0" SourceColumn="CONNECTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@SQL_RESULT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SQL_RESULT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@SQL_ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="SQL_ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_DOCTYPE_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="DOCTYPE_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_INDEXNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="INDEXNAME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_VALUE" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="VALUE" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="VALUE" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int16" Direction="Input" ParameterName="@Original_CONNECTION_ID" Precision="0" ProviderType="SmallInt" Scale="0" Size="0" SourceColumn="CONNECTION_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_COMMENT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_ADDED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHO" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_CHANGED_WHEN" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@Original_CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="0" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_SQL_RESULT" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="SQL_RESULT" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@Original_SQL_ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="0" SourceColumn="SQL_ACTIVE" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBDD_INDEX_AUTOM" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="DOCTYPE_ID" ColumnName="DOCTYPE_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@DOCTYPE_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="DOCTYPE_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="INDEXNAME" ColumnName="INDEXNAME" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@INDEXNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="INDEXNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="VALUE" ColumnName="VALUE" DataSourceName="" DataTypeServer="varchar(2000)" DbType="AnsiString" Direction="Input" ParameterName="@VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="2000" SourceColumn="VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CONNECTION_ID" ColumnName="CONNECTION_ID" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@CONNECTION_ID" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="CONNECTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="COMMENT" ColumnName="COMMENT" DataSourceName="" DataTypeServer="varchar(400)" DbType="AnsiString" Direction="Input" ParameterName="@COMMENT" Precision="0" ProviderType="VarChar" Scale="0" Size="400" SourceColumn="COMMENT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SQL_RESULT" ColumnName="SQL_RESULT" DataSourceName="" DataTypeServer="varchar(2000)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_RESULT" Precision="0" ProviderType="VarChar" Scale="0" Size="2000" SourceColumn="SQL_RESULT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SQL_ACTIVE" ColumnName="SQL_ACTIVE" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SQL_ACTIVE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SQL_ACTIVE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="" DataTypeServer="tinyint" DbType="Byte" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="TinyInt" Scale="0" Size="1" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -1226,7 +1219,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" />
@@ -1291,7 +1284,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" />
@@ -1374,7 +1367,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" />
@@ -1411,7 +1404,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" />
@@ -1425,7 +1418,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" />
@@ -1439,7 +1432,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" />
@@ -1521,7 +1514,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" />
@@ -1594,7 +1587,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" />
@@ -1707,7 +1700,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" />
@@ -1804,7 +1797,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" />
@@ -1860,7 +1853,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" />
@@ -1868,7 +1861,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" />
@@ -1918,7 +1911,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" />
@@ -1990,7 +1983,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" />
@@ -2071,7 +2064,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" />
@@ -2085,7 +2078,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" />
@@ -2094,7 +2087,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" />
@@ -2119,7 +2112,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" />
@@ -2158,7 +2151,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" />
@@ -2197,7 +2190,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" />
@@ -2219,7 +2212,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" />
@@ -2231,7 +2224,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" />
@@ -2347,14 +2340,14 @@ 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_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_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,7 +4,7 @@
      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="-10" ViewPortY="-47" 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="251" 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="12" X="765" Y="247" Height="305" Width="213" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
     <Shape ID="DesignTable:TBDD_DOKUMENTART" ZOrder="14" X="119" Y="308" Height="381" Width="278" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="275" />

Global_Indexer/frmConfig_Basic.vb

@@ -516,11 +516,4 @@ Public Class frmConfig_Basic
         ' Navigate to a URL.
         System.Diagnostics.Process.Start("http://www.didalog.de/Support")
     End Sub
-
-    'Private Sub chkdelete_origin_CheckedChanged(sender As Object, e As EventArgs) Handles chkdelete_origin.CheckedChanged
-    '    If CURR_DELETE_ORIGIN <> chkdelete_origin.Checked Then
-    '        CURR_DELETE_ORIGIN = chkdelete_origin.Checked
-    '        SaveConfigValue("Delete_OriginFile", CURR_DELETE_ORIGIN)
-    '    End If
-    'End Sub
 End Class

Global_Indexer/frmStart.vb

@@ -1,6 +1,5 @@
 Imports System.IO
 Imports Microsoft.Office.Interop
-Imports Independentsoft
 Imports DLLLicenseManager
 Imports System.Text
 Imports System.Globalization
@@ -254,14 +253,17 @@ Public Class frmStart
         Catch ex As Exception
             MsgBox("Unexpected Error in Closing Application: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
+
+        EMAIL.Clear_TempFiles()
+
         'TempDateien löschen
-        Try
-            For Each _file In TEMP_FILES
-                System.IO.File.Delete(_file)
-            Next
-        Catch ex As Exception
-            LOGGER.Error(ex)
-        End Try
+        For Each oFile In TEMP_FILES
+            Try
+                System.IO.File.Delete(oFile)
+            Catch ex As Exception
+                LOGGER.Error(ex)
+            End Try
+        Next
 
         Try
             IndexForm.DisposeViewer()

SetupVS19/Product.wxs

@@ -118,6 +118,10 @@
         <File Id="LookupGrid" Name="DigitalData.Controls.LookupGrid.dll" Source="DigitalData.Controls.LookupGrid.dll" KeyPath="no" />
         <File Id="Windream" Name="DigitalData.Modules.Windream.dll" Source="DigitalData.Modules.Windream.dll" KeyPath="no" />
         <File Id="Windows" Name="DigitalData.Modules.Windows.dll" Source="DigitalData.Modules.Windows.dll" KeyPath="no" />
+        <File Id="Language" Name="DigitalData.Modules.Language.dll" Source="DigitalData.Modules.Language.dll" KeyPath="no" />
+
+        <File Id="Messaging" Name="DigitalData.Modules.Messaging.dll" Source="DigitalData.Modules.Messaging.dll" KeyPath="no" />
+        <File Id="Messaging.License" Name="MailLicense.xml" Source="MailLicense.xml" KeyPath="no" />
       </Component>
 
       <Component Id="GDPictureLibs" Guid="9ea5ab43-58ff-4813-9a8b-f854784f0275">
@@ -129,8 +133,8 @@
 
       <!--Verschiedene Bibliotheken-->
       <Component Id="MiscLibs" Guid="56bb39d9-101a-411d-8b11-5d4e3a602275">
-        <File Id="MSGLib" Name="Independentsoft.Msg.dll" Source="P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\Independentsoft.Msg.2.0.570.21482.dll" KeyPath="yes" />
         <File Id="NLog" Name="NLog.dll" Source="NLog.dll" KeyPath="no" />
+        <File Id="Limilabs.Mail" Name="Mail.dll" Source="Mail.dll" KeyPath="no" />
       </Component>
 
       <!--WINDREAM Bibliotheken-->