Bugfix nach Test MArvin

2019-11-05 14:32:29 +01:00 · 2019-11-05 14:32:29 +01:00 · 2b9e0e7ef4
commit 2b9e0e7ef4
parent cfeec0d257
29 changed files with 2349 additions and 347 deletions
--- a/ToolCollection/ClassNIWindream.vb
+++ b/ToolCollection/ClassNIWindream.vb
@ -880,7 +880,7 @@ Public Class ClassNIWindream
                        _Logger.Debug("Finaler Index '" & Indexname & "' wurde gesetzt")
                        oDocument.Save()
                        oDocument.unlock()
-                        _Logger.Warn(" >> DATEI wurde erfolgreich als fertig nachindexiert gekennzeichnet")
+                        _Logger.Info(" >> DATEI wurde erfolgreich als fertig nachindexiert gekennzeichnet")
                    End If
                Else
                    _Logger.Warn(" >> Dokument ist gesperrt, Indexierung erst im nächsten Durchlauf!")
--- a/ToolCollection/ClassWindream_allgemein.vb
+++ b/ToolCollection/ClassWindream_allgemein.vb
@ -154,7 +154,7 @@ Public Class ClassWindream_allgemein


        Else
-            If My.Settings.vLogErrorsonly = False Then _Logger.Info("WMSession already created!")
+            If My.Settings.vLogErrorsonly = False Then _Logger.Debug("WMSession already created!")
            oWMSession = CURRENToWMSession
            Return True
        End If
--- 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.4")>
+<Assembly: AssemblyVersion("2.3.0.5")>
 <Assembly: AssemblyFileVersion("1.5.1.0")> 
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@ -370,6 +370,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property CheckConstraints_5634() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("CheckConstraints_5634", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@ -650,6 +660,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property lines_Text_code_16xLG() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("lines_Text_code_16xLG", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@ -124,6 +124,12 @@
  <data name="user_edit3" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_edit3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="haken_gruen" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\haken_gruen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="folder_Closed_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\folder_Closed_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="Auslesen1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Auslesen1.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@ -169,9 +175,6 @@
  <data name="Untitled (1055)" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Untitled (1055).ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="arrow_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="table" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@ -181,6 +184,9 @@
  <data name="table_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\table_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="lines_Text_code_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\lines_Text_code_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="link_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\link_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@ -307,8 +313,8 @@
  <data name="puzzle1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\puzzle1.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="haken_gruen" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\haken_gruen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="arrow_up" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="puzzle2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\puzzle2.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -427,7 +433,7 @@
  <data name="user_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="folder_Closed_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\folder_Closed_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="CheckConstraints_5634" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CheckConstraints_5634.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
 </root>
--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@ -901,6 +901,38 @@ Namespace My
                Return CType(Me("DDECMConString"),String)
            End Get
        End Property
+        
+        <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+         Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.Configuration.DefaultSettingValueAttribute("[\\\/:\*\?""""'<>|]")>  _
+        Public ReadOnly Property REGEX_INVALID_PATH() As String
+            Get
+                Return CType(Me("REGEX_INVALID_PATH"),String)
+            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=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security 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")>  _
+        Public Property myDateiname() As String
+            Get
+                Return CType(Me("myDateiname"),String)
+            End Get
+            Set
+                Me("myDateiname") = value
+            End Set
+        End Property
    End Class
 End Namespace

--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@ -225,5 +225,19 @@
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
      <Value Profile="(Default)">Data Source=172.24.12.41\tests;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">
+      <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=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd&lt;/ConnectionString&gt;
+  &lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
+&lt;/SerializableConnectionString&gt;</DesignTimeValue>
+      <Value Profile="(Default)">Data Source=172.24.12.41\tests;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
@ -0,0 +1,2 @@
+Partial Class MyDataset
+End Class
--- a/ToolCollection/MyDataset.xsc
+++ b/ToolCollection/MyDataset.xsc
@ -20,5 +20,19 @@
        </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>
 </DataSetUISetting>
--- a/ToolCollection/MyDataset.xsd
+++ b/ToolCollection/MyDataset.xsd
@ -2,9 +2,10 @@
 <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="0" FunctionsComponentName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" xmlns="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">
        <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" />
+          <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" />
        </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">
@ -171,6 +172,81 @@ WHERE        (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1</Comman
              </DbSource>
            </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">
+                <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>
+                <InsertCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>INSERT INTO TBTC_DI_REGEX_MATCH
+                         (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" />
+                    </Parameters>
+                  </DbCommand>
+                </InsertCommand>
+                <SelectCommand>
+                  <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>
+                    <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>
+                <UpdateCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>UPDATE       TBTC_DI_REGEX_MATCH
+SET                PROFILE_NAME = @PROFILE_NAME, REGEX = @REGEX, CHANGED_WHO = @CHANGED_WHO
+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" />
+                    </Parameters>
+                  </DbCommand>
+                </UpdateCommand>
+              </DbSource>
+            </MainSource>
+            <Mappings>
+              <Mapping SourceColumn="GUID" DataSetColumn="GUID" />
+              <Mapping SourceColumn="PROFILE_NAME" DataSetColumn="PROFILE_NAME" />
+              <Mapping SourceColumn="REGEX" DataSetColumn="REGEX" />
+              <Mapping SourceColumn="CREATED_WHO" DataSetColumn="CREATED_WHO" />
+              <Mapping SourceColumn="CREATED_WHEN" DataSetColumn="CREATED_WHEN" />
+              <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>
+          </TableAdapter>
        </Tables>
        <Sources />
      </DataSource>
@ -179,7 +255,7 @@ WHERE        (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1</Comman
  <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_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_UserTableName="TBVEKTOR_ARRAY" msprop:Generator_RowChangedName="TBVEKTOR_ARRAYRowChanged" msprop:Generator_RowEvArgName="TBVEKTOR_ARRAYRowChangeEvent" msprop:Generator_RowClassName="TBVEKTOR_ARRAYRow">
+        <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" />
@ -187,14 +263,14 @@ WHERE        (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1</Comman
            </xs:sequence>
          </xs:complexType>
        </xs:element>
-        <xs:element name="TBErgebnis" msprop:Generator_TableClassName="TBErgebnisDataTable" msprop:Generator_TableVarName="tableTBErgebnis" msprop:Generator_TablePropName="TBErgebnis" msprop:Generator_RowDeletingName="TBErgebnisRowDeleting" msprop:Generator_RowChangingName="TBErgebnisRowChanging" msprop:Generator_RowEvHandlerName="TBErgebnisRowChangeEventHandler" msprop:Generator_RowDeletedName="TBErgebnisRowDeleted" msprop:Generator_UserTableName="TBErgebnis" msprop:Generator_RowChangedName="TBErgebnisRowChanged" msprop:Generator_RowEvArgName="TBErgebnisRowChangeEvent" msprop:Generator_RowClassName="TBErgebnisRow">
+        <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_RowChangedName="TBUVRowChanged" msprop:Generator_TablePropName="TBUV" msprop:Generator_RowDeletingName="TBUVRowDeleting" msprop:Generator_RowChangingName="TBUVRowChanging" msprop:Generator_RowEvHandlerName="TBUVRowChangeEventHandler" msprop:Generator_RowDeletedName="TBUVRowDeleted" msprop:Generator_RowClassName="TBUVRow" msprop:Generator_UserTableName="TBUV" msprop:Generator_RowEvArgName="TBUVRowChangeEvent">
+        <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" />
@ -202,7 +278,7 @@ WHERE        (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1</Comman
            </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_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_UserTableName="TBDD_REPORTING_IMPORT" msprop:Generator_RowChangedName="TBDD_REPORTING_IMPORTRowChanged" msprop:Generator_RowEvArgName="TBDD_REPORTING_IMPORTRowChangeEvent" msprop:Generator_RowClassName="TBDD_REPORTING_IMPORTRow">
+        <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" />
@ -233,7 +309,7 @@ WHERE        (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1</Comman
            </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_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_UserTableName="TBTC_MOVE_RENAME" msprop:Generator_RowChangedName="TBTC_MOVE_RENAMERowChanged" msprop:Generator_RowEvArgName="TBTC_MOVE_RENAMERowChangeEvent" msprop:Generator_RowClassName="TBTC_MOVE_RENAMERow">
+        <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" />
@ -278,6 +354,43 @@ WHERE        (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1</Comman
            </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: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="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="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:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="1000" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <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" />
+                  </xs:restriction>
+                </xs:simpleType>
+              </xs:element>
+              <xs:element name="CREATED_WHEN" msprop:Generator_ColumnVarNameInTable="columnCREATED_WHEN" msprop:Generator_ColumnPropNameInRow="CREATED_WHEN" msprop:Generator_ColumnPropNameInTable="CREATED_WHENColumn" msprop:Generator_UserColumnName="CREATED_WHEN" type="xs:dateTime" minOccurs="0" />
+              <xs:element name="CHANGED_WHO" msprop:Generator_ColumnVarNameInTable="columnCHANGED_WHO" msprop:Generator_ColumnPropNameInRow="CHANGED_WHO" msprop:Generator_ColumnPropNameInTable="CHANGED_WHOColumn" msprop:Generator_UserColumnName="CHANGED_WHO" minOccurs="0">
+                <xs:simpleType>
+                  <xs:restriction base="xs:string">
+                    <xs:maxLength value="50" />
+                  </xs:restriction>
+                </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:sequence>
+          </xs:complexType>
+        </xs:element>
      </xs:choice>
    </xs:complexType>
    <xs:unique name="Constraint1" msdata:PrimaryKey="true">
@ -288,5 +401,9 @@ WHERE        (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1</Comman
      <xs:selector xpath=".//mstns:TBTC_MOVE_RENAME" />
      <xs:field xpath="mstns:GUID" />
    </xs:unique>
+    <xs:unique name="TBTC_DI_REGEX_MATCH_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true">
+      <xs:selector xpath=".//mstns:TBTC_DI_REGEX_MATCH" />
+      <xs:field xpath="mstns:GUID" />
+    </xs:unique>
  </xs:element>
 </xs:schema>
--- a/ToolCollection/MyDataset.xss
+++ b/ToolCollection/MyDataset.xss
@ -4,13 +4,14 @@
     Changes to this file may cause incorrect behavior and will be lost if
     the code is regenerated.
 </autogenerated>-->
-<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-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="27" ViewPortY="-11" 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="2" 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="1" X="96" Y="306" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
-    <Shape ID="DesignTable:TBVEKTOR_ARRAY" ZOrder="5" X="42" Y="0" Height="144" Width="174" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
-    <Shape ID="DesignTable:TBErgebnis" ZOrder="4" X="243" Y="-1" Height="48" Width="150" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="44" />
-    <Shape ID="DesignTable:TBUV" ZOrder="3" X="44" Y="155" Height="90" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="86" />
+    <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" />
  </Shapes>
  <Connectors />
 </DiagramLayout>
--- a/ToolCollection/Resources/CheckConstraints_5634.png
+++ b/ToolCollection/Resources/CheckConstraints_5634.png
--- a/ToolCollection/Resources/lines_Text_code_16xLG.png
+++ b/ToolCollection/Resources/lines_Text_code_16xLG.png
--- a/ToolCollection/ToolCollection.vbproj
+++ b/ToolCollection/ToolCollection.vbproj
@ -227,6 +227,12 @@
    <Compile Include="frmApplicationLog.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmDIRegex.Designer.vb">
+      <DependentUpon>frmDIRegex.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmDIRegex.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmGrundeinstellungen.Designer.vb">
      <DependentUpon>frmGrundeinstellungen.vb</DependentUpon>
    </Compile>
@ -415,6 +421,9 @@
      <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>
@ -434,6 +443,9 @@
    <EmbeddedResource Include="frmApplicationLog.resx">
      <DependentUpon>frmApplicationLog.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmDIRegex.resx">
+      <DependentUpon>frmDIRegex.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmGrundeinstellungen.resx">
      <DependentUpon>frmGrundeinstellungen.vb</DependentUpon>
    </EmbeddedResource>
@ -824,6 +836,8 @@
    <Content Include="Interop.WINDREAMLib.dll" />
    <None Include="Resources\action_add_16xMD.png" />
    <None Include="Resources\folder_Closed_16xMD.png" />
+    <None Include="Resources\lines_Text_code_16xLG.png" />
+    <None Include="Resources\CheckConstraints_5634.png" />
    <Content Include="x64\SQLite.Interop.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
--- a/ToolCollection/app.config
+++ b/ToolCollection/app.config
@ -12,6 +12,9 @@
  </configSections>
  <connectionStrings>
    <add name="ToolCollection.My.MySettings.DDECMConString" connectionString="Data Source=172.24.12.41\tests;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=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd"
+      providerName="System.Data.SqlClient" />
  </connectionStrings>
  <system.diagnostics>
    <sources>
@ -205,6 +208,9 @@
      <setting name="VFS_RESTART" serializeAs="String">
        <value>DigitalData\windream_VFS_RESTART</value>
      </setting>
+      <setting name="myDateiname" serializeAs="String">
+        <value>myInvalidDateiname.pdf</value>
+      </setting>
    </ToolCollection.My.MySettings>
  </userSettings>
  <applicationSettings>
@ -251,6 +257,9 @@
      <setting name="DIOpt_CheckLength" serializeAs="String">
        <value>False</value>
      </setting>
+      <setting name="REGEX_INVALID_PATH" serializeAs="String">
+        <value>[\\\/:\*\?""'&lt;&gt;|]</value>
+      </setting>
    </ToolCollection.My.MySettings>
  </applicationSettings>
  <startup>
--- a/ToolCollection/frmDIHauptseite.Designer.vb
+++ b/ToolCollection/frmDIHauptseite.Designer.vb
@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmDIHauptseite
    Inherits System.Windows.Forms.Form

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
        Try
            If disposing AndAlso components IsNot Nothing Then
@ -20,7 +20,7 @@ Partial Class frmDIHauptseite
    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDIHauptseite))
@ -83,6 +83,8 @@ Partial Class frmDIHauptseite
        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()
@ -94,6 +96,7 @@ Partial Class frmDIHauptseite
        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
@ -212,7 +215,7 @@ Partial Class frmDIHauptseite
        Me.GroupBox1.Controls.Add(Me.lbldurchlauf2)
        Me.GroupBox1.Location = New System.Drawing.Point(11, 189)
        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(325, 220)
+        Me.GroupBox1.Size = New System.Drawing.Size(339, 220)
        Me.GroupBox1.TabIndex = 48
        Me.GroupBox1.TabStop = False
        Me.GroupBox1.Text = "4. Durchlauf bestimmen"
@ -379,7 +382,7 @@ Partial Class frmDIHauptseite
        'lblProgress
        '
        Me.lblProgress.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.lblProgress.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_REPORTING_IMPORTBindingSource, "IMPORT_ID", True))
+        Me.lblProgress.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_DI_REGEX_MATCHBindingSource, "GUID", True))
        Me.lblProgress.Location = New System.Drawing.Point(11, 448)
        Me.lblProgress.Name = "lblProgress"
        Me.lblProgress.Size = New System.Drawing.Size(536, 33)
@ -475,7 +478,7 @@ Partial Class frmDIHauptseite
        Me.Label16.Name = "Label16"
        Me.Label16.Size = New System.Drawing.Size(503, 13)
        Me.Label16.TabIndex = 16
-        Me.Label16.Text = "Standard Einleitungstext: (HTML fähig: <br> = Zeilenwechsel;<b>= Fett Formatiert;" & _
+        Me.Label16.Text = "Standard Einleitungstext: (HTML fähig: <br> = Zeilenwechsel;<b>= Fett Formatiert;" &
    "</b>= Ende)"
        '
        'txtBody
@ -532,7 +535,7 @@ Partial Class frmDIHauptseite
        Me.Label12.AutoSize = True
        Me.Label12.Location = New System.Drawing.Point(6, 150)
        Me.Label12.Name = "Label12"
-        Me.Label12.Size = New System.Drawing.Size(239, 13)
+        Me.Label12.Size = New System.Drawing.Size(238, 13)
        Me.Label12.TabIndex = 8
        Me.Label12.Text = "Betreff: (Text für den Betreff der Fehler-Email)"
        '
@ -672,8 +675,19 @@ Partial Class frmDIHauptseite
        '
        Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
        Me.TableAdapterManager.TBDD_REPORTING_IMPORTTableAdapter = Me.TBDD_REPORTING_IMPORTTableAdapter
+        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
+        '
        'frmDIHauptseite
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@ -702,9 +716,10 @@ Partial Class frmDIHauptseite
        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
+    End Sub
    Friend WithEvents dlgZielordner As System.Windows.Forms.FolderBrowserDialog
    Friend WithEvents dlgQuellordner As System.Windows.Forms.FolderBrowserDialog
    Friend WithEvents timRun_Dateiimport As System.Windows.Forms.Timer
@ -764,4 +779,6 @@ End Sub
    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
 End Class
--- a/ToolCollection/frmDIHauptseite.resx
+++ b/ToolCollection/frmDIHauptseite.resx
@ -129,12 +129,15 @@
  <metadata name="contextLog.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>437, 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 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>
  </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>
@ -147,6 +150,9 @@
  <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>
+  </metadata>
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>125</value>
  </metadata>
--- a/ToolCollection/frmDIHauptseite.vb
+++ b/ToolCollection/frmDIHauptseite.vb
@ -7,6 +7,7 @@ Imports System.Net.Mail
 Imports System.ServiceProcess
 Imports WINDREAMLib
 Imports DigitalData.Modules.Logging
+Imports System.Text.RegularExpressions
 #End Region
 Public Class frmDIHauptseite
    Dim Formloaded As Boolean = False
@ -27,7 +28,7 @@ Public Class frmDIHauptseite
    End Function


-   
+
    Public Sub New()
        Try
            ' Dieser Aufruf ist für den Designer erforderlich.
@ -297,7 +298,9 @@ Public Class frmDIHauptseite
                    Gesamtfiles = 0
                    Dim files_Durchlauf As ReadOnlyCollection(Of String)
                    For Each item As ClassDIProfil In ClassDIProfile.Profile
+
                        Me.selectedProfile = ClassDIProfile.getProfilByName(item.OriginalProfilname)
+
                        'Nur die files der Aktiven Profile zählen
                        If CBool(selectedProfile.Aktiv) = True Then
                            If Me.selectedProfile.Subdirectories = True Then
@ -429,6 +432,8 @@ 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)

        If Me.ImportFileList IsNot Nothing Then
            Me.CountFilesImported = 0
@ -490,34 +495,44 @@ Public Class frmDIHauptseite

            ' alle Dateien durchlaufen

-            For Each filenameQuelle As String In Me.ImportFileList
+            For Each oFilenameQuelle As String In Me.ImportFileList
                fileAusschliessen = False
-                If filenameQuelle.StartsWith("~$") Then
-                    fileAusschliessen = True
-                Else
-                    If My.Settings.vDIAusschluss <> "" Then
-                        If My.Settings.vDIAusschluss.Contains("/") Then
-                            'Ausschlußzeichen
-                            Dim strTeile() As String
-                            strTeile = My.Settings.vDIAusschluss.Split("/")
-                            For i As Integer = 0 To strTeile.Length - 1
-                                If string_Contains(filenameQuelle, strTeile(i).ToLower) = True Then
+                Dim oFilenameOnly = Path.GetFileName(oFilenameQuelle)
+                If Me.MyDataset.TBTC_DI_REGEX_MATCH.Rows.Count = 1 Then
+                    If Regex.IsMatch(oFilenameOnly, MyDataset.TBTC_DI_REGEX_MATCH.Rows(0).Item("REGEX")) = False Then
+                        ClassLoggerDI.Add($" >> Regex not Matching for file {oFilenameOnly}!", False)
+                        fileAusschliessen = True
+                    End If
+                End If
+                If fileAusschliessen = False Then
+                    If oFilenameQuelle.StartsWith("~$") Then
+                        fileAusschliessen = True
+                    Else
+                        If My.Settings.vDIAusschluss <> "" Then
+                            If My.Settings.vDIAusschluss.Contains("/") Then
+                                'Ausschlußzeichen
+                                Dim strTeile() As String
+                                strTeile = My.Settings.vDIAusschluss.Split("/")
+                                For i As Integer = 0 To strTeile.Length - 1
+                                    If string_Contains(oFilenameQuelle, strTeile(i).ToLower) = True Then
+                                        fileAusschliessen = True
+                                        Exit For
+                                    End If
+                                Next
+                            Else
+                                If string_Contains(oFilenameQuelle, My.Settings.vDIAusschluss.ToLower) = True Then
                                    fileAusschliessen = True
-                                    Exit For
                                End If
-                            Next
-                        Else
-                            If string_Contains(filenameQuelle, My.Settings.vDIAusschluss.ToLower) = True Then
-                                fileAusschliessen = True
                            End If
                        End If
                    End If
                End If
+
                'Wenn Datei nicht Sonderzeichen enthält
                If fileAusschliessen = False Then
                    'Überprüfen ob Datei geöffnet ist??
-                    In_Use = func_check_file_use(filenameQuelle)
-                    If In_Use = True And filenameQuelle.EndsWith(".pdf") Then
+                    In_Use = func_check_file_use(oFilenameQuelle)
+                    If In_Use = True And oFilenameQuelle.EndsWith(".pdf") Then
                        ClassLoggerDI.Add(" >> File might be an PDF/A ", False)
                        In_Use = False
                    End If
@ -525,18 +540,18 @@ Public Class frmDIHauptseite
                    If In_Use = True Then
                        If My.Settings.vLogErrorsonly = False Then
                            ClassLoggerDI.Add(" >> Datei in Benutzung ", False)
-                            ClassLoggerDI.Add(" >> Datei '" & filenameQuelle & "' wird im aktuellen Durchlauf nicht berücksichtigt!", False)
+                            ClassLoggerDI.Add(" >> Datei '" & oFilenameQuelle & "' wird im aktuellen Durchlauf nicht berücksichtigt!", False)
                            ClassLoggerDI.Add(" ", False)
                        End If
                        'File in Array speichern
-                        oFileAusschlussList.Add(filenameQuelle)
+                        oFileAusschlussList.Add(oFilenameQuelle)

                        Me.oWMStream_Result = 0
                        Me.threadDateiimport.ReportProgress(Me.CountFilesImported / Me.CountFiles2Import * 100)
                        Me.CountFilesImported += 1
                    Else
                        'Datei nicht in Benutzung
-                        Dim oFileInfo As IO.FileInfo = New IO.FileInfo(filenameQuelle)
+                        Dim oFileInfo As IO.FileInfo = New IO.FileInfo(oFilenameQuelle)
                        'zeitdiff nur Zur sicherheit ob file gerade erst erstellt

                        'If My.Settings.vDItime_durationExists <> 0 Then
@ -544,20 +559,20 @@ Public Class frmDIHauptseite
                            'Datei wurde erst "vor kurzem erstellt" - nicht berücksichtigen
                            If My.Settings.vLogErrorsonly = False Then
                                ClassLoggerDI.Add(" ### Datei vor weniger als " & selectedProfile.Verzoegerung & " sec. erstellt ###", False)
-                                ClassLoggerDI.Add(" Datei: " & filenameQuelle & " wird im aktuellen Durchlauf nicht berücksichtigt!", False)
+                                ClassLoggerDI.Add(" Datei: " & oFilenameQuelle & " wird im aktuellen Durchlauf nicht berücksichtigt!", False)
                            End If
                            'File in Array speichern
-                            oFileAusschlussList.Add(filenameQuelle)
+                            oFileAusschlussList.Add(oFilenameQuelle)
                            Me.oWMStream_Result = 0
                            Me.threadDateiimport.ReportProgress(Me.CountFilesImported / Me.CountFiles2Import * 100)
                            Me.CountFilesImported += 1
                        Else
                            'Datei kann bearbeitet werden
-                            Me.bgwQuelldatei = filenameQuelle
+                            Me.bgwQuelldatei = oFilenameQuelle
                            Me.bgwZielordner = Me.selectedProfile.OriginalZielordner 'Me.txtZielordner.Text
                            If My.Settings.vLogErrorsonly = False Then
                                ClassLoggerDI.Add(" ", False)
-                                ClassLoggerDI.Add(" # Hintergrundprozess wird gestartet (" & filenameQuelle & ") <==", False)
+                                ClassLoggerDI.Add(" # Hintergrundprozess wird gestartet (" & oFilenameQuelle & ") <==", False)
                                ClassLoggerDI.Add(" Datei " & Me.bgwQuelldatei & " behandeln", False)
                            End If

@ -691,7 +706,7 @@ Public Class frmDIHauptseite
                                        Exit Sub
                                    Else
                                        If My.Settings.vDIMailSenden = True Then
-                                            email.Send_EMail("Fehler bei Datei: " & filenameQuelle & " <br\>ERROR: " & Err.Description)
+                                            email.Send_EMail("Fehler bei Datei: " & oFilenameQuelle & " <br\>ERROR: " & Err.Description)
                                        End If
                                    End If

@ -1381,7 +1396,7 @@ Public Class frmDIHauptseite

                            End Try
                            Try
-                                ClassLoggerDI.Add(" FEHLER bei Dateiindexieren - Datei" & endgültigerDateiname & " wird wieder gelöscht!")
+                                ClassLoggerDI.Add("FEHLER bei Dateiindexieren - Datei [" & endgültigerDateiname & "] wird wieder gelöscht!")
                                System.IO.File.Delete(My.Settings.vWLaufwerk & ":" & endgültigerDateiname)
                                If My.Settings.StopwatchTimerActive = True Then
                                    oStopWatchTimer.Done()
@ -1532,13 +1547,16 @@ Public Class frmDIHauptseite
    ''' <remarks></remarks>
    Private Function DateiIndexieren(ByVal filenameQuelle As String, ByVal filenameZiel As String)
        Try
-            If My.Settings.vLogErrorsonly = False Then ClassLoggerDI.Add(" - DateiIndexieren wurde aufgerufen", False)
+            If My.Settings.vLogErrorsonly = False Then ClassLoggerDI.Add(" >>> DateiIndexieren wurde aufgerufen", False)
            'Die Werte zusammenfügen
-            Dim arr As ArrayList = Me.GetArrayZuDatei(filenameQuelle)
+            Dim oArrayList As ArrayList = Me.GetArrayZuDatei(filenameQuelle)

            Dim WMObject As WINDREAMLib.WMObject '= CreateObject("WINDREAMLib.WMObject")  'New WINDREAMLib.WMObject

-            If arr Is Nothing Then Return False
+            If oArrayList Is Nothing Then
+                ClassLoggerDI.Add($"Attention: oArrayList is nothing!!", False)
+                Return False
+            End If

            'MsgBox("DateiIndexieren:" & vbNewLine & ClassDateiimportWindream.GetWindreamDriveLetter & filenameZiel & vbNewLine & Me.selectedProfile.DokumenttypString)

@ -1589,6 +1607,7 @@ Public Class frmDIHauptseite
                Catch ex As Exception
                    ' wenn es einen Fehler beim speichern gab, dann konnte auch kein Dokumenttyp gesetzt werden -> es kann also auch keine
                    ' Indexierung stattfinden und die Indexierung muss nicht fortgesetzt werden
+                    ClassLoggerDI.Add(">> Error while saving Object: " & ex.Message, False)
                    Return False
                End Try

@ -1602,12 +1621,18 @@ Public Class frmDIHauptseite
                ' dies wird an das Array für den TreeView-Log übergeben
                Me.singleInfoNode.Add("Objekttyp: " & Me.selectedProfile.DokumenttypString)
                If My.Settings.vLogErrorsonly = False Then ClassLoggerDI.Add(" - Objekttyp: " & Me.selectedProfile.DokumenttypString, False)
+            Else
+                ClassLoggerDI.Add($"INDEXIEREN_DURCHFÜHREN: {INDEXIEREN_DURCHFÜHREN}", False)
+
            End If

            ' wenn keine Werte vorhanden sind, soll wenigstens der Dokumenttyp eingetragen werden

            Try
-                If arr(1) Is Nothing Then Return False
+                If oArrayList(1) Is Nothing Then
+                    ClassLoggerDI.Add($"Attention: oArrayList(1) is nothing!!", False)
+                    Return False
+                End If
            Catch ex As Exception
                ' wenn ein Fehler auftrat -> Fehler vermerken
                Me.singleInfoNode.Add(" - ACHTUNG: Der Datei wurde kein Index zugewiesen.")
@ -1620,16 +1645,16 @@ Public Class frmDIHauptseite

            Dim indexe As String = ""

-            For i As Integer = 1 To arr.Count - 1
+            For i As Integer = 1 To oArrayList.Count - 1

-                Dim indexname As String = arr(i)(0)
+                Dim indexname As String = oArrayList(i)(0)
                Dim werte
                If My.Settings.vLogErrorsonly = False Then ClassLoggerDI.Add(" - Indexname: '" & indexname & "'", False)

                If (_windream.GetTypeOfIndexAsIntByName(indexname) = WMObjectVariableValueTypeVector) Or _windream.GetTypeOfIndexAsIntByName(indexname) = 4097 Then
                    If My.Settings.vLogErrorsonly = False Then ClassLoggerDI.Add(" - Es handelt sich um ein Vektor-Feld", False)
                    werte = New ArrayList
-                    For Each wert As String In arr(i)(1)
+                    For Each wert As String In oArrayList(i)(1)
                        'Am 04.08.2014 aktualisiert: um zu verhindern das die vorangegangene Versionierung "Tilde-Werte" schreibt
                        Dim IndexValue = wert
                        If My.Settings.vLogErrorsonly = False Then ClassLoggerDI.Add(" - Wert vor Überprüfung: " & IndexValue, False)
@ -1644,7 +1669,7 @@ Public Class frmDIHauptseite
                    If My.Settings.vLogErrorsonly = False Then ClassLoggerDI.Add(" - Werte zu Array hinzugefügt!", False)
                Else
                    'Am 04.08.2014 aktualisiert: um zu verhindern das die vorangegangene Versionierung "Tilde-Werte" schreibt
-                    Dim IndexValue = arr(i)(1)(0)
+                    Dim IndexValue = oArrayList(i)(1)(0)
                    If My.Settings.vLogErrorsonly = False Then ClassLoggerDI.Add(" - Value vor Überprüfung: " & IndexValue, False)
                    IndexValue = CheckIndexValue(IndexValue)
                    'Ausstieg da Fehler in der Überprüfung
@ -2477,6 +2502,8 @@ Public Class frmDIHauptseite
        My.Settings.Save()
    End Sub

+
+
    Private Sub frmDIHauptseite_Load(sender As Object, e As EventArgs) Handles MyBase.Load

    End Sub
--- a/ToolCollection/frmDIProfilEigenschaften.Designer.vb
+++ b/ToolCollection/frmDIProfilEigenschaften.Designer.vb
@ -24,15 +24,8 @@ Partial Class frmDIProfilEigenschaften
    Private Sub InitializeComponent()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDIProfilEigenschaften))
        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
-        Me.btnSpeichern = New System.Windows.Forms.ToolStripDropDownButton()
-        Me.btnLöschen = New System.Windows.Forms.ToolStripDropDownButton()
-        Me.btnHinzufügen = New System.Windows.Forms.ToolStripDropDownButton()
        Me.cmbProfilauswahl = New System.Windows.Forms.ToolStripSplitButton()
        Me.tslblAnzahl = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.tsbtnfirst = New System.Windows.Forms.ToolStripDropDownButton()
-        Me.tsbtnprevious = New System.Windows.Forms.ToolStripDropDownButton()
-        Me.tsbtnnext = New System.Windows.Forms.ToolStripDropDownButton()
-        Me.tsbtnlast = New System.Windows.Forms.ToolStripDropDownButton()
        Me.lblProfil = New System.Windows.Forms.ToolStripStatusLabel()
        Me.dlgQuellordner = New System.Windows.Forms.FolderBrowserDialog()
        Me.dlgZielordner = New System.Windows.Forms.FolderBrowserDialog()
@ -67,7 +60,6 @@ Partial Class frmDIProfilEigenschaften
        Me.rbUV_Date1 = New System.Windows.Forms.RadioButton()
        Me.chkb_DateUV = New System.Windows.Forms.CheckBox()
        Me.Label5 = New System.Windows.Forms.Label()
-        Me.btnRegeln = New System.Windows.Forms.Button()
        Me.boxImportoptionenLoeschen = New System.Windows.Forms.GroupBox()
        Me.chkUVloeschen = New System.Windows.Forms.CheckBox()
        Me.chkQuellverzeichnisLoeschen = New System.Windows.Forms.CheckBox()
@ -83,6 +75,15 @@ Partial Class frmDIProfilEigenschaften
        Me.Label1 = New System.Windows.Forms.Label()
        Me.txtProfilname = New System.Windows.Forms.TextBox()
        Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.btnRegeln = New System.Windows.Forms.Button()
+        Me.btnSpeichern = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.btnLöschen = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.btnHinzufügen = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.tsbtnfirst = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.tsbtnprevious = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.tsbtnnext = New System.Windows.Forms.ToolStripDropDownButton()
+        Me.tsbtnlast = New System.Windows.Forms.ToolStripDropDownButton()
        Me.StatusStrip1.SuspendLayout()
        Me.pnlProfileigenschaften.SuspendLayout()
        Me.GroupBox3.SuspendLayout()
@ -101,46 +102,11 @@ Partial Class frmDIProfilEigenschaften
        Me.StatusStrip1.Name = "StatusStrip1"
        Me.StatusStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.ManagerRenderMode
        Me.StatusStrip1.ShowItemToolTips = True
-        Me.StatusStrip1.Size = New System.Drawing.Size(739, 22)
+        Me.StatusStrip1.Size = New System.Drawing.Size(941, 22)
        Me.StatusStrip1.SizingGrip = False
        Me.StatusStrip1.TabIndex = 21
        Me.StatusStrip1.Text = "StatusStrip1"
        '
-        'btnSpeichern
-        '
-        Me.btnSpeichern.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.btnSpeichern.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.btnSpeichern.Enabled = False
-        Me.btnSpeichern.Image = Global.ToolCollection.My.Resources.Resources.table_save
-        Me.btnSpeichern.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.btnSpeichern.Name = "btnSpeichern"
-        Me.btnSpeichern.ShowDropDownArrow = False
-        Me.btnSpeichern.Size = New System.Drawing.Size(20, 20)
-        Me.btnSpeichern.Text = "Profil speichern"
-        '
-        'btnLöschen
-        '
-        Me.btnLöschen.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.btnLöschen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.btnLöschen.Enabled = False
-        Me.btnLöschen.Image = Global.ToolCollection.My.Resources.Resources.table_delete
-        Me.btnLöschen.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.btnLöschen.Name = "btnLöschen"
-        Me.btnLöschen.ShowDropDownArrow = False
-        Me.btnLöschen.Size = New System.Drawing.Size(20, 20)
-        Me.btnLöschen.Text = "Profil löschen"
-        '
-        'btnHinzufügen
-        '
-        Me.btnHinzufügen.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
-        Me.btnHinzufügen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.btnHinzufügen.Image = Global.ToolCollection.My.Resources.Resources.table_add
-        Me.btnHinzufügen.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.btnHinzufügen.Name = "btnHinzufügen"
-        Me.btnHinzufügen.ShowDropDownArrow = False
-        Me.btnHinzufügen.Size = New System.Drawing.Size(20, 20)
-        Me.btnHinzufügen.Text = "Profil hinzufügen"
-        '
        'cmbProfilauswahl
        '
        Me.cmbProfilauswahl.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
@ -156,49 +122,6 @@ Partial Class frmDIProfilEigenschaften
        Me.tslblAnzahl.Size = New System.Drawing.Size(94, 17)
        Me.tslblAnzahl.Text = "Anzahl Profile: "
        '
-        'tsbtnfirst
-        '
-        Me.tsbtnfirst.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.tsbtnfirst.DoubleClickEnabled = True
-        Me.tsbtnfirst.Image = Global.ToolCollection.My.Resources.Resources.control_rewind
-        Me.tsbtnfirst.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbtnfirst.Name = "tsbtnfirst"
-        Me.tsbtnfirst.ShowDropDownArrow = False
-        Me.tsbtnfirst.Size = New System.Drawing.Size(20, 20)
-        Me.tsbtnfirst.Text = "Erstes Profil"
-        '
-        'tsbtnprevious
-        '
-        Me.tsbtnprevious.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.tsbtnprevious.Image = Global.ToolCollection.My.Resources.Resources.arrow_left
-        Me.tsbtnprevious.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbtnprevious.Name = "tsbtnprevious"
-        Me.tsbtnprevious.ShowDropDownArrow = False
-        Me.tsbtnprevious.Size = New System.Drawing.Size(20, 20)
-        Me.tsbtnprevious.Text = "ToolStripDropDownButton2"
-        Me.tsbtnprevious.ToolTipText = "Vorheriges Profil"
-        '
-        'tsbtnnext
-        '
-        Me.tsbtnnext.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.tsbtnnext.Image = Global.ToolCollection.My.Resources.Resources.arrow_right
-        Me.tsbtnnext.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbtnnext.Name = "tsbtnnext"
-        Me.tsbtnnext.ShowDropDownArrow = False
-        Me.tsbtnnext.Size = New System.Drawing.Size(20, 20)
-        Me.tsbtnnext.Text = "ToolStripDropDownButton3"
-        Me.tsbtnnext.ToolTipText = "Nächstes Profil"
-        '
-        'tsbtnlast
-        '
-        Me.tsbtnlast.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        Me.tsbtnlast.Image = Global.ToolCollection.My.Resources.Resources.control_fastforward
-        Me.tsbtnlast.ImageTransparentColor = System.Drawing.Color.Magenta
-        Me.tsbtnlast.Name = "tsbtnlast"
-        Me.tsbtnlast.ShowDropDownArrow = False
-        Me.tsbtnlast.Size = New System.Drawing.Size(20, 20)
-        Me.tsbtnlast.Text = "Letztes Profil"
-        '
        'lblProfil
        '
        Me.lblProfil.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@ -208,6 +131,7 @@ Partial Class frmDIProfilEigenschaften
        '
        'pnlProfileigenschaften
        '
+        Me.pnlProfileigenschaften.Controls.Add(Me.Button1)
        Me.pnlProfileigenschaften.Controls.Add(Me.GroupBox3)
        Me.pnlProfileigenschaften.Controls.Add(Me.txtlastRun)
        Me.pnlProfileigenschaften.Controls.Add(Me.Label7)
@ -227,7 +151,7 @@ Partial Class frmDIProfilEigenschaften
        Me.pnlProfileigenschaften.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnlProfileigenschaften.Location = New System.Drawing.Point(0, 22)
        Me.pnlProfileigenschaften.Name = "pnlProfileigenschaften"
-        Me.pnlProfileigenschaften.Size = New System.Drawing.Size(739, 658)
+        Me.pnlProfileigenschaften.Size = New System.Drawing.Size(941, 658)
        Me.pnlProfileigenschaften.TabIndex = 22
        Me.pnlProfileigenschaften.Visible = False
        '
@ -242,7 +166,7 @@ Partial Class frmDIProfilEigenschaften
        Me.GroupBox3.Controls.Add(Me.txtLink2Navision)
        Me.GroupBox3.Controls.Add(Me.chkbxlink2Navision)
        Me.GroupBox3.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.GroupBox3.Location = New System.Drawing.Point(15, 480)
+        Me.GroupBox3.Location = New System.Drawing.Point(15, 408)
        Me.GroupBox3.Name = "GroupBox3"
        Me.GroupBox3.Size = New System.Drawing.Size(563, 136)
        Me.GroupBox3.TabIndex = 59
@ -435,7 +359,7 @@ Partial Class frmDIProfilEigenschaften
        '
        'txtVerzoegerung
        '
-        Me.txtVerzoegerung.Location = New System.Drawing.Point(411, 632)
+        Me.txtVerzoegerung.Location = New System.Drawing.Point(400, 562)
        Me.txtVerzoegerung.Name = "txtVerzoegerung"
        Me.txtVerzoegerung.Size = New System.Drawing.Size(45, 22)
        Me.txtVerzoegerung.TabIndex = 55
@ -444,7 +368,7 @@ Partial Class frmDIProfilEigenschaften
        'Label6
        '
        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(18, 628)
+        Me.Label6.Location = New System.Drawing.Point(18, 558)
        Me.Label6.Name = "Label6"
        Me.Label6.Size = New System.Drawing.Size(376, 26)
        Me.Label6.TabIndex = 54
@ -542,27 +466,15 @@ Partial Class frmDIProfilEigenschaften
        Me.Label5.TabIndex = 50
        Me.Label5.Text = "*  bei diesem Feld handelt es sich um ein Pflichtfeld"
        '
-        'btnRegeln
-        '
-        Me.btnRegeln.Image = Global.ToolCollection.My.Resources.Resources.f5
-        Me.btnRegeln.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnRegeln.Location = New System.Drawing.Point(581, 10)
-        Me.btnRegeln.Name = "btnRegeln"
-        Me.btnRegeln.Size = New System.Drawing.Size(155, 46)
-        Me.btnRegeln.TabIndex = 6
-        Me.btnRegeln.Text = "Regeln verwalten ..."
-        Me.btnRegeln.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnRegeln.UseVisualStyleBackColor = True
-        '
        'boxImportoptionenLoeschen
        '
        Me.boxImportoptionenLoeschen.Controls.Add(Me.chkUVloeschen)
        Me.boxImportoptionenLoeschen.Controls.Add(Me.chkQuellverzeichnisLoeschen)
        Me.boxImportoptionenLoeschen.Controls.Add(Me.chkDateienLoeschen)
        Me.boxImportoptionenLoeschen.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.boxImportoptionenLoeschen.Location = New System.Drawing.Point(15, 408)
+        Me.boxImportoptionenLoeschen.Location = New System.Drawing.Point(584, 110)
        Me.boxImportoptionenLoeschen.Name = "boxImportoptionenLoeschen"
-        Me.boxImportoptionenLoeschen.Size = New System.Drawing.Size(564, 66)
+        Me.boxImportoptionenLoeschen.Size = New System.Drawing.Size(345, 99)
        Me.boxImportoptionenLoeschen.TabIndex = 46
        Me.boxImportoptionenLoeschen.TabStop = False
        Me.boxImportoptionenLoeschen.Text = "Löschen"
@ -571,7 +483,7 @@ Partial Class frmDIProfilEigenschaften
        '
        Me.chkUVloeschen.AutoSize = True
        Me.chkUVloeschen.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.chkUVloeschen.Location = New System.Drawing.Point(271, 42)
+        Me.chkUVloeschen.Location = New System.Drawing.Point(8, 65)
        Me.chkUVloeschen.Name = "chkUVloeschen"
        Me.chkUVloeschen.Size = New System.Drawing.Size(230, 17)
        Me.chkUVloeschen.TabIndex = 2
@ -717,11 +629,113 @@ Partial Class frmDIProfilEigenschaften
        '
        Me.OpenFileDialog1.FileName = "OpenFileDialog1"
        '
+        'Button1
+        '
+        Me.Button1.Image = Global.ToolCollection.My.Resources.Resources.lines_Text_code_16xLG
+        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button1.Location = New System.Drawing.Point(584, 11)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(184, 23)
+        Me.Button1.TabIndex = 60
+        Me.Button1.Text = "Regular Expressions"
+        Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'btnRegeln
+        '
+        Me.btnRegeln.Image = Global.ToolCollection.My.Resources.Resources.f5
+        Me.btnRegeln.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnRegeln.Location = New System.Drawing.Point(774, 10)
+        Me.btnRegeln.Name = "btnRegeln"
+        Me.btnRegeln.Size = New System.Drawing.Size(155, 49)
+        Me.btnRegeln.TabIndex = 6
+        Me.btnRegeln.Text = "Regeln verwalten ..."
+        Me.btnRegeln.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnRegeln.UseVisualStyleBackColor = True
+        '
+        'btnSpeichern
+        '
+        Me.btnSpeichern.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.btnSpeichern.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.btnSpeichern.Enabled = False
+        Me.btnSpeichern.Image = Global.ToolCollection.My.Resources.Resources.table_save
+        Me.btnSpeichern.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.btnSpeichern.Name = "btnSpeichern"
+        Me.btnSpeichern.ShowDropDownArrow = False
+        Me.btnSpeichern.Size = New System.Drawing.Size(20, 20)
+        Me.btnSpeichern.Text = "Profil speichern"
+        '
+        'btnLöschen
+        '
+        Me.btnLöschen.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.btnLöschen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.btnLöschen.Enabled = False
+        Me.btnLöschen.Image = Global.ToolCollection.My.Resources.Resources.table_delete
+        Me.btnLöschen.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.btnLöschen.Name = "btnLöschen"
+        Me.btnLöschen.ShowDropDownArrow = False
+        Me.btnLöschen.Size = New System.Drawing.Size(20, 20)
+        Me.btnLöschen.Text = "Profil löschen"
+        '
+        'btnHinzufügen
+        '
+        Me.btnHinzufügen.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right
+        Me.btnHinzufügen.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.btnHinzufügen.Image = Global.ToolCollection.My.Resources.Resources.table_add
+        Me.btnHinzufügen.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.btnHinzufügen.Name = "btnHinzufügen"
+        Me.btnHinzufügen.ShowDropDownArrow = False
+        Me.btnHinzufügen.Size = New System.Drawing.Size(20, 20)
+        Me.btnHinzufügen.Text = "Profil hinzufügen"
+        '
+        'tsbtnfirst
+        '
+        Me.tsbtnfirst.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.tsbtnfirst.DoubleClickEnabled = True
+        Me.tsbtnfirst.Image = Global.ToolCollection.My.Resources.Resources.control_rewind
+        Me.tsbtnfirst.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbtnfirst.Name = "tsbtnfirst"
+        Me.tsbtnfirst.ShowDropDownArrow = False
+        Me.tsbtnfirst.Size = New System.Drawing.Size(20, 20)
+        Me.tsbtnfirst.Text = "Erstes Profil"
+        '
+        'tsbtnprevious
+        '
+        Me.tsbtnprevious.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.tsbtnprevious.Image = Global.ToolCollection.My.Resources.Resources.arrow_left
+        Me.tsbtnprevious.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbtnprevious.Name = "tsbtnprevious"
+        Me.tsbtnprevious.ShowDropDownArrow = False
+        Me.tsbtnprevious.Size = New System.Drawing.Size(20, 20)
+        Me.tsbtnprevious.Text = "ToolStripDropDownButton2"
+        Me.tsbtnprevious.ToolTipText = "Vorheriges Profil"
+        '
+        'tsbtnnext
+        '
+        Me.tsbtnnext.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.tsbtnnext.Image = Global.ToolCollection.My.Resources.Resources.arrow_right
+        Me.tsbtnnext.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbtnnext.Name = "tsbtnnext"
+        Me.tsbtnnext.ShowDropDownArrow = False
+        Me.tsbtnnext.Size = New System.Drawing.Size(20, 20)
+        Me.tsbtnnext.Text = "ToolStripDropDownButton3"
+        Me.tsbtnnext.ToolTipText = "Nächstes Profil"
+        '
+        'tsbtnlast
+        '
+        Me.tsbtnlast.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        Me.tsbtnlast.Image = Global.ToolCollection.My.Resources.Resources.control_fastforward
+        Me.tsbtnlast.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.tsbtnlast.Name = "tsbtnlast"
+        Me.tsbtnlast.ShowDropDownArrow = False
+        Me.tsbtnlast.Size = New System.Drawing.Size(20, 20)
+        Me.tsbtnlast.Text = "Letztes Profil"
+        '
        'frmDIProfilEigenschaften
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(739, 680)
+        Me.ClientSize = New System.Drawing.Size(941, 680)
        Me.Controls.Add(Me.pnlProfileigenschaften)
        Me.Controls.Add(Me.StatusStrip1)
        Me.DataBindings.Add(New System.Windows.Forms.Binding("Location", Global.ToolCollection.My.MySettings.Default, "frmDIProfileigenschaften_Loc", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
@ -810,4 +824,5 @@ Partial Class frmDIProfilEigenschaften
    Friend WithEvents rbUV_Date2 As System.Windows.Forms.RadioButton
    Friend WithEvents rbUV_Date1 As System.Windows.Forms.RadioButton
    Friend WithEvents txtUV_Date As System.Windows.Forms.TextBox
+    Friend WithEvents Button1 As Button
 End Class
--- a/ToolCollection/frmDIProfilEigenschaften.vb
+++ b/ToolCollection/frmDIProfilEigenschaften.vb
@ -494,6 +494,7 @@ Public Class frmDIProfilEigenschaften
    Private Sub txtProfilname_TextChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles txtProfilname.TextChanged
        If Me.selectedProfile IsNot Nothing Then
            Me.selectedProfile.Profilname = Me.txtProfilname.Text
+            CURRENT_PROFILENAME = Me.selectedProfile.Profilname
            If Not Me.txtProfilname.Text = Me.selectedProfile.OriginalProfilname Then
                Me.btnSpeichern.Enabled = True
            Else
@ -942,4 +943,12 @@ Public Class frmDIProfilEigenschaften
            End If
        End If
    End Sub
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        If CURRENT_PROFILENAME = "" Then
+            MsgBox("Please choose a Profile!", MsgBoxStyle.Exclamation)
+            Exit Sub
+        End If
+        frmDIRegex.ShowDialog()
+    End Sub
 End Class
--- a/ToolCollection/frmDIRegex.Designer.vb
+++ b/ToolCollection/frmDIRegex.Designer.vb
@ -0,0 +1,345 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmDIRegex
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
+        Dim GUIDLabel As System.Windows.Forms.Label
+        Dim PROFILE_NAMELabel As System.Windows.Forms.Label
+        Dim REGEXLabel As System.Windows.Forms.Label
+        Dim CREATED_WHOLabel As System.Windows.Forms.Label
+        Dim CREATED_WHENLabel As System.Windows.Forms.Label
+        Dim CHANGED_WHOLabel As System.Windows.Forms.Label
+        Dim CHANGED_WHENLabel As System.Windows.Forms.Label
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDIRegex))
+        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.GUIDTextBox = New System.Windows.Forms.TextBox()
+        Me.PROFILE_NAMETextBox = New System.Windows.Forms.TextBox()
+        Me.REGEXTextBox = New System.Windows.Forms.TextBox()
+        Me.CREATED_WHOTextBox = New System.Windows.Forms.TextBox()
+        Me.CREATED_WHENTextBox = New System.Windows.Forms.TextBox()
+        Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox()
+        Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox()
+        Me.txtFilenameTest = New System.Windows.Forms.TextBox()
+        Me.Label11 = New System.Windows.Forms.Label()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.TBTC_DI_REGEX_MATCHBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.MyDataset = New ToolCollection.MyDataset()
+        Me.TBTC_DI_REGEX_MATCHTableAdapter = New ToolCollection.MyDatasetTableAdapters.TBTC_DI_REGEX_MATCHTableAdapter()
+        Me.TableAdapterManager = New ToolCollection.MyDatasetTableAdapters.TableAdapterManager()
+        GUIDLabel = New System.Windows.Forms.Label()
+        PROFILE_NAMELabel = New System.Windows.Forms.Label()
+        REGEXLabel = New System.Windows.Forms.Label()
+        CREATED_WHOLabel = New System.Windows.Forms.Label()
+        CREATED_WHENLabel = New System.Windows.Forms.Label()
+        CHANGED_WHOLabel = New System.Windows.Forms.Label()
+        CHANGED_WHENLabel = New System.Windows.Forms.Label()
+        Me.ToolStrip1.SuspendLayout()
+        CType(Me.TBTC_DI_REGEX_MATCHBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SuspendLayout()
+        '
+        'GUIDLabel
+        '
+        GUIDLabel.AutoSize = True
+        GUIDLabel.Location = New System.Drawing.Point(9, 25)
+        GUIDLabel.Name = "GUIDLabel"
+        GUIDLabel.Size = New System.Drawing.Size(22, 13)
+        GUIDLabel.TabIndex = 4
+        GUIDLabel.Text = "ID:"
+        '
+        'PROFILE_NAMELabel
+        '
+        PROFILE_NAMELabel.AutoSize = True
+        PROFILE_NAMELabel.Location = New System.Drawing.Point(64, 25)
+        PROFILE_NAMELabel.Name = "PROFILE_NAMELabel"
+        PROFILE_NAMELabel.Size = New System.Drawing.Size(61, 13)
+        PROFILE_NAMELabel.TabIndex = 6
+        PROFILE_NAMELabel.Text = "Profilname:"
+        '
+        'REGEXLabel
+        '
+        REGEXLabel.AutoSize = True
+        REGEXLabel.Location = New System.Drawing.Point(9, 64)
+        REGEXLabel.Name = "REGEXLabel"
+        REGEXLabel.Size = New System.Drawing.Size(86, 13)
+        REGEXLabel.TabIndex = 8
+        REGEXLabel.Text = "RegexAusdruck:"
+        '
+        'CREATED_WHOLabel
+        '
+        CREATED_WHOLabel.AutoSize = True
+        CREATED_WHOLabel.Location = New System.Drawing.Point(9, 137)
+        CREATED_WHOLabel.Name = "CREATED_WHOLabel"
+        CREATED_WHOLabel.Size = New System.Drawing.Size(65, 13)
+        CREATED_WHOLabel.TabIndex = 12
+        CREATED_WHOLabel.Text = "Erstellt wer:"
+        '
+        'CREATED_WHENLabel
+        '
+        CREATED_WHENLabel.AutoSize = True
+        CREATED_WHENLabel.Location = New System.Drawing.Point(211, 137)
+        CREATED_WHENLabel.Name = "CREATED_WHENLabel"
+        CREATED_WHENLabel.Size = New System.Drawing.Size(73, 13)
+        CREATED_WHENLabel.TabIndex = 14
+        CREATED_WHENLabel.Text = "Erstellt wann:"
+        '
+        'CHANGED_WHOLabel
+        '
+        CHANGED_WHOLabel.AutoSize = True
+        CHANGED_WHOLabel.Location = New System.Drawing.Point(9, 176)
+        CHANGED_WHOLabel.Name = "CHANGED_WHOLabel"
+        CHANGED_WHOLabel.Size = New System.Drawing.Size(77, 13)
+        CHANGED_WHOLabel.TabIndex = 16
+        CHANGED_WHOLabel.Text = "Geändert wer:"
+        '
+        'CHANGED_WHENLabel
+        '
+        CHANGED_WHENLabel.AutoSize = True
+        CHANGED_WHENLabel.Location = New System.Drawing.Point(211, 176)
+        CHANGED_WHENLabel.Name = "CHANGED_WHENLabel"
+        CHANGED_WHENLabel.Size = New System.Drawing.Size(85, 13)
+        CHANGED_WHENLabel.TabIndex = 18
+        CHANGED_WHENLabel.Text = "Geändert wann:"
+        '
+        'StatusStrip1
+        '
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 223)
+        Me.StatusStrip1.Name = "StatusStrip1"
+        Me.StatusStrip1.Size = New System.Drawing.Size(800, 22)
+        Me.StatusStrip1.TabIndex = 0
+        Me.StatusStrip1.Text = "StatusStrip1"
+        '
+        'ToolStrip1
+        '
+        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.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(121, 22)
+        Me.tsbtnAdd.Text = "Regex 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"
+        '
+        'GUIDTextBox
+        '
+        Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_DI_REGEX_MATCHBindingSource, "GUID", True))
+        Me.GUIDTextBox.Enabled = False
+        Me.GUIDTextBox.Location = New System.Drawing.Point(12, 41)
+        Me.GUIDTextBox.Name = "GUIDTextBox"
+        Me.GUIDTextBox.ReadOnly = True
+        Me.GUIDTextBox.Size = New System.Drawing.Size(46, 21)
+        Me.GUIDTextBox.TabIndex = 5
+        '
+        'PROFILE_NAMETextBox
+        '
+        Me.PROFILE_NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_DI_REGEX_MATCHBindingSource, "PROFILE_NAME", True))
+        Me.PROFILE_NAMETextBox.Location = New System.Drawing.Point(67, 41)
+        Me.PROFILE_NAMETextBox.Name = "PROFILE_NAMETextBox"
+        Me.PROFILE_NAMETextBox.ReadOnly = True
+        Me.PROFILE_NAMETextBox.Size = New System.Drawing.Size(480, 21)
+        Me.PROFILE_NAMETextBox.TabIndex = 7
+        '
+        'REGEXTextBox
+        '
+        Me.REGEXTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_DI_REGEX_MATCHBindingSource, "REGEX", True))
+        Me.REGEXTextBox.Location = New System.Drawing.Point(12, 80)
+        Me.REGEXTextBox.Multiline = True
+        Me.REGEXTextBox.Name = "REGEXTextBox"
+        Me.REGEXTextBox.Size = New System.Drawing.Size(535, 54)
+        Me.REGEXTextBox.TabIndex = 9
+        '
+        'CREATED_WHOTextBox
+        '
+        Me.CREATED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_DI_REGEX_MATCHBindingSource, "CREATED_WHO", True))
+        Me.CREATED_WHOTextBox.Enabled = False
+        Me.CREATED_WHOTextBox.Location = New System.Drawing.Point(12, 153)
+        Me.CREATED_WHOTextBox.Name = "CREATED_WHOTextBox"
+        Me.CREATED_WHOTextBox.ReadOnly = True
+        Me.CREATED_WHOTextBox.Size = New System.Drawing.Size(193, 21)
+        Me.CREATED_WHOTextBox.TabIndex = 13
+        '
+        'CREATED_WHENTextBox
+        '
+        Me.CREATED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_DI_REGEX_MATCHBindingSource, "CREATED_WHEN", True))
+        Me.CREATED_WHENTextBox.Enabled = False
+        Me.CREATED_WHENTextBox.Location = New System.Drawing.Point(214, 153)
+        Me.CREATED_WHENTextBox.Name = "CREATED_WHENTextBox"
+        Me.CREATED_WHENTextBox.ReadOnly = True
+        Me.CREATED_WHENTextBox.Size = New System.Drawing.Size(163, 21)
+        Me.CREATED_WHENTextBox.TabIndex = 15
+        '
+        'CHANGED_WHOTextBox
+        '
+        Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_DI_REGEX_MATCHBindingSource, "CHANGED_WHO", True))
+        Me.CHANGED_WHOTextBox.Enabled = False
+        Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(12, 192)
+        Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox"
+        Me.CHANGED_WHOTextBox.ReadOnly = True
+        Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(193, 21)
+        Me.CHANGED_WHOTextBox.TabIndex = 17
+        '
+        'CHANGED_WHENTextBox
+        '
+        Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBTC_DI_REGEX_MATCHBindingSource, "CHANGED_WHEN", True))
+        Me.CHANGED_WHENTextBox.Enabled = False
+        Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(214, 192)
+        Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox"
+        Me.CHANGED_WHENTextBox.ReadOnly = True
+        Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(163, 21)
+        Me.CHANGED_WHENTextBox.TabIndex = 19
+        '
+        'txtFilenameTest
+        '
+        Me.txtFilenameTest.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.ToolCollection.My.MySettings.Default, "myDateiname", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
+        Me.txtFilenameTest.Location = New System.Drawing.Point(553, 80)
+        Me.txtFilenameTest.Name = "txtFilenameTest"
+        Me.txtFilenameTest.Size = New System.Drawing.Size(207, 21)
+        Me.txtFilenameTest.TabIndex = 22
+        Me.txtFilenameTest.Text = Global.ToolCollection.My.MySettings.Default.myDateiname
+        '
+        'Label11
+        '
+        Me.Label11.AutoSize = True
+        Me.Label11.ImeMode = System.Windows.Forms.ImeMode.NoControl
+        Me.Label11.Location = New System.Drawing.Point(550, 64)
+        Me.Label11.Name = "Label11"
+        Me.Label11.Size = New System.Drawing.Size(86, 13)
+        Me.Label11.TabIndex = 21
+        Me.Label11.Text = "Dateiname Test:"
+        '
+        'Button1
+        '
+        Me.Button1.Image = Global.ToolCollection.My.Resources.Resources.CheckConstraints_5634
+        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button1.Location = New System.Drawing.Point(553, 111)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(207, 23)
+        Me.Button1.TabIndex = 20
+        Me.Button1.Text = "Check Regex"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'TBTC_DI_REGEX_MATCHBindingSource
+        '
+        Me.TBTC_DI_REGEX_MATCHBindingSource.DataMember = "TBTC_DI_REGEX_MATCH"
+        Me.TBTC_DI_REGEX_MATCHBindingSource.DataSource = Me.MyDataset
+        '
+        'MyDataset
+        '
+        Me.MyDataset.DataSetName = "MyDataset"
+        Me.MyDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
+        '
+        'TBTC_DI_REGEX_MATCHTableAdapter
+        '
+        Me.TBTC_DI_REGEX_MATCHTableAdapter.ClearBeforeFill = True
+        '
+        '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
+        '
+        'frmDIRegex
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(800, 245)
+        Me.Controls.Add(Me.txtFilenameTest)
+        Me.Controls.Add(Me.Label11)
+        Me.Controls.Add(Me.Button1)
+        Me.Controls.Add(GUIDLabel)
+        Me.Controls.Add(Me.GUIDTextBox)
+        Me.Controls.Add(PROFILE_NAMELabel)
+        Me.Controls.Add(Me.PROFILE_NAMETextBox)
+        Me.Controls.Add(REGEXLabel)
+        Me.Controls.Add(Me.REGEXTextBox)
+        Me.Controls.Add(CREATED_WHOLabel)
+        Me.Controls.Add(Me.CREATED_WHOTextBox)
+        Me.Controls.Add(CREATED_WHENLabel)
+        Me.Controls.Add(Me.CREATED_WHENTextBox)
+        Me.Controls.Add(CHANGED_WHOLabel)
+        Me.Controls.Add(Me.CHANGED_WHOTextBox)
+        Me.Controls.Add(CHANGED_WHENLabel)
+        Me.Controls.Add(Me.CHANGED_WHENTextBox)
+        Me.Controls.Add(Me.ToolStrip1)
+        Me.Controls.Add(Me.StatusStrip1)
+        Me.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Name = "frmDIRegex"
+        Me.Text = "Dateiimport - Regular Expression"
+        Me.ToolStrip1.ResumeLayout(False)
+        Me.ToolStrip1.PerformLayout()
+        CType(Me.TBTC_DI_REGEX_MATCHBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents StatusStrip1 As StatusStrip
+    Friend WithEvents ToolStrip1 As ToolStrip
+    Friend WithEvents tsbtnAdd As ToolStripButton
+    Friend WithEvents tsbtnSave As ToolStripButton
+    Friend WithEvents tsbtnDelete As ToolStripButton
+    Friend WithEvents MyDataset As MyDataset
+    Friend WithEvents TBTC_DI_REGEX_MATCHBindingSource As BindingSource
+    Friend WithEvents TBTC_DI_REGEX_MATCHTableAdapter As MyDatasetTableAdapters.TBTC_DI_REGEX_MATCHTableAdapter
+    Friend WithEvents TableAdapterManager As MyDatasetTableAdapters.TableAdapterManager
+    Friend WithEvents GUIDTextBox As TextBox
+    Friend WithEvents PROFILE_NAMETextBox As TextBox
+    Friend WithEvents REGEXTextBox As TextBox
+    Friend WithEvents CREATED_WHOTextBox As TextBox
+    Friend WithEvents CREATED_WHENTextBox As TextBox
+    Friend WithEvents CHANGED_WHOTextBox As TextBox
+    Friend WithEvents CHANGED_WHENTextBox As TextBox
+    Friend WithEvents Button1 As Button
+    Friend WithEvents txtFilenameTest As TextBox
+    Friend WithEvents Label11 As Label
+End Class
--- a/ToolCollection/frmDIRegex.resx
+++ b/ToolCollection/frmDIRegex.resx
@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="GUIDLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="PROFILE_NAMELabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="REGEXLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="CREATED_WHOLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="CREATED_WHENLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="CHANGED_WHOLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="CHANGED_WHENLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>134, 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>351, 17</value>
+  </metadata>
+  <metadata name="MyDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>241, 17</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>614, 17</value>
+  </metadata>
+  <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>871, 17</value>
+  </metadata>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAIAICAAAAEAIACoEAAAJgAAABAQAAABACAAaAQAAM4QAAAoAAAAIAAAAEAAAAABACAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACBaFb/Y0k1/2NJ
+        Nf9jSTX/Y0k1/2NJNf9jSTX/Y0k1/2NJNf9jSTX/Y0k1/2NJNf9jSTX/Y0k1/2NJNf9jSTX/Y0k1/2NJ
+        Nf9jSTX/Y0k1/2NJNf9jSTX/Y0k1/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIRr
+        Wf/0287/3sCx/9y+rv/bvKz/27uq/9m5qP/Yt6X/2LWj/9ezof/WsZ//1rCc/9Stmv/Uq5f/0qqW/9Ko
+        k//QppH/0KSP/8+jjf/PoIv/zZ+J/82eh/9jSTX/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAhm5b//Tc0f/67un/+ezm//nq4//359//+OXc//fj2v/24Nf/9d/U//Td0f/0287/89jL//PW
+        yP/y08X/8dHC//HPv//wzbz/78u5/+/Jtv/ux7T/zaCJ/2NJNf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAABAAAAAQAAAAGIcF7/9N7S//nv6//47ef/+Orl//jo4f/35t7/9+Tb//Xi2f/04NX/9N3T//Tc
+        0P/z2cz/8tfK//LUx//x0sT/8NDA//DPvv/vzbz/78q5/+/It//PoYv/Y0k1/wAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAA0AAAAPAAAAD4NsW//o08n/7OTg/+vj3f/HuK3/xrar/8S0qf/Csaf/wK+l/76s
+        ov+8qZ7/uqib/7ilmP+2opX/tKCT/7afkv+4oJP/uKCS/7efkf/wzLv/78u5/9Cijf9jSTX/AAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAANgAAADsAAAA7bFtN/72upv/CvLr/wru3/8G4tf/AtrL/wLWw/7+z
+        rf+/sav/vq+p/72up/+9raT/vaui/7ypoP/Aq6L/zLWq/+HFuf/t0MH/8M/A//DOv//wzLz/0KSP/2NJ
+        Nf8AAAAAAAAAAAAAAAAAAAAAAAAAAEGGUv8/gU//PHxL/zp3SP84ckb/Nm9D/zRqQP8yZj3/MGM8/y5f
+        Ov8tXDj/iU1P/4ZKS/+CRkf/fkNE/3tBQv94Pj//djw9/3M6O/9xODn/zLSq/+nNv//x0sP/8dHB//DO
+        vv/RppH/Y0k1/wAAAAAAAAAAAAAAAAAAAAAAAAAARIxV/0KHU/9AgU//PH1M/zp4Sf85c0b/Nm9E/zRr
+        Qf8yZz//MWQ8/y9gOv+OUVL/i05O/4ZKS/+DR0j/f0RF/3tBQv94Pj//dTw9/3M6O/+TgHX/sJmM/7ae
+        kP/y0sP/8dHB/9KplP9jSTX/AAAAAAAAAAAAAAAAAAAAAAAAAABGkln/RI1W////////////////////
+        //////////////////8yaD//MWQ8//////////////////////////////////////94P0D/djw9/7yp
+        oP/mzMH/89bJ//LVx//y0sT/06uW/2NJNf8AAAAAAAAAAAAAAAAAAAAAAAAAAEmXXP9Hk1r/////////
+        /////////////////////////////zVtQv8zaUD//////////////////////////////////////3xB
+        Qv95P0D/vKuh/+bPxP/z2Mz/89fJ//PUxv/UrJn/Y0k1/wAAAAAAAAAAAAAAAAAAAAAAAAAATJxg/0qY
+        Xf//////////////////////////////////////OHJF/zZuQ///////////////////////////////
+        ////////gEVG/31CQ/+QfXP/rpiK/7aekP/02sz/89fJ/9Wum/9jSTX/AAAAAAAAAAAAAAAAAAAAAAAA
+        AABOoWP/TZ1g//////////////////////////////////////87eEj/OXNG////////////////////
+        //////////////////+FSUr/gUZH/72upv/o0sn/9NzR//Tbz//z2cz/1rGe/2NJNf8AAAAAAAAAAAAA
+        AAAAAAAAAAAAAFCmZv9PomT//////////////////////////////////////z59Tf86eUr/////////
+        /////////////////////////////4lMTf+ESUr/vq6o/+jVy//139T/9d3T//Tbz//Xs6D/Y0k1/wAA
+        AAAAAAAAAAAAAAAAAAAAAAAAU6po/1GmZv//////////////////////////////////////QIRQ/z5+
+        Tf//////////////////////////////////////jVBR/4pNTv+QfXP/rpiK/7aekP/24NT/9d3S/9e1
+        o/9jSTX/AAAAAAAAAAAAAAAAAAAAAAAAAABVrmv/U6tq////////////////////////////////////
+        //9CilT/QIRR//////////////////////////////////////+SVVX/jlFS/7+yrP/p2ND/9uLZ//bh
+        2P/239T/2bel/2NJNf8AAAAAAAAAAAAAAAAAAAAAAAAAAFWxbf9Vrmv/U6xp/1GoZ/9QpWX/T6Fj/02d
+        YP9KmF3/R5Ra/1FQsP9MSab/RkKe/0E8lf86NYz/NS6D/zAoev8rInL/Jx1r/yIYZP8fFF//v7Su/+na
+        0//35Nv/9uPa//bh1//auaf/Y0k1/wAAAAAAAAAAAAAAAAAAAAAAAAAAVrFt/1axbf9Vr2z/U6xq/1Kp
+        aP9Qpmb/T6Jj/02eYP9KmV7/WFi6/1JRsf9MSqj/R0Of/0E8lf88No3/NS6E/zApe/8rI3P/Jx1s/yMY
+        Zf+QfXP/rpiK/7aekP/45t3/9+Pa/9u6qv9jSTX/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAqpSE//75+P////////////////9dXsT/WFi7////////////////////////////////////
+        //8sI3T/KB1t/8C4sv/q39j/9+nh//jo4P/45dz/27ys/2NJNf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAACslof//vv6/////////////////2JkzP9eX8T/////////////////////////
+        /////////////zIqff8tJHX/wbi1/+rg2//56+X/+erj//jn3//cvq7/Y0k1/wAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAK6Ziv/+/Pz////////////Tw7j/Z2rT/2NmzP//////////////
+        ////////////////////////ODGH/zIrfv+QfXP/rpiK/7aekP/66+b/+eni/93Bsf9jSTX/AAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsZyN///+/f////////////////9rcNr/aGvU////
+        //////////////////////////////////8+OZH/OTOI/8K8uf/s5OD/+u/q//ru6P/56+X/38Kz/2NJ
+        Nf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACzno///////////////////////250
+        3/9sb9v//////////////////////////////////////0RAm/8/OpL/wr68/+3m4//68e3/+/Dr//ru
+        6P/fxLb/Y0k1/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALWgkv//////////////
+        ///Tw7j/b3Tg/2904P//////////////////////////////////////S0mm/0ZCnP+QfXP/7ejm//v0
+        8P/78+3/+vDr/+DHuP9jSTX/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAuKOU////
+        //////////////////9vdOD/b3Tg//////////////////////////////////////9RULD/S0mn/8PA
+        v//u6ej/yLOo/72ll/+ymYn/pIp4/2NJNf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAC6ppj//////////////////////2904P9vdOD/b3Tg/2904P9scdz/am7X/2Zo0f9hY8r/XF7C/1dY
+        uf9SUbH/x8bF/5aAcP9jSTX/Y0k1/2NJNf9jSTX/Y0k1/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAALyomv//////////////////////b3Tg/2904P9vdOD/b3Tg/2904P9tct3/am7Y/2Zq
+        0v9iZMv/XV7D/1hZu//W1NP/moR0/9TEvP/HsaX/uaGS/2xSPv9jSTVmAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAvqqc////////////////////////////////////////////////////
+        /////////////////////////////////v+ijHz/49rT/9XFvP95YEz/bFI+ZgAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADArZ//////////////////////////////////////////
+        /////////////////////////////////////////////6WOfv/z7+3/iHBd/3lgTGYAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMKvof////////////////////////38//77
+        +//9+fj//fj1//z18v/78+//+/Dr//rt6P/56+T/+Oni//fn3f/35Nv/p5GC/5Z/bv+IcF1mAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAxbGj/8Ovof/CrqD/wKyf/7+r
+        nP+9qZv/vKea/7uml/+4pJX/t6KU/7ahkv+zn5D/sp2P/7Cbjf+umov/rZiI/6uWh/+plIT/ln9uZgAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP/////8AAAH/AAAB/wAAAfgAAAH4AAAB+AA
+        AAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB8AAAAfAAAAHwAAAB/wAAAf8AAAH/AAAB/wA
+        AAf8AAAH/AAAB/wAAAf8AAAH/AAAB/wAAA/8AAAf/AAAP/wAAH//////KAAAABAAAAAgAAAAAQAgAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAC3opP/Y0k1/2NJNf9jSTX/Y0k1/2NJ
+        Nf9jSTX/Y0k1/2NJNf9jSTX/Y0k1/2NJNf8AAAAAAAAAAAAAAAAAAAAAt6KT//fl3P+3opP/t6KT/7ei
+        k/+3opP/t6KT/7eik/+3opP/t6KT/7eik/9jSTX/AAAAAAAAAAYAAAASAAAAGKaThf/i083/4dDI/+DN
+        xP/eyb//3ca7/+LIvP/sz8D/8dDB//DNvP+3opP/Y0k1/wAAAAAAAAASAAAANgAAAEmDdGn/sqqm/7Gn
+        ov+xpJ7/sKKb/6+fmP/BraT/4sm9//LVxv/x0cL/t6KT/2NJNf8AAAAASI5Q/z99R/83bT7/L142/yhQ
+        MP+ramv/klRW/31DRP9uNjf/iXlv/6mTh/+1nI3/89XH/7eik/9jSTX/AAAAADieVP//+P////j////4
+        //8vXjf///j////4////+P//fUJD/7CjnP/fzMP/9N7T//Pazf+3opP/Y0k1/wAAAABBpFz///j////4
+        ////+P//N24+///4////+P////j//5JVVf+JeG//qZOG/7Wbjf/139P/t6KT/2NJNf8AAAAATKpl///4
+        ////+P////j//z9+R///+P////j////4//+ramv/sqqm/+HUz//359//9uLa/7eik/9jSTX/AAAAAFax
+        bf9Mq2T/QqRc/zidVP9IQon/OjJ6/y0kbf8jGWL/HBBa/4l4b/+pk4b/tpyN//jo3/+3opP/Y0k1/wAA
+        AAAAAAAAAAAAAAAAAADIsqP/RkvV///4////+P////j//yUcZP+0r63/49vY//vv6v/57Ob/t6KT/2NJ
+        Nf8AAAAAAAAAAAAAAAAAAAAAzLan/1NZ2f//+P////j////4//80K3P/iXlv/+Tf3P/79O//t6KT/7ei
+        k/9kSjb/AAAAAAAAAAAAAAAAAAAAANG7q/9hZt3///j////4////+P//RT+F/8jGxv/r5+b/t6KT/2RK
+        Nv9kSjb/ZEo2/wAAAAAAAAAAAAAAAAAAAADVv6//b3Tg/2Fm3f9TWdn/RkvV/1ZTmP/t7Oz/+Pb1/7mk
+        lf/Uxbr/Y0k1/6KLevUAAAAAAAAAAAAAAAAAAAAA2MKy////////////////////////////////////
+        /v/Aq5z/Y0k1/6KLevUAAAAAAAAAAAAAAAAAAAAAAAAAANjCsv/YwrL/2MKy/9jCsv/YwrL/2MKy/9S+
+        rv/Puan/ybOk/8mzpOcAAAAAAAAAAAAAAAD//wAA4AEAAOABVf8AAVP/AAFP/wABTP8AAUn/AAFG/wAB
+        RP8AAUH/4AE//+ABPP/gATr/4AFS/+ADTv/gB0v/
+</value>
+  </data>
+</root>
--- a/ToolCollection/frmDIRegex.vb
+++ b/ToolCollection/frmDIRegex.vb
@ -0,0 +1,95 @@
+Imports System.Text.RegularExpressions
+
+Public Class frmDIRegex
+    Private Sub TBTC_DI_REGEX_MATCHBindingNavigatorSaveItem_Click(sender As Object, e As EventArgs)
+        Me.Validate()
+        Me.TBTC_DI_REGEX_MATCHBindingSource.EndEdit()
+        Me.TableAdapterManager.UpdateAll(Me.MyDataset)
+
+    End Sub
+    Sub LoadData()
+        Try
+            TBTC_DI_REGEX_MATCHTableAdapter.Connection.ConnectionString = My.Settings.DDECMConString
+            Me.TBTC_DI_REGEX_MATCHTableAdapter.Fill(Me.MyDataset.TBTC_DI_REGEX_MATCH, CURRENT_PROFILENAME)
+            If Me.MyDataset.TBTC_DI_REGEX_MATCH.Rows.Count = 1 Then
+                tsbtnAdd.Enabled = False
+                tsbtnSave.Enabled = True
+                tsbtnDelete.Enabled = True
+                REGEXTextBox.Enabled = True
+                PROFILE_NAMETextBox.Enabled = True
+                Button1.Enabled = True
+
+            Else
+                tsbtnAdd.Enabled = True
+                tsbtnSave.Enabled = False
+                tsbtnDelete.Enabled = False
+                REGEXTextBox.Enabled = False
+                PROFILE_NAMETextBox.Enabled = False
+                Button1.Enabled = False
+
+            End If
+        Catch ex As System.Exception
+
+            MsgBox("Unexpected error in Loading Regex Fileimport: " & vbNewLine & ex.Message & vbNewLine & "ConnectionString: " & My.Settings.DDECMConString, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+
+    Private Sub tsbtnSave_Click(sender As Object, e As EventArgs) Handles tsbtnSave.Click
+        Try
+            Me.TBTC_DI_REGEX_MATCHBindingSource.EndEdit()
+            Me.MyDataset.TBTC_DI_REGEX_MATCH.CHANGED_WHOColumn.DefaultValue = Environment.UserName
+            If Not IsNothing(MyDataset.TBTC_DI_REGEX_MATCH.GetChanges) Then
+                Me.CHANGED_WHOTextBox.Text = Environment.UserName
+                Me.TBTC_DI_REGEX_MATCHBindingSource.EndEdit()
+                TBTC_DI_REGEX_MATCHTableAdapter.Update(MyDataset.TBTC_DI_REGEX_MATCH)
+                LoadData()
+            End If
+
+        Catch ex As Exception
+            MsgBox("Unexpected error in Saving Regex Fileimport: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+
+    Private Sub frmDIRegex_Load(sender As Object, e As EventArgs) Handles Me.Load
+        LoadData()
+    End Sub
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        My.Settings.Save()
+
+        Try
+            If Regex.IsMatch(txtFilenameTest.Text, REGEXTextBox.Text) Then
+                MsgBox("The RegEx resulted in a proper match!", MsgBoxStyle.Information, "Perfect:")
+            Else
+                MsgBox("No Match- There might be an error in the RegEx!", MsgBoxStyle.Information, "Something wrong:")
+            End If
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Testing Regex: ")
+        End Try
+    End Sub
+
+    Private Sub tsbtnAdd_Click(sender As Object, e As EventArgs) Handles tsbtnAdd.Click
+        Try
+            Me.MyDataset.TBTC_DI_REGEX_MATCH.CREATED_WHOColumn.DefaultValue = Environment.UserName
+            Me.MyDataset.TBTC_DI_REGEX_MATCH.PROFILE_NAMEColumn.DefaultValue = CURRENT_PROFILENAME
+            TBTC_DI_REGEX_MATCHBindingSource.AddNew()
+            tsbtnDelete.Enabled = True
+            REGEXTextBox.Enabled = True
+            PROFILE_NAMETextBox.Enabled = True
+            Button1.Enabled = True
+            tsbtnSave.Enabled = True
+        Catch ex As Exception
+            MsgBox("Unexpected error in tsbtnAdd.Click: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+
+    Private Sub tsbtnDelete_Click(sender As Object, e As EventArgs) Handles tsbtnDelete.Click
+        Try
+            TBTC_DI_REGEX_MATCHTableAdapter.DeleteQuery(PROFILE_NAMETextBox.Text)
+            LoadData()
+        Catch ex As Exception
+            MsgBox("Unexpected error in deletingRegex: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
+
+    End Sub
+End Class
--- a/ToolCollection/frmNIHauptseite.vb
+++ b/ToolCollection/frmNIHauptseite.vb
@ -319,7 +319,7 @@ Public Class frmNIHauptseite

                ' Ausgabe an Logdatei über nächstes Profil

-                _Logger.Info("Starte Durchlauf für Profil:  " & profil.Profilname & " - " & Now)
+                _Logger.Debug("Starte Durchlauf für Profil:  " & profil.Profilname & " - " & Now)

                ' Überprüfen ob Profil aktiv oder inaktiv
                If CBool(Me.aktivesProfil.Aktiv) = False Then
@ -377,103 +377,110 @@ Public Class frmNIHauptseite


                            If _Fehler = False Then
-                                If windreamSucheErgebnisse.Count > 0 Then
-                                    _Logger.Debug($"windreamSucheErgebnisse.Count: [{windreamSucheErgebnisse.Count}]")
-                                    'Wenn Nachbearbeitung AD aktiv ist dann, Klassen initialisieren
-                                    If aktivesProfil.NachbearbeitungAD = True Then
-                                        _Logger.Debug($"aktivesProfil.NachbearbeitungAD = True")
-                                        'Erst DB
-                                        _sqlite = New ClassSQLITE(_MyLogger)
-                                        _windreamRechte = New ClassWD_Rechte(_MyLogger, _sqlite)
-                                        If _sqlite.DBInit(False) = True Then
-                                            _Logger.Debug($"ClassSQLITE initialized...")
-                                            'Dann Rechte-Klasse
-                                            If _windreamRechte.Init() = False Then
-                                                _Logger.Warn("## Die AD-Rechteklasse konnte nicht initialisert werden - Profil Abbruch")
-                                                _Fehler = True
+                                If Not IsNothing(windreamSucheErgebnisse) Then
+
+
+
+                                    If windreamSucheErgebnisse.Count > 0 Then
+                                        _Logger.Debug($"windreamSucheErgebnisse.Count: [{windreamSucheErgebnisse.Count}]")
+                                        'Wenn Nachbearbeitung AD aktiv ist dann, Klassen initialisieren
+                                        If aktivesProfil.NachbearbeitungAD = True Then
+                                            _Logger.Debug($"aktivesProfil.NachbearbeitungAD = True")
+                                            'Erst DB
+                                            _sqlite = New ClassSQLITE(_MyLogger)
+                                            _windreamRechte = New ClassWD_Rechte(_MyLogger, _sqlite)
+                                            If _sqlite.DBInit(False) = True Then
+                                                _Logger.Debug($"ClassSQLITE initialized...")
+                                                'Dann Rechte-Klasse
+                                                If _windreamRechte.Init() = False Then
+                                                    _Logger.Warn("## Die AD-Rechteklasse konnte nicht initialisert werden - Profil Abbruch")
+                                                    _Fehler = True
+                                                Else
+                                                    _Logger.Debug($"The AD-RightClass has been initialized...")
+                                                End If
                                            Else
-                                                _Logger.Debug($"The AD-RightClass has been initialized...")
+                                                _Logger.Warn("## Die SQLite-DB konnte nicht initialisert werden - Profil Abbruch")
+                                                _Fehler = True
                                            End If
                                        Else
-                                            _Logger.Warn("## Die SQLite-DB konnte nicht initialisert werden - Profil Abbruch")
-                                            _Fehler = True
+                                            _Logger.Debug("NachbearbeitungAD inaktiv")
                                        End If
-                                    Else
-                                        _Logger.Debug("NachbearbeitungAD inaktiv")
-                                    End If
-                                    _Logger.Debug($"...Row 397...")
-                                    If _Fehler = False Then
-                                        'profil()
-                                        ' nun Profilabhängige Parameter laden
-                                        If aktivesProfil.IndexValidation <> "" Then
-                                            _Logger.Debug("Dokumente sollen für Validierung markiert werden - Index: " & aktivesProfil.IndexValidation)
-                                            _clsWorkfile._SetFileValidation = True
-                                        Else
-                                            _clsWorkfile._SetFileValidation = False
-                                        End If
-                                        _Logger.Debug($"clsWorkfile._filevalidation Checked...")
-                                        If My.Settings.ERROR_INDEX <> "" Then
-                                            _Logger.Debug("Error-msg shall be logged in index: " & My.Settings.ERROR_INDEX)
-
-                                        End If
-                                        _Logger.Debug($"clsWorkfile._fileerror Checked...")
-                                        _Logger.Debug("Ni-Art: " & aktivesProfil.Ni_Art.ToLower)
-                                        ' neue Anzahl von Dateien an ProgressBar2
-                                        bwProfil.ReportProgress(windreamSucheErgebnisse.Count)
-                                        For Each dok As WMObject In windreamSucheErgebnisse
-                                            _Logger.Debug($"Working on Doc: [{dok.aName}]")
-                                            ' aktuelles Dokument der Klasse mitteilen
-                                            Me.aktivesDokument = dok
-
-                                            '####### Go für das Dokument ##########
-                                            ' Thread für diese Datei starten
-
-                                            Me.startDateiDurchlauf()
-                                            '######################################
-                                            ' solange der Datei-Thread noch nicht abgeschlossen wurde
-                                            'tim = 0
-                                            While Me.bwDatei.IsBusy
-                                                ' warten
-                                                '   tim += 1
-                                                'Select Case tim
-                                                '    Case 5000
-                                                '       _Logger.Debug("ACHTUNG: bwDatei (5000) is still busy")
-                                                '    Case 10000
-                                                '       _Logger.Debug("ACHTUNG: bwDatei (10000) is still busy")
-                                                '    Case 30000
-                                                '       _Logger.Debug("ACHTUNG: bwDatei (30000) is still busy")
-                                                '       _Logger.Debug("ACHTUNG: ThreadDatei wird abgebrochen")
-                                                '        Try
-                                                '            Me.bwDatei.CancelAsync()
-                                                '        Catch ex As Exception
-                                                '           _Logger.Debug("Fehler beim Abbrechen des Threads bwDatei: " & ex.Message)
-                                                '        End Try
-                                                '        Exit While
-                                                'End Select
-
-
-                                            End While
-                                            ' nächste Datei an ProgressBar2
-                                            bwProfil.ReportProgress(-1)
-                                            ' Vorgang abbrechen
-                                            If bwProfil.CancellationPending Then
-                                                _Logger.Debug($"bwProfil.CancellationPending...Exit bwProfil_DoWork")
-                                                Exit Sub
+                                        _Logger.Debug($"...Row 397...")
+                                        If _Fehler = False Then
+                                            'profil()
+                                            ' nun Profilabhängige Parameter laden
+                                            If aktivesProfil.IndexValidation <> "" Then
+                                                _Logger.Debug("Dokumente sollen für Validierung markiert werden - Index: " & aktivesProfil.IndexValidation)
+                                                _clsWorkfile._SetFileValidation = True
+                                            Else
+                                                _clsWorkfile._SetFileValidation = False
                                            End If
-                                        Next
+                                            _Logger.Debug($"clsWorkfile._filevalidation Checked...")
+                                            If My.Settings.ERROR_INDEX <> "" Then
+                                                _Logger.Debug("Error-msg shall be logged in index: " & My.Settings.ERROR_INDEX)
+
+                                            End If
+                                            _Logger.Debug($"clsWorkfile._fileerror Checked...")
+                                            _Logger.Debug("Ni-Art: " & aktivesProfil.Ni_Art.ToLower)
+                                            ' neue Anzahl von Dateien an ProgressBar2
+                                            bwProfil.ReportProgress(windreamSucheErgebnisse.Count)
+                                            For Each dok As WMObject In windreamSucheErgebnisse
+                                                _Logger.Debug($"Working on Doc: [{dok.aName}]")
+                                                ' aktuelles Dokument der Klasse mitteilen
+                                                Me.aktivesDokument = dok
+
+                                                '####### Go für das Dokument ##########
+                                                ' Thread für diese Datei starten
+
+                                                Me.startDateiDurchlauf()
+                                                '######################################
+                                                ' solange der Datei-Thread noch nicht abgeschlossen wurde
+                                                'tim = 0
+                                                While Me.bwDatei.IsBusy
+                                                    ' warten
+                                                    '   tim += 1
+                                                    'Select Case tim
+                                                    '    Case 5000
+                                                    '       _Logger.Debug("ACHTUNG: bwDatei (5000) is still busy")
+                                                    '    Case 10000
+                                                    '       _Logger.Debug("ACHTUNG: bwDatei (10000) is still busy")
+                                                    '    Case 30000
+                                                    '       _Logger.Debug("ACHTUNG: bwDatei (30000) is still busy")
+                                                    '       _Logger.Debug("ACHTUNG: ThreadDatei wird abgebrochen")
+                                                    '        Try
+                                                    '            Me.bwDatei.CancelAsync()
+                                                    '        Catch ex As Exception
+                                                    '           _Logger.Debug("Fehler beim Abbrechen des Threads bwDatei: " & ex.Message)
+                                                    '        End Try
+                                                    '        Exit While
+                                                    'End Select
+
+
+                                                End While
+                                                ' nächste Datei an ProgressBar2
+                                                bwProfil.ReportProgress(-1)
+                                                ' Vorgang abbrechen
+                                                If bwProfil.CancellationPending Then
+                                                    _Logger.Debug($"bwProfil.CancellationPending...Exit bwProfil_DoWork")
+                                                    Exit Sub
+                                                End If
+                                            Next
+                                        Else
+                                            _Logger.Debug("Fehler = True - Check Log")
+                                            _Logger.Warn("Fehler = True - Check Log")
+                                            bwProfil.ReportProgress(-4)
+                                        End If
+
                                    Else
-                                        _Logger.Debug("Fehler = True - Check Log")
-                                        _Logger.Warn("Fehler = True - Check Log")
+                                        _Logger.Debug("Keine windream-Dokumente für Profil: " & profil.Profilname & " gefunden!")
+                                        ' keine Dateien zum Indexieren
                                        bwProfil.ReportProgress(-4)
                                    End If
-
                                Else
-                                    _Logger.Debug("Keine windream-Dokumente für Profil: " & profil.Profilname & " gefunden!")
-                                    ' keine Dateien zum Indexieren
-                                    bwProfil.ReportProgress(-4)
+                                    _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

@ -502,7 +509,7 @@ Public Class frmNIHauptseite
        ElseIf e.Error IsNot Nothing Then
            ' MsgBox("Fehler")
        Else
-            _Logger.Info("bwProfil_RunWorkerCompleted")
+            _Logger.Debug("bwProfil_RunWorkerCompleted")
            _Logger.Info("")

        End If
@ -585,7 +592,6 @@ Public Class frmNIHauptseite
            'nur weiter machen wenn kein BackgroundWorker mehr läuft
            If Not Me.bwProfil.IsBusy And Not Me.bwDatei.IsBusy And Not Me.bwsearch.IsBusy Then
                _Logger.Info("Nachindexierungsvorgang gestartet                                    ")
-                _Logger.Info("Datum/Uhrzeit: " & Now)
                Me.lblStatus.Text = "(Status: Nachindexieren läuft)"
                Me.tslblStatus.Text = "Status: Nachindexieren läuft"
                Me.tslblStatus.Visible = True
@ -602,7 +608,7 @@ Public Class frmNIHauptseite
                    If debug Then
                        Dim resultProfilnamen As String = ""
                        For Each profil As ClassNIProfil In ClassNIProfile.Profile
-                            _Logger.Info($"Start Profile-Run for ProfilName [{ profil.Profilname}] ")
+                            _Logger.Debug($"Start Profile-Run for ProfilName [{ profil.Profilname}] ")
                            resultProfilnamen &= "- " & profil.Profilname & vbNewLine
                        Next

@ -1242,6 +1248,7 @@ Public Class frmNIHauptseite
                        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
+                            _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......")
                                Dim anweisung As String = Me.aktivesProfil.SQL_Anweisung.Replace("EXECUTEVB ", "")
@ -1302,45 +1309,41 @@ Public Class frmNIHauptseite


                                    Dim myProcess As New Process
-                                    Dim ProcID
+                                    Dim oProcessID
                                    myProcess.StartInfo.FileName = arr_split(0)

-
-
-
                                    ' Dim startInfo As New ProcessStartInfo(arr_split(0))
                                    ' startInfo.CreateNoWindow = True

                                    Dim _argument As String = arr_split(1)
                                    _argument = _argument.Replace("'", """")
-                                    _Logger.Debug("Split2 - Argument (after replace): " & _argument)
-
                                    'startInfo.Arguments = _argument

                                    myProcess.StartInfo.Arguments = _argument
+                                    _Logger.Debug("Argument from myProcess: " & myProcess.StartInfo.Arguments)
                                    myProcess.Start()

                                    'Process.Start(startInfo)

-                                    ProcID = myProcess.Id
+                                    oProcessID = myProcess.Id
                                    _Logger.Debug("Script executed!")

-                                    If IsNumeric(ProcID) Then
-                                        _Logger.Debug("got an PROCID: " & ProcID.ToString)
+                                    If IsNumeric(oProcessID) Then
+                                        _Logger.Debug("got an PROCID: " & oProcessID.ToString)


-                                        Dim p As Process
-                                        p = Process.GetProcessById(ProcID)
+                                        Dim oMyProcess As Process
+                                        oMyProcess = Process.GetProcessById(oProcessID)

                                        Dim _sw As Stopwatch = New Stopwatch()
                                        _sw.Start()

-                                        Do While p.HasExited = False
+                                        Do While oMyProcess.HasExited = False

                                            If _sw.Elapsed.TotalSeconds = 30 Then
-                                                _Logger.Debug("Still waiting (30 sec) for ending of process-id: " & ProcID.ToString)
+                                                _Logger.Debug("Still waiting (30 sec) for ending of process-id: " & oProcessID.ToString)
                                            ElseIf _sw.Elapsed.TotalMinutes = 1 Then
-                                                _Logger.Debug("Still waiting (60 sec) for ending of process-id: " & ProcID.ToString & " - Exit now", True)
+                                                _Logger.Debug("Still waiting (60 sec) for ending of process-id: " & oProcessID.ToString & " - Exit now", True)
                                                Exit Do
                                            End If
                                        Loop
@ -1411,6 +1414,12 @@ Public Class frmNIHauptseite
                            End If

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

                    End If
                    If aktivesProfil.Ni_Art.ToLower = "xml" Then
@ -1605,6 +1614,15 @@ Public Class frmNIHauptseite
            End If

            oUnexpectedError = False
+            Try
+                If aktivesDokument.aLocked Then
+                    _Logger.Debug("Document still is locked...now unlocking")
+                    aktivesDokument.unlock()
+                End If
+            Catch ex As Exception
+                _Logger.Warn("Unexpected error in final Unlocking: " & ex.Message)
+            End Try
+
        Catch ex As Exception
            _Logger.Error(ex)
            If My.Settings.vNIMailsenden = True Then
@ -1635,6 +1653,7 @@ Public Class frmNIHauptseite
                            If IsDate(oWMIndexValue) Then
                                oWMIndexValue = CDate(oWMIndexValue).ToString("yyyyMMdd")
                            End If
+                            oWMIndexValue = oWMIndexValue.Replace("\", "")
                            oDynamicFolder = oDynamicFolder.Replace(oMatchElement.ToString, oWMIndexValue)
                            _Logger.Debug(" FolderPattern: '" & oDynamicFolder & "'", False)
                        Else
@ -1677,17 +1696,22 @@ Public Class frmNIHauptseite

                End Select
            Next
-            _Logger.Debug("Checking oDynamicFolder: " & oDynamicFolder, False)
-
+            _Logger.Debug("Checking oDynamicFolder on illegal PathChars: " & oDynamicFolder, False)
            Dim invalidPathChars() As Char = Path.GetInvalidPathChars()
-            For Each oSonderChar As Char In invalidPathChars
-                'Sonderzeichen ausser Whitespace entfernen
-                If Char.IsWhiteSpace(oSonderChar) = False Then
-                    If oDynamicFolder.Contains(oSonderChar) Then
-                        oDynamicFolder = oDynamicFolder.Replace(oSonderChar, "")
-                    End If
+            Dim oPathSplit As String() = oDynamicFolder.Split("\")
+            For Each oFolder In oPathSplit
+                If oFolder = "" Then
+                    Continue For
                End If
-            Next oSonderChar
+                Dim rgPattern = My.Settings.REGEX_INVALID_PATH  '----Invalid Characters
+                Dim objRegEx As New Regex(rgPattern)
+                Dim oClearFolder = objRegEx.Replace(oFolder, "")
+                If oFolder <> oClearFolder Then
+                    oDynamicFolder = oDynamicFolder.Replace(oFolder, oClearFolder)
+                End If
+
+            Next
+
            If Directory.Exists(oDynamicFolder) = False Then
                Try
                    Directory.CreateDirectory(oDynamicFolder)
@ -1746,8 +1770,13 @@ Public Class frmNIHauptseite
                            Dim oWMIndexname = oElement.Value.Substring(3, oElement.Value.Length - 4)
                            Dim oWMIndexValue As String = myWMDocument.GetVariableValue(oWMIndexname)
                            If oWMIndexValue <> String.Empty Then
-                                Dim firstVectorValue = oWMIndexValue.Split("~").First()

+                                Dim oClearedContent As String = String.Join("", oWMIndexValue.Split(Path.GetInvalidFileNameChars()))
+                                If oClearedContent <> oWMIndexValue Then
+                                    _Logger.Info($"Cleaned the WMContent with GetInvalidFileNameChars from [{oWMIndexValue}] to [{oClearedContent}]")
+                                    oWMIndexValue = oClearedContent
+                                End If
+                                Dim firstVectorValue = oWMIndexValue.Split("~").First()
                                oNamenkonvention = oNamenkonvention.Replace(oElement.Value, firstVectorValue)
                            Else
                                _Logger.Info($"Attention: the indexvalue of index {oWMIndexname} is empty!")
@ -1839,15 +1868,19 @@ Public Class frmNIHauptseite
            Else
                oReturnString = oActWMPath
            End If
-            Dim oCleanFileName As String = String.Join("", oReturnString.Split(Path.GetInvalidFileNameChars()))
-            If oCleanFileName <> oReturnString Then
-                _Logger.Info($"Cleaned the filename with GetInvalidFileNameChars from [{oReturnString}] to [{oCleanFileName}]")
-                oReturnString = oCleanFileName
+            Dim oOldFilename = oReturnString.Substring(oReturnString.LastIndexOf("\") + 1)
+            _Logger.Debug($"oOldFilename: {oOldFilename}")
+            Dim oCleanFileName As String = String.Join("", oOldFilename.Split(Path.GetInvalidFileNameChars()))
+            If oCleanFileName <> oOldFilename Then
+                _Logger.Info($"Cleaned the filename with GetInvalidFileNameChars from [{oOldFilename}] to [{oCleanFileName}]")
+                oReturnString = oReturnString.Replace(oOldFilename, oCleanFileName)
            End If
-            Dim oCleanPathName As String = String.Join("", oReturnString.Split(Path.GetInvalidPathChars()))
-            If oCleanPathName <> oReturnString Then
-                _Logger.Info($"Cleaned the path with GetInvalidPathChars from [{oReturnString}] to [{oCleanPathName}]")
-                oReturnString = oCleanPathName
+            Dim oOriginalPath = oReturnString.Substring(1, oReturnString.LastIndexOf("\"))
+
+            Dim oCleanPathName As String = String.Join("", oOriginalPath.Split(Path.GetInvalidPathChars()))
+            If oCleanPathName <> oOriginalPath Then
+                _Logger.Info($"Cleaned the path with GetInvalidPathChars from [{oOriginalPath}] to [{oCleanPathName}]")
+                oReturnString = oReturnString.Replace(oOriginalPath, oCleanPathName)
            End If

            If _windreamNI.NEW_MOVE_FILE(oReturnString, oActWMPath, "MO_RE") = True Then
--- a/ToolCollection/frmNIMoveRename.vb
+++ b/ToolCollection/frmNIMoveRename.vb
@ -17,7 +17,6 @@
        Catch ex As Exception
            MsgBox("Unexpected error in tsbtnAdd.Click: " & ex.Message, MsgBoxStyle.Critical)
        End Try
-
    End Sub

    Private Sub frmNIMoveRename_Load(sender As Object, e As EventArgs) Handles Me.Load
@ -45,7 +44,8 @@
                Button2.Enabled = False
            End If
        Catch ex As System.Exception
-            MsgBox("Unexpected error in Loading MoveRename: " & ex.Message, MsgBoxStyle.Critical)
+
+            MsgBox("Unexpected error in Loading MoveRename: " & vbNewLine & ex.Message & vbNewLine & "ConnectionString: " & My.Settings.DDECMConString, MsgBoxStyle.Critical)
        End Try
    End Sub
    Private Sub tsbtnsave_Click(sender As Object, e As EventArgs) Handles tsbtnsave.Click
@ -53,7 +53,7 @@
            Me.TBTC_MOVE_RENAMEBindingSource.EndEdit()
            Me.MyDataset.TBTC_MOVE_RENAME.CHANGED_WHOColumn.DefaultValue = Environment.UserName
            If Not IsNothing(MyDataset.TBTC_MOVE_RENAME.GetChanges) Then
-                Me.MyDataset.TBTC_MOVE_RENAME.CHANGED_WHOColumn.DefaultValue = Environment.UserName
+                Me.CHANGED_WHOTextBox.Text = Environment.UserName
                Me.TBTC_MOVE_RENAMEBindingSource.EndEdit()
                TBTC_MOVE_RENAMETableAdapter.Update(MyDataset.TBTC_MOVE_RENAME)
                LoadData()
--- a/ToolCollection/frmStart.Designer.vb
+++ b/ToolCollection/frmStart.Designer.vb
@ -28,8 +28,6 @@ Partial Class frmStart
        Me.Status_Machine = New System.Windows.Forms.ToolStripStatusLabel()
        Me.ToolStripStatusLabel2 = New System.Windows.Forms.ToolStripStatusLabel()
        Me.tslblVersion = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.Status_Clock = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.timUhrzeit = New System.Windows.Forms.Timer(Me.components)
        Me.menHauptmenü = New System.Windows.Forms.MenuStrip()
        Me.DateiToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ÜbersichtToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
@ -75,7 +73,7 @@ Partial Class frmStart
        '
        'StatusStrip1
        '
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.Status_Machine, Me.ToolStripStatusLabel2, Me.tslblVersion, Me.Status_Clock})
+        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.Status_Machine, Me.ToolStripStatusLabel2, Me.tslblVersion})
        Me.StatusStrip1.Location = New System.Drawing.Point(0, 708)
        Me.StatusStrip1.Name = "StatusStrip1"
        Me.StatusStrip1.RenderMode = System.Windows.Forms.ToolStripRenderMode.ManagerRenderMode
@ -118,22 +116,6 @@ Partial Class frmStart
        Me.tslblVersion.Text = "ToolStripStatusLabel1"
        Me.tslblVersion.ToolTipText = "Aktueller Benutzer"
        '
-        'Status_Clock
-        '
-        Me.Status_Clock.Image = CType(resources.GetObject("Status_Clock.Image"), System.Drawing.Image)
-        Me.Status_Clock.ImageAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Status_Clock.Name = "Status_Clock"
-        Me.Status_Clock.Size = New System.Drawing.Size(808, 20)
-        Me.Status_Clock.Spring = True
-        Me.Status_Clock.Text = "ToolStripStatusLabel1"
-        Me.Status_Clock.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.Status_Clock.ToolTipText = "Datum/Uhrzeit"
-        '
-        'timUhrzeit
-        '
-        Me.timUhrzeit.Enabled = True
-        Me.timUhrzeit.Interval = 1000
-        '
        'menHauptmenü
        '
        Me.menHauptmenü.BackColor = System.Drawing.SystemColors.Control
@ -485,8 +467,6 @@ Partial Class frmStart
    Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
    Friend WithEvents Status_Machine As System.Windows.Forms.ToolStripStatusLabel
    Friend WithEvents tslblVersion As System.Windows.Forms.ToolStripStatusLabel
-    Friend WithEvents Status_Clock As System.Windows.Forms.ToolStripStatusLabel
-    Friend WithEvents timUhrzeit As System.Windows.Forms.Timer
    Friend WithEvents menHauptmenü As System.Windows.Forms.MenuStrip
    Friend WithEvents DateiToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents BeendenToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
--- a/ToolCollection/frmStart.resx
+++ b/ToolCollection/frmStart.resx
@ -148,19 +148,6 @@
        OKnoLBUcsaNDRD795Ki6zCeHqwAAAABJRU5ErkJggg==
 </value>
  </data>
-  <data name="Status_Clock.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAA7ElEQVQ4T62T0RHDIAxD/ZGN2CmjZAfW
-        yBzsRPuM5UCa/NV3qsFIsiFX+2uc59mP4+jFrG/blmBPnfOg/kat1cl7sV53663uCfbUOccoJFdILOH3
-        x0FNaxn9mDCWxBDJIgpPJnkd3BhvJmgKFxNhADiDj6611o0HUvdhMMSss/vNBH6xMqaApI7KMlkmUA5e
-        XoOF7jUTMbnXiJm/TODdiUmgTl4LiJsG3EVv4Aix8pPJeAMbBvoKPoFIIRY4UxPWy1fAhQ4QFhPwYpTj
-        K3B7MqGm/SyGH9IrZMJ4Mpoz9VexgrEg8LCQhfd/o9kHgHwMs7GeTSYAAAAASUVORK5CYII=
-</value>
-  </data>
-  <metadata name="timUhrzeit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>134, 17</value>
-  </metadata>
  <metadata name="menHauptmenü.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>242, 17</value>
  </metadata>
@ -172,7 +159,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAO
-        FAAAAk1TRnQBSQFMAgEBCQEAASABAwEgAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        FAAAAk1TRnQBSQFMAgEBCQEAATABAwEwAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
--- a/ToolCollection/frmStart.vb
+++ b/ToolCollection/frmStart.vb
@ -11,17 +11,17 @@ Public Class frmStart
    Public licMore As Boolean = False
    Public licNB_AD As Boolean = False
    Public _company As String
-    Dim timediff As Integer = 0
+    ' Dim timediff As Integer = 0
    Private licenseManager As ClassLicenseManager = Nothing
-    Private Sub timUhrzeit_Tick(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles timUhrzeit.Tick
-        ' der Statusuhr die aktuelle Systemzeit zuweisen
-        Me.Status_Clock.Text = CType(My.Computer.Clock.LocalTime, String)
-        timediff += 1000
-        If timediff >= 86400000 Then
-            'LogDateien-löschen
-            Delete_LogFiles()
-        End If
-    End Sub
+    'Private Sub timUhrzeit_Tick(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles timUhrzeit.Tick
+    '    ' der Statusuhr die aktuelle Systemzeit zuweisen
+    '    Me.Status_Clock.Text = CType(My.Computer.Clock.LocalTime, String)
+    '    timediff += 1000
+    '    If timediff >= 86400000 Then
+    '        'LogDateien-löschen
+    '        Delete_LogFiles()
+    '    End If
+    'End Sub
    Private Sub Delete_LogFiles()
        Try
            Dim vDate = DateAdd("d", -CInt(My.Settings.logolder_then), Now)
@ -54,7 +54,7 @@ Public Class frmStart
        Me.tslblVersion.Text = "Version: " & My.Application.Info.Version.ToString
        'Aktuelle Machine
        Me.Status_Machine.Text = My.Computer.Name
-        timUhrzeit.Start()
+        ' timUhrzeit.Start()
        TimerErrorLog.Start()

        If Not My.Settings.licensekey = "" Then