MS VERsioning MoveRename OFF, new DS

MS VErknüpfungen und Licenses
2020-07-29 14:31:04 +02:00 · 2020-05-06 12:55:11 +02:00
35 changed files with 1515 additions and 3540 deletions
--- a/ToolCollection/ClassNIDatenbankzugriff.vb
+++ b/ToolCollection/ClassNIDatenbankzugriff.vb
@@ -165,8 +165,8 @@ Public Class ClassNIDatenbankzugriff
                            Dim Row1 As DataRow
                            Row1 = myDS.Tables("TBVEKTOR_ARRAY").NewRow()
                            'filling the row with values. Item property is used to set the field value.
-                            Row1.Item("Indexname") = Indexname
-                            Row1.Item("Wert") = CStr(Row.Item(0))
+                            Row1.Item("IndexName") = Indexname
+                            Row1.Item("Value") = CStr(Row.Item(0))
                            myDS.Tables("TBVEKTOR_ARRAY").Rows.Add(Row1)
                            '                    ds.Tables("TBVEKTOR_ARRAYDataTable").Rows.Add(Temptable.Rows(0))
                            Index = Index + 1
@@ -619,15 +619,15 @@ Public Class ClassNIDatenbankzugriff
                                        If QuellVektor = True Then
                                            newRow = myDS.Tables("TBVEKTOR_ARRAY").NewRow()
                                            'filling the row with values. Item property is used to set the field value.
-                                            newRow.Item("Indexname") = Indexname
-                                            newRow.Item("Wert") = CStr(sqlresult)
+                                            newRow.Item("IndexName") = Indexname
+                                            newRow.Item("Value") = CStr(sqlresult)
                                            _Logger.Debug("Value: " & CStr(sqlresult))
                                            myDS.Tables("TBVEKTOR_ARRAY").Rows.Add(newRow)
                                        Else
                                            newRow = myDS.Tables("TBVEKTOR_ARRAY").NewRow()
                                            'filling the row with values. Item property is used to set the field value.
-                                            newRow.Item("Indexname") = Indexname
-                                            newRow.Item("Wert") = sqlresult.ToString
+                                            newRow.Item("IndexName") = Indexname
+                                            newRow.Item("Value") = sqlresult.ToString
                                            myDS.Tables("TBVEKTOR_ARRAY").Rows.Add(newRow)
                                        End If
                                        If sqlresult Is Nothing Then
@@ -647,8 +647,8 @@ Public Class ClassNIDatenbankzugriff
                                        Dim newRow As DataRow
                                        newRow = myDS.Tables("TBVEKTOR_ARRAY").NewRow()
                                        'filling the row with values. Item property is used to set the field value.
-                                        newRow.Item("Indexname") = Indexname
-                                        newRow.Item("Wert") = CStr(Row.Item(0))
+                                        newRow.Item("IndexName") = Indexname
+                                        newRow.Item("Value") = CStr(Row.Item(0))
                                        _Logger.Debug("Value: " & CStr(Row.Item(0)))
                                        myDS.Tables("TBVEKTOR_ARRAY").Rows.Add(newRow)
                                        '                    ds.Tables("TBVEKTOR_ARRAYDataTable").Rows.Add(Temptable.Rows(0))
@@ -721,8 +721,8 @@ Public Class ClassNIDatenbankzugriff
            Dim newRow As DataRow
            newRow = myDS.Tables("TBVEKTOR_ARRAY").NewRow()
            'filling the row with values. Item property is used to set the field value.
-            newRow.Item("Indexname") = Indexname
-            newRow.Item("Wert") = CStr(result)
+            newRow.Item("IndexName") = Indexname
+            newRow.Item("Value") = CStr(result)
            _Logger.Debug("Value: " & CStr(result))
            myDS.Tables("TBVEKTOR_ARRAY").Rows.Add(newRow)
            Return result
--- a/ToolCollection/ClassNIEmail.vb
+++ b/ToolCollection/ClassNIEmail.vb
@@ -94,7 +94,7 @@ Public Class ClassNIEmail
            End Try
            '#########
            Dim empfaenger As String()
-            Dim EMAIL_EMP As String = "support@didalog.de"
+            Dim EMAIL_EMP As String = "support-flow@digitaldata.works"
            'If EMAIL_EMP.Contains(";") Then
            empfaenger = EMAIL_EMP.Split(";")
            'Else
@@ -104,13 +104,13 @@ Public Class ClassNIEmail
            'Für jeden Empfänger eine Neue Mail erzeugen
            For Each _mailempfaenger As String In empfaenger
                ' Neue Nachricht erzeugen: 
-                Dim message As New MailMessage("alarm@didalog.de", _mailempfaenger, "Tool Collection - Critical Error - Domain: " & Environment.UserDomainName, _
-                                               "<font face=""Arial"">" & vBody & "<br>>> Maschine: " & Environment.MachineName & _
-                                                "<br>Kunde: " & frmStart._company & "<br>" & _
-                                                     "<br>Domain-Name: " & Environment.UserDomainName & "<br>" & _
-                                                     "<br>Gesendet am: " & My.Computer.Clock.LocalTime.ToShortDateString & "-" & _
+                Dim message As New MailMessage("support-flow@digitaldata.works", _mailempfaenger, "Tool Collection - Urgent Error - Domain: " & Environment.UserDomainName,
+                                               "<font face=""Arial"">" & vBody & "<br>>> Machine: " & Environment.MachineName &
+                                                "<br>Kunde: " & frmStart._company & "<br>" &
+                                                     "<br>Domain: " & Environment.UserDomainName & "<br>" &
+                                                     "<br>Send-Time: " & My.Computer.Clock.LocalTime.ToShortDateString & "-" &
                                               My.Computer.Clock.LocalTime.ToLongTimeString & "</font>")
-             
+


                With message
@@ -121,7 +121,7 @@ Public Class ClassNIEmail
                'Einen SMTP Client erzeugen und Anmeldungsinformationen hinterlegen
                Dim emailClient As New SmtpClient("mail.triplew.de")
                'Email mit Authentifizierung
-                Dim SMTPUserInfo As New System.Net.NetworkCredential("alarm@didalog.de", "ddemail72")
+                Dim SMTPUserInfo As New System.Net.NetworkCredential("support-flow@digitaldata.works", "ddemail105")
                emailClient.UseDefaultCredentials = False
                emailClient.Credentials = SMTPUserInfo
                emailClient.Port = My.Settings.vemailPort
--- a/ToolCollection/ClassNIProfil.vb
+++ b/ToolCollection/ClassNIProfil.vb
@@ -173,7 +173,7 @@
    ''' </summary>
    ''' <returns></returns>
    ''' <remarks></remarks>
-    Public Function Save(ByVal msg As Boolean)
+    Public Function Save(ByVal msg As Boolean, item As String)

        Try
            ' wenn das Profil nicht gespeichert ist
@@ -288,7 +288,7 @@
                    ' Profil auf gespeichert setzen
                    Me._saved = True

-                    If msg = True Then MsgBox("Das Profil '" & Me._originalProfilname & "' wurde erfolgreich gespeichert.", MsgBoxStyle.Information, "Profil gespeichert")
+                    If msg = True And item = "profile" Then MsgBox("Das Profil '" & Me._originalProfilname & "' wurde erfolgreich gespeichert.", MsgBoxStyle.Information, "Profil gespeichert")

                    Return True
                Else
--- a/ToolCollection/ClassNIVerknüpfung.vb
+++ b/ToolCollection/ClassNIVerknüpfung.vb
@@ -45,7 +45,7 @@
    End Function
    Public Function Save_DB_Link(ByVal profilname As String)
        ' wenn ein Profilname für dieses Profil gesetzt ist
-        If Me.SelectAnweisung.ToLower.StartsWith("select") Or (Me.SelectAnweisung.StartsWith("(") And Me.SelectAnweisung.EndsWith("])")) Or Me.Spalte.StartsWith("%") And Me.Spalte.EndsWith("%") Then
+        If Me.SelectAnweisung.ToLower.Contains("select") Then
            'If Me.SelectAnweisung IsNot Nothing And Me.SelectAnweisung.StartsWith("SELECT [%spalte] FROM [%view] WHERE ") And Me.SelectAnweisung.Length > "SELECT [%spalte] FROM [%view] WHERE ".Length Then
            Dim xml As New Xml.XmlDocument()
            Dim xmlProfil As Xml.XmlElement
@@ -71,7 +71,8 @@
                Return True
            End If
        Else
-            Return True
+            MsgBox("Command must at least contain a 'select' to verify and store!", MsgBoxStyle.Exclamation, "No Saving possible!")
+            Return False
            'If Me.SelectAnweisung.Contains("=") = False Or Me.SelectAnweisung.Contains("where") = False Then
            '    MsgBox("Die Verknüpfung konnte nicht gespeichert werden weil weder ein '=' oder 'where' vorhanden sind. Bitte überprüfen Sie die Verknüpfung " & Me.Index & " <-> " & Me.Spalte & " (in " & Me.From & ").", MsgBoxStyle.Information, "Verknüpfung konnte nicht gespeichert werden")
            'Else
--- a/ToolCollection/ClassNIWindream.vb
+++ b/ToolCollection/ClassNIWindream.vb
@@ -496,19 +496,19 @@ Public Class ClassNIWindream


                                Dim DS As DataSet
-                                Dim DT As DataTable
+                                Dim DT_VEKTOR As DataTable
                                Dim DR As DataRow
                                Dim BS As New System.Windows.Forms.BindingSource
                                ' --- DataSet zuweisen
                                DS = myDS
                                ' --- Zugriff auf Tabelle
-                                DT = DS.Tables("TBVEKTOR_ARRAY")
+                                DT_VEKTOR = DS.Tables("TBVEKTOR_ARRAY")
                                ' --- den Filter auf den Indexnamen setzen
                                BS.DataSource = DS
                                BS.DataMember = "TBVEKTOR_ARRAY"
-                                BS.Filter = "Indexname = '" & aName.ToString & "'"
+                                BS.Filter = "IndexName = '" & aName.ToString & "'"
                                'For Each row As DataRow In DT.Rows
-                                'MsgBox(aName & vbNewLine & row.Item("Indexname") & vbNewLine & CStr(row.Item("Wert")))
+                                'MsgBox(aName & vbNewLine & row.Item("IndexName") & vbNewLine & CStr(row.Item("Value")))
                                'Next
                                Dim Anzahl As Integer = BS.Count
                                _Logger.Debug("Anzahl Vektorwerte: " & Anzahl.ToString)
@@ -573,7 +573,7 @@ Public Class ClassNIWindream

                                                'Else
                                                _Logger.Debug($"Vektortype is {vType}: Indexing with [{VektorArray.Length} values]!")
-                                                    oDocument.SetVariableValue(aName, myArray)
+                                                oDocument.SetVariableValue(aName, myArray)
                                                'End If

                                                _Logger.Debug("'SetVariableValue' für VEKTOR erfolgreich")
@@ -597,17 +597,17 @@ Public Class ClassNIWindream
                                    ReDim myArray(Anzahl - 1)
                                    Dim i1 As Integer = 0
                                    'Die Datatable durchlaufen und Werte für den Index in Array schreiben
-                                    For Each DR In DT.Rows
+                                    For Each DR In DT_VEKTOR.Rows

-                                        If DR.Item("Indexname") = aName.ToString Then
+                                        If DR.Item("IndexName") = aName.ToString Then
                                            If vType = 4098 Then
-                                                myArray(i1) = CInt(DR.Item("Wert"))
+                                                myArray(i1) = CInt(DR.Item("Value"))
                                            ElseIf vType = 4101 Then
-                                                myArray(i1) = CDate(DR.Item("Wert"))
+                                                myArray(i1) = CDate(DR.Item("Value"))
                                            Else
-                                                myArray(i1) = CStr(DR.Item("Wert"))
+                                                myArray(i1) = CStr(DR.Item("Value"))
                                            End If
-                                            _Logger.Debug("Value (" & i1 & "): '" & DR.Item("Wert").ToString & "'")
+                                            _Logger.Debug("Value (" & i1 & "): '" & DR.Item("Value").ToString & "'")
                                            i1 = i1 + 1
                                        End If
                                    Next
--- a/ToolCollection/ClassStopwatch.vb
+++ b/ToolCollection/ClassStopwatch.vb
@@ -11,19 +11,16 @@
        Try
            stopwatch.Stop()
            Dim ts As TimeSpan = stopwatch.Elapsed
-            If ts.Minutes = 0 And ts.Seconds = 0 Then
-                Return ""
-            End If

-            Dim timespan_ = String.Format("{0:00}:{1:00}.{2:00} minutes", ts.Minutes, ts.Seconds, ts.Milliseconds / 10)
+            Dim timespan_ = String.Format("{0:00}:{1:00}.{2:00}", ts.Minutes, ts.Seconds, ts.Milliseconds / 10)
            If ts.Minutes > 0 Then
                timespan_ = String.Format("{0:00}:{1:00}.{2:00}", ts.Minutes, ts.Seconds, ts.Milliseconds / 10)
            ElseIf ts.Seconds > 0 And (ts.Minutes > 0) = False Then
                timespan_ = String.Format("{0:00}.{1:00} seconds", ts.Seconds, ts.Milliseconds / 10)
            ElseIf (ts.Seconds > 0) = False And ts.Milliseconds > 0 Then
-                timespan_ = String.Format("{0:00}.{1:00} seconds/milliseconds", ts.Seconds, ts.Milliseconds / 10)
+                timespan_ = String.Format("{0:00}.{1:00} seconds", ts.Seconds, ts.Milliseconds / 10)
            End If
-            If timespan_ <> "00:00.00" And timespan_ <> "00.00" And timespan_ <> "00.01" Then
+            If timespan_ <> "00:00.00" Then
                Dim message = String.Format("{0} || {1}", label, timespan_)
                Return message
            Else
--- a/ToolCollection/DS_More.Designer.vb
+++ b/ToolCollection/DS_More.Designer.vb
--- a/ToolCollection/DS_More.xsd
+++ b/ToolCollection/DS_More.xsd
@@ -4,7 +4,7 @@
    <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
      <DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
        <Connections>
-          <Connection AppSettingsObjectName="MySettings" AppSettingsPropertyName="DDECMConString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="DDECMConString (MySettings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.ToolCollection.My.MySettings.GlobalReference.Default.DDECMConString" Provider="System.Data.SqlClient" />
+          <Connection AppSettingsObjectName="MySettings" AppSettingsPropertyName="DDECMConString" IsAppSettingsProperty="true" Modifier="Assembly" Name="DDECMConString (MySettings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.ToolCollection.My.MySettings.GlobalReference.Default.DDECMConString" Provider="System.Data.SqlClient" />
        </Connections>
        <Tables>
          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBMO_RE_KUNDENTableAdapter" GeneratorDataComponentClassName="TBMO_RE_KUNDENTableAdapter" Name="TBMO_RE_KUNDEN" UserDataComponentName="TBMO_RE_KUNDENTableAdapter">
@@ -425,7 +425,7 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E
  <xs:element name="DS_More" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="true" msprop:Generator_DataSetName="DS_More" msprop:Generator_UserDSName="DS_More">
    <xs:complexType>
      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBMO_RE_KUNDEN" msprop:Generator_TableClassName="TBMO_RE_KUNDENDataTable" msprop:Generator_TableVarName="tableTBMO_RE_KUNDEN" msprop:Generator_RowChangedName="TBMO_RE_KUNDENRowChanged" msprop:Generator_TablePropName="TBMO_RE_KUNDEN" msprop:Generator_RowDeletingName="TBMO_RE_KUNDENRowDeleting" msprop:Generator_RowChangingName="TBMO_RE_KUNDENRowChanging" msprop:Generator_RowEvHandlerName="TBMO_RE_KUNDENRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMO_RE_KUNDENRowDeleted" msprop:Generator_RowClassName="TBMO_RE_KUNDENRow" msprop:Generator_UserTableName="TBMO_RE_KUNDEN" msprop:Generator_RowEvArgName="TBMO_RE_KUNDENRowChangeEvent">
+        <xs:element name="TBMO_RE_KUNDEN" msprop:Generator_TableClassName="TBMO_RE_KUNDENDataTable" msprop:Generator_TableVarName="tableTBMO_RE_KUNDEN" msprop:Generator_TablePropName="TBMO_RE_KUNDEN" msprop:Generator_RowDeletingName="TBMO_RE_KUNDENRowDeleting" msprop:Generator_RowChangingName="TBMO_RE_KUNDENRowChanging" msprop:Generator_RowEvHandlerName="TBMO_RE_KUNDENRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMO_RE_KUNDENRowDeleted" msprop:Generator_UserTableName="TBMO_RE_KUNDEN" msprop:Generator_RowChangedName="TBMO_RE_KUNDENRowChanged" msprop:Generator_RowEvArgName="TBMO_RE_KUNDENRowChangeEvent" msprop:Generator_RowClassName="TBMO_RE_KUNDENRow">
          <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" />
@@ -463,7 +463,7 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="TBMO_RE_DOKART_KUNDE" msprop:Generator_TableClassName="TBMO_RE_DOKART_KUNDEDataTable" msprop:Generator_TableVarName="tableTBMO_RE_DOKART_KUNDE" msprop:Generator_RowChangedName="TBMO_RE_DOKART_KUNDERowChanged" msprop:Generator_TablePropName="TBMO_RE_DOKART_KUNDE" msprop:Generator_RowDeletingName="TBMO_RE_DOKART_KUNDERowDeleting" msprop:Generator_RowChangingName="TBMO_RE_DOKART_KUNDERowChanging" msprop:Generator_RowEvHandlerName="TBMO_RE_DOKART_KUNDERowChangeEventHandler" msprop:Generator_RowDeletedName="TBMO_RE_DOKART_KUNDERowDeleted" msprop:Generator_RowClassName="TBMO_RE_DOKART_KUNDERow" msprop:Generator_UserTableName="TBMO_RE_DOKART_KUNDE" msprop:Generator_RowEvArgName="TBMO_RE_DOKART_KUNDERowChangeEvent">
+        <xs:element name="TBMO_RE_DOKART_KUNDE" msprop:Generator_TableClassName="TBMO_RE_DOKART_KUNDEDataTable" msprop:Generator_TableVarName="tableTBMO_RE_DOKART_KUNDE" msprop:Generator_TablePropName="TBMO_RE_DOKART_KUNDE" msprop:Generator_RowDeletingName="TBMO_RE_DOKART_KUNDERowDeleting" msprop:Generator_RowChangingName="TBMO_RE_DOKART_KUNDERowChanging" msprop:Generator_RowEvHandlerName="TBMO_RE_DOKART_KUNDERowChangeEventHandler" msprop:Generator_RowDeletedName="TBMO_RE_DOKART_KUNDERowDeleted" msprop:Generator_UserTableName="TBMO_RE_DOKART_KUNDE" msprop:Generator_RowChangedName="TBMO_RE_DOKART_KUNDERowChanged" msprop:Generator_RowEvArgName="TBMO_RE_DOKART_KUNDERowChangeEvent" msprop:Generator_RowClassName="TBMO_RE_DOKART_KUNDERow">
          <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" />
@@ -495,7 +495,7 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="WHMO_RE_DOKART" msprop:Generator_TableClassName="WHMO_RE_DOKARTDataTable" msprop:Generator_TableVarName="tableWHMO_RE_DOKART" msprop:Generator_TablePropName="WHMO_RE_DOKART" msprop:Generator_RowDeletingName="WHMO_RE_DOKARTRowDeleting" msprop:Generator_RowChangingName="WHMO_RE_DOKARTRowChanging" msprop:Generator_RowEvHandlerName="WHMO_RE_DOKARTRowChangeEventHandler" msprop:Generator_RowDeletedName="WHMO_RE_DOKARTRowDeleted" msprop:Generator_UserTableName="WHMO_RE_DOKART" msprop:Generator_RowChangedName="WHMO_RE_DOKARTRowChanged" msprop:Generator_RowEvArgName="WHMO_RE_DOKARTRowChangeEvent" msprop:Generator_RowClassName="WHMO_RE_DOKARTRow">
+        <xs:element name="WHMO_RE_DOKART" msprop:Generator_TableClassName="WHMO_RE_DOKARTDataTable" msprop:Generator_TableVarName="tableWHMO_RE_DOKART" msprop:Generator_RowChangedName="WHMO_RE_DOKARTRowChanged" msprop:Generator_TablePropName="WHMO_RE_DOKART" msprop:Generator_RowDeletingName="WHMO_RE_DOKARTRowDeleting" msprop:Generator_RowChangingName="WHMO_RE_DOKARTRowChanging" msprop:Generator_RowEvHandlerName="WHMO_RE_DOKARTRowChangeEventHandler" msprop:Generator_RowDeletedName="WHMO_RE_DOKARTRowDeleted" msprop:Generator_RowClassName="WHMO_RE_DOKARTRow" msprop:Generator_UserTableName="WHMO_RE_DOKART" msprop:Generator_RowEvArgName="WHMO_RE_DOKARTRowChangeEvent">
          <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" />
@@ -509,7 +509,7 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="WHMO_RE_KUNDEN" msprop:Generator_TableClassName="WHMO_RE_KUNDENDataTable" msprop:Generator_TableVarName="tableWHMO_RE_KUNDEN" msprop:Generator_TablePropName="WHMO_RE_KUNDEN" msprop:Generator_RowDeletingName="WHMO_RE_KUNDENRowDeleting" msprop:Generator_RowChangingName="WHMO_RE_KUNDENRowChanging" msprop:Generator_RowEvHandlerName="WHMO_RE_KUNDENRowChangeEventHandler" msprop:Generator_RowDeletedName="WHMO_RE_KUNDENRowDeleted" msprop:Generator_UserTableName="WHMO_RE_KUNDEN" msprop:Generator_RowChangedName="WHMO_RE_KUNDENRowChanged" msprop:Generator_RowEvArgName="WHMO_RE_KUNDENRowChangeEvent" msprop:Generator_RowClassName="WHMO_RE_KUNDENRow">
+        <xs:element name="WHMO_RE_KUNDEN" msprop:Generator_TableClassName="WHMO_RE_KUNDENDataTable" msprop:Generator_TableVarName="tableWHMO_RE_KUNDEN" msprop:Generator_RowChangedName="WHMO_RE_KUNDENRowChanged" msprop:Generator_TablePropName="WHMO_RE_KUNDEN" msprop:Generator_RowDeletingName="WHMO_RE_KUNDENRowDeleting" msprop:Generator_RowChangingName="WHMO_RE_KUNDENRowChanging" msprop:Generator_RowEvHandlerName="WHMO_RE_KUNDENRowChangeEventHandler" msprop:Generator_RowDeletedName="WHMO_RE_KUNDENRowDeleted" msprop:Generator_RowClassName="WHMO_RE_KUNDENRow" msprop:Generator_UserTableName="WHMO_RE_KUNDEN" msprop:Generator_RowEvArgName="WHMO_RE_KUNDENRowChangeEvent">
          <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" />
@@ -530,7 +530,7 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="VWMO_RE_DOKUMENTARTZUORDNUNG" msprop:Generator_TableClassName="VWMO_RE_DOKUMENTARTZUORDNUNGDataTable" msprop:Generator_TableVarName="tableVWMO_RE_DOKUMENTARTZUORDNUNG" msprop:Generator_TablePropName="VWMO_RE_DOKUMENTARTZUORDNUNG" msprop:Generator_RowDeletingName="VWMO_RE_DOKUMENTARTZUORDNUNGRowDeleting" msprop:Generator_RowChangingName="VWMO_RE_DOKUMENTARTZUORDNUNGRowChanging" msprop:Generator_RowEvHandlerName="VWMO_RE_DOKUMENTARTZUORDNUNGRowChangeEventHandler" msprop:Generator_RowDeletedName="VWMO_RE_DOKUMENTARTZUORDNUNGRowDeleted" msprop:Generator_UserTableName="VWMO_RE_DOKUMENTARTZUORDNUNG" msprop:Generator_RowChangedName="VWMO_RE_DOKUMENTARTZUORDNUNGRowChanged" msprop:Generator_RowEvArgName="VWMO_RE_DOKUMENTARTZUORDNUNGRowChangeEvent" msprop:Generator_RowClassName="VWMO_RE_DOKUMENTARTZUORDNUNGRow">
+        <xs:element name="VWMO_RE_DOKUMENTARTZUORDNUNG" msprop:Generator_TableClassName="VWMO_RE_DOKUMENTARTZUORDNUNGDataTable" msprop:Generator_TableVarName="tableVWMO_RE_DOKUMENTARTZUORDNUNG" msprop:Generator_RowChangedName="VWMO_RE_DOKUMENTARTZUORDNUNGRowChanged" msprop:Generator_TablePropName="VWMO_RE_DOKUMENTARTZUORDNUNG" msprop:Generator_RowDeletingName="VWMO_RE_DOKUMENTARTZUORDNUNGRowDeleting" msprop:Generator_RowChangingName="VWMO_RE_DOKUMENTARTZUORDNUNGRowChanging" msprop:Generator_RowEvHandlerName="VWMO_RE_DOKUMENTARTZUORDNUNGRowChangeEventHandler" msprop:Generator_RowDeletedName="VWMO_RE_DOKUMENTARTZUORDNUNGRowDeleted" msprop:Generator_RowClassName="VWMO_RE_DOKUMENTARTZUORDNUNGRow" msprop:Generator_UserTableName="VWMO_RE_DOKUMENTARTZUORDNUNG" msprop:Generator_RowEvArgName="VWMO_RE_DOKUMENTARTZUORDNUNGRowChangeEvent">
          <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" />
@@ -609,7 +609,7 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="TBMO_RE_DOKART" msprop:Generator_TableClassName="TBMO_RE_DOKARTDataTable" msprop:Generator_TableVarName="tableTBMO_RE_DOKART" msprop:Generator_TablePropName="TBMO_RE_DOKART" msprop:Generator_RowDeletingName="TBMO_RE_DOKARTRowDeleting" msprop:Generator_RowChangingName="TBMO_RE_DOKARTRowChanging" msprop:Generator_RowEvHandlerName="TBMO_RE_DOKARTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMO_RE_DOKARTRowDeleted" msprop:Generator_UserTableName="TBMO_RE_DOKART" msprop:Generator_RowChangedName="TBMO_RE_DOKARTRowChanged" msprop:Generator_RowEvArgName="TBMO_RE_DOKARTRowChangeEvent" msprop:Generator_RowClassName="TBMO_RE_DOKARTRow">
+        <xs:element name="TBMO_RE_DOKART" msprop:Generator_TableClassName="TBMO_RE_DOKARTDataTable" msprop:Generator_TableVarName="tableTBMO_RE_DOKART" msprop:Generator_RowChangedName="TBMO_RE_DOKARTRowChanged" msprop:Generator_TablePropName="TBMO_RE_DOKART" msprop:Generator_RowDeletingName="TBMO_RE_DOKARTRowDeleting" msprop:Generator_RowChangingName="TBMO_RE_DOKARTRowChanging" msprop:Generator_RowEvHandlerName="TBMO_RE_DOKARTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMO_RE_DOKARTRowDeleted" msprop:Generator_RowClassName="TBMO_RE_DOKARTRow" msprop:Generator_UserTableName="TBMO_RE_DOKART" msprop:Generator_RowEvArgName="TBMO_RE_DOKARTRowChangeEvent">
          <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" />
@@ -654,7 +654,7 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="TBMO_RE_HISTORY" msprop:Generator_TableClassName="TBMO_RE_HISTORYDataTable" msprop:Generator_TableVarName="tableTBMO_RE_HISTORY" msprop:Generator_TablePropName="TBMO_RE_HISTORY" msprop:Generator_RowDeletingName="TBMO_RE_HISTORYRowDeleting" msprop:Generator_RowChangingName="TBMO_RE_HISTORYRowChanging" msprop:Generator_RowEvHandlerName="TBMO_RE_HISTORYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMO_RE_HISTORYRowDeleted" msprop:Generator_UserTableName="TBMO_RE_HISTORY" msprop:Generator_RowChangedName="TBMO_RE_HISTORYRowChanged" msprop:Generator_RowEvArgName="TBMO_RE_HISTORYRowChangeEvent" msprop:Generator_RowClassName="TBMO_RE_HISTORYRow">
+        <xs:element name="TBMO_RE_HISTORY" msprop:Generator_TableClassName="TBMO_RE_HISTORYDataTable" msprop:Generator_TableVarName="tableTBMO_RE_HISTORY" msprop:Generator_RowChangedName="TBMO_RE_HISTORYRowChanged" msprop:Generator_TablePropName="TBMO_RE_HISTORY" msprop:Generator_RowDeletingName="TBMO_RE_HISTORYRowDeleting" msprop:Generator_RowChangingName="TBMO_RE_HISTORYRowChanging" msprop:Generator_RowEvHandlerName="TBMO_RE_HISTORYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBMO_RE_HISTORYRowDeleted" msprop:Generator_RowClassName="TBMO_RE_HISTORYRow" msprop:Generator_UserTableName="TBMO_RE_HISTORY" msprop:Generator_RowEvArgName="TBMO_RE_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" />
@@ -734,9 +734,9 @@ SELECT GUID, FILE_ORIGINAL, FILE_NEW, KUNDE_KURZ, INDEX1, INDEX2, ERSTELLTWER, E
  </xs:element>
  <xs:annotation>
    <xs:appinfo>
-      <msdata:Relationship name="FK_TBMO_RE_DOKART_KUNDE_KDID" msdata:parent="TBMO_RE_KUNDEN" msdata:child="TBMO_RE_DOKART_KUNDE" msdata:parentkey="GUID" msdata:childkey="KUNDEN_ID" msprop:Generator_UserChildTable="TBMO_RE_DOKART_KUNDE" msprop:Generator_ChildPropName="GetTBMO_RE_DOKART_KUNDERows" msprop:Generator_UserRelationName="FK_TBMO_RE_DOKART_KUNDE_KDID" msprop:Generator_RelationVarName="relationFK_TBMO_RE_DOKART_KUNDE_KDID" msprop:Generator_UserParentTable="TBMO_RE_KUNDEN" msprop:Generator_ParentPropName="TBMO_RE_KUNDENRow" />
-      <msdata:Relationship name="FK_TBMO_RE_DOKART_KUNDE_KDID1" msdata:parent="WHMO_RE_KUNDEN" msdata:child="TBMO_RE_DOKART_KUNDE" msdata:parentkey="GUID" msdata:childkey="KUNDEN_ID" msprop:Generator_UserChildTable="TBMO_RE_DOKART_KUNDE" msprop:Generator_ChildPropName="GetTBMO_RE_DOKART_KUNDERows" msprop:Generator_UserRelationName="FK_TBMO_RE_DOKART_KUNDE_KDID1" msprop:Generator_RelationVarName="relationFK_TBMO_RE_DOKART_KUNDE_KDID1" msprop:Generator_UserParentTable="WHMO_RE_KUNDEN" msprop:Generator_ParentPropName="WHMO_RE_KUNDENRow" />
-      <msdata:Relationship name="FK_TBMO_RE_DOKART_KUNDE_DAID" msdata:parent="TBMO_RE_DOKART" msdata:child="TBMO_RE_DOKART_KUNDE" msdata:parentkey="GUID" msdata:childkey="DA_ID" msprop:Generator_UserChildTable="TBMO_RE_DOKART_KUNDE" msprop:Generator_ChildPropName="GetTBMO_RE_DOKART_KUNDERows" msprop:Generator_UserRelationName="FK_TBMO_RE_DOKART_KUNDE_DAID" msprop:Generator_RelationVarName="relationFK_TBMO_RE_DOKART_KUNDE_DAID" msprop:Generator_UserParentTable="TBMO_RE_DOKART" msprop:Generator_ParentPropName="TBMO_RE_DOKARTRow" />
+      <msdata:Relationship name="FK_TBMO_RE_DOKART_KUNDE_KDID" msdata:parent="TBMO_RE_KUNDEN" msdata:child="TBMO_RE_DOKART_KUNDE" msdata:parentkey="GUID" msdata:childkey="KUNDEN_ID" msprop:Generator_UserChildTable="TBMO_RE_DOKART_KUNDE" msprop:Generator_ChildPropName="GetTBMO_RE_DOKART_KUNDERows" msprop:Generator_UserRelationName="FK_TBMO_RE_DOKART_KUNDE_KDID" msprop:Generator_ParentPropName="TBMO_RE_KUNDENRow" msprop:Generator_RelationVarName="relationFK_TBMO_RE_DOKART_KUNDE_KDID" msprop:Generator_UserParentTable="TBMO_RE_KUNDEN" />
+      <msdata:Relationship name="FK_TBMO_RE_DOKART_KUNDE_KDID1" msdata:parent="WHMO_RE_KUNDEN" msdata:child="TBMO_RE_DOKART_KUNDE" msdata:parentkey="GUID" msdata:childkey="KUNDEN_ID" msprop:Generator_UserChildTable="TBMO_RE_DOKART_KUNDE" msprop:Generator_ChildPropName="GetTBMO_RE_DOKART_KUNDERows" msprop:Generator_UserRelationName="FK_TBMO_RE_DOKART_KUNDE_KDID1" msprop:Generator_ParentPropName="WHMO_RE_KUNDENRow" msprop:Generator_RelationVarName="relationFK_TBMO_RE_DOKART_KUNDE_KDID1" msprop:Generator_UserParentTable="WHMO_RE_KUNDEN" />
+      <msdata:Relationship name="FK_TBMO_RE_DOKART_KUNDE_DAID" msdata:parent="TBMO_RE_DOKART" msdata:child="TBMO_RE_DOKART_KUNDE" msdata:parentkey="GUID" msdata:childkey="DA_ID" msprop:Generator_UserChildTable="TBMO_RE_DOKART_KUNDE" msprop:Generator_ChildPropName="GetTBMO_RE_DOKART_KUNDERows" msprop:Generator_UserRelationName="FK_TBMO_RE_DOKART_KUNDE_DAID" msprop:Generator_ParentPropName="TBMO_RE_DOKARTRow" msprop:Generator_RelationVarName="relationFK_TBMO_RE_DOKART_KUNDE_DAID" msprop:Generator_UserParentTable="TBMO_RE_DOKART" />
    </xs:appinfo>
  </xs:annotation>
 </xs:schema>
--- a/ToolCollection/ModuleCURRENT.vb
+++ b/ToolCollection/ModuleCURRENT.vb
@@ -26,4 +26,7 @@ Module ModuleCURRENT

    Public Property CURR_LogConfig As LogConfig
    Public Property CURR_Logger As DigitalData.Modules.Logging.Logger
+    Public Stopwatch1 As String
+    Public Stopwatch2 As String
+    Public CURRENT_UNTERV As List(Of String)
 End Module
--- a/ToolCollection/ModuleSettings.vb
+++ b/ToolCollection/ModuleSettings.vb
@@ -0,0 +1,4 @@
+Module ModuleSettings
+    Public LICENSE_MoveRename As Boolean
+    Public LICENSE_AD As Boolean
+End Module
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("2.3.0.7")>
+<Assembly: AssemblyVersion("2.3.5.0")>
 <Assembly: AssemblyFileVersion("1.5.1.0")> 
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
    
    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
    Partial Friend NotInheritable Class MySettings
        Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -891,17 +891,6 @@ Namespace My
            End Get
        End Property
        
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _ 
-            "rity Info=True;User ID=sa;Password=dd")>  _
-        Public ReadOnly Property DDECMConString() As String
-            Get
-                Return CType(Me("DDECMConString"),String)
-            End Get
-        End Property
-        
        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.Configuration.DefaultSettingValueAttribute("[\\\/:\*\?""""'<>|]")>  _
@@ -911,17 +900,6 @@ Namespace My
            End Get
        End Property
        
-        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
-         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
-         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _ 
-            "rity Info=True;User ID=sa;Password=dd")>  _
-        Public ReadOnly Property DD_ECM_TESTConnectionString() As String
-            Get
-                Return CType(Me("DD_ECM_TESTConnectionString"),String)
-            End Get
-        End Property
-        
        <Global.System.Configuration.UserScopedSettingAttribute(),  _
         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
         Global.System.Configuration.DefaultSettingValueAttribute("myInvalidDateiname.pdf")>  _
@@ -933,6 +911,17 @@ Namespace My
                Me("myDateiname") = value
            End Set
        End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.SpecialSettingAttribute(Global.System.Configuration.SpecialSetting.ConnectionString),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Secu"& _ 
+            "rity Info=True;User ID=sa;Password=dd")>  _
+        Public ReadOnly Property DDECMConString() As String
+            Get
+                Return CType(Me("DDECMConString"),String)
+            End Get
+        End Property
    End Class
 End Namespace

--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -218,17 +218,13 @@
    <Setting Name="DIOpt_CheckLength" Type="System.Boolean" Scope="Application">
      <Value Profile="(Default)">False</Value>
    </Setting>
-    <Setting Name="DDECMConString" Type="(Connection string)" Scope="Application">
-      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
-&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
-  &lt;ConnectionString&gt;Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd&lt;/ConnectionString&gt;
-&lt;/SerializableConnectionString&gt;</DesignTimeValue>
-      <Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
-    </Setting>
    <Setting Name="REGEX_INVALID_PATH" Type="System.String" Scope="Application">
      <Value Profile="(Default)">[\\\/:\*\?""'&lt;&gt;|]</Value>
    </Setting>
-    <Setting Name="DD_ECM_TESTConnectionString" Type="(Connection string)" Scope="Application">
+    <Setting Name="myDateiname" Type="System.String" Scope="User">
+      <Value Profile="(Default)">myInvalidDateiname.pdf</Value>
+    </Setting>
+    <Setting Name="DDECMConString" Type="(Connection string)" Scope="Application">
      <DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
 &lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
  &lt;ConnectionString&gt;Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd&lt;/ConnectionString&gt;
@@ -236,8 +232,5 @@
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
      <Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
    </Setting>
-    <Setting Name="myDateiname" Type="System.String" Scope="User">
-      <Value Profile="(Default)">myInvalidDateiname.pdf</Value>
-    </Setting>
  </Settings>
 </SettingsFile>
--- a/ToolCollection/MyDataset.Designer.vb
+++ b/ToolCollection/MyDataset.Designer.vb
--- a/ToolCollection/MyDataset.vb
+++ b/ToolCollection/MyDataset.vb
@@ -1,2 +0,0 @@
-Partial Class MyDataset
-End Class
--- a/ToolCollection/MyDataset.xsc
+++ b/ToolCollection/MyDataset.xsc
@@ -5,34 +5,5 @@
     the code is regenerated.
 </autogenerated>-->
 <DataSetUISetting Version="1.00" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-  <TableUISettings>
-    <TableUISetting Name="TBTC_MOVE_RENAME">
-      <ColumnUISettings>
-        <ColumnUISetting Name="CREATED_WHEN">
-          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-              <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting></ControlSettings>
-        </ColumnUISetting>
-        <ColumnUISetting Name="CHANGED_WHEN">
-          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-              <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting></ControlSettings>
-        </ColumnUISetting>
-      </ColumnUISettings>
-    </TableUISetting>
-    <TableUISetting Name="TBTC_DI_REGEX_MATCH">
-      <ColumnUISettings>
-        <ColumnUISetting Name="CREATED_WHEN">
-          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-              <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting></ControlSettings>
-        </ColumnUISetting>
-        <ColumnUISetting Name="CHANGED_WHEN">
-          <ControlSettings><ControlSetting ArtifactName="Microsoft:System.Windows.Forms:Form" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-              <BindableControlInfo Name="TextBox" Type="System.Windows.Forms.TextBox" AssemblyName="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-            </ControlSetting></ControlSettings>
-        </ColumnUISetting>
-      </ColumnUISettings>
-    </TableUISetting>
-  </TableUISettings>
+  <TableUISettings />
 </DataSetUISetting>
--- a/ToolCollection/MyDataset.xsd
+++ b/ToolCollection/MyDataset.xsd
@@ -2,143 +2,63 @@
 <xs:schema id="MyDataset" targetNamespace="http://tempuri.org/MyDataset.xsd" xmlns:mstns="http://tempuri.org/MyDataset.xsd" xmlns="http://tempuri.org/MyDataset.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:msprop="urn:schemas-microsoft-com:xml-msprop" attributeFormDefault="qualified" elementFormDefault="qualified">
  <xs:annotation>
    <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource">
-      <DataSource DefaultConnectionIndex="1" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+      <DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
        <Connections>
-          <Connection AppSettingsObjectName="MySettings" AppSettingsPropertyName="DDECMConString" IsAppSettingsProperty="true" Modifier="Assembly" Name="DDECMConString (MySettings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.ToolCollection.My.MySettings.GlobalReference.Default.DDECMConString" Provider="System.Data.SqlClient" />
-          <Connection AppSettingsObjectName="MySettings" AppSettingsPropertyName="DD_ECM_TESTConnectionString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="DD_ECM_TESTConnectionString (MySettings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.ToolCollection.My.MySettings.GlobalReference.Default.DD_ECM_TESTConnectionString" Provider="System.Data.SqlClient" />
+          <Connection AppSettingsObjectName="MySettings" AppSettingsPropertyName="DDECMConString" ConnectionStringObject="" IsAppSettingsProperty="true" Modifier="Assembly" Name="DDECMConString (MySettings)" ParameterPrefix="@" PropertyReference="ApplicationSettings.ToolCollection.My.MySettings.GlobalReference.Default.DDECMConString" Provider="System.Data.SqlClient" />
        </Connections>
        <Tables>
-          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBDD_REPORTING_IMPORTTableAdapter" GeneratorDataComponentClassName="TBDD_REPORTING_IMPORTTableAdapter" Name="TBDD_REPORTING_IMPORT" UserDataComponentName="TBDD_REPORTING_IMPORTTableAdapter">
-            <MainSource>
-              <DbSource ConnectionRef="DDECMConString (MySettings)" DbObjectName="DD_ECM.dbo.TBDD_REPORTING_IMPORT" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
-                <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>DELETE FROM [TBDD_REPORTING_IMPORT] WHERE (([IMPORT_ID] = @Original_IMPORT_ID) AND ((@IsNull_FILE_NAME = 1 AND [FILE_NAME] IS NULL) OR ([FILE_NAME] = @Original_FILE_NAME)) AND ([PROFILE_NAME] = @Original_PROFILE_NAME) AND ((@IsNull_VOLUME = 1 AND [VOLUME] IS NULL) OR ([VOLUME] = @Original_VOLUME)) AND ((@IsNull_PAGE_COUNT = 1 AND [PAGE_COUNT] IS NULL) OR ([PAGE_COUNT] = @Original_PAGE_COUNT)) AND ((@IsNull_EXTENSION = 1 AND [EXTENSION] IS NULL) OR ([EXTENSION] = @Original_EXTENSION)) AND ([ADDED_WHEN] = @Original_ADDED_WHEN))</CommandText>
-                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_IMPORT_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IMPORT_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_FILE_NAME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="FILE_NAME" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_FILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="FILE_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PROFILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_VOLUME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="VOLUME" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_VOLUME" Precision="10" ProviderType="Decimal" Scale="2" Size="0" SourceColumn="VOLUME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_PAGE_COUNT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PAGE_COUNT" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_PAGE_COUNT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PAGE_COUNT" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_EXTENSION" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="EXTENSION" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_EXTENSION" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="EXTENSION" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" 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" />
-                    </Parameters>
-                  </DbCommand>
-                </DeleteCommand>
-                <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>INSERT INTO TBDD_REPORTING_IMPORT
-                         (FILE_NAME, PROFILE_NAME, VOLUME, PAGE_COUNT, EXTENSION)
-VALUES        (@FILE_NAME,@PROFILE_NAME,@VOLUME,@PAGE_COUNT,@EXTENSION); 
-SELECT IMPORT_ID, FILE_NAME, PROFILE_NAME, VOLUME, PAGE_COUNT, EXTENSION, ADDED_WHEN FROM TBDD_REPORTING_IMPORT WHERE (IMPORT_ID = SCOPE_IDENTITY())</CommandText>
-                    <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="FILE_NAME" ColumnName="FILE_NAME" DataSourceName="DD_ECM.dbo.TBDD_REPORTING_IMPORT" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@FILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="FILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_NAME" ColumnName="PROFILE_NAME" DataSourceName="DD_ECM.dbo.TBDD_REPORTING_IMPORT" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="VOLUME" ColumnName="VOLUME" DataSourceName="DD_ECM.dbo.TBDD_REPORTING_IMPORT" DataTypeServer="decimal(10, 2)" DbType="Decimal" Direction="Input" ParameterName="@VOLUME" Precision="10" ProviderType="Decimal" Scale="2" Size="9" SourceColumn="VOLUME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="PAGE_COUNT" ColumnName="PAGE_COUNT" DataSourceName="DD_ECM.dbo.TBDD_REPORTING_IMPORT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PAGE_COUNT" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PAGE_COUNT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="EXTENSION" ColumnName="EXTENSION" DataSourceName="DD_ECM.dbo.TBDD_REPORTING_IMPORT" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@EXTENSION" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="EXTENSION" SourceColumnNullMapping="false" SourceVersion="Current" />
-                    </Parameters>
-                  </DbCommand>
-                </InsertCommand>
-                <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT        TBDD_REPORTING_IMPORT.*
-FROM            TBDD_REPORTING_IMPORT</CommandText>
-                    <Parameters />
-                  </DbCommand>
-                </SelectCommand>
-                <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>UPDATE [TBDD_REPORTING_IMPORT] SET [FILE_NAME] = @FILE_NAME, [PROFILE_NAME] = @PROFILE_NAME, [VOLUME] = @VOLUME, [PAGE_COUNT] = @PAGE_COUNT, [EXTENSION] = @EXTENSION, [ADDED_WHEN] = @ADDED_WHEN WHERE (([IMPORT_ID] = @Original_IMPORT_ID) AND ((@IsNull_FILE_NAME = 1 AND [FILE_NAME] IS NULL) OR ([FILE_NAME] = @Original_FILE_NAME)) AND ([PROFILE_NAME] = @Original_PROFILE_NAME) AND ((@IsNull_VOLUME = 1 AND [VOLUME] IS NULL) OR ([VOLUME] = @Original_VOLUME)) AND ((@IsNull_PAGE_COUNT = 1 AND [PAGE_COUNT] IS NULL) OR ([PAGE_COUNT] = @Original_PAGE_COUNT)) AND ((@IsNull_EXTENSION = 1 AND [EXTENSION] IS NULL) OR ([EXTENSION] = @Original_EXTENSION)) AND ([ADDED_WHEN] = @Original_ADDED_WHEN));
-SELECT IMPORT_ID, FILE_NAME, PROFILE_NAME, VOLUME, PAGE_COUNT, EXTENSION, ADDED_WHEN FROM TBDD_REPORTING_IMPORT WHERE (IMPORT_ID = @IMPORT_ID)</CommandText>
-                    <Parameters>
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@FILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="FILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@VOLUME" Precision="10" ProviderType="Decimal" Scale="2" Size="0" SourceColumn="VOLUME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@PAGE_COUNT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PAGE_COUNT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@EXTENSION" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="EXTENSION" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" 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="false" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_IMPORT_ID" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="IMPORT_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_FILE_NAME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="FILE_NAME" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_FILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="FILE_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_PROFILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_VOLUME" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="VOLUME" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Decimal" Direction="Input" ParameterName="@Original_VOLUME" Precision="10" ProviderType="Decimal" Scale="2" Size="0" SourceColumn="VOLUME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_PAGE_COUNT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PAGE_COUNT" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@Original_PAGE_COUNT" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="PAGE_COUNT" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@IsNull_EXTENSION" Precision="0" ProviderType="Int" Scale="0" Size="0" SourceColumn="EXTENSION" SourceColumnNullMapping="true" SourceVersion="Original" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@Original_EXTENSION" Precision="0" ProviderType="VarChar" Scale="0" Size="0" SourceColumn="EXTENSION" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" 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="false" AutogeneratedName="IMPORT_ID" ColumnName="IMPORT_ID" DataSourceName="DD_ECM.dbo.TBDD_REPORTING_IMPORT" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IMPORT_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="IMPORT_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                    </Parameters>
-                  </DbCommand>
-                </UpdateCommand>
-              </DbSource>
-            </MainSource>
-            <Mappings>
-              <Mapping SourceColumn="IMPORT_ID" DataSetColumn="IMPORT_ID" />
-              <Mapping SourceColumn="FILE_NAME" DataSetColumn="FILE_NAME" />
-              <Mapping SourceColumn="PROFILE_NAME" DataSetColumn="PROFILE_NAME" />
-              <Mapping SourceColumn="VOLUME" DataSetColumn="VOLUME" />
-              <Mapping SourceColumn="PAGE_COUNT" DataSetColumn="PAGE_COUNT" />
-              <Mapping SourceColumn="ADDED_WHEN" DataSetColumn="ADDED_WHEN" />
-              <Mapping SourceColumn="EXTENSION" DataSetColumn="EXTENSION" />
-            </Mappings>
-            <Sources />
-          </TableAdapter>
          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBTC_MOVE_RENAMETableAdapter" GeneratorDataComponentClassName="TBTC_MOVE_RENAMETableAdapter" Name="TBTC_MOVE_RENAME" UserDataComponentName="TBTC_MOVE_RENAMETableAdapter">
            <MainSource>
              <DbSource ConnectionRef="DDECMConString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBTC_MOVE_RENAME" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                <DeleteCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>DELETE FROM TBTC_MOVE_RENAME
-WHERE        (GUID = @Original_GUID)</CommandText>
+WHERE        (PROFILE_NAME = @PNAME)</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBTC_MOVE_RENAME" 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="PNAME" ColumnName="PROFILE_NAME" DataSourceName="DD_ECM_TEST.dbo.TBTC_MOVE_RENAME" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@PNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
                    </Parameters>
                  </DbCommand>
                </DeleteCommand>
                <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>INSERT INTO TBTC_MOVE_RENAME
-                         (PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO)
-VALUES        (@PROFILE_NAME,@FOLDER_FOR_INDEX,@NAMECONVENTION,@ACTIVE,@CREATED_WHO); 
-SELECT GUID, PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBTC_MOVE_RENAME WHERE (GUID = SCOPE_IDENTITY())</CommandText>
+                         (PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO, VERSION_OFF)
+VALUES        (@PROFILE_NAME,@FOLDER_FOR_INDEX,@NAMECONVENTION,@ACTIVE,@CREATED_WHO,@VERSION_OFF);  
+SELECT GUID, PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN, VERSION_OFF FROM TBTC_MOVE_RENAME WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_NAME" ColumnName="PROFILE_NAME" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="FOLDER_FOR_INDEX" ColumnName="FOLDER_FOR_INDEX" DataSourceName="" DataTypeServer="varchar(500)" DbType="AnsiString" Direction="Input" ParameterName="@FOLDER_FOR_INDEX" Precision="0" ProviderType="VarChar" Scale="0" Size="500" SourceColumn="FOLDER_FOR_INDEX" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="NAMECONVENTION" ColumnName="NAMECONVENTION" DataSourceName="" DataTypeServer="varchar(500)" DbType="AnsiString" Direction="Input" ParameterName="@NAMECONVENTION" Precision="0" ProviderType="VarChar" Scale="0" Size="500" SourceColumn="NAMECONVENTION" 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="true" AutogeneratedName="CREATED_WHO" ColumnName="CREATED_WHO" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CREATED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CREATED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_NAME" ColumnName="PROFILE_NAME" DataSourceName="DD_ECM_TEST.dbo.TBTC_MOVE_RENAME" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="FOLDER_FOR_INDEX" ColumnName="FOLDER_FOR_INDEX" DataSourceName="DD_ECM_TEST.dbo.TBTC_MOVE_RENAME" DataTypeServer="varchar(500)" DbType="AnsiString" Direction="Input" ParameterName="@FOLDER_FOR_INDEX" Precision="0" ProviderType="VarChar" Scale="0" Size="500" SourceColumn="FOLDER_FOR_INDEX" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="NAMECONVENTION" ColumnName="NAMECONVENTION" DataSourceName="DD_ECM_TEST.dbo.TBTC_MOVE_RENAME" DataTypeServer="varchar(500)" DbType="AnsiString" Direction="Input" ParameterName="@NAMECONVENTION" Precision="0" ProviderType="VarChar" Scale="0" Size="500" SourceColumn="NAMECONVENTION" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ACTIVE" ColumnName="ACTIVE" DataSourceName="DD_ECM_TEST.dbo.TBTC_MOVE_RENAME" 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="CREATED_WHO" ColumnName="CREATED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBTC_MOVE_RENAME" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CREATED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CREATED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="VERSION_OFF" ColumnName="VERSION_OFF" DataSourceName="DD_ECM_TEST.dbo.TBTC_MOVE_RENAME" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VERSION_OFF" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VERSION_OFF" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </InsertCommand>
                <SelectCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="false">
-                    <CommandText>SELECT        GUID, PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN
+                    <CommandText>SELECT        GUID, PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN, VERSION_OFF
 FROM            TBTC_MOVE_RENAME
-WHERE        (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME))</CommandText>
+WHERE        (PROFILE_NAME = @PROFILE_NAME)</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_NAME" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_NAME" ColumnName="PROFILE_NAME" DataSourceName="DD_ECM_TEST.dbo.TBTC_MOVE_RENAME" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </SelectCommand>
                <UpdateCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>UPDATE       TBTC_MOVE_RENAME
-SET                PROFILE_NAME = @PROFILE_NAME, FOLDER_FOR_INDEX = @FOLDER_FOR_INDEX, NAMECONVENTION = @NAMECONVENTION, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO
+SET                PROFILE_NAME = @PROFILE_NAME, FOLDER_FOR_INDEX = @FOLDER_FOR_INDEX, NAMECONVENTION = @NAMECONVENTION, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO, 
+                         VERSION_OFF = @VERSION_OFF
 WHERE        (GUID = @Original_GUID); 
-SELECT GUID, PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBTC_MOVE_RENAME WHERE (GUID = @GUID)</CommandText>
+SELECT GUID, PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN, VERSION_OFF FROM TBTC_MOVE_RENAME WHERE (GUID = @GUID)</CommandText>
                    <Parameters>
                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_NAME" ColumnName="PROFILE_NAME" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="FOLDER_FOR_INDEX" ColumnName="FOLDER_FOR_INDEX" DataSourceName="" DataTypeServer="varchar(500)" DbType="AnsiString" Direction="Input" ParameterName="@FOLDER_FOR_INDEX" Precision="0" ProviderType="VarChar" Scale="0" Size="500" SourceColumn="FOLDER_FOR_INDEX" SourceColumnNullMapping="false" SourceVersion="Current" />
                      <Parameter AllowDbNull="false" AutogeneratedName="NAMECONVENTION" ColumnName="NAMECONVENTION" DataSourceName="" DataTypeServer="varchar(500)" DbType="AnsiString" Direction="Input" ParameterName="@NAMECONVENTION" Precision="0" ProviderType="VarChar" Scale="0" Size="500" SourceColumn="NAMECONVENTION" 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="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="false" AutogeneratedName="VERSION_OFF" ColumnName="VERSION_OFF" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VERSION_OFF" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VERSION_OFF" 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>
@@ -156,25 +76,13 @@ SELECT GUID, PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO
              <Mapping SourceColumn="CREATED_WHEN" DataSetColumn="CREATED_WHEN" />
              <Mapping SourceColumn="CHANGED_WHO" DataSetColumn="CHANGED_WHO" />
              <Mapping SourceColumn="CHANGED_WHEN" DataSetColumn="CHANGED_WHEN" />
+              <Mapping SourceColumn="VERSION_OFF" DataSetColumn="VERSION_OFF" />
            </Mappings>
-            <Sources>
-              <DbSource ConnectionRef="DDECMConString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBTC_MOVE_RENAME" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByActive" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByActive" GeneratorSourceName="FillByActive" GetMethodModifier="Public" GetMethodName="GetDataByActive" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataByActive" UserSourceName="FillByActive">
-                <SelectCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>SELECT        GUID, PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN
-FROM            TBTC_MOVE_RENAME
-WHERE        (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1</CommandText>
-                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_NAME" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
-                    </Parameters>
-                  </DbCommand>
-                </SelectCommand>
-              </DbSource>
-            </Sources>
+            <Sources />
          </TableAdapter>
          <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBTC_DI_REGEX_MATCHTableAdapter" GeneratorDataComponentClassName="TBTC_DI_REGEX_MATCHTableAdapter" Name="TBTC_DI_REGEX_MATCH" UserDataComponentName="TBTC_DI_REGEX_MATCHTableAdapter">
            <MainSource>
-              <DbSource ConnectionRef="DD_ECM_TESTConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBTC_DI_REGEX_MATCH" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="DDECMConString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBTC_DI_REGEX_MATCH" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                <DeleteCommand>
                  <DbCommand CommandType="Text" ModifiedByUser="true">
                    <CommandText>DELETE FROM TBTC_DI_REGEX_MATCH
@@ -185,15 +93,15 @@ WHERE        (PROFILE_NAME = @PNAME)</CommandText>
                  </DbCommand>
                </DeleteCommand>
                <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>INSERT INTO TBTC_DI_REGEX_MATCH
                         (PROFILE_NAME, REGEX, CREATED_WHO)
-VALUES        (@PROFILE_NAME,@REGEX,@CREATED_WHO);   
+VALUES        (@PROFILE_NAME,@REGEX,@CREATED_WHO); 
 SELECT GUID, PROFILE_NAME, REGEX, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBTC_DI_REGEX_MATCH WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_NAME" ColumnName="PROFILE_NAME" DataSourceName="DD_ECM_TEST.dbo.TBTC_DI_REGEX_MATCH" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX" ColumnName="REGEX" DataSourceName="DD_ECM_TEST.dbo.TBTC_DI_REGEX_MATCH" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="CREATED_WHO" ColumnName="CREATED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBTC_DI_REGEX_MATCH" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CREATED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CREATED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_NAME" ColumnName="PROFILE_NAME" DataSourceName="" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX" ColumnName="REGEX" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CREATED_WHO" ColumnName="CREATED_WHO" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CREATED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CREATED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </InsertCommand>
@@ -201,24 +109,24 @@ SELECT GUID, PROFILE_NAME, REGEX, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGE
                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>SELECT        GUID, PROFILE_NAME, REGEX, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN
 FROM            TBTC_DI_REGEX_MATCH
-WHERE        (UPPER(PROFILE_NAME) = UPPER(@PROFILE_NAME))</CommandText>
+WHERE        (PROFILE_NAME = @PROFILE_NAME)</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_NAME" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_NAME" ColumnName="PROFILE_NAME" DataSourceName="DD_ECM_TEST.dbo.TBTC_DI_REGEX_MATCH" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
                    </Parameters>
                  </DbCommand>
                </SelectCommand>
                <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                    <CommandText>UPDATE       TBTC_DI_REGEX_MATCH
 SET                PROFILE_NAME = @PROFILE_NAME, REGEX = @REGEX, CHANGED_WHO = @CHANGED_WHO
-WHERE        (GUID = @Original_GUID);   
+WHERE        (GUID = @Original_GUID); 
 SELECT GUID, PROFILE_NAME, REGEX, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBTC_DI_REGEX_MATCH WHERE (GUID = @GUID)</CommandText>
                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_NAME" ColumnName="PROFILE_NAME" DataSourceName="DD_ECM_TEST.dbo.TBTC_DI_REGEX_MATCH" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX" ColumnName="REGEX" DataSourceName="DD_ECM_TEST.dbo.TBTC_DI_REGEX_MATCH" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBTC_DI_REGEX_MATCH" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBTC_DI_REGEX_MATCH" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBTC_DI_REGEX_MATCH" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PROFILE_NAME" ColumnName="PROFILE_NAME" DataSourceName="" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@PROFILE_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX" ColumnName="REGEX" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX" 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="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>
@@ -233,19 +141,7 @@ SELECT GUID, PROFILE_NAME, REGEX, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGE
              <Mapping SourceColumn="CHANGED_WHO" DataSetColumn="CHANGED_WHO" />
              <Mapping SourceColumn="CHANGED_WHEN" DataSetColumn="CHANGED_WHEN" />
            </Mappings>
-            <Sources>
-              <DbSource ConnectionRef="DD_ECM_TESTConnectionString (MySettings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteQuery" Modifier="Public" Name="DeleteQuery" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="DeleteQuery">
-                <DeleteCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
-                    <CommandText>DELETE FROM TBTC_DI_REGEX_MATCH
-WHERE        (PROFILE_NAME = @PNAME)</CommandText>
-                    <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="PNAME" ColumnName="PROFILE_NAME" DataSourceName="DD_ECM_TEST.dbo.TBTC_DI_REGEX_MATCH" DataTypeServer="varchar(250)" DbType="AnsiString" Direction="Input" ParameterName="@PNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="250" SourceColumn="PROFILE_NAME" SourceColumnNullMapping="false" SourceVersion="Original" />
-                    </Parameters>
-                  </DbCommand>
-                </DeleteCommand>
-              </DbSource>
-            </Sources>
+            <Sources />
          </TableAdapter>
        </Tables>
        <Sources />
@@ -255,64 +151,10 @@ WHERE        (PROFILE_NAME = @PNAME)</CommandText>
  <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="TBVEKTOR_ARRAY" msprop:Generator_TableClassName="TBVEKTOR_ARRAYDataTable" msprop:Generator_TableVarName="tableTBVEKTOR_ARRAY" msprop:Generator_RowChangedName="TBVEKTOR_ARRAYRowChanged" msprop:Generator_TablePropName="TBVEKTOR_ARRAY" msprop:Generator_RowDeletingName="TBVEKTOR_ARRAYRowDeleting" msprop:Generator_RowChangingName="TBVEKTOR_ARRAYRowChanging" msprop:Generator_RowEvHandlerName="TBVEKTOR_ARRAYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBVEKTOR_ARRAYRowDeleted" msprop:Generator_RowClassName="TBVEKTOR_ARRAYRow" msprop:Generator_UserTableName="TBVEKTOR_ARRAY" msprop:Generator_RowEvArgName="TBVEKTOR_ARRAYRowChangeEvent">
-          <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" />
-              <xs:element name="Wert" msprop:Generator_ColumnVarNameInTable="columnWert" msprop:Generator_ColumnPropNameInRow="Wert" msprop:Generator_ColumnPropNameInTable="WertColumn" msprop:Generator_UserColumnName="Wert" type="xs:string" minOccurs="0" />
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="TBErgebnis" msprop:Generator_TableClassName="TBErgebnisDataTable" msprop:Generator_TableVarName="tableTBErgebnis" msprop:Generator_RowChangedName="TBErgebnisRowChanged" msprop:Generator_TablePropName="TBErgebnis" msprop:Generator_RowDeletingName="TBErgebnisRowDeleting" msprop:Generator_RowChangingName="TBErgebnisRowChanging" msprop:Generator_RowEvHandlerName="TBErgebnisRowChangeEventHandler" msprop:Generator_RowDeletedName="TBErgebnisRowDeleted" msprop:Generator_RowClassName="TBErgebnisRow" msprop:Generator_UserTableName="TBErgebnis" msprop:Generator_RowEvArgName="TBErgebnisRowChangeEvent">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="Ergebniswerte" msprop:Generator_ColumnVarNameInTable="columnErgebniswerte" msprop:Generator_ColumnPropNameInRow="Ergebniswerte" msprop:Generator_ColumnPropNameInTable="ErgebniswerteColumn" msprop:Generator_UserColumnName="Ergebniswerte" type="xs:string" minOccurs="0" />
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="TBUV" msprop:Generator_TableClassName="TBUVDataTable" msprop:Generator_TableVarName="tableTBUV" msprop:Generator_TablePropName="TBUV" msprop:Generator_RowDeletingName="TBUVRowDeleting" msprop:Generator_RowChangingName="TBUVRowChanging" msprop:Generator_RowEvHandlerName="TBUVRowChangeEventHandler" msprop:Generator_RowDeletedName="TBUVRowDeleted" msprop:Generator_UserTableName="TBUV" msprop:Generator_RowChangedName="TBUVRowChanged" msprop:Generator_RowEvArgName="TBUVRowChangeEvent" msprop:Generator_RowClassName="TBUVRow">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="ID" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnID" msprop:Generator_ColumnPropNameInRow="ID" msprop:Generator_ColumnPropNameInTable="IDColumn" msprop:Generator_UserColumnName="ID" type="xs:int" minOccurs="0" />
-              <xs:element name="Unterverzeichnis" msprop:Generator_ColumnVarNameInTable="columnUnterverzeichnis" msprop:Generator_ColumnPropNameInRow="Unterverzeichnis" msprop:Generator_ColumnPropNameInTable="UnterverzeichnisColumn" msprop:Generator_UserColumnName="Unterverzeichnis" type="xs:string" minOccurs="0" />
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
-        <xs:element name="TBDD_REPORTING_IMPORT" msprop:Generator_TableClassName="TBDD_REPORTING_IMPORTDataTable" msprop:Generator_TableVarName="tableTBDD_REPORTING_IMPORT" msprop:Generator_RowChangedName="TBDD_REPORTING_IMPORTRowChanged" msprop:Generator_TablePropName="TBDD_REPORTING_IMPORT" msprop:Generator_RowDeletingName="TBDD_REPORTING_IMPORTRowDeleting" msprop:Generator_RowChangingName="TBDD_REPORTING_IMPORTRowChanging" msprop:Generator_RowEvHandlerName="TBDD_REPORTING_IMPORTRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_REPORTING_IMPORTRowDeleted" msprop:Generator_RowClassName="TBDD_REPORTING_IMPORTRow" msprop:Generator_UserTableName="TBDD_REPORTING_IMPORT" msprop:Generator_RowEvArgName="TBDD_REPORTING_IMPORTRowChangeEvent">
-          <xs:complexType>
-            <xs:sequence>
-              <xs:element name="IMPORT_ID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnIMPORT_ID" msprop:Generator_ColumnPropNameInRow="IMPORT_ID" msprop:Generator_ColumnPropNameInTable="IMPORT_IDColumn" msprop:Generator_UserColumnName="IMPORT_ID" type="xs:int" />
-              <xs:element name="FILE_NAME" msprop:Generator_ColumnVarNameInTable="columnFILE_NAME" msprop:Generator_ColumnPropNameInRow="FILE_NAME" msprop:Generator_ColumnPropNameInTable="FILE_NAMEColumn" msprop:Generator_UserColumnName="FILE_NAME" minOccurs="0">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="250" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-              <xs:element name="PROFILE_NAME" msprop:Generator_ColumnVarNameInTable="columnPROFILE_NAME" msprop:Generator_ColumnPropNameInRow="PROFILE_NAME" msprop:Generator_ColumnPropNameInTable="PROFILE_NAMEColumn" msprop:Generator_UserColumnName="PROFILE_NAME">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="250" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-              <xs:element name="VOLUME" msprop:Generator_ColumnVarNameInTable="columnVOLUME" msprop:Generator_ColumnPropNameInRow="VOLUME" msprop:Generator_ColumnPropNameInTable="VOLUMEColumn" msprop:Generator_UserColumnName="VOLUME" type="xs:decimal" minOccurs="0" />
-              <xs:element name="PAGE_COUNT" msprop:Generator_ColumnVarNameInTable="columnPAGE_COUNT" msprop:Generator_ColumnPropNameInRow="PAGE_COUNT" msprop:Generator_ColumnPropNameInTable="PAGE_COUNTColumn" msprop:Generator_UserColumnName="PAGE_COUNT" type="xs:int" minOccurs="0" />
-              <xs:element name="ADDED_WHEN" msprop:Generator_ColumnVarNameInTable="columnADDED_WHEN" msprop:Generator_ColumnPropNameInRow="ADDED_WHEN" msprop:Generator_ColumnPropNameInTable="ADDED_WHENColumn" msprop:Generator_UserColumnName="ADDED_WHEN" type="xs:dateTime" />
-              <xs:element name="EXTENSION" msprop:Generator_ColumnVarNameInTable="columnEXTENSION" msprop:Generator_ColumnPropNameInRow="EXTENSION" msprop:Generator_ColumnPropNameInTable="EXTENSIONColumn" msprop:Generator_UserColumnName="EXTENSION" minOccurs="0">
-                <xs:simpleType>
-                  <xs:restriction base="xs:string">
-                    <xs:maxLength value="10" />
-                  </xs:restriction>
-                </xs:simpleType>
-              </xs:element>
-            </xs:sequence>
-          </xs:complexType>
-        </xs:element>
        <xs:element name="TBTC_MOVE_RENAME" msprop:Generator_TableClassName="TBTC_MOVE_RENAMEDataTable" msprop:Generator_TableVarName="tableTBTC_MOVE_RENAME" msprop:Generator_RowChangedName="TBTC_MOVE_RENAMERowChanged" msprop:Generator_TablePropName="TBTC_MOVE_RENAME" msprop:Generator_RowDeletingName="TBTC_MOVE_RENAMERowDeleting" msprop:Generator_RowChangingName="TBTC_MOVE_RENAMERowChanging" msprop:Generator_RowEvHandlerName="TBTC_MOVE_RENAMERowChangeEventHandler" msprop:Generator_RowDeletedName="TBTC_MOVE_RENAMERowDeleted" msprop:Generator_RowClassName="TBTC_MOVE_RENAMERow" msprop:Generator_UserTableName="TBTC_MOVE_RENAME" msprop:Generator_RowEvArgName="TBTC_MOVE_RENAMERowChangeEvent">
          <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" />
+              <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" />
              <xs:element name="PROFILE_NAME" msprop:Generator_ColumnVarNameInTable="columnPROFILE_NAME" msprop:Generator_ColumnPropNameInRow="PROFILE_NAME" msprop:Generator_ColumnPropNameInTable="PROFILE_NAMEColumn" msprop:Generator_UserColumnName="PROFILE_NAME">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
@@ -335,7 +177,7 @@ WHERE        (PROFILE_NAME = @PNAME)</CommandText>
                </xs:simpleType>
              </xs:element>
              <xs:element name="ACTIVE" msprop:Generator_ColumnVarNameInTable="columnACTIVE" msprop:Generator_ColumnPropNameInRow="ACTIVE" msprop:Generator_ColumnPropNameInTable="ACTIVEColumn" msprop:Generator_UserColumnName="ACTIVE" type="xs:boolean" default="true" />
-              <xs:element name="CREATED_WHO" msprop:Generator_ColumnVarNameInTable="columnCREATED_WHO" msprop:Generator_ColumnPropNameInRow="CREATED_WHO" msprop:Generator_ColumnPropNameInTable="CREATED_WHOColumn" msprop:Generator_UserColumnName="CREATED_WHO" minOccurs="0">
+              <xs:element name="CREATED_WHO" msprop:Generator_ColumnVarNameInTable="columnCREATED_WHO" msprop:Generator_ColumnPropNameInRow="CREATED_WHO" msprop:Generator_ColumnPropNameInTable="CREATED_WHOColumn" msprop:Generator_UserColumnName="CREATED_WHO">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="50" />
@@ -351,13 +193,14 @@ WHERE        (PROFILE_NAME = @PNAME)</CommandText>
                </xs:simpleType>
              </xs:element>
              <xs:element name="CHANGED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHEN" msprop:Generator_ColumnPropNameInRow="CHANGED_WHEN" msprop:Generator_ColumnPropNameInTable="CHANGED_WHENColumn" msprop:Generator_UserColumnName="CHANGED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="VERSION_OFF" msprop:Generator_ColumnVarNameInTable="columnVERSION_OFF" msprop:Generator_ColumnPropNameInRow="VERSION_OFF" msprop:Generator_ColumnPropNameInTable="VERSION_OFFColumn" msprop:Generator_UserColumnName="VERSION_OFF" type="xs:boolean" default="false" />
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="TBTC_DI_REGEX_MATCH" msprop:Generator_TableClassName="TBTC_DI_REGEX_MATCHDataTable" msprop:Generator_TableVarName="tableTBTC_DI_REGEX_MATCH" msprop:Generator_TablePropName="TBTC_DI_REGEX_MATCH" msprop:Generator_RowDeletingName="TBTC_DI_REGEX_MATCHRowDeleting" msprop:Generator_RowChangingName="TBTC_DI_REGEX_MATCHRowChanging" msprop:Generator_RowEvHandlerName="TBTC_DI_REGEX_MATCHRowChangeEventHandler" msprop:Generator_RowDeletedName="TBTC_DI_REGEX_MATCHRowDeleted" msprop:Generator_UserTableName="TBTC_DI_REGEX_MATCH" msprop:Generator_RowChangedName="TBTC_DI_REGEX_MATCHRowChanged" msprop:Generator_RowEvArgName="TBTC_DI_REGEX_MATCHRowChangeEvent" msprop:Generator_RowClassName="TBTC_DI_REGEX_MATCHRow">
+        <xs:element name="TBTC_DI_REGEX_MATCH" msprop:Generator_TableClassName="TBTC_DI_REGEX_MATCHDataTable" msprop:Generator_TableVarName="tableTBTC_DI_REGEX_MATCH" msprop:Generator_RowChangedName="TBTC_DI_REGEX_MATCHRowChanged" msprop:Generator_TablePropName="TBTC_DI_REGEX_MATCH" msprop:Generator_RowDeletingName="TBTC_DI_REGEX_MATCHRowDeleting" msprop:Generator_RowChangingName="TBTC_DI_REGEX_MATCHRowChanging" msprop:Generator_RowEvHandlerName="TBTC_DI_REGEX_MATCHRowChangeEventHandler" msprop:Generator_RowDeletedName="TBTC_DI_REGEX_MATCHRowDeleted" msprop:Generator_RowClassName="TBTC_DI_REGEX_MATCHRow" msprop:Generator_UserTableName="TBTC_DI_REGEX_MATCH" msprop:Generator_RowEvArgName="TBTC_DI_REGEX_MATCHRowChangeEvent">
          <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" />
+              <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" />
              <xs:element name="PROFILE_NAME" msprop:Generator_ColumnVarNameInTable="columnPROFILE_NAME" msprop:Generator_ColumnPropNameInRow="PROFILE_NAME" msprop:Generator_ColumnPropNameInTable="PROFILE_NAMEColumn" msprop:Generator_UserColumnName="PROFILE_NAME">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
@@ -365,7 +208,7 @@ WHERE        (PROFILE_NAME = @PNAME)</CommandText>
                  </xs:restriction>
                </xs:simpleType>
              </xs:element>
-              <xs:element name="REGEX" msprop:Generator_ColumnVarNameInTable="columnREGEX" msprop:Generator_ColumnPropNameInRow="REGEX" msprop:Generator_ColumnPropNameInTable="REGEXColumn" msprop:Generator_UserColumnName="REGEX" default=".+\.[a-zA-Z0-9]{3,4}">
+              <xs:element name="REGEX" msprop:Generator_ColumnVarNameInTable="columnREGEX" msprop:Generator_ColumnPropNameInRow="REGEX" msprop:Generator_ColumnPropNameInTable="REGEXColumn" msprop:Generator_UserColumnName="REGEX">
                <xs:simpleType>
                  <xs:restriction base="xs:string">
                    <xs:maxLength value="1000" />
@@ -391,13 +234,29 @@ WHERE        (PROFILE_NAME = @PNAME)</CommandText>
            </xs:sequence>
          </xs:complexType>
        </xs:element>
+        <xs:element name="TBVEKTOR_ARRAY" msprop:Generator_TableClassName="TBVEKTOR_ARRAYDataTable" msprop:Generator_TableVarName="tableTBVEKTOR_ARRAY" msprop:Generator_RowChangedName="TBVEKTOR_ARRAYRowChanged" msprop:Generator_TablePropName="TBVEKTOR_ARRAY" msprop:Generator_RowDeletingName="TBVEKTOR_ARRAYRowDeleting" msprop:Generator_RowChangingName="TBVEKTOR_ARRAYRowChanging" msprop:Generator_RowEvHandlerName="TBVEKTOR_ARRAYRowChangeEventHandler" msprop:Generator_RowDeletedName="TBVEKTOR_ARRAYRowDeleted" msprop:Generator_RowClassName="TBVEKTOR_ARRAYRow" msprop:Generator_UserTableName="TBVEKTOR_ARRAY" msprop:Generator_RowEvArgName="TBVEKTOR_ARRAYRowChangeEvent">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="IndexName" msprop:Generator_ColumnVarNameInTable="columnIndexName" msprop:Generator_ColumnPropNameInRow="IndexName" msprop:Generator_ColumnPropNameInTable="IndexNameColumn" msprop:Generator_UserColumnName="IndexName" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="100" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="Value" msprop:Generator_ColumnVarNameInTable="columnValue" msprop:Generator_ColumnPropNameInRow="Value" msprop:Generator_ColumnPropNameInTable="ValueColumn" msprop:Generator_UserColumnName="Value" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="999" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
      </xs:choice>
    </xs:complexType>
    <xs:unique name="Constraint1" msdata:PrimaryKey="true">
-      <xs:selector xpath=".//mstns:TBDD_REPORTING_IMPORT" />
-      <xs:field xpath="mstns:IMPORT_ID" />
-    </xs:unique>
-    <xs:unique name="TBTC_MOVE_RENAME_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
      <xs:selector xpath=".//mstns:TBTC_MOVE_RENAME" />
      <xs:field xpath="mstns:GUID" />
    </xs:unique>
--- a/ToolCollection/MyDataset.xss
+++ b/ToolCollection/MyDataset.xss
@@ -4,14 +4,11 @@
     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="27" ViewPortY="-11" 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="3" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
  <Shapes>
-    <Shape ID="DesignTable:TBDD_REPORTING_IMPORT" ZOrder="3" X="242" Y="71" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
-    <Shape ID="DesignTable:TBTC_MOVE_RENAME" ZOrder="2" X="96" Y="306" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:TBTC_DI_REGEX_MATCH" ZOrder="1" X="569" Y="115" Height="229" Width="286" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
-    <Shape ID="DesignTable:TBVEKTOR_ARRAY" ZOrder="6" X="42" Y="0" Height="144" Width="174" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:TBErgebnis" ZOrder="5" X="243" Y="-1" Height="48" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
-    <Shape ID="DesignTable:TBUV" ZOrder="4" X="44" Y="155" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <Shape ID="DesignTable:TBTC_MOVE_RENAME" ZOrder="3" X="89" Y="81" Height="267" Width="272" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
+    <Shape ID="DesignTable:TBTC_DI_REGEX_MATCH" ZOrder="2" X="402" Y="78" Height="210" Width="286" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
+    <Shape ID="DesignTable:TBVEKTOR_ARRAY" ZOrder="1" X="946" Y="307" Height="67" Width="174" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="63" />
  </Shapes>
  <Connectors />
 </DiagramLayout>
--- a/ToolCollection/ToolCollection.vbproj
+++ b/ToolCollection/ToolCollection.vbproj
@@ -95,7 +95,8 @@
    <Reference Include="DigitalData.Modules.Filesystem">
      <HintPath>..\..\DDMonorepo\Modules.Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
    </Reference>
-    <Reference Include="DigitalData.Modules.Logging">
+    <Reference Include="DigitalData.Modules.Logging, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
      <HintPath>..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
    </Reference>
    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
@@ -406,6 +407,7 @@
    </Compile>
    <Compile Include="modSaveTreeView.vb" />
    <Compile Include="ModuleCURRENT.vb" />
+    <Compile Include="ModuleSettings.vb" />
    <Compile Include="ModuleStopwatch.vb" />
    <Compile Include="My Project\AssemblyInfo.vb" />
    <Compile Include="My Project\Application.Designer.vb">
@@ -427,9 +429,6 @@
      <DesignTime>True</DesignTime>
      <DependentUpon>MyDataset.xsd</DependentUpon>
    </Compile>
-    <Compile Include="MyDataset.vb">
-      <DependentUpon>MyDataset.xsd</DependentUpon>
-    </Compile>
    <Compile Include="ProjectInstaller.Designer.vb">
      <DependentUpon>ProjectInstaller.vb</DependentUpon>
    </Compile>
--- a/ToolCollection/app.config
+++ b/ToolCollection/app.config
@@ -11,9 +11,7 @@
    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
  </configSections>
  <connectionStrings>
-    <add name="ToolCollection.My.MySettings.DDECMConString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd" />
-    <add name="ToolCollection.My.MySettings.DD_ECM_TESTConnectionString"
-      connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd"
+    <add name="ToolCollection.My.MySettings.DDECMConString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd"
      providerName="System.Data.SqlClient" />
  </connectionStrings>
  <system.diagnostics>
--- a/ToolCollection/clsNI_WorkFile.vb
+++ b/ToolCollection/clsNI_WorkFile.vb
@@ -263,8 +263,8 @@ Public Class clsNI_WorkFile
                                Dim RowNew As DataRow
                                RowNew = MyDataset.Tables("TBVEKTOR_ARRAY").NewRow()
                                'filling the row with values. Item property is used to set the field value.
-                                RowNew.Item("Indexname") = Volltext_Indexierung.Index
-                                RowNew.Item("Wert") = Value
+                                RowNew.Item("IndexName") = Volltext_Indexierung.Index
+                                RowNew.Item("Value") = Value
                                MyDataset.Tables("TBVEKTOR_ARRAY").Rows.Add(RowNew)
                            Next

--- a/ToolCollection/frmDIHauptseite.Designer.vb
+++ b/ToolCollection/frmDIHauptseite.Designer.vb
@@ -53,7 +53,7 @@ Partial Class frmDIHauptseite
        Me.lblLog = New System.Windows.Forms.Label()
        Me.btnQuellordner = New System.Windows.Forms.Button()
        Me.lblProgress = New System.Windows.Forms.Label()
-        Me.TBDD_REPORTING_IMPORTBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.TBTC_DI_REGEX_MATCHBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.MyDataset = New ToolCollection.MyDataset()
        Me.txtQuellordner = New System.Windows.Forms.TextBox()
        Me.tvLog = New System.Windows.Forms.TreeView()
@@ -80,23 +80,18 @@ Partial Class frmDIHauptseite
        Me.txtAusschluss = New System.Windows.Forms.TextBox()
        Me.chkbEmail = New System.Windows.Forms.CheckBox()
        Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.TBUVBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.TBDD_REPORTING_IMPORTTableAdapter = New ToolCollection.MyDatasetTableAdapters.TBDD_REPORTING_IMPORTTableAdapter()
        Me.TableAdapterManager = New ToolCollection.MyDatasetTableAdapters.TableAdapterManager()
-        Me.TBTC_DI_REGEX_MATCHBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.TBTC_DI_REGEX_MATCHTableAdapter = New ToolCollection.MyDatasetTableAdapters.TBTC_DI_REGEX_MATCHTableAdapter()
        Me.contextLog.SuspendLayout()
        Me.tcMain.SuspendLayout()
        Me.tpMain.SuspendLayout()
        Me.GroupBox1.SuspendLayout()
        CType(Me.numIntervallDurchlauf, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TBDD_REPORTING_IMPORTBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TBTC_DI_REGEX_MATCHBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.tpKonfiguration.SuspendLayout()
        Me.gbEmail.SuspendLayout()
        Me.GroupBox3.SuspendLayout()
-        CType(Me.TBUVBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.TBTC_DI_REGEX_MATCHBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'timRun_Dateiimport
@@ -390,10 +385,10 @@ Partial Class frmDIHauptseite
        Me.lblProgress.Text = "0 von 100 Dateien importiert"
        Me.lblProgress.Visible = False
        '
-        'TBDD_REPORTING_IMPORTBindingSource
+        'TBTC_DI_REGEX_MATCHBindingSource
        '
-        Me.TBDD_REPORTING_IMPORTBindingSource.DataMember = "TBDD_REPORTING_IMPORT"
-        Me.TBDD_REPORTING_IMPORTBindingSource.DataSource = Me.MyDataset
+        Me.TBTC_DI_REGEX_MATCHBindingSource.DataMember = "TBTC_DI_REGEX_MATCH"
+        Me.TBTC_DI_REGEX_MATCHBindingSource.DataSource = Me.MyDataset
        '
        'MyDataset
        '
@@ -662,28 +657,14 @@ Partial Class frmDIHauptseite
        Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
        Me.ContextMenuStrip1.Size = New System.Drawing.Size(61, 4)
        '
-        'TBUVBindingSource
-        '
-        Me.TBUVBindingSource.DataMember = "TBUV"
-        Me.TBUVBindingSource.DataSource = Me.MyDataset
-        '
-        'TBDD_REPORTING_IMPORTTableAdapter
-        '
-        Me.TBDD_REPORTING_IMPORTTableAdapter.ClearBeforeFill = True
-        '
        'TableAdapterManager
        '
        Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
-        Me.TableAdapterManager.TBDD_REPORTING_IMPORTTableAdapter = Me.TBDD_REPORTING_IMPORTTableAdapter
+        Me.TableAdapterManager.Connection = Nothing
        Me.TableAdapterManager.TBTC_DI_REGEX_MATCHTableAdapter = Nothing
        Me.TableAdapterManager.TBTC_MOVE_RENAMETableAdapter = Nothing
        Me.TableAdapterManager.UpdateOrder = ToolCollection.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
        '
-        'TBTC_DI_REGEX_MATCHBindingSource
-        '
-        Me.TBTC_DI_REGEX_MATCHBindingSource.DataMember = "TBTC_DI_REGEX_MATCH"
-        Me.TBTC_DI_REGEX_MATCHBindingSource.DataSource = Me.MyDataset
-        '
        'TBTC_DI_REGEX_MATCHTableAdapter
        '
        Me.TBTC_DI_REGEX_MATCHTableAdapter.ClearBeforeFill = True
@@ -708,15 +689,13 @@ Partial Class frmDIHauptseite
        Me.GroupBox1.ResumeLayout(False)
        Me.GroupBox1.PerformLayout()
        CType(Me.numIntervallDurchlauf, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TBDD_REPORTING_IMPORTBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TBTC_DI_REGEX_MATCHBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit()
        Me.tpKonfiguration.ResumeLayout(False)
        Me.gbEmail.ResumeLayout(False)
        Me.gbEmail.PerformLayout()
        Me.GroupBox3.ResumeLayout(False)
        Me.GroupBox3.PerformLayout()
-        CType(Me.TBUVBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.TBTC_DI_REGEX_MATCHBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

    End Sub
@@ -775,9 +754,6 @@ Partial Class frmDIHauptseite
    Friend WithEvents Label3 As System.Windows.Forms.Label
    Friend WithEvents txtAusschluss As System.Windows.Forms.TextBox
    Friend WithEvents MyDataset As ToolCollection.MyDataset
-    Friend WithEvents TBUVBindingSource As System.Windows.Forms.BindingSource
-    Friend WithEvents TBDD_REPORTING_IMPORTBindingSource As System.Windows.Forms.BindingSource
-    Friend WithEvents TBDD_REPORTING_IMPORTTableAdapter As ToolCollection.MyDatasetTableAdapters.TBDD_REPORTING_IMPORTTableAdapter
    Friend WithEvents TableAdapterManager As ToolCollection.MyDatasetTableAdapters.TableAdapterManager
    Friend WithEvents TBTC_DI_REGEX_MATCHBindingSource As BindingSource
    Friend WithEvents TBTC_DI_REGEX_MATCHTableAdapter As MyDatasetTableAdapters.TBTC_DI_REGEX_MATCHTableAdapter
--- a/ToolCollection/frmDIHauptseite.resx
+++ b/ToolCollection/frmDIHauptseite.resx
@@ -130,28 +130,19 @@
    <value>437, 17</value>
  </metadata>
  <metadata name="TBTC_DI_REGEX_MATCHBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>465, 56</value>
+    <value>989, 17</value>
  </metadata>
  <metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>706, 17</value>
  </metadata>
-  <metadata name="TBDD_REPORTING_IMPORTBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>976, 17</value>
-  </metadata>
  <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>549, 17</value>
  </metadata>
-  <metadata name="TBUVBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>816, 17</value>
  </metadata>
-  <metadata name="TBDD_REPORTING_IMPORTTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
-  </metadata>
-  <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>292, 56</value>
-  </metadata>
  <metadata name="TBTC_DI_REGEX_MATCHTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>728, 56</value>
+    <value>17, 56</value>
  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>125</value>
--- a/ToolCollection/frmDIHauptseite.vb
+++ b/ToolCollection/frmDIHauptseite.vb
@@ -27,8 +27,6 @@ Public Class frmDIHauptseite
        Return _Instance
    End Function

-
-
    Public Sub New()
        Try
            ' Dieser Aufruf ist für den Designer erforderlich.
@@ -406,13 +404,11 @@ Public Class frmDIHauptseite
    Sub GetDirectories(ByVal StartPath As String, ByRef DirectoryList As ArrayList)
        Dim Dirs() As String = Directory.GetDirectories(StartPath)
        DirectoryList.AddRange(Dirs)
+
+
        For Each Dir As String In Dirs
-            Dim newRow As MyDataset.TBUVRow
-            newRow = MyDataset.TBUV.NewTBUVRow
+            CURRENT_UNTERV.Add(Dir)

-            newRow.Unterverzeichnis = Dir
-
-            MyDataset.TBUV.Rows.Add(newRow)
            GetDirectories(Dir, DirectoryList)
        Next
    End Sub
@@ -432,10 +428,18 @@ Public Class frmDIHauptseite
        Else
            Me.ImportFileList = My.Computer.FileSystem.GetFiles(Me.selectedProfile.OriginalQuellordner, FileIO.SearchOption.SearchTopLevelOnly, "*.*")
        End If
-        Me.TBTC_DI_REGEX_MATCHTableAdapter.Connection.ConnectionString = My.Settings.DDECMConString
-        Me.TBTC_DI_REGEX_MATCHTableAdapter.Fill(Me.MyDataset.TBTC_DI_REGEX_MATCH, Me.selectedProfile.OriginalProfilname)
+        Dim oError As Boolean = False
+        Try
+            Me.TBTC_DI_REGEX_MATCHTableAdapter.Connection.ConnectionString = My.Settings.DDECMConString
+            Me.TBTC_DI_REGEX_MATCHTableAdapter.Fill(Me.MyDataset.TBTC_DI_REGEX_MATCH, Me.selectedProfile.OriginalProfilname)
+        Catch ex As Exception
+            ClassLoggerDI.Add($"Error while connecting via My.Settings.DDECMConString [{My.Settings.DDECMConString}]" + ex.Message)
+            ClassLoggerDI.Add($"ErrorMessage: {ex.Message}")
+            oError = True
+        End Try

-        If Me.ImportFileList IsNot Nothing Then
+
+        If Me.ImportFileList IsNot Nothing And oError = False Then
            Me.CountFilesImported = 0
            If Durchlauf = True Then
                Me.CountFiles2Import = Gesamtfiles
@@ -455,7 +459,7 @@ Public Class frmDIHauptseite

            Dim fileAusschliessen As Boolean = False
            If Me.selectedProfile.Subdirectories = True Then
-                MyDataset.TBUV.Clear()
+                CURRENT_UNTERV.Clear()
                For Each di In Directory.GetDirectories(Path.GetDirectoryName(Me.selectedProfile.OriginalQuellordner & "\"), "*.*")
                    GetDirectories(Me.selectedProfile.OriginalQuellordner & "\", oSubDirectoryList)
                Next
@@ -660,7 +664,7 @@ Public Class frmDIHauptseite
                                If Me.oWMStream_Result = 0 Then
                                    Try
                                        Dim extension As String = Replace(Path.GetExtension(DI_STREAMRESULTFILE), ".", "").ToUpper
-                                        'TBDD_REPORTING_IMPORTTableAdapter.Insert(DI_STREAMRESULTFILE, manProfile, DI_FILESIZE, DI_PAGECOUNT, extension)
+
                                    Catch ex As Exception

                                    End Try
@@ -669,7 +673,19 @@ Public Class frmDIHauptseite
                                    If My.Settings.vLogErrorsonly = False Then ClassLoggerDI.Add(" >> Stream war erfolgreich", False)
                                    If Me.selectedProfile.DateiLöschen Then
                                        If My.Settings.vLogErrorsonly = False Then ClassLoggerDI.Add(" - Datei soll gelöscht werden: " & bgwQuelldatei, False)
-                                        My.Computer.FileSystem.DeleteFile(Me.bgwQuelldatei)
+                                        Try
+                                            My.Computer.FileSystem.DeleteFile(Me.bgwQuelldatei)
+                                        Catch ex As Exception
+                                            Try
+                                                Dim opath = Path.GetDirectoryName(Me.bgwQuelldatei) & "\Delete_Error"
+                                                Dim oFilename = Path.GetFileName(Me.bgwQuelldatei)
+                                                File.Move(Me.bgwQuelldatei, opath & "\" & oFilename)
+                                            Catch ex1 As Exception
+                                                ClassLoggerDI.Add("## Unbehandelter Fehler FileMove after NoDelete : " & ex.Message, False)
+                                            End Try
+
+                                        End Try
+
                                        If My.Settings.vLogErrorsonly = False Then ClassLoggerDI.Add(" - Datei wurde gelöscht", False)
                                    End If

@@ -2069,6 +2085,15 @@ Public Class frmDIHauptseite
                                            wert = wert.ToString.Replace(".", ",")
                                            temp_arr.Add(CDbl(wert))
                                        Next
+                                    Case 4100
+                                        If My.Settings.vLogErrorsonly = False Then ClassLoggerDI.Add("- VektorIndex vom Typ 4100 (Boolean)", False)
+                                        If count_Values = 1 Then
+                                            temp_arr.Add(CBool(werte))
+                                        Else
+                                            For Each wert As Object In werte
+                                                temp_arr.Add(CBool(wert))
+                                            Next
+                                        End If
                                    Case 4101
                                        If My.Settings.vLogErrorsonly = False Then ClassLoggerDI.Add("- VektorIndex vom Typ 4101 Date", False)
                                        For Each wert As Object In werte
--- a/ToolCollection/frmDIProfilEigenschaften.vb
+++ b/ToolCollection/frmDIProfilEigenschaften.vb
@@ -256,17 +256,23 @@ Public Class frmDIProfilEigenschaften
    End Sub

    Private Sub btnHinzufügen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnHinzufügen.Click
+        Try
+            For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
+                Select Case license.Modulename.ToUpper
+                    Case "DATEIIMPORT"
+                        If Prof_Anzahl + 1 > license.Anz_Profile Then
+                            MsgBox("Die Maximalanzahl der lizensierten Dateiimport-Profile (" & license.Anz_Profile.ToString & ") ist erreicht!", MsgBoxStyle.Exclamation, "Achtung - Lizenzfehler:")
+                            Exit Sub
+                        End If
+                End Select

-        For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
-            Select Case license.Modulename.ToUpper
-                Case "DATEIIMPORT"
-                    If Prof_Anzahl + 1 > license.Anz_Profile Then
-                        MsgBox("Die Maximalanzahl der lizensierten Dateiimport-Profile (" & license.Anz_Profile.ToString & ") ist erreicht!", MsgBoxStyle.Exclamation, "Achtung - Lizenzfehler:")
-                        Exit Sub
-                    End If
-            End Select
+            Next
+        Catch ex As Exception
+            If My.Settings.licensekey <> "DD MaxLicense" Or My.Settings.licensekey.ToUpper <> "DDALLIN" Then
+                MsgBox("Error Adding Profile due to license issue!", MsgBoxStyle.Critical)
+            End If
+        End Try

-        Next
        ' das Formular zum Erstellen eines neuen Profil öffnen
        frmLogin_DI.ShowDialog()
        'frmDIProfilHinzufuegen.ShowDialog()
--- a/ToolCollection/frmDIRegex.Designer.vb
+++ b/ToolCollection/frmDIRegex.Designer.vb
@@ -281,7 +281,6 @@ Partial Class frmDIRegex
        'TableAdapterManager
        '
        Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
-        Me.TableAdapterManager.TBDD_REPORTING_IMPORTTableAdapter = Nothing
        Me.TableAdapterManager.TBTC_DI_REGEX_MATCHTableAdapter = Me.TBTC_DI_REGEX_MATCHTableAdapter
        Me.TableAdapterManager.TBTC_MOVE_RENAMETableAdapter = Nothing
        Me.TableAdapterManager.UpdateOrder = ToolCollection.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
--- a/ToolCollection/frmDIRegex.vb
+++ b/ToolCollection/frmDIRegex.vb
@@ -85,7 +85,7 @@ Public Class frmDIRegex

    Private Sub tsbtnDelete_Click(sender As Object, e As EventArgs) Handles tsbtnDelete.Click
        Try
-            TBTC_DI_REGEX_MATCHTableAdapter.DeleteQuery(PROFILE_NAMETextBox.Text)
+            TBTC_DI_REGEX_MATCHTableAdapter.Delete(PROFILE_NAMETextBox.Text)
            LoadData()
        Catch ex As Exception
            MsgBox("Unexpected error in deletingRegex: " & ex.Message, MsgBoxStyle.Critical)
--- a/ToolCollection/frmLizenzmanager.vb
+++ b/ToolCollection/frmLizenzmanager.vb
@@ -18,36 +18,44 @@ Public Class frmLizenzmanager
        Me.lvLicense.Items.Clear()

        If Not Me.txtKey.Text = "" Then
-            Me.licenseManager.licenseString = Me.licenseManager.DecodeLicenseKey(Me.txtKey.Text)
-            Me.licenseManager.licenseStringArray = Me.licenseManager.SplitLicenseString(Me.licenseManager.licenseString)
-            Me.licenseManager.LoadLicenses()
+            If Me.txtKey.Text = "DD MaxLicense" Or Me.txtKey.Text.ToUpper = "DDALLIN" Then
+                Me.txtCompany.Text = "Digital Data"
+                Me.txtmachine.Text = "None"
+            Else
+                Me.licenseManager.licenseString = Me.licenseManager.DecodeLicenseKey(Me.txtKey.Text)
+                Me.licenseManager.licenseStringArray = Me.licenseManager.SplitLicenseString(Me.licenseManager.licenseString)
+                Me.licenseManager.LoadLicenses()

-            Dim i As Integer = 0
+                Dim i As Integer = 0

-            If Me.licenseManager.Licenses.Licenses IsNot Nothing Then
-                Me.txtCompany.Text = Me.licenseManager.Licenses.Company
-                Me.txtmachine.Text = Me.licenseManager.Licenses.machine
-                Me.lvLicense.Items.Clear()
-                For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
-                    Dim expires As String = license.Expires.Date
-                    Dim type As String = license.Type
-                    Dim anzProf As String = license.Anz_Profile
-                    If anzProf = 99 Then
-                        anzProf = "Unlimited"
-                    End If
+                If Me.licenseManager.Licenses.Licenses IsNot Nothing Then
+                    Me.txtCompany.Text = Me.licenseManager.Licenses.Company
+                    Me.txtmachine.Text = Me.licenseManager.Licenses.machine
+                    Me.lvLicense.Items.Clear()
+                    For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
+                        Dim expires As String = license.Expires.Date
+                        Dim type As String = license.Type
+                        Dim anzProf As String = license.Anz_Profile
+                        If anzProf = 99 Then
+                            anzProf = "Unlimited"
+                        End If

-                    'Date.TryParse(expires, license.Expires)
-                    If Not expires = "" Then
-                        Me.lvLicense.Items.Add(license.Modulename)
-                        ' MsgBox(license.Modulename)
-                        Dim test = Me.lvLicense.Items.Item(i)
-                        Me.lvLicense.Items(i).SubItems.Add(expires)
-                        lvLicense.Items(i).SubItems.Add(type)
-                        lvLicense.Items(i).SubItems.Add(anzProf)
-                        i += 1
-                    End If
-                Next
+                        'Date.TryParse(expires, license.Expires)
+                        If Not expires = "" Then
+                            Me.lvLicense.Items.Add(license.Modulename)
+                            ' MsgBox(license.Modulename)
+                            Dim test = Me.lvLicense.Items.Item(i)
+                            Me.lvLicense.Items(i).SubItems.Add(expires)
+                            lvLicense.Items(i).SubItems.Add(type)
+                            lvLicense.Items(i).SubItems.Add(anzProf)
+                            i += 1
+                        End If
+                    Next
+                End If
            End If
+
+
+
        End If
    End Sub

--- a/ToolCollection/frmMORE_Verwaltung.Designer.vb
+++ b/ToolCollection/frmMORE_Verwaltung.Designer.vb
@@ -484,7 +484,7 @@ Partial Class frmMORE_Verwaltung
        'DataGridViewTextBoxColumn7
        '
        Me.DataGridViewTextBoxColumn7.DataPropertyName = "INDEXNAME"
-        Me.DataGridViewTextBoxColumn7.HeaderText = "Indexname"
+        Me.DataGridViewTextBoxColumn7.HeaderText = "IndexName"
        Me.DataGridViewTextBoxColumn7.Name = "DataGridViewTextBoxColumn7"
        Me.DataGridViewTextBoxColumn7.ReadOnly = True
        '
--- a/ToolCollection/frmNIHauptseite.Designer.vb
+++ b/ToolCollection/frmNIHauptseite.Designer.vb
@@ -644,7 +644,6 @@ Partial Class frmNIHauptseite
        'TableAdapterManager1
        '
        Me.TableAdapterManager1.BackupDataSetBeforeUpdate = False
-        Me.TableAdapterManager1.TBDD_REPORTING_IMPORTTableAdapter = Nothing
        Me.TableAdapterManager1.TBTC_MOVE_RENAMETableAdapter = Me.TBTC_MOVE_RENAMETableAdapter
        Me.TableAdapterManager1.UpdateOrder = ToolCollection.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
        '
--- a/ToolCollection/frmNIHauptseite.vb
+++ b/ToolCollection/frmNIHauptseite.vb
@@ -27,13 +27,12 @@ Public Class frmNIHauptseite
    Private _fulltext As clsNIFulltext

    Private manuallyRun As Boolean = False
-
+    Private manually_cancel As Boolean = True
    '#### Variablen für das Profil
    Private myNIDatatable As DataTable
-    Private oNiArrayIndexe() As String = Nothing  ' zum Speichern der Indexe
-    Private oNiArrayValues() As String = Nothing  ' zum Speichern der Werte
+    Private myNIArrayIndexe() As String = Nothing  ' zum Speichern der Indexe
+    Private myNIArrayValues() As String = Nothing  ' zum Speichern der Werte
    Public _MRDokumentart, _MRKundenKennzeichen, _MRDeskrIndex As String
-    Private _MRlicense As Boolean = False
    Public Shared _MRKONVERT_FEHLER As Integer = 0

    Private windreamSucheErgebnisse As WMObjects
@@ -120,7 +119,7 @@ Public Class frmNIHauptseite
    End Sub
    Private Sub frmNIHauptseite_Load(sender As Object, e As System.EventArgs) Handles Me.Load
        Try
-            LoadAllModules()
+            'LoadAllModules()
            TBTC_MOVE_RENAMETableAdapter.Connection.ConnectionString = My.Settings.DDECMConString
        Catch ex As Exception
            MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei frmNIHauptseite_Load")
@@ -151,43 +150,44 @@ Public Class frmNIHauptseite
    '            Return Nothing
    '    End Select
    'End Function
-    Public Sub LoadAllModules()
-        Me._validModules = Nothing
+    'Public Sub LoadAllModules()
+    '    Me._validModules = Nothing

-        If Not My.Settings.licensekey = "" Then
-            'Me.licenseManager = New ClassLicenseManager = Nothing
-            Me.licenseManager = New ClassLicenseManager("#DigitalData9731258!#", My.Settings.licensekey)
+    '    If Not My.Settings.licensekey = "" Then
+    '        'Me.licenseManager = New ClassLicenseManager = Nothing
+    '        Me.licenseManager = New ClassLicenseManager("#DigitalData9731258!#", My.Settings.licensekey)

-            Me.licenseManager.licenseString = Me.licenseManager.DecodeLicenseKey(My.Settings.licensekey)
-            Me.licenseManager.licenseStringArray = Me.licenseManager.SplitLicenseString(Me.licenseManager.licenseString)
-            Me.licenseManager.LoadLicenses()
+    '        Me.licenseManager.licenseString = Me.licenseManager.DecodeLicenseKey(My.Settings.licensekey)
+    '        Me.licenseManager.licenseStringArray = Me.licenseManager.SplitLicenseString(Me.licenseManager.licenseString)
+    '        Me.licenseManager.LoadLicenses()

-            Dim i As Integer = 0
+    '        Dim i As Integer = 0

-            If Me.licenseManager.Licenses.Licenses IsNot Nothing Then
-                For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
-                    Dim expires As String = license.Expires.Date
-                    If IsExpired(license.Expires.Date) = False Then
-                        ' MsgBox(license.Modulename & vbNewLine & expires)
+    '        If Me.licenseManager.Licenses.Licenses IsNot Nothing Then
+    '            For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
+    '                Dim expires As String = license.Expires.Date
+    '                If IsExpired(license.Expires.Date) = False Then
+    '                    ' MsgBox(license.Modulename & vbNewLine & expires)

-                        Select Case license.Modulename.ToUpper
-                            Case "MOVEANDRENAME"
-                                _MRlicense = True
-                        End Select
-                        i += 1
-                    Else
-                        Select Case license.Modulename
-                            Case "MOVEANDRENAME"
-                                _MRlicense = False
-                        End Select
-                        i += 1
-                    End If
-                    'Date.TryParse(expires, license.Expires)
+    '                    Select Case license.Modulename.ToUpper
+    '                        Case "MOVEANDRENAME"
+    '                            LICENSE_MoveRename = True
+    '                            _Logger.Info("LICENSE MoveandRename aktiv")
+    '                    End Select
+    '                    i += 1
+    '                Else
+    '                    Select Case license.Modulename
+    '                        Case "MOVEANDRENAME"
+    '                            LICENSE_MoveRename = False
+    '                    End Select
+    '                    i += 1
+    '                End If
+    '                'Date.TryParse(expires, license.Expires)

-                Next
-            End If
-        End If
-    End Sub
+    '            Next
+    '        End If
+    '    End If
+    'End Sub
    Private Function IsExpired(ByVal _Date As Date)
        If Date.Today > _Date Then
            Return True
@@ -250,7 +250,10 @@ Public Class frmNIHauptseite
    End Sub
    Private Sub bwDatei_DoWork(ByVal sender As Object, ByVal e As System.ComponentModel.DoWorkEventArgs)
        If bwDatei.CancellationPending Then
-            _Logger.Debug("bwDatei.CancellationPending - e.Cancel")
+            _Logger.Info("bwDatei.CancellationPending - e.Cancel")
+            e.Cancel = True
+        ElseIf manually_cancel = True Then
+            _Logger.Info("bwDatei.manually_cancel - e.Cancel")
            e.Cancel = True
        Else
            IndexiereVerarbeiteDokument(Me.aktivesDokument)
@@ -318,7 +321,7 @@ Public Class frmNIHauptseite
                bwProfil.ReportProgress(-3)

                ' Ausgabe an Logdatei über nächstes Profil
-
+                _Logger.Debug("########################################################")
                _Logger.Debug("Starte Durchlauf für Profil:  " & profil.Profilname & " - " & Now)

                ' Überprüfen ob Profil aktiv oder inaktiv
@@ -346,9 +349,6 @@ Public Class frmNIHauptseite
                        If Me.aktivesProfil.Verknüpfungen IsNot Nothing Then
                            ' windream-Suche für Profil starten
                            bwsearch.RunWorkerAsync()
-                            'TimerSearch.Start()
-                            'Dim windreamSucheErgebnisse As WMObjects = Me._windreamNI.GetSearchDocuments(Me.aktivesProfil.WindreamSuche)
-                            'TimerSearch.Start()
                            Dim d1 As Date = Now
                            CURRENT_START_DATETIME = Now
                            Dim oldminute As Integer = 0
@@ -360,9 +360,9 @@ Public Class frmNIHauptseite
                                    If minutes >= 2 Then
                                        Select Case minutes
                                            Case 3
-                                                _Logger.Warn("Die Ausführung der Suche dauerte zu lange MinutesSinceRunWD-Search: " & minutes.ToString)
+                                                _Logger.Warn($"Die Ausführung der Suche [{Me.aktivesProfil.WindreamSuche}] dauerte zu lange - MinutesSinceRunWD-Search: " & minutes.ToString)
                                                _Logger.Warn("Die Nachindexierung wird abgebrochen und läuft wieder im Intervall an!")
-                                                ClassNIEmail.Send_Urgent("Achtung - die Ausführung der Suche: " & Me.aktivesProfil.WindreamSuche & " dauerte viel zu lange! <p> Prüfen Sie schnellst möglich die Client-Konfiguration")
+                                                'ClassNIEmail.Send_Urgent("Achtung - die Ausführung der Suche: " & Me.aktivesProfil.WindreamSuche & " dauerte viel zu lange! <p> Prüfen Sie schnellst möglich die Client-Konfiguration")
                                                Abbruch_NI("Abbruch nach Timeout Suche", False, True)
                                                CURRENT_STATE = "Abbruch Timeout"
                                                Exit Sub
@@ -405,7 +405,7 @@ Public Class frmNIHauptseite
                                        Else
                                            _Logger.Debug("NachbearbeitungAD inaktiv")
                                        End If
-                                        _Logger.Debug($"...Row 397...")
+
                                        If _Fehler = False Then
                                            'profil()
                                            ' nun Profilabhängige Parameter laden
@@ -424,8 +424,10 @@ Public Class frmNIHauptseite
                                            _Logger.Debug("Ni-Art: " & aktivesProfil.Ni_Art.ToLower)
                                            ' neue Anzahl von Dateien an ProgressBar2
                                            bwProfil.ReportProgress(windreamSucheErgebnisse.Count)
+                                            Dim oWorkCount As Integer = 1
                                            For Each dok As WMObject In windreamSucheErgebnisse
-                                                _Logger.Debug($"Working on Doc: [{dok.aName}]")
+                                                Dim StopwatchTimer As New ClassStopwatch("Stopwatch FileRun")
+                                                _Logger.Info($"Working on Doc: [{dok.aName}] # ({oWorkCount} of {windreamSucheErgebnisse.Count})")
                                                ' aktuelles Dokument der Klasse mitteilen
                                                Me.aktivesDokument = dok

@@ -459,10 +461,21 @@ Public Class frmNIHauptseite
                                                End While
                                                ' nächste Datei an ProgressBar2
                                                bwProfil.ReportProgress(-1)
+                                                oWorkCount += 1
                                                ' Vorgang abbrechen
                                                If bwProfil.CancellationPending Then
-                                                    _Logger.Debug($"bwProfil.CancellationPending...Exit bwProfil_DoWork")
+                                                    _Logger.Info($"bwProfil.CancellationPending...Exit bwProfil_DoWork")
+                                                    StopwatchTimer.Done()
                                                    Exit Sub
+                                                ElseIf manually_cancel = True Then
+                                                    _Logger.Info($"manually_cancel...Exit bwProfil_DoWork")
+                                                    StopwatchTimer.Done()
+                                                    Exit Sub
+                                                End If
+
+                                                Dim swMessage = StopwatchTimer.Done()
+                                                If swMessage <> "" Then
+                                                    _Logger.Info(swMessage)
                                                End If
                                            Next
                                        Else
@@ -480,7 +493,7 @@ Public Class frmNIHauptseite
                                    _Logger.Warn($"windreamSucheErgebnisse is Nothing!! - Please check Search of {profil.Profilname}")
                                End If
                            Else
-                                    _Logger.Warn("_Fehler = True - Check the config of Nachindexierung")
+                                _Logger.Warn("_Fehler = True - Check the config of Nachindexierung")
                                bwProfil.ReportProgress(-4)
                            End If

@@ -710,12 +723,13 @@ Public Class frmNIHauptseite
        Dim oResultNachindexierung = Nothing
        Try
            If bwDatei.CancellationPending Then
-                _Logger.Debug("bwDatei.CancellationPending - IndexiereVerarbeiteDokument - Exit Sub")
+                _Logger.Info("bwDatei.CancellationPending - IndexiereVerarbeiteDokument - Exit Sub")
                Exit Sub
            End If
            Dim moved_Folder As String = ""
            Dim swWorkDocument_All As New ClassStopwatch("WorkDocument_All")
-            _Logger.Info("IndexiereVerarbeiteDokument '" & Me.aktivesDokument.aName & "'")
+            Dim swRegIndex As New ClassStopwatch("RegularIndexing")
+            ' _Logger.Info($"IndexiereVerarbeiteDokument [{Me.aktivesDokument.aName}]...")
            ' dient zum Überprüfen auf Fehler
            Dim oUnexpectedError As Boolean = False
            Dim unvollstaendig As Boolean = False
@@ -732,7 +746,6 @@ Public Class frmNIHauptseite
            Dim _ergebnisSQL As Boolean = False
            'Die Tabelle mit den select werten leeren
            MyDataset.TBVEKTOR_ARRAY.Clear()
-
            'Als erste überprüfen ob überhaupt ein Deskriptiver Index ausgelesen werden kann
            Select Case Me.aktivesProfil.Ni_Art.ToLower
                Case "fulltext"
@@ -818,13 +831,14 @@ Public Class frmNIHauptseite

            End Select
            myNIDatatable = Nothing
+            myNIArrayIndexe = Nothing  ' zum Speichern der Indexe
+            myNIArrayValues = Nothing  ' zum Speichern der Werte
            Dim oDt As New DataTable
-            oDt.Columns.Add("Indexname")
+            oDt.Columns.Add("IndexName")
            oDt.Columns.Add("Value")
            myNIDatatable = oDt

-            oNiArrayIndexe = Nothing  ' zum Speichern der Indexe
-            oNiArrayValues = Nothing  ' zum Speichern der Werte
+

            Dim verknüpfungZähler As Integer = 0

@@ -833,97 +847,105 @@ Public Class frmNIHauptseite

            If IsNothing(Me.aktivesProfil.Verknüpfungen.Links) = False And oUnexpectedError = False And unvollstaendig = False And Me.aktivesProfil.Ni_Art.ToLower <> "fulltext" Then
                ' alle Verknüpfungen/Links des aktuellen Suchergebnisses durchlaufen
+                Dim ocounter As Integer = 0
                For Each INDEX_SQL_BEFEHL As ClassNIVerknüpfung In Me.aktivesProfil.Verknüpfungen.Links
-
+                    ocounter += 1
+                    _Logger.Debug($"### For each Verknüpfung [{ocounter}]...###")
                    'Regulären Ausdruck zum Auslesen der windream-Indexe definieren
                    Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
                    ' SQL-String für aktuelle Verknüpfung laden
                    Dim oSqlCommand As String = INDEX_SQL_BEFEHL.SelectAnweisung
-                    'Ersetzen des Dateinamens - für CURSOR NachindexierungPr
-                    If oSqlCommand.Contains("[DATEINAME]") Then
-                        oSqlCommand = oSqlCommand.Replace("[DATEINAME]", dokument.aName)
-                    End If
-                    If oSqlCommand.Contains("[FULLNAME]") Then
-                        oSqlCommand = oSqlCommand.Replace("[FULLNAME]", My.Settings.MRWD_Laufwerk & ":" & dokument.aPath)
-                    End If
-
-                    If oSqlCommand.Contains("[%DOCFilename]") Then
-                        oSqlCommand = oSqlCommand.Replace("[%DOCFilename]", dokument.aName)
-                    End If
-                    If oSqlCommand.Contains("[%DOCFilenameoE]") Then
-                        Dim Filename As String = aktivesDokument.aName.ToString.Substring(0, aktivesDokument.aName.LastIndexOf("."))
-                        oSqlCommand = oSqlCommand.Replace("[%DOCFilenameoE]", Path.GetFileNameWithoutExtension(Filename))
-                    End If
-
-                    If oSqlCommand.Contains("[%DOCPath]") Then
-                        oSqlCommand = oSqlCommand.Replace("[FULLNAME]", Path.GetDirectoryName(My.Settings.vWLaufwerk & ":" & dokument.aPath))
-                    End If
-                    If oSqlCommand.Contains("[%DATENow]") Then
-                        oSqlCommand = oSqlCommand.Replace("[%DATENow]", Now.ToShortDateString)
-                    End If
-                    If oSqlCommand.Contains("[%DOCFULLPATH]") Then
-                        oSqlCommand = oSqlCommand.Replace("[%DOCFULLPATH]", My.Settings.MRWD_Laufwerk & ":" & dokument.aPath)
-                    End If
-
-                    ' einen Regulären Ausdruck laden
-                    Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
-                    ' die Vorkommen im SQL-String auslesen
-                    Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(oSqlCommand)
-
-                    ' alle Vorkommen der windream-Indexe im SQL-String durchlaufen
-                    For Each element As System.Text.RegularExpressions.Match In elemente
-                        ' wenn es sich nicht um die Spalten- oder Viewangabe handelt (es sollen ja nur die Indexe ausgelesen werden)
-                        If Not element.Value.ToUpper = "[%SPALTE]" And Not element.Value.ToUpper = "[%VIEW]" Then
-                            ' die Zeichen [% und ] entfernen (liefert den wirklichen windream-Index)
-                            Dim idxName_ohneSonderzeichen As String = element.Value.Substring(2, element.Value.Length - 3)
-                            Try
-                                ' den Wert des deskriptiven Indexes für das aktuelle Dokument auslesen
-                                IndexwertAusWindream = dokument.GetVariableValue(idxName_ohneSonderzeichen)
-                                If element.ToString = aktivesProfil.Desk_windreamIndex Then
-                                    eindeutigerWertausWindream = IndexwertAusWindream
-                                End If
-                            Catch ex As Exception
-                                _Logger.Error(ex)
-
-                                ' wenn ein Fehler aufgetreten ist, muss das Flag gesetzt werden
-                                result &= vbNewLine & "   - Schwerwiegender Fehler bei Auslesen des einschränkenden Wertes aus Index':" & idxName_ohneSonderzeichen & "'"
-                                oUnexpectedError = True
-                                fehlermsg &= vbNewLine & "Schwerwiegender Fehler bei Auslesen des einschränkenden Wertes aus Index':" & idxName_ohneSonderzeichen & "' - Fehler: " & ex.Message
-                                If My.Settings.vNIMailsenden = True Then
-                                    email.Send_EMail("Beim Indexieren der Datei " & dokument.aName.ToString & " ist ein Fehler aufgetreten (GetVariableValue bei Auslesen des einschränkenden Wertes): " & ex.Message)
-                                End If
-                            End Try
-
-                            ' wenn beim Auslesen des Wertes für den aktuellen windream-Index kein Fehler auftrat
-                            ' und die Abfrage ein Ergebnis zurück gab
-                            If IndexwertAusWindream Is Nothing And Not oUnexpectedError Then
-                                ' IndexwertAusWindream ist Nothing (idxName_ohneSonderzeichen)
-                                _Logger.Warn("ACHTUNG: der einschränkende Wert aus Windream für Index '" & idxName_ohneSonderzeichen & "' ist EMPTY oder NOTHING")
-                                _Logger.Warn("SQL-String bisher: " & oSqlCommand)
-                                ' wenn die Abfrage in windream kein Ergebnis gab, muss das error_in_Indexierungflag gesetzt werden
-                                oUnexpectedError = True
-                            Else
-                                ' den Platzhalter im SQL-String durch den Wert ersetzen
-                                oSqlCommand = oSqlCommand.Replace(element.Value, IndexwertAusWindream.ToString)
-                                _Logger.Debug("SqlString.Replace(" & element.Value & ", " & IndexwertAusWindream.ToString)
-
-                            End If
-
-                        Else  ' wenn es sich um den Platzhalter für die Spalte bzw. den View handelt
-                            ' wenn es sich um den Platzhalter für die Spalte handelt
-                            If element.Value.ToUpper = "[%SPALTE]" Then
-                                ' den Platzhalter für die auszulesende Spalte durch den Spaltennamen ersetzen
-                                oSqlCommand = oSqlCommand.Replace(element.Value, INDEX_SQL_BEFEHL.Spalte)
-
-                            ElseIf element.Value.ToUpper = "[%VIEW]" Then
-                                ' den Platzhalter für den auszulesenden View durch den Viewnamen ersetzen
-                                oSqlCommand = oSqlCommand.Replace(element.Value, INDEX_SQL_BEFEHL.From)
-                            End If
-
+                    If Len(oSqlCommand) > 0 Then
+                        'Ersetzen des Dateinamens - für CURSOR NachindexierungPr
+                        If oSqlCommand.Contains("[DATEINAME]") Then
+                            oSqlCommand = oSqlCommand.Replace("[DATEINAME]", dokument.aName)
+                        End If
+                        If oSqlCommand.Contains("[FULLNAME]") Then
+                            oSqlCommand = oSqlCommand.Replace("[FULLNAME]", My.Settings.MRWD_Laufwerk & ":" & dokument.aPath)
                        End If

-                    Next  ' zum nächsten Wert in der SQL-Anweisung gehen
-                    result &= vbNewLine & "           " & oSqlCommand
+                        If oSqlCommand.Contains("[%DOCFilename]") Then
+                            oSqlCommand = oSqlCommand.Replace("[%DOCFilename]", dokument.aName)
+                        End If
+                        If oSqlCommand.Contains("[%DOCFilenameoE]") Then
+                            Dim Filename As String = aktivesDokument.aName.ToString.Substring(0, aktivesDokument.aName.LastIndexOf("."))
+                            oSqlCommand = oSqlCommand.Replace("[%DOCFilenameoE]", Path.GetFileNameWithoutExtension(Filename))
+                        End If
+
+                        If oSqlCommand.Contains("[%DOCPath]") Then
+                            oSqlCommand = oSqlCommand.Replace("[FULLNAME]", Path.GetDirectoryName(My.Settings.vWLaufwerk & ":" & dokument.aPath))
+                        End If
+                        If oSqlCommand.Contains("[%DATENow]") Then
+                            oSqlCommand = oSqlCommand.Replace("[%DATENow]", Now.ToShortDateString)
+                        End If
+                        If oSqlCommand.Contains("[%DOCFULLPATH]") Then
+                            oSqlCommand = oSqlCommand.Replace("[%DOCFULLPATH]", My.Settings.MRWD_Laufwerk & ":" & dokument.aPath)
+                        End If
+                        _Logger.Debug($"oSqlCommand after Replace 1([{oSqlCommand}])")
+                        ' einen Regulären Ausdruck laden
+                        Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
+                        ' die Vorkommen im SQL-String auslesen
+                        Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(oSqlCommand)
+
+                        ' alle Vorkommen der windream-Indexe im SQL-String durchlaufen
+                        For Each element As System.Text.RegularExpressions.Match In elemente
+                            ' wenn es sich nicht um die Spalten- oder Viewangabe handelt (es sollen ja nur die Indexe ausgelesen werden)
+                            If Not element.Value.ToUpper = "[%SPALTE]" And Not element.Value.ToUpper = "[%VIEW]" Then
+
+                                ' die Zeichen [% und ] entfernen (liefert den wirklichen windream-Index)
+                                Dim idxName_ohneSonderzeichen As String = element.Value.Substring(2, element.Value.Length - 3)
+                                _Logger.Debug("### Working on Index(" & idxName_ohneSonderzeichen & ")...###")
+                                Try
+                                    ' den Wert des deskriptiven Indexes für das aktuelle Dokument auslesen
+                                    IndexwertAusWindream = dokument.GetVariableValue(idxName_ohneSonderzeichen)
+                                    If element.ToString = aktivesProfil.Desk_windreamIndex Then
+                                        eindeutigerWertausWindream = IndexwertAusWindream
+                                    End If
+                                Catch ex As Exception
+                                    _Logger.Error(ex)
+
+                                    ' wenn ein Fehler aufgetreten ist, muss das Flag gesetzt werden
+                                    result &= vbNewLine & "   - Schwerwiegender Fehler bei Auslesen des einschränkenden Wertes aus Index':" & idxName_ohneSonderzeichen & "'"
+                                    oUnexpectedError = True
+                                    fehlermsg &= vbNewLine & "Schwerwiegender Fehler bei Auslesen des einschränkenden Wertes aus Index':" & idxName_ohneSonderzeichen & "' - Fehler: " & ex.Message
+                                    If My.Settings.vNIMailsenden = True Then
+                                        email.Send_EMail("Beim Indexieren der Datei " & dokument.aName.ToString & " ist ein Fehler aufgetreten (GetVariableValue bei Auslesen des einschränkenden Wertes): " & ex.Message)
+                                    End If
+                                End Try
+
+                                ' wenn beim Auslesen des Wertes für den aktuellen windream-Index kein Fehler auftrat
+                                ' und die Abfrage ein Ergebnis zurück gab
+                                If IndexwertAusWindream Is Nothing And Not oUnexpectedError Then
+                                    ' IndexwertAusWindream ist Nothing (idxName_ohneSonderzeichen)
+                                    _Logger.Warn("ACHTUNG: der einschränkende Wert aus Windream für Index '" & idxName_ohneSonderzeichen & "' ist EMPTY oder NOTHING")
+                                    _Logger.Warn("SQL-String bisher: " & oSqlCommand)
+                                    ' wenn die Abfrage in windream kein Ergebnis gab, muss das error_in_Indexierungflag gesetzt werden
+                                    oUnexpectedError = True
+                                Else
+                                    ' den Platzhalter im SQL-String durch den Wert ersetzen
+                                    oSqlCommand = oSqlCommand.Replace(element.Value, IndexwertAusWindream.ToString)
+
+                                End If
+
+                            Else  ' wenn es sich um den Platzhalter für die Spalte bzw. den View handelt
+                                ' wenn es sich um den Platzhalter für die Spalte handelt
+                                If element.Value.ToUpper = "[%SPALTE]" Then
+                                    ' den Platzhalter für die auszulesende Spalte durch den Spaltennamen ersetzen
+                                    oSqlCommand = oSqlCommand.Replace(element.Value, INDEX_SQL_BEFEHL.Spalte)
+
+                                ElseIf element.Value.ToUpper = "[%VIEW]" Then
+                                    ' den Platzhalter für den auszulesenden View durch den Viewnamen ersetzen
+                                    oSqlCommand = oSqlCommand.Replace(element.Value, INDEX_SQL_BEFEHL.From)
+                                End If
+
+                            End If
+
+                        Next  ' zum nächsten Wert in der SQL-Anweisung gehen
+                        result &= vbNewLine & "           " & oSqlCommand
+                        _Logger.Debug($"oSqlCommand after Replace 2([{oSqlCommand}])")
+                    Else
+                        _Logger.Debug("### oSqlCommand is empty!! ###")
+                    End If

                    ' wenn kein error_in_Indexierung aufgetreten ist
                    If oUnexpectedError = False Then
@@ -942,7 +964,7 @@ Public Class frmNIHauptseite
                            If IndexwertAusWindream Is Nothing = False Then
                                'Es wird gegen ein Vektorfeld nachindexiert
                                If IndexwertAusWindream.GetType.ToString.Contains("System.Object") Then
-                                    _Logger.Debug("INDEXIERUNG GEGEN EIN VEKTORFELD")
+                                    _Logger.Debug("...INDEXIERUNG GEGEN EIN VEKTORFELD")
                                    'Zuweisen der Indexwerte des Vektorfeldes zu Array
                                    Arr = IndexwertAusWindream
                                    For Each str As Object In Arr
@@ -967,10 +989,13 @@ Public Class frmNIHauptseite
                                        i += 1
                                    Next
                                Else
-                                    ReDim Preserve selectArray(0)
-                                    'MsgBox("Nur ein Einfachindex :(" & vbNewLine & IndexwertAusWindream.ToString)
-                                    selectArray(0) = oSqlCommand
-                                    _Logger.Debug("Indexierung gegen einen Einfachindex")
+                                    _Logger.Debug("...Indexierung gegen einen Einfachindex")
+                                    If Len(oSqlCommand) > 0 Then
+                                        ReDim Preserve selectArray(0)
+                                        'MsgBox("Nur ein Einfachindex :(" & vbNewLine & IndexwertAusWindream.ToString)
+                                        selectArray(0) = oSqlCommand
+                                    End If
+
                                End If
                            Else
                                ReDim Preserve selectArray(0)
@@ -981,11 +1006,11 @@ Public Class frmNIHauptseite


                            'Nur wenn KEIN INDEXWERT also KEIN MANUELLER WERT
-                            If oResultNachindexierung Is Nothing Then
+                            If oResultNachindexierung Is Nothing And selectArray.Length > 0 Then
                                'Indexwert über DB oder Datei
                                Select Case aktivesProfil.Ni_Art.ToLower
                                    Case "db"
-                                        _Logger.Debug("SQL-Abfragen durchlaufen!")
+                                        _Logger.Debug("SQL-Abfrage/n durchlaufen...")
                                        Dim i As Integer
                                        Dim Quelle_is_vektor = False
                                        If selectArray.Length > 1 Then
@@ -998,6 +1023,7 @@ Public Class frmNIHauptseite
                                            If Me.aktivesProfil.DbArt = "Oracle" Then
                                                oResultNachindexierung = database.GetValueFromOracleDb(aktivesProfil.Profilname, selectArray(i), Me.aktivesProfil.DataSource, aktivesProfil.InitialCatalog, aktivesProfil.UserId, aktivesProfil.Password, MyDataset, INDEX_SQL_BEFEHL.Index, Quelle_is_vektor)
                                            ElseIf Me.aktivesProfil.DbArt = "MS-SQL" Then
+                                                _Logger.Debug($"Executing MSSQL ...")
                                                oResultNachindexierung = database.GetValueFromMssqlDb(dokument.aName, aktivesProfil.Profilname, selectArray(i), Me.aktivesProfil.DataSource, aktivesProfil.UserId, aktivesProfil.Password, MyDataset, aktivesProfil.InitialCatalog, INDEX_SQL_BEFEHL.Index, Quelle_is_vektor)
                                            ElseIf Me.aktivesProfil.DbArt = "ODBC" Then
                                                oResultNachindexierung = database.GetValueFromOdbcDb(aktivesProfil.Profilname, selectArray(i), Me.aktivesProfil.DataSource, aktivesProfil.UserId, aktivesProfil.Password, INDEX_SQL_BEFEHL.Index)
@@ -1145,6 +1171,10 @@ Public Class frmNIHauptseite
                        '######
                        'nur wenn kein Fehler 
                        If Not oUnexpectedError Then
+                            If oResultNachindexierung Is Nothing Then
+                                _Logger.Debug("oResultNachindexierung is nothing...Continue next")
+                                Continue For
+                            End If
                            Try
                                If Not IsNothing(oResultNachindexierung) Then
                                    _Logger.Debug("oResultNachindexierung is not nothing...")
@@ -1164,13 +1194,13 @@ Public Class frmNIHauptseite
                                Try
                                    _Logger.Debug("Arraygößen werden angepasst:")
                                    ' die Arraygrößen anpassen
-                                    ReDim Preserve oNiArrayIndexe(verknüpfungZähler)
-                                    ReDim Preserve oNiArrayValues(verknüpfungZähler)
+                                    ReDim Preserve myNIArrayIndexe(verknüpfungZähler)
+                                    ReDim Preserve myNIArrayValues(verknüpfungZähler)
                                    ' den angegebenen Index eintragen
-                                    oNiArrayIndexe(verknüpfungZähler) = INDEX_SQL_BEFEHL.Index
+                                    myNIArrayIndexe(verknüpfungZähler) = INDEX_SQL_BEFEHL.Index

                                    ' den, übergebenen/gefundenen IndexWert, eintragen
-                                    oNiArrayValues(verknüpfungZähler) = Convert.ToString(oResultNachindexierung)
+                                    myNIArrayValues(verknüpfungZähler) = Convert.ToString(oResultNachindexierung)

                                    Dim oRow As DataRow = myNIDatatable.NewRow
                                    oRow(0) = INDEX_SQL_BEFEHL.Index
@@ -1189,13 +1219,13 @@ Public Class frmNIHauptseite
                                End If
                                If IndexwertAusWindream.GetType.ToString.Contains("System.Object") Then
                                    ' die Arraygrößen anpassen
-                                    ReDim Preserve oNiArrayIndexe(verknüpfungZähler)
-                                    ReDim Preserve oNiArrayValues(verknüpfungZähler)
+                                    ReDim Preserve myNIArrayIndexe(verknüpfungZähler)
+                                    ReDim Preserve myNIArrayValues(verknüpfungZähler)
                                    ' den angegebenen Index eintragen
-                                    oNiArrayIndexe(verknüpfungZähler) = INDEX_SQL_BEFEHL.Index
+                                    myNIArrayIndexe(verknüpfungZähler) = INDEX_SQL_BEFEHL.Index

                                    ' den, übergebenen/gefundenen IndexWert, eintragen
-                                    oNiArrayValues(verknüpfungZähler) = Convert.ToString("")
+                                    myNIArrayValues(verknüpfungZähler) = Convert.ToString("")
                                    _Logger.Debug("Nachindexwert ist Object")
                                    verknüpfungZähler += 1

@@ -1235,30 +1265,29 @@ Public Class frmNIHauptseite
                Next  ' zur nächsten Verknüpfung gehen
            End If

-
            ' wenn kein error_in_Indexierung aufgetreten ist
            If oUnexpectedError = False Then
                If unvollstaendig = False And Me.aktivesProfil.Ni_Art.ToLower <> "fulltext" Or Me.aktivesProfil.Ni_Art.ToLower <> "nurordnerrechte" Or Me.aktivesProfil.Ni_Art.ToLower <> "nur-ordner-indizes" Then
                    '###############################################################################################
                    '#### Nachindexierung ##########################################################################
                    Dim sw As New ClassStopwatch("RunIndexing_Case1")
-                    Dim mmdf = myNIDatatable.Rows.Count
-
-                    oUnexpectedError = Me._windreamNI.RunIndexing(dokument, oNiArrayIndexe, oNiArrayValues, MyDataset, aktivesProfil.Profilname, aktivesProfil.DokumenttypString)
+                    oUnexpectedError = Me._windreamNI.RunIndexing(dokument, myNIArrayIndexe, myNIArrayValues, MyDataset, aktivesProfil.Profilname, aktivesProfil.DokumenttypString)
                    Dim msg = sw.Done
-                    If msg <> "" Then _Logger.Info($"SWResult: {msg}")
+                    If msg <> "" Then
+                        Stopwatch1 = $"{msg}"
+                    End If
                    '#### Nachindexierung Ende #####################################################################
                    '###############################################################################################
                    If oUnexpectedError = True Then
                        _Logger.Debug("error_in_Indexierung is True - none of following steps will be run!")
                    End If
                    'Wenn ein SQL-Ergebnis im Durchlauf einen Wert lieferte wird der finale Index auf True gesetzt
-                    If oNiArrayValues Is Nothing = False And Not oUnexpectedError Then
-                        If Me.aktivesProfil.finalerIndex <> "" And Not oUnexpectedError And oNiArrayValues.Length >= 1 And oNiArrayValues(0) <> "" Then
+                    If myNIArrayValues Is Nothing = False And Not oUnexpectedError Then
+                        If Me.aktivesProfil.finalerIndex <> "" And Not oUnexpectedError And myNIArrayValues.Length >= 1 And myNIArrayValues(0) <> "" Then
                            Me._windreamNI.SetfinalIndex(dokument, Me.aktivesProfil.finalerIndex, True)
                        End If
                        '###### Spezifisches SQL nach jeder Datei!
-                        If Me.aktivesProfil.SQL_Anweisung IsNot Nothing And Not oUnexpectedError And oNiArrayValues.Length >= 1 And oNiArrayValues(0) <> "" Then
+                        If Me.aktivesProfil.SQL_Anweisung IsNot Nothing And Not oUnexpectedError And myNIArrayValues.Length >= 1 And myNIArrayValues(0) <> "" Then
                            _Logger.Debug("Me.aktivesProfil.SQL_Anweisung: " & Me.aktivesProfil.SQL_Anweisung)
                            If Me.aktivesProfil.SQL_Anweisung.StartsWith("EXECUTEVB") Then
                                _Logger.Debug("Execute VB-Script after indexing......")
@@ -1417,16 +1446,16 @@ Public Class frmNIHauptseite
                                End If
                            End If
                        Else
-                            If IsNothing(oNiArrayValues) Then
+                            If IsNothing(myNIArrayValues) Then
                                _Logger.Debug("NI_Values is nothing!")
                            Else
-                                _Logger.Debug("NI_Values.Length: " & oNiArrayValues.Length)
-                                _Logger.Debug("NI_Values(0): " & oNiArrayValues(0))
+                                _Logger.Debug("NI_Values.Length: " & myNIArrayValues.Length)
+                                _Logger.Debug("NI_Values(0): " & myNIArrayValues(0))
                            End If

                        End If
                    Else
-                        If IsNothing(oNiArrayValues) Then
+                        If IsNothing(myNIArrayValues) Then
                            _Logger.Debug("oNiArrayValues is nothing!")
                        Else

@@ -1444,7 +1473,7 @@ Public Class frmNIHauptseite
                            End Try
                            If valid = True Then
                                'nur Zurücksetzten wenn Wert zuweisbar
-                                If (oNiArrayValues.Length = 1 And oNiArrayValues(0) = "") = False Then
+                                If (myNIArrayValues.Length = 1 And myNIArrayValues(0) = "") = False Then
                                    _Logger.Debug("Dokument sollte validiert werden - Nun erfolgreich indexiert - also Index '" & aktivesProfil.IndexValidation & "' zurücksetzen!")
                                    'Den Flag Validation wieder auf False setzen
                                    File_SetBooleanIndex(False, aktivesDokument, aktivesProfil.IndexValidation)
@@ -1456,7 +1485,7 @@ Public Class frmNIHauptseite
                            '###### Nachindexierung über XML - Löschen des Dokumentes ######
                            If unvollstaendig = False Then
                                '##### Löschen der xml-Indexdatei
-                                If oNiArrayValues.Length = 1 And oNiArrayValues(0) = "" Then
+                                If myNIArrayValues.Length = 1 And myNIArrayValues(0) = "" Then
                                    _Logger.Debug("XML-Wert ist Leer und somit nicht auswertbar - Dok für Validierung markieren")
                                    'Den Flag Validation auf True setzen
                                    File_SetBooleanIndex(True, aktivesDokument, aktivesProfil.IndexValidation)
@@ -1523,13 +1552,15 @@ Public Class frmNIHauptseite
            End If
            '#### Ende Nachindexierung
            '#################################################################################################################################################
-            Dim msgindex = swWorkDocument_All.Done
-            If msgindex <> "" Then _Logger.Info(($"SWResult: {msgindex}"))
+            Dim swMessage As String
+            swMessage = swRegIndex.Done
+            If swMessage <> "" Then
+                Stopwatch1 += vbNewLine & $"{swMessage}"
+            End If

            'Move and Rename ausführen
-            If _MRlicense = True And Not oUnexpectedError And unvollstaendig = False Then
-                Dim swMoveandrename As New ClassStopwatch("MoveandRename - Complete")
-
+            If LICENSE_MoveRename = True And Not oUnexpectedError And unvollstaendig = False Then
+                Dim swMoveandrename As New ClassStopwatch("MoveandRename")
                oUnexpectedError = FNMoveRename(dokument)
                'sd
                'Dim sw1 As New ClassStopwatch("dokument.GetVariableValue(Me.aktivesProfil.MR_DAIndex)")
@@ -1554,11 +1585,15 @@ Public Class frmNIHauptseite
                '    'End If
                'End If
                Dim msg1 = swMoveandrename.Done
-                If msg1 <> "" Then _Logger.Info($"SWResult: {msg1}")
+                If msg1 <> "" Then
+                    Stopwatch1 += vbNewLine & $"{msg1}"
+
+                End If
                ' MsgBox("Dokument wird in Ordnerbaum verschoben und umbenannt!" & vbNewLine & Me.aktivesProfil.MR_DAIndex & vbNewLine & Me.aktivesProfil.MR_KDIndex & vbNewLine & Me.aktivesProfil.Desk_windreamIndex, MsgBoxStyle.Information, dokument.aPath)
            Else
-                If _MRlicense = True And oUnexpectedError = True Or unvollstaendig = True Then
+                If LICENSE_MoveRename = True And oUnexpectedError = True Or unvollstaendig = True Then
                    _Logger.Info("MoveRename Yes but error_in_Indexierung = True Or unvollstaendig = True")
+                    _Logger.Debug("MoveRename Yes but error_in_Indexierung = True Or unvollstaendig = True")
                End If

                'Dim Err As Boolean = MRGetValuesFromFile(My.Settings.MRWD_Laufwerk & ":" & dokument.aPath, Me.aktivesProfil.MR_DAIndex, Me.aktivesProfil.MR_KDIndex, Me.aktivesProfil.Desk_windreamIndex)
@@ -1589,7 +1624,10 @@ Public Class frmNIHauptseite
                    _Logger.Debug("Move 2 Folder ist aktiviert")
                    Dim err As Boolean = Move2Folder(Me.aktivesDokument.aName, My.Settings.MRWD_Laufwerk & ":" & dokument.aPath)
                    Dim msg = sw.Done
-                    If msg <> "" Then _Logger.Info($"SWResult: {msg}")
+                    If msg <> "" Then
+                        Stopwatch1 += vbNewLine & $"{msg}"
+
+                    End If
                Else
                    If My.Settings.vLogErrorsonly = False Then _Logger.Info("... no Move2Folder as something went wrong!")
                End If
@@ -1621,9 +1659,10 @@ Public Class frmNIHauptseite
                Dim sw As New ClassStopwatch("AD-Rework")
                Nachbearbeitung_AD(dokument)
                Dim msg = sw.Done
-                If msg <> "" Then _Logger.Info($"SWResult: {msg}")
+                If msg <> "" Then
+                    Stopwatch1 += vbNewLine & $"{msg}"
+                End If
            End If
-
            oUnexpectedError = False
            Try
                If aktivesDokument.aLocked Then
@@ -1633,10 +1672,14 @@ Public Class frmNIHauptseite
            Catch ex As Exception
                _Logger.Warn("Unexpected error in final Unlocking: " & ex.Message)
            End Try
-
+            swMessage = swWorkDocument_All.Done
+            If swMessage <> "" Then
+                Stopwatch1 += vbNewLine & $"{swMessage}"
+            End If
+            _Logger.Info("## Result Stopwatch: ##" & vbNewLine & Stopwatch1)
        Catch ex As Exception
            _Logger.Error(ex)
-            _Logger.Warn($"oResultNachindexierung so far: {oResultNachindexierung.tostring}")
+            _Logger.Warn($"oResultNachindexierung so far: {oResultNachindexierung.ToString}")
            If My.Settings.vNIMailsenden = True Then
                email.Send_EMail("Schwerwiegender Fehler bei IndexiereVerarbeiteDokument - <br> Profil: " & aktivesProfil.Profilname & "<br> Datei: " & dokument.aName.ToString & "<br> Fehler: " & ex.Message)
            End If
@@ -1669,7 +1712,7 @@ Public Class frmNIHauptseite
                            oDynamicFolder = oDynamicFolder.Replace(oMatchElement.ToString, oWMIndexValue)
                            _Logger.Debug(" FolderPattern: '" & oDynamicFolder & "'", False)
                        Else
-                            _Logger.Info("Achtung Ausnahme in 'FolderForIndex': der Index ist leer!", True)
+                            _Logger.Warn($"[{myWMDocument.aName}] - Attention in 'FolderForIndex': the Index-Value [{oWMIndexname}] is empty! No Dynamic folder will be used!", True)
                            Return ""
                        End If
                    Case "v"
@@ -1748,10 +1791,11 @@ Public Class frmNIHauptseite
            Dim oActWMPath As String = "\\windream\objects" & myWMDocument.aPath
            Dim oExtension As String = System.IO.Path.GetExtension(oActWMPath)
            TBTC_MOVE_RENAMETableAdapter.Connection.ConnectionString = My.Settings.DDECMConString
-            Me.TBTC_MOVE_RENAMETableAdapter.FillByActive(Me.MyDataset.TBTC_MOVE_RENAME, aktivesProfil.Profilname)
+            Me.TBTC_MOVE_RENAMETableAdapter.Fill(Me.MyDataset.TBTC_MOVE_RENAME, aktivesProfil.Profilname)
+            Dim oVERSIONOFF As Boolean
            If MyDataset.TBTC_MOVE_RENAME.Rows.Count = 1 Then
                _Logger.Debug($"Found a Move and Rename Definition: [{MyDataset.TBTC_MOVE_RENAME.Rows(0).Item("FOLDER_FOR_INDEX")}]")
-
+                oVERSIONOFF = MyDataset.TBTC_MOVE_RENAME.Rows(0).Item("VERSION_OFF")
                Dim oTargetpath As String
                'Regulären Ausdruck zum Auslesen der Indexe definieren
                Dim oPRegex As String = "\[%{1}[a-zA-Z0-9ß\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
@@ -1908,18 +1952,31 @@ Public Class frmNIHauptseite
            Dim oPathFile As String = oReturnString.Replace(oExtension, "")
            Dim oNewPathFilename = oPathFile + oExtension
            'Dim MoveFilename As String = DATEINAME.Replace(element.Value, "")
-            'Überprüfen ob File existiert
-            Dim oNewVersion As Integer = 1
-            Do While File.Exists(oNewPathFilename)
+            If oVERSIONOFF = True Then

-                oNewVersion = oNewVersion + 1
-                oNewPathFilename = oPathFile & "~" & oNewVersion & oExtension
+                If File.Exists(oNewPathFilename) Then
+                    Try
+                        _Logger.Info("MOVERENAME-VERSIONING is OFF - Deleting existing file...")
+                        File.Delete(oNewPathFilename)
+                    Catch ex As Exception
+                        _Logger.Warn($"Could Not delete file As VERSIONOFF Is True [{ex.Message}]")
+                    End Try
+                End If
+            Else
+                'Überprüfen ob File existiert
+                Dim oNewVersion As Integer = 1
+                Do While File.Exists(oNewPathFilename)

-            Loop
-            If oNewPathFilename <> oReturnString Then
-                oReturnString = oNewPathFilename
+                    oNewVersion = oNewVersion + 1
+                    oNewPathFilename = oPathFile & "~" & oNewVersion & oExtension
+
+                Loop
+                If oNewPathFilename <> oReturnString Then
+                    oReturnString = oNewPathFilename
+                End If
            End If

+
            If _windreamNI.NEW_MOVE_FILE(oReturnString, oActWMPath, "MO_RE") = True Then
                Return False
            Else
@@ -2123,8 +2180,8 @@ Public Class frmNIHauptseite
                                Dim RowNew As DataRow
                                RowNew = MyDataset.Tables("TBVEKTOR_ARRAY").NewRow()
                                'filling the row with values. Item property is used to set the field value.
-                                RowNew.Item("Indexname") = Fulltext_Indexierung.Index
-                                RowNew.Item("Wert") = Value
+                                RowNew.Item("IndexName") = Fulltext_Indexierung.Index
+                                RowNew.Item("Value") = Value
                                MyDataset.Tables("TBVEKTOR_ARRAY").Rows.Add(RowNew)
                            Next

@@ -2173,9 +2230,9 @@ Public Class frmNIHauptseite
                    '    Dim RowNew As DataRow
                    '    RowNew = MyDataset.Tables("TBVEKTOR_ARRAY").NewRow()
                    '    'filling the row with values. Item property is used to set the field value.
-                    '    RowNew.Item("Indexname") = Fulltext_Indexierung.Index
+                    '    RowNew.Item("IndexName") = Fulltext_Indexierung.Index

-                    '    RowNew.Item("Wert") = element.ToString
+                    '    RowNew.Item("Value") = element.ToString

                    '    MyDataset.Tables("TBVEKTOR_ARRAY").Rows.Add(RowNew)
                    '    'ArrayCounter hochsetzen
@@ -2195,8 +2252,8 @@ Public Class frmNIHauptseite
                    '    Dim RowNew As DataRow
                    '    RowNew = MyDataset.Tables("TBVEKTOR_ARRAY").NewRow()
                    '    'filling the row with values. Item property is used to set the field value.
-                    '    RowNew.Item("Indexname") = Fulltext_Indexierung.Index
-                    '    RowNew.Item("Wert") = Value
+                    '    RowNew.Item("IndexName") = Fulltext_Indexierung.Index
+                    '    RowNew.Item("Value") = Value
                    '    MyDataset.Tables("TBVEKTOR_ARRAY").Rows.Add(RowNew)
                    'Next

@@ -2485,6 +2542,7 @@ Public Class frmNIHauptseite
        If Me.numIntervall.Value = 0 Then
            Me.numIntervall.Value = 5
        End If
+        manually_cancel = False
        Me.timRun.Interval = Me.numIntervall.Value * 60 * 1000
        Me.timRun.Start()
        'Variable für den Fall Programmabbruch und Neustart!
@@ -2516,7 +2574,6 @@ Public Class frmNIHauptseite
    End Sub
    Sub Abbruch_NI(cancel_Reason As String, Abbruch As Boolean, keeprunning As Boolean)
        Try
-
            _Logger.Info("Nachindexierung wird abgebrochen - Reason: " & cancel_Reason)
            Try
                If Me.bwProfil.IsBusy Or cancel_Reason = "Abbruch nach Timeout Suche" Then
@@ -2545,7 +2602,7 @@ Public Class frmNIHauptseite
                _Logger.Warn("Fehler beim Abbrechen des Threads bwDatei: " & ex.Message)
            End Try

-
+            manually_cancel = True
            _Logger.Info("Threads gestoppt - " & Now)

            If keeprunning = False Then
--- a/ToolCollection/frmNIMoveRename.Designer.vb
+++ b/ToolCollection/frmNIMoveRename.Designer.vb
@@ -34,6 +34,9 @@ Partial Class frmNIMoveRename
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNIMoveRename))
        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+        Me.tsbtnAdd = New System.Windows.Forms.ToolStripButton()
+        Me.tsbtnsave = New System.Windows.Forms.ToolStripButton()
+        Me.tsbtndelete = New System.Windows.Forms.ToolStripButton()
        Me.MyDataset = New ToolCollection.MyDataset()
        Me.TBTC_MOVE_RENAMEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.TBTC_MOVE_RENAMETableAdapter = New ToolCollection.MyDatasetTableAdapters.TBTC_MOVE_RENAMETableAdapter()
@@ -50,10 +53,8 @@ Partial Class frmNIMoveRename
        Me.Button1 = New System.Windows.Forms.Button()
        Me.Button2 = New System.Windows.Forms.Button()
        Me.Button3 = New System.Windows.Forms.Button()
-        Me.tsbtnAdd = New System.Windows.Forms.ToolStripButton()
-        Me.tsbtnsave = New System.Windows.Forms.ToolStripButton()
-        Me.tsbtndelete = New System.Windows.Forms.ToolStripButton()
        Me.FolderBrowserDialog1 = New System.Windows.Forms.FolderBrowserDialog()
+        Me.VERSION_OFFCheckBox = New System.Windows.Forms.CheckBox()
        GUIDLabel = New System.Windows.Forms.Label()
        PROFILE_NAMELabel = New System.Windows.Forms.Label()
        FOLDER_FOR_INDEXLabel = New System.Windows.Forms.Label()
@@ -141,9 +142,9 @@ Partial Class frmNIMoveRename
        '
        'StatusStrip1
        '
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 233)
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 244)
        Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Size = New System.Drawing.Size(800, 22)
+        Me.StatusStrip1.Size = New System.Drawing.Size(813, 22)
        Me.StatusStrip1.TabIndex = 0
        Me.StatusStrip1.Text = "StatusStrip1"
        '
@@ -153,10 +154,34 @@ Partial Class frmNIMoveRename
        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsbtnAdd, Me.tsbtnsave, Me.tsbtndelete})
        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
        Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolStrip1.Size = New System.Drawing.Size(800, 25)
+        Me.ToolStrip1.Size = New System.Drawing.Size(813, 25)
        Me.ToolStrip1.TabIndex = 1
        Me.ToolStrip1.Text = "ToolStrip1"
        '
+        'tsbtnAdd
+        '
+        Me.tsbtnAdd.Image = Global.ToolCollection.My.Resources.Resources.action_add_16xMD
+        Me.tsbtnAdd.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbtnAdd.Name = "tsbtnAdd"
+        Me.tsbtnAdd.Size = New System.Drawing.Size(163, 22)
+        Me.tsbtnAdd.Text = "Konfiguration hinzufügen"
+        '
+        'tsbtnsave
+        '
+        Me.tsbtnsave.Image = Global.ToolCollection.My.Resources.Resources.save
+        Me.tsbtnsave.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbtnsave.Name = "tsbtnsave"
+        Me.tsbtnsave.Size = New System.Drawing.Size(79, 22)
+        Me.tsbtnsave.Text = "Speichern"
+        '
+        'tsbtndelete
+        '
+        Me.tsbtndelete.Image = Global.ToolCollection.My.Resources.Resources.delete
+        Me.tsbtndelete.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbtndelete.Name = "tsbtndelete"
+        Me.tsbtndelete.Size = New System.Drawing.Size(71, 22)
+        Me.tsbtndelete.Text = "Löschen"
+        '
        'MyDataset
        '
        Me.MyDataset.DataSetName = "MyDataset"
@@ -174,7 +199,7 @@ Partial Class frmNIMoveRename
        'TableAdapterManager
        '
        Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
-        Me.TableAdapterManager.TBDD_REPORTING_IMPORTTableAdapter = Nothing
+        Me.TableAdapterManager.TBTC_DI_REGEX_MATCHTableAdapter = Nothing
        Me.TableAdapterManager.TBTC_MOVE_RENAMETableAdapter = Me.TBTC_MOVE_RENAMETableAdapter
        Me.TableAdapterManager.UpdateOrder = ToolCollection.MyDatasetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
        '
@@ -285,39 +310,26 @@ Partial Class frmNIMoveRename
        Me.Button3.TabIndex = 24
        Me.Button3.UseVisualStyleBackColor = True
        '
-        'tsbtnAdd
-        '
-        Me.tsbtnAdd.Image = Global.ToolCollection.My.Resources.Resources.action_add_16xMD
-        Me.tsbtnAdd.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbtnAdd.Name = "tsbtnAdd"
-        Me.tsbtnAdd.Size = New System.Drawing.Size(163, 22)
-        Me.tsbtnAdd.Text = "Konfiguration hinzufügen"
-        '
-        'tsbtnsave
-        '
-        Me.tsbtnsave.Image = Global.ToolCollection.My.Resources.Resources.save
-        Me.tsbtnsave.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbtnsave.Name = "tsbtnsave"
-        Me.tsbtnsave.Size = New System.Drawing.Size(79, 22)
-        Me.tsbtnsave.Text = "Speichern"
-        '
-        'tsbtndelete
-        '
-        Me.tsbtndelete.Image = Global.ToolCollection.My.Resources.Resources.delete
-        Me.tsbtndelete.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbtndelete.Name = "tsbtndelete"
-        Me.tsbtndelete.Size = New System.Drawing.Size(71, 22)
-        Me.tsbtndelete.Text = "Löschen"
-        '
        'FolderBrowserDialog1
        '
        Me.FolderBrowserDialog1.RootFolder = System.Environment.SpecialFolder.MyComputer
        '
+        'VERSION_OFFCheckBox
+        '
+        Me.VERSION_OFFCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBTC_MOVE_RENAMEBindingSource, "VERSION_OFF", True))
+        Me.VERSION_OFFCheckBox.Location = New System.Drawing.Point(597, 33)
+        Me.VERSION_OFFCheckBox.Name = "VERSION_OFFCheckBox"
+        Me.VERSION_OFFCheckBox.Size = New System.Drawing.Size(132, 37)
+        Me.VERSION_OFFCheckBox.TabIndex = 25
+        Me.VERSION_OFFCheckBox.Text = "Versionierung inaktiv" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "(Datei wird ersetzt)"
+        Me.VERSION_OFFCheckBox.UseVisualStyleBackColor = True
+        '
        'frmNIMoveRename
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(800, 255)
+        Me.ClientSize = New System.Drawing.Size(813, 266)
+        Me.Controls.Add(Me.VERSION_OFFCheckBox)
        Me.Controls.Add(Me.Button3)
        Me.Controls.Add(Me.Button2)
        Me.Controls.Add(Me.Button1)
@@ -377,4 +389,5 @@ Partial Class frmNIMoveRename
    Friend WithEvents tsbtndelete As ToolStripButton
    Friend WithEvents Button3 As Button
    Friend WithEvents FolderBrowserDialog1 As FolderBrowserDialog
+    Friend WithEvents VERSION_OFFCheckBox As CheckBox
 End Class
--- a/ToolCollection/frmNIProfileigenschaften.vb
+++ b/ToolCollection/frmNIProfileigenschaften.vb
@@ -137,7 +137,7 @@ Public Class frmNIProfileigenschaften
                If result = MsgBoxResult.Yes Then           ' wenn die Daten gespeichert werden sollen

                    ' die Änderungen speichern
-                    If Me._selectedProfile.Save(True) = True Then    ' wenn das Speichern erfolgreich war
+                    If Me._selectedProfile.Save(True, "profile") = True Then    ' wenn das Speichern erfolgreich war
                        ' die Profile neu in die Combobox der Toolbar laden (für den Fall das Profilname geändert wurde)
                        Me.LoadProfilesInCombobox()

@@ -511,7 +511,7 @@ Public Class frmNIProfileigenschaften
        If Me._selectedProfile IsNot Nothing Then
            Me.cmbIndexValidierung.SelectedIndex = -1
            If _selectedProfile.HasChanges Then
-                _selectedProfile.Save(True)
+                _selectedProfile.Save(True, "profile")
                Me.lblSave.Visible = True
            Else
                Me.lblSave.Visible = False
@@ -532,16 +532,23 @@ Public Class frmNIProfileigenschaften
    End Sub

    Private Sub btnHinzufügen_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnHinzufügen.Click
-        For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
-            Select Case license.Modulename.ToUpper
-                Case "NACHINDEXIERUNG"
-                    If Prof_Anzahl + 1 > license.Anz_Profile Then
-                        MsgBox("Die Maximalanzahl der lizensierten Nachindexierungs-Profile (" & license.Anz_Profile.ToString & ") ist erreicht!", MsgBoxStyle.Exclamation, "Achtung - Lizenzfehler:")
-                        Exit Sub
-                    End If
-            End Select
+        Try
+            For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
+                Select Case license.Modulename.ToUpper
+                    Case "NACHINDEXIERUNG"
+                        If Prof_Anzahl + 1 > license.Anz_Profile Then
+                            MsgBox("Die Maximalanzahl der lizensierten Nachindexierungs-Profile (" & license.Anz_Profile.ToString & ") ist erreicht!", MsgBoxStyle.Exclamation, "Achtung - Lizenzfehler:")
+                            Exit Sub
+                        End If
+                End Select
+
+            Next
+        Catch ex As Exception
+            If My.Settings.licensekey <> "DD MaxLicense" Then
+                MsgBox("Error Adding Profile due to license issue!", MsgBoxStyle.Critical)
+            End If
+        End Try

-        Next
        frmLogin_NI.ShowDialog()
        ' wenn das Formular geschlossen wurde, werden die Profile neu in die Combobox geladen
        Me.LoadProfilesInCombobox()
@@ -613,7 +620,7 @@ Public Class frmNIProfileigenschaften


            ' die Änderungen speichern
-            If Me._selectedProfile.Save(False) = True Then    ' wenn das Speichern erfolgreich war
+            If Me._selectedProfile.Save(False, "profile") = True Then    ' wenn das Speichern erfolgreich war
                Me.lblSave.Visible = True
                ' den Speichern-Button deaktivieren 
                Me.btnSpeichern.Enabled = False
@@ -886,7 +893,7 @@ Public Class frmNIProfileigenschaften
    Private Sub tsbtnFirstProfil_Click(sender As System.Object, e As System.EventArgs) Handles tsbtnfirst.Click
        If Me._selectedProfile IsNot Nothing Then
            If _selectedProfile.HasChanges Then
-                _selectedProfile.Save(True)
+                _selectedProfile.Save(True, "profile")
            End If
        Else
            'Noch kein Profil geladen also das erste laden
@@ -906,7 +913,7 @@ Public Class frmNIProfileigenschaften
    Private Sub tsbtnpreviousProfil_Click(sender As System.Object, e As System.EventArgs) Handles tsbtnprevious.Click
        If Me._selectedProfile IsNot Nothing Then
            If _selectedProfile.HasChanges Then
-                _selectedProfile.Save(True)
+                _selectedProfile.Save(True, "profile")
            End If
        Else
            'Noch kein Profil geladen also das erste laden
@@ -935,7 +942,7 @@ Public Class frmNIProfileigenschaften
    Private Sub tsbtnnextProfil_Click(sender As System.Object, e As System.EventArgs) Handles tsbtnnext.Click
        If Me._selectedProfile IsNot Nothing Then
            If _selectedProfile.HasChanges Then
-                _selectedProfile.Save(True)
+                _selectedProfile.Save(True, "profile")
            End If
        Else
            'Noh kein Profil geladen also das erste laden
@@ -964,7 +971,7 @@ Public Class frmNIProfileigenschaften
    Private Sub tsbtnLastProfil_Click(sender As System.Object, e As System.EventArgs) Handles tsbtnlast.Click
        If Me._selectedProfile IsNot Nothing Then
            If _selectedProfile.HasChanges Then
-                _selectedProfile.Save(True)
+                _selectedProfile.Save(True, "profile")
            End If
        Else
            'Noch kein Profil geladen also das erste laden
@@ -1095,7 +1102,7 @@ Public Class frmNIProfileigenschaften
    End Sub

    Private Sub frmNIProfileigenschaften_Load(sender As Object, e As EventArgs) Handles Me.Load
-        If frmStart.licMore = True Then
+        If LICENSE_MoveRename = True Then
            grpbxMORE.Enabled = True
        Else
            grpbxMORE.Enabled = False
--- a/ToolCollection/frmNIVerknuepfungen.vb
+++ b/ToolCollection/frmNIVerknuepfungen.vb
@@ -482,7 +482,7 @@ Public Class frmNIVerknuepfungen
                Me.pnlZielQuelle.Enabled = True
            Else ' wenn bereits ein Profil geladen war
                If Me._selectedProfil.HasChanges Then
-                    Me._selectedProfil.Save(True)
+                    Me._selectedProfil.Save(True, "profile")
                End If
                ' wenn ein anderes Profil ausgewählt wurde
                If Not e.ClickedItem.Text = Me._selectedProfil.OriginalProfilname Then
@@ -2015,8 +2015,10 @@ Public Class frmNIVerknuepfungen
            If Me._selectedProfil._links.selectedLink IsNot Nothing Then
                If Me._selectedProfil.IsSaved = False Then

-                    Me._selectedProfil.Save(True)
-                    Me._selectedProfil._links.selectedLink.SaveLink(Me._selectedProfil.Profilname, Me._selectedProfil.Ni_Art)
+                    Me._selectedProfil.Save(True, "link")
+                    If Me._selectedProfil._links.selectedLink.SaveLink(Me._selectedProfil.Profilname, Me._selectedProfil.Ni_Art) = True Then
+                        MsgBox("Verknüpfung erfolgreich gespeichert!", MsgBoxStyle.Information)
+                    End If
                    With btnsave_select
                        .Enabled = False
                        .ForeColor = Drawing.Color.Black
@@ -2144,7 +2146,7 @@ Public Class frmNIVerknuepfungen
    'Private Sub btnSQL_Updatespeichern_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles btnSQL_Updatespeichern.Click
    '    Try
    '        ' die Änderungen speichern
-    '        If Me._selectedProfil.Save(True) = True Then    ' wenn das Speichern erfolgreich war
+    '        If Me._selectedProfil.Save(True,"profile") = True Then    ' wenn das Speichern erfolgreich war
    '            ' den Speichern-Button deaktivieren 
    '            Me.btnSQL_Updatespeichern.Enabled = False
    '        Else
@@ -2159,7 +2161,7 @@ Public Class frmNIVerknuepfungen
        'If Me.txtfinalSkriptUpdate.Text <> "" Then
        '    Try
        '        ' die Änderungen speichern
-        '        If Me._selectedProfil.Save(True) = True Then    ' wenn das Speichern erfolgreich war
+        '        If Me._selectedProfil.Save(True,"profile") = True Then    ' wenn das Speichern erfolgreich war
        '            Me._selectedProfil.setChanged()
        '        Else
        '            MsgBox("Das Profil konnte nicht erfolgreich gespeichert werden.", MsgBoxStyle.Exclamation, "Fehler beim Speichern eines Profils")
@@ -2274,7 +2276,7 @@ Public Class frmNIVerknuepfungen
                If Me._selectedProfil Is Nothing = False Then
                    Me.tabctrlbottom.Visible = False
                    If Me._selectedProfil.HasChanges Then
-                        Me._selectedProfil.Save(True)
+                        Me._selectedProfil.Save(True, "profile")
                    End If
                End If
            End If
@@ -2598,7 +2600,7 @@ Public Class frmNIVerknuepfungen
        If Me.txtCheckIndexSQL.Text <> "" Then
            Try
                ' die Änderungen speichern
-                If Me._selectedProfil.Save(True) = True Then    ' wenn das Speichern erfolgreich war
+                If Me._selectedProfil.Save(True, "profile") = True Then    ' wenn das Speichern erfolgreich war
                    ' den Speichern-Button deaktivieren 
                Else
                    MsgBox("Das Profil konnte nicht erfolgreich gespeichert werden.", MsgBoxStyle.Exclamation, "Fehler beim Speichern eines Profils")
@@ -2711,7 +2713,7 @@ Public Class frmNIVerknuepfungen
    Private Sub tsbtnFirstProfil_Click(sender As System.Object, e As System.EventArgs) Handles tsbtnfirst.Click
        If Me._selectedProfil IsNot Nothing Then
            If _selectedProfil.HasChanges Then
-                _selectedProfil.Save(True)
+                Me._selectedProfil.Save(True, "profile")
            End If
        Else
            'Noch kein Profil geladen also das erste laden
@@ -2731,7 +2733,7 @@ Public Class frmNIVerknuepfungen
    Private Sub tsbtnpreviousProfil_Click(sender As System.Object, e As System.EventArgs) Handles tsbtnprevious.Click
        If Me._selectedProfil IsNot Nothing Then
            If _selectedProfil.HasChanges Then
-                _selectedProfil.Save(True)
+                Me._selectedProfil.Save(True, "profile")
            End If
        Else
            'Noch kein Profil geladen also das erste laden
@@ -2760,7 +2762,7 @@ Public Class frmNIVerknuepfungen
    Private Sub tsbtnnextProfil_Click(sender As System.Object, e As System.EventArgs) Handles tsbtnnext.Click
        If Me._selectedProfil IsNot Nothing Then
            If _selectedProfil.HasChanges Then
-                _selectedProfil.Save(True)
+                Me._selectedProfil.Save(True, "profile")
            End If
        Else
            'Noh kein Profil geladen also das erste laden
@@ -2789,7 +2791,7 @@ Public Class frmNIVerknuepfungen
    Private Sub tsbtnLastProfil_Click(sender As System.Object, e As System.EventArgs) Handles tsbtnlast.Click
        If Me._selectedProfil IsNot Nothing Then
            If _selectedProfil.HasChanges Then
-                _selectedProfil.Save(True)
+                Me._selectedProfil.Save(True, "profile")
            End If
        Else
            'Noch kein Profil geladen also das erste laden
@@ -3129,7 +3131,7 @@ Public Class frmNIVerknuepfungen
        Try
            If Me._selectedProfil._links.selectedLink IsNot Nothing Then
                If Me._selectedProfil.IsSaved = False Then
-                    Me._selectedProfil.Save(True)
+                    Me._selectedProfil.Save(True, "profile")
                    Me._selectedProfil._links.selectedLink.SaveLink(Me._selectedProfil.Profilname, Me._selectedProfil.Ni_Art)
                    With btnSaveLDAP
                        .Enabled = False
@@ -3291,8 +3293,10 @@ Public Class frmNIVerknuepfungen
        Try
            If Me._selectedProfil._links.selectedLink IsNot Nothing Then
                If Me._selectedProfil.IsSaved = False Then
-                    Me._selectedProfil.Save(False)
-                    Me._selectedProfil._links.selectedLink.SaveLink(Me._selectedProfil.Profilname, Me._selectedProfil.Ni_Art)
+                    Me._selectedProfil.Save(False, "FTLink")
+                    If Me._selectedProfil._links.selectedLink.SaveLink(Me._selectedProfil.Profilname, Me._selectedProfil.Ni_Art) = True Then
+                        MsgBox("Speichern erfolgreich!", MsgBoxStyle.Information)
+                    End If
                    If Me._selectedProfil.Ni_Art <> "fulltext" Then
                        Dim vktState = Getvktinsert_State()
                        Me._selectedProfil._links.RenewLinks(Me.lvwVerknuepfungen, vktState)
@@ -3496,7 +3500,7 @@ Public Class frmNIVerknuepfungen
        Me._selectedProfil.SQL_Anweisung = Me.txtfinalSkriptUpdate.Text
        If Not Me._selectedProfil.SQL_Anweisung = Me._selectedProfil.OriginalSQL_Anweisung Then
            Me._selectedProfil.setChanged()
-            If Me._selectedProfil.Save(True) = True Then
+            If Me._selectedProfil.Save(True, "profile") = True Then
                Me.lblsaveSQLAnweisung.Text = "Data saved - " & Now.ToString

            End If
@@ -3512,7 +3516,7 @@ Public Class frmNIVerknuepfungen
        Me._selectedProfil.SQL_Anweisung = Me.txtfinalSkriptUpdate.Text
        If Not Me._selectedProfil.SQL_Anweisung = Me._selectedProfil.OriginalSQL_Anweisung Then
            Me._selectedProfil.setChanged()
-            If Me._selectedProfil.Save(True) = True Then
+            If Me._selectedProfil.Save(True, "profile") = True Then
                Me.lblsaveSQLAnweisung.Text = "Data saved - " & Now.ToString
            End If
        End If
@@ -3527,7 +3531,7 @@ Public Class frmNIVerknuepfungen
    End Sub

    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
-        If Me._selectedProfil.Save(True) = True Then
+        If Me._selectedProfil.Save(True, "profile") = True Then
            ' wenn das Speichern erfolgreich war
            Me.lblsaveSQLAnweisung.Text = "Data saved - " & Now.ToString
        Else
--- a/ToolCollection/frmStart.vb
+++ b/ToolCollection/frmStart.vb
@@ -8,8 +8,6 @@ Public Class frmStart
    Private _MyLogger As LogConfig
    Private Shared _Logger As DigitalData.Modules.Logging.Logger
    Public _validModules()
-    Public licMore As Boolean = False
-    Public licNB_AD As Boolean = False
    Public _company As String
    ' Dim timediff As Integer = 0
    Private licenseManager As ClassLicenseManager = Nothing
@@ -45,7 +43,8 @@ Public Class frmStart
        End If
    End Sub
    Private Sub FMStart_Load(ByVal sender As Object, ByVal e As System.EventArgs) Handles Me.Load
-        _MyLogger = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"))
+        _MyLogger = New LogConfig(LogConfig.PathType.CustomPath, Path.Combine(My.Application.Info.DirectoryPath, "Log"), Nothing, My.Application.Info.CompanyName,
+                                        My.Application.Info.ProductName)
        _Logger = _MyLogger.GetLogger()
        CURR_Logger = _Logger
        CURR_LogConfig = _MyLogger
@@ -121,77 +120,90 @@ Public Class frmStart
        Me.GBNachindexierung.Visible = False
        Me.GroupBoxIntegration.Visible = False
        Me.grbxMoRe.Visible = False
-        licMore = False
-        licNB_AD = False
+        LICENSE_MoveRename = False
+        LICENSE_AD = False
    End Sub
    Public Sub LoadAllModules()
        Me._validModules = Nothing

        If Not My.Settings.licensekey = "" Then
-            'Me.licenseManager = New ClassLicenseManager = Nothing
-            Me.licenseManager = New ClassLicenseManager("#DigitalData9731258!#", My.Settings.licensekey)
+            If My.Settings.licensekey = "DD MaxLicense" Or My.Settings.licensekey.ToUpper = "DDALLIN" Then
+                Me.grbDI.Visible = True
+                Me.GBNachindexierung.Visible = True
+                Me.GroupBoxIntegration.Visible = True
+                'Me.grbxMoRe.Visible = True
+                btnNachbearbeitungAD.Visible = True
+                LICENSE_AD = True
+                LICENSE_MoveRename = True
+            Else
+                'Me.licenseManager = New ClassLicenseManager = Nothing
+                Me.licenseManager = New ClassLicenseManager("#DigitalData9731258!#", My.Settings.licensekey)

-            Me.licenseManager.licenseString = Me.licenseManager.DecodeLicenseKey(My.Settings.licensekey)
+                Me.licenseManager.licenseString = Me.licenseManager.DecodeLicenseKey(My.Settings.licensekey)

-            Me.licenseManager.licenseStringArray = Me.licenseManager.SplitLicenseString(Me.licenseManager.licenseString)
-            Me.licenseManager.LoadLicenses()
+                Me.licenseManager.licenseStringArray = Me.licenseManager.SplitLicenseString(Me.licenseManager.licenseString)
+                Me.licenseManager.LoadLicenses()

-            If Me.licenseManager.Licenses.machine.ToLower <> "all" Then
-                If Me.licenseManager.Licenses.machine.ToLower <> My.Computer.Name.ToLower Then
-                    MsgBox("Ihre Lizenz gilt nicht für diese Maschine. " & vbNewLine & "Gelesener Computer Name: '" & My.Computer.Name & "'" & vbNewLine & "License Computer Name: '" & Me.licenseManager.Licenses.machine & "'" & vbNewLine &
-                           "Bitte setzen Sie sich mit Digital Data in Verbindung.", MsgBoxStyle.Exclamation, "Lizenz ungültig:")
-                    Me.grbDI.Visible = False
-                    Me.GBNachindexierung.Visible = False
-                    Me.GroupBoxIntegration.Visible = False
-                    Me.grbxMoRe.Visible = False
-                    Exit Sub
+                If Me.licenseManager.Licenses.machine.ToLower <> "all" Then
+                    If Me.licenseManager.Licenses.machine.ToLower <> My.Computer.Name.ToLower Then
+                        MsgBox("Ihre Lizenz gilt nicht für diese Maschine. " & vbNewLine & "Gelesener Computer Name: '" & My.Computer.Name & "'" & vbNewLine & "License Computer Name: '" & Me.licenseManager.Licenses.machine & "'" & vbNewLine &
+                               "Bitte setzen Sie sich mit Digital Data in Verbindung.", MsgBoxStyle.Exclamation, "Lizenz ungültig:")
+                        Me.grbDI.Visible = False
+                        Me.GBNachindexierung.Visible = False
+                        Me.GroupBoxIntegration.Visible = False
+                        Me.grbxMoRe.Visible = False
+                        Exit Sub
+                    End If
+                End If
+
+                Dim i As Integer = 0
+
+                If Me.licenseManager.Licenses.Licenses IsNot Nothing Then
+                    For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
+                        Dim expires As String = license.Expires.Date
+                        If IsExpired(license.Expires.Date) = False Then
+                            ' MsgBox(license.Modulename & vbNewLine & expires)
+                            Select Case license.Modulename
+                                Case "Dateiimport"
+                                    Me.grbDI.Visible = True
+                                Case "Nachindexierung"
+                                    Me.GBNachindexierung.Visible = True
+                                Case "MerkatorIntegration"
+                                    Me.GroupBoxIntegration.Visible = True
+                                Case "MoveandRename"
+                                    'Me.grbxMoRe.Visible = True
+                                    LICENSE_MoveRename = True
+                                Case "NachbearbeitungAD"
+                                    btnNachbearbeitungAD.Visible = True
+                                    LICENSE_AD = True
+                            End Select
+                            i += 1
+                        Else
+                            MsgBox("Ihre Lizenz für das Modul '" & license.Modulename & "' ist am ' " & license.Expires.Date.ToShortDateString & "' abgelaufen" & vbNewLine & "Bitte setzen Sie sich mit Digital Data in Verbindung.", MsgBoxStyle.Exclamation, "Lizenz abgelaufen:")
+                            Select Case license.Modulename
+                                Case "Dateiimport"
+                                    Me.grbDI.Visible = False
+                                Case "Nachindexierung"
+                                    Me.GBNachindexierung.Visible = False
+                                Case "MerkatorIntegration"
+                                    Me.GroupBoxIntegration.Visible = False
+                                Case "MoveandRename"
+                                    Me.GroupBoxIntegration.Visible = False
+                                    LICENSE_MoveRename = False
+                                Case "NachbearbeitungAD"
+                                    btnNachbearbeitungAD.Visible = False
+                                    LICENSE_AD = False
+                            End Select
+                            i += 1
+                        End If
+                        'Date.TryParse(expires, license.Expires)
+
+                    Next
                End If
            End If

-            Dim i As Integer = 0

-            If Me.licenseManager.Licenses.Licenses IsNot Nothing Then
-                For Each license As ClassLicense In Me.licenseManager.Licenses.Licenses()
-                    Dim expires As String = license.Expires.Date
-                    If IsExpired(license.Expires.Date) = False Then
-                        ' MsgBox(license.Modulename & vbNewLine & expires)
-                        Select Case license.Modulename
-                            Case "Dateiimport"
-                                Me.grbDI.Visible = True
-                            Case "Nachindexierung"
-                                Me.GBNachindexierung.Visible = True
-                            Case "MerkatorIntegration"
-                                Me.GroupBoxIntegration.Visible = True
-                            Case "MoveandRename"
-                                'Me.grbxMoRe.Visible = True
-                                licMore = True
-                            Case "NachbearbeitungAD"
-                                btnNachbearbeitungAD.Visible = True
-                                licNB_AD = True
-                        End Select
-                        i += 1
-                    Else
-                        MsgBox("Ihre Lizenz für das Modul '" & license.Modulename & "' ist am ' " & license.Expires.Date.ToShortDateString & "' abgelaufen" & vbNewLine & "Bitte setzen Sie sich mit Digital Data in Verbindung.", MsgBoxStyle.Exclamation, "Lizenz abgelaufen:")
-                        Select Case license.Modulename
-                            Case "Dateiimport"
-                                Me.grbDI.Visible = False
-                            Case "Nachindexierung"
-                                Me.GBNachindexierung.Visible = False
-                            Case "MerkatorIntegration"
-                                Me.GroupBoxIntegration.Visible = False
-                            Case "MoveandRename"
-                                Me.GroupBoxIntegration.Visible = False
-                                licMore = False
-                            Case "NachbearbeitungAD"
-                                btnNachbearbeitungAD.Visible = False
-                                licNB_AD = False
-                        End Select
-                        i += 1
-                    End If
-                    'Date.TryParse(expires, license.Expires)

-                Next
-            End If
        End If
    End Sub
    Private Function IsExpired(ByVal _Date As Date)
Author	SHA1	Message	Date
Digital Data - Marlon Schreiber	59b08fa9cd	MS VERsioning MoveRename OFF, new DS	2020-07-29 14:31:04 +02:00
Digital Data - Marlon Schreiber	3753cab8a6	MS VErknüpfungen und Licenses	2020-05-06 12:55:11 +02:00