From 2b9e0e7ef41014a83fb480f18495882ce13482d6 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 5 Nov 2019 14:32:29 +0100 Subject: [PATCH] Bugfix nach Test MArvin --- ToolCollection/ClassNIWindream.vb | 2 +- ToolCollection/ClassWindream_allgemein.vb | 2 +- ToolCollection/My Project/AssemblyInfo.vb | 2 +- .../My Project/Resources.Designer.vb | 20 + ToolCollection/My Project/Resources.resx | 20 +- .../My Project/Settings.Designer.vb | 32 + ToolCollection/My Project/Settings.settings | 14 + ToolCollection/MyDataset.Designer.vb | 2542 ++++++++++++----- ToolCollection/MyDataset.vb | 2 + ToolCollection/MyDataset.xsc | 14 + ToolCollection/MyDataset.xsd | 131 +- ToolCollection/MyDataset.xss | 13 +- .../Resources/CheckConstraints_5634.png | Bin 0 -> 174 bytes .../Resources/lines_Text_code_16xLG.png | Bin 0 -> 188 bytes ToolCollection/ToolCollection.vbproj | 14 + ToolCollection/app.config | 9 + ToolCollection/frmDIHauptseite.Designer.vb | 33 +- ToolCollection/frmDIHauptseite.resx | 10 +- ToolCollection/frmDIHauptseite.vb | 99 +- .../frmDIProfilEigenschaften.Designer.vb | 229 +- ToolCollection/frmDIProfilEigenschaften.vb | 9 + ToolCollection/frmDIRegex.Designer.vb | 345 +++ ToolCollection/frmDIRegex.resx | 255 ++ ToolCollection/frmDIRegex.vb | 95 + ToolCollection/frmNIHauptseite.vb | 273 +- ToolCollection/frmNIMoveRename.vb | 6 +- ToolCollection/frmStart.Designer.vb | 22 +- ToolCollection/frmStart.resx | 15 +- ToolCollection/frmStart.vb | 22 +- 29 files changed, 3116 insertions(+), 1114 deletions(-) create mode 100644 ToolCollection/MyDataset.vb create mode 100644 ToolCollection/Resources/CheckConstraints_5634.png create mode 100644 ToolCollection/Resources/lines_Text_code_16xLG.png create mode 100644 ToolCollection/frmDIRegex.Designer.vb create mode 100644 ToolCollection/frmDIRegex.resx create mode 100644 ToolCollection/frmDIRegex.vb diff --git a/ToolCollection/ClassNIWindream.vb b/ToolCollection/ClassNIWindream.vb index f38f9b7..68cf129 100644 --- 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!") diff --git a/ToolCollection/ClassWindream_allgemein.vb b/ToolCollection/ClassWindream_allgemein.vb index e8b491f..00110f4 100644 --- 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 diff --git a/ToolCollection/My Project/AssemblyInfo.vb b/ToolCollection/My Project/AssemblyInfo.vb index 4e76bb5..85cc683 100644 --- a/ToolCollection/My Project/AssemblyInfo.vb +++ b/ToolCollection/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/ToolCollection/My Project/Resources.Designer.vb b/ToolCollection/My Project/Resources.Designer.vb index 54bde05..592d61e 100644 --- a/ToolCollection/My Project/Resources.Designer.vb +++ b/ToolCollection/My Project/Resources.Designer.vb @@ -370,6 +370,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + 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 + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -650,6 +660,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + 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 + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/ToolCollection/My Project/Resources.resx b/ToolCollection/My Project/Resources.resx index db0a407..7145258 100644 --- a/ToolCollection/My Project/Resources.resx +++ b/ToolCollection/My Project/Resources.resx @@ -124,6 +124,12 @@ ..\Resources\user_edit3.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\haken_gruen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\folder_Closed_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\Auslesen1.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -169,9 +175,6 @@ ..\Resources\Untitled (1055).ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -181,6 +184,9 @@ ..\Resources\table_add.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\lines_Text_code_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\link_delete.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -307,8 +313,8 @@ ..\Resources\puzzle1.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\haken_gruen.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\arrow_up.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\puzzle2.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -427,7 +433,7 @@ ..\Resources\user_edit.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\folder_Closed_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\CheckConstraints_5634.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/ToolCollection/My Project/Settings.Designer.vb b/ToolCollection/My Project/Settings.Designer.vb index 08fde1d..36f8b8f 100644 --- a/ToolCollection/My Project/Settings.Designer.vb +++ b/ToolCollection/My Project/Settings.Designer.vb @@ -901,6 +901,38 @@ Namespace My Return CType(Me("DDECMConString"),String) End Get End Property + + |]")> _ + Public ReadOnly Property REGEX_INVALID_PATH() As String + Get + Return CType(Me("REGEX_INVALID_PATH"),String) + End Get + End Property + + _ + Public ReadOnly Property DD_ECM_TESTConnectionString() As String + Get + Return CType(Me("DD_ECM_TESTConnectionString"),String) + End Get + End Property + + _ + 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 diff --git a/ToolCollection/My Project/Settings.settings b/ToolCollection/My Project/Settings.settings index 4a1d12b..e5aadf4 100644 --- a/ToolCollection/My Project/Settings.settings +++ b/ToolCollection/My Project/Settings.settings @@ -225,5 +225,19 @@ </SerializableConnectionString> Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd + + [\\\/:\*\?""'<>|] + + + <?xml version="1.0" encoding="utf-16"?> +<SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"> + <ConnectionString>Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd</ConnectionString> + <ProviderName>System.Data.SqlClient</ProviderName> +</SerializableConnectionString> + Data Source=172.24.12.41\tests;Initial Catalog=DD_ECM_TEST;Persist Security Info=True;User ID=sa;Password=dd + + + myInvalidDateiname.pdf + \ No newline at end of file diff --git a/ToolCollection/MyDataset.Designer.vb b/ToolCollection/MyDataset.Designer.vb index 8cf0c2e..fc141c7 100644 --- a/ToolCollection/MyDataset.Designer.vb +++ b/ToolCollection/MyDataset.Designer.vb @@ -29,6 +29,8 @@ Partial Public Class MyDataset Private tableTBTC_MOVE_RENAME As TBTC_MOVE_RENAMEDataTable + Private tableTBTC_DI_REGEX_MATCH As TBTC_DI_REGEX_MATCHDataTable + Private tableTBVEKTOR_ARRAY As TBVEKTOR_ARRAYDataTable Private tableTBErgebnis As TBErgebnisDataTable @@ -70,6 +72,9 @@ Partial Public Class MyDataset If (Not (ds.Tables("TBTC_MOVE_RENAME")) Is Nothing) Then MyBase.Tables.Add(New TBTC_MOVE_RENAMEDataTable(ds.Tables("TBTC_MOVE_RENAME"))) End If + If (Not (ds.Tables("TBTC_DI_REGEX_MATCH")) Is Nothing) Then + MyBase.Tables.Add(New TBTC_DI_REGEX_MATCHDataTable(ds.Tables("TBTC_DI_REGEX_MATCH"))) + End If If (Not (ds.Tables("TBVEKTOR_ARRAY")) Is Nothing) Then MyBase.Tables.Add(New TBVEKTOR_ARRAYDataTable(ds.Tables("TBVEKTOR_ARRAY"))) End If @@ -116,6 +121,16 @@ Partial Public Class MyDataset End Get End Property + _ + Public ReadOnly Property TBTC_DI_REGEX_MATCH() As TBTC_DI_REGEX_MATCHDataTable + Get + Return Me.tableTBTC_DI_REGEX_MATCH + End Get + End Property + _ + Private Function ShouldSerializeTBTC_DI_REGEX_MATCH() As Boolean + Return false + End Function + _ Private Function ShouldSerializeTBVEKTOR_ARRAY() As Boolean @@ -406,6 +438,9 @@ Partial Public Class MyDataset _ Public Delegate Sub TBTC_MOVE_RENAMERowChangeEventHandler(ByVal sender As Object, ByVal e As TBTC_MOVE_RENAMERowChangeEvent) + _ + Public Delegate Sub TBTC_DI_REGEX_MATCHRowChangeEventHandler(ByVal sender As Object, ByVal e As TBTC_DI_REGEX_MATCHRowChangeEvent) + _ Public Delegate Sub TBVEKTOR_ARRAYRowChangeEventHandler(ByVal sender As Object, ByVal e As TBVEKTOR_ARRAYRowChangeEvent) @@ -1146,18 +1181,28 @@ Partial Public Class MyDataset ''' _ - Partial Public Class TBVEKTOR_ARRAYDataTable - Inherits Global.System.Data.TypedTableBase(Of TBVEKTOR_ARRAYRow) + Partial Public Class TBTC_DI_REGEX_MATCHDataTable + Inherits Global.System.Data.TypedTableBase(Of TBTC_DI_REGEX_MATCHRow) - Private columnIndexname As Global.System.Data.DataColumn + Private columnGUID As Global.System.Data.DataColumn - Private columnWert As Global.System.Data.DataColumn + Private columnPROFILE_NAME As Global.System.Data.DataColumn + + Private columnREGEX As Global.System.Data.DataColumn + + Private columnCREATED_WHO As Global.System.Data.DataColumn + + Private columnCREATED_WHEN As Global.System.Data.DataColumn + + Private columnCHANGED_WHO As Global.System.Data.DataColumn + + Private columnCHANGED_WHEN As Global.System.Data.DataColumn _ Public Sub New() MyBase.New - Me.TableName = "TBVEKTOR_ARRAY" + Me.TableName = "TBTC_DI_REGEX_MATCH" Me.BeginInit Me.InitClass Me.EndInit @@ -1190,17 +1235,57 @@ Partial Public Class MyDataset _ - Public ReadOnly Property IndexnameColumn() As Global.System.Data.DataColumn + Public ReadOnly Property GUIDColumn() As Global.System.Data.DataColumn Get - Return Me.columnIndexname + Return Me.columnGUID End Get End Property _ - Public ReadOnly Property WertColumn() As Global.System.Data.DataColumn + Public ReadOnly Property PROFILE_NAMEColumn() As Global.System.Data.DataColumn Get - Return Me.columnWert + Return Me.columnPROFILE_NAME + End Get + End Property + + _ + Public ReadOnly Property REGEXColumn() As Global.System.Data.DataColumn + Get + Return Me.columnREGEX + End Get + End Property + + _ + Public ReadOnly Property CREATED_WHOColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCREATED_WHO + End Get + End Property + + _ + Public ReadOnly Property CREATED_WHENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCREATED_WHEN + End Get + End Property + + _ + Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCHANGED_WHO + End Get + End Property + + _ + Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCHANGED_WHEN End Get End Property @@ -1215,44 +1300,50 @@ Partial Public Class MyDataset _ - Public Default ReadOnly Property Item(ByVal index As Integer) As TBVEKTOR_ARRAYRow + Public Default ReadOnly Property Item(ByVal index As Integer) As TBTC_DI_REGEX_MATCHRow Get - Return CType(Me.Rows(index),TBVEKTOR_ARRAYRow) + Return CType(Me.Rows(index),TBTC_DI_REGEX_MATCHRow) End Get End Property _ - Public Event TBVEKTOR_ARRAYRowChanging As TBVEKTOR_ARRAYRowChangeEventHandler + Public Event TBTC_DI_REGEX_MATCHRowChanging As TBTC_DI_REGEX_MATCHRowChangeEventHandler _ - Public Event TBVEKTOR_ARRAYRowChanged As TBVEKTOR_ARRAYRowChangeEventHandler + Public Event TBTC_DI_REGEX_MATCHRowChanged As TBTC_DI_REGEX_MATCHRowChangeEventHandler _ - Public Event TBVEKTOR_ARRAYRowDeleting As TBVEKTOR_ARRAYRowChangeEventHandler + Public Event TBTC_DI_REGEX_MATCHRowDeleting As TBTC_DI_REGEX_MATCHRowChangeEventHandler _ - Public Event TBVEKTOR_ARRAYRowDeleted As TBVEKTOR_ARRAYRowChangeEventHandler + Public Event TBTC_DI_REGEX_MATCHRowDeleted As TBTC_DI_REGEX_MATCHRowChangeEventHandler _ - Public Overloads Sub AddTBVEKTOR_ARRAYRow(ByVal row As TBVEKTOR_ARRAYRow) + Public Overloads Sub AddTBTC_DI_REGEX_MATCHRow(ByVal row As TBTC_DI_REGEX_MATCHRow) Me.Rows.Add(row) End Sub _ - Public Overloads Function AddTBVEKTOR_ARRAYRow(ByVal Indexname As String, ByVal Wert As String) As TBVEKTOR_ARRAYRow - Dim rowTBVEKTOR_ARRAYRow As TBVEKTOR_ARRAYRow = CType(Me.NewRow,TBVEKTOR_ARRAYRow) - Dim columnValuesArray() As Object = New Object() {Indexname, Wert} - rowTBVEKTOR_ARRAYRow.ItemArray = columnValuesArray - Me.Rows.Add(rowTBVEKTOR_ARRAYRow) - Return rowTBVEKTOR_ARRAYRow + Public Overloads Function AddTBTC_DI_REGEX_MATCHRow(ByVal PROFILE_NAME As String, ByVal REGEX As String, ByVal CREATED_WHO As String, ByVal CREATED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBTC_DI_REGEX_MATCHRow + Dim rowTBTC_DI_REGEX_MATCHRow As TBTC_DI_REGEX_MATCHRow = CType(Me.NewRow,TBTC_DI_REGEX_MATCHRow) + Dim columnValuesArray() As Object = New Object() {Nothing, PROFILE_NAME, REGEX, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN} + rowTBTC_DI_REGEX_MATCHRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBTC_DI_REGEX_MATCHRow) + Return rowTBTC_DI_REGEX_MATCHRow + End Function + + _ + Public Function FindByGUID(ByVal GUID As Integer) As TBTC_DI_REGEX_MATCHRow + Return CType(Me.Rows.Find(New Object() {GUID}),TBTC_DI_REGEX_MATCHRow) End Function _ Public Overrides Function Clone() As Global.System.Data.DataTable - Dim cln As TBVEKTOR_ARRAYDataTable = CType(MyBase.Clone,TBVEKTOR_ARRAYDataTable) + Dim cln As TBTC_DI_REGEX_MATCHDataTable = CType(MyBase.Clone,TBTC_DI_REGEX_MATCHDataTable) cln.InitVars Return cln End Function @@ -1260,49 +1351,78 @@ Partial Public Class MyDataset _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable - Return New TBVEKTOR_ARRAYDataTable() + Return New TBTC_DI_REGEX_MATCHDataTable() End Function _ Friend Sub InitVars() - Me.columnIndexname = MyBase.Columns("Indexname") - Me.columnWert = MyBase.Columns("Wert") + Me.columnGUID = MyBase.Columns("GUID") + Me.columnPROFILE_NAME = MyBase.Columns("PROFILE_NAME") + Me.columnREGEX = MyBase.Columns("REGEX") + Me.columnCREATED_WHO = MyBase.Columns("CREATED_WHO") + Me.columnCREATED_WHEN = MyBase.Columns("CREATED_WHEN") + Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") + Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") End Sub _ Private Sub InitClass() - Me.columnIndexname = New Global.System.Data.DataColumn("Indexname", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnIndexname) - Me.columnWert = New Global.System.Data.DataColumn("Wert", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnWert) + Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnGUID) + Me.columnPROFILE_NAME = New Global.System.Data.DataColumn("PROFILE_NAME", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnPROFILE_NAME) + Me.columnREGEX = New Global.System.Data.DataColumn("REGEX", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnREGEX) + Me.columnCREATED_WHO = New Global.System.Data.DataColumn("CREATED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCREATED_WHO) + Me.columnCREATED_WHEN = New Global.System.Data.DataColumn("CREATED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCREATED_WHEN) + Me.columnCHANGED_WHO = New Global.System.Data.DataColumn("CHANGED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCHANGED_WHO) + Me.columnCHANGED_WHEN = New Global.System.Data.DataColumn("CHANGED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCHANGED_WHEN) + Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true)) + Me.columnGUID.AutoIncrement = true + Me.columnGUID.AutoIncrementSeed = 1 + Me.columnGUID.AllowDBNull = false + Me.columnGUID.ReadOnly = true + Me.columnGUID.Unique = true + Me.columnPROFILE_NAME.AllowDBNull = false + Me.columnPROFILE_NAME.MaxLength = 250 + Me.columnREGEX.AllowDBNull = false + Me.columnREGEX.DefaultValue = CType(".+\.[a-zA-Z0-9]{3,4}",String) + Me.columnREGEX.MaxLength = 1000 + Me.columnCREATED_WHO.AllowDBNull = false + Me.columnCREATED_WHO.MaxLength = 50 + Me.columnCHANGED_WHO.MaxLength = 50 End Sub _ - Public Function NewTBVEKTOR_ARRAYRow() As TBVEKTOR_ARRAYRow - Return CType(Me.NewRow,TBVEKTOR_ARRAYRow) + Public Function NewTBTC_DI_REGEX_MATCHRow() As TBTC_DI_REGEX_MATCHRow + Return CType(Me.NewRow,TBTC_DI_REGEX_MATCHRow) End Function _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow - Return New TBVEKTOR_ARRAYRow(builder) + Return New TBTC_DI_REGEX_MATCHRow(builder) End Function _ Protected Overrides Function GetRowType() As Global.System.Type - Return GetType(TBVEKTOR_ARRAYRow) + Return GetType(TBTC_DI_REGEX_MATCHRow) End Function _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) - If (Not (Me.TBVEKTOR_ARRAYRowChangedEvent) Is Nothing) Then - RaiseEvent TBVEKTOR_ARRAYRowChanged(Me, New TBVEKTOR_ARRAYRowChangeEvent(CType(e.Row,TBVEKTOR_ARRAYRow), e.Action)) + If (Not (Me.TBTC_DI_REGEX_MATCHRowChangedEvent) Is Nothing) Then + RaiseEvent TBTC_DI_REGEX_MATCHRowChanged(Me, New TBTC_DI_REGEX_MATCHRowChangeEvent(CType(e.Row,TBTC_DI_REGEX_MATCHRow), e.Action)) End If End Sub @@ -1310,8 +1430,8 @@ Partial Public Class MyDataset Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) - If (Not (Me.TBVEKTOR_ARRAYRowChangingEvent) Is Nothing) Then - RaiseEvent TBVEKTOR_ARRAYRowChanging(Me, New TBVEKTOR_ARRAYRowChangeEvent(CType(e.Row,TBVEKTOR_ARRAYRow), e.Action)) + If (Not (Me.TBTC_DI_REGEX_MATCHRowChangingEvent) Is Nothing) Then + RaiseEvent TBTC_DI_REGEX_MATCHRowChanging(Me, New TBTC_DI_REGEX_MATCHRowChangeEvent(CType(e.Row,TBTC_DI_REGEX_MATCHRow), e.Action)) End If End Sub @@ -1319,8 +1439,8 @@ Partial Public Class MyDataset Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) - If (Not (Me.TBVEKTOR_ARRAYRowDeletedEvent) Is Nothing) Then - RaiseEvent TBVEKTOR_ARRAYRowDeleted(Me, New TBVEKTOR_ARRAYRowChangeEvent(CType(e.Row,TBVEKTOR_ARRAYRow), e.Action)) + If (Not (Me.TBTC_DI_REGEX_MATCHRowDeletedEvent) Is Nothing) Then + RaiseEvent TBTC_DI_REGEX_MATCHRowDeleted(Me, New TBTC_DI_REGEX_MATCHRowChangeEvent(CType(e.Row,TBTC_DI_REGEX_MATCHRow), e.Action)) End If End Sub @@ -1328,14 +1448,14 @@ Partial Public Class MyDataset Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) - If (Not (Me.TBVEKTOR_ARRAYRowDeletingEvent) Is Nothing) Then - RaiseEvent TBVEKTOR_ARRAYRowDeleting(Me, New TBVEKTOR_ARRAYRowChangeEvent(CType(e.Row,TBVEKTOR_ARRAYRow), e.Action)) + If (Not (Me.TBTC_DI_REGEX_MATCHRowDeletingEvent) Is Nothing) Then + RaiseEvent TBTC_DI_REGEX_MATCHRowDeleting(Me, New TBTC_DI_REGEX_MATCHRowChangeEvent(CType(e.Row,TBTC_DI_REGEX_MATCHRow), e.Action)) End If End Sub _ - Public Sub RemoveTBVEKTOR_ARRAYRow(ByVal row As TBVEKTOR_ARRAYRow) + Public Sub RemoveTBTC_DI_REGEX_MATCHRow(ByVal row As TBTC_DI_REGEX_MATCHRow) Me.Rows.Remove(row) End Sub @@ -1362,7 +1482,7 @@ Partial Public Class MyDataset type.Attributes.Add(attribute1) Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() attribute2.Name = "tableTypeName" - attribute2.FixedValue = "TBVEKTOR_ARRAYDataTable" + attribute2.FixedValue = "TBTC_DI_REGEX_MATCHDataTable" type.Attributes.Add(attribute2) type.Particle = sequence Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable @@ -1411,16 +1531,18 @@ Partial Public Class MyDataset ''' _ - Partial Public Class TBErgebnisDataTable - Inherits Global.System.Data.TypedTableBase(Of TBErgebnisRow) + Partial Public Class TBVEKTOR_ARRAYDataTable + Inherits Global.System.Data.TypedTableBase(Of TBVEKTOR_ARRAYRow) - Private columnErgebniswerte As Global.System.Data.DataColumn + Private columnIndexname As Global.System.Data.DataColumn + + Private columnWert As Global.System.Data.DataColumn _ Public Sub New() MyBase.New - Me.TableName = "TBErgebnis" + Me.TableName = "TBVEKTOR_ARRAY" Me.BeginInit Me.InitClass Me.EndInit @@ -1453,9 +1575,17 @@ Partial Public Class MyDataset _ - Public ReadOnly Property ErgebniswerteColumn() As Global.System.Data.DataColumn + Public ReadOnly Property IndexnameColumn() As Global.System.Data.DataColumn Get - Return Me.columnErgebniswerte + Return Me.columnIndexname + End Get + End Property + + _ + Public ReadOnly Property WertColumn() As Global.System.Data.DataColumn + Get + Return Me.columnWert End Get End Property @@ -1470,44 +1600,44 @@ Partial Public Class MyDataset _ - Public Default ReadOnly Property Item(ByVal index As Integer) As TBErgebnisRow + Public Default ReadOnly Property Item(ByVal index As Integer) As TBVEKTOR_ARRAYRow Get - Return CType(Me.Rows(index),TBErgebnisRow) + Return CType(Me.Rows(index),TBVEKTOR_ARRAYRow) End Get End Property _ - Public Event TBErgebnisRowChanging As TBErgebnisRowChangeEventHandler + Public Event TBVEKTOR_ARRAYRowChanging As TBVEKTOR_ARRAYRowChangeEventHandler _ - Public Event TBErgebnisRowChanged As TBErgebnisRowChangeEventHandler + Public Event TBVEKTOR_ARRAYRowChanged As TBVEKTOR_ARRAYRowChangeEventHandler _ - Public Event TBErgebnisRowDeleting As TBErgebnisRowChangeEventHandler + Public Event TBVEKTOR_ARRAYRowDeleting As TBVEKTOR_ARRAYRowChangeEventHandler _ - Public Event TBErgebnisRowDeleted As TBErgebnisRowChangeEventHandler + Public Event TBVEKTOR_ARRAYRowDeleted As TBVEKTOR_ARRAYRowChangeEventHandler _ - Public Overloads Sub AddTBErgebnisRow(ByVal row As TBErgebnisRow) + Public Overloads Sub AddTBVEKTOR_ARRAYRow(ByVal row As TBVEKTOR_ARRAYRow) Me.Rows.Add(row) End Sub _ - Public Overloads Function AddTBErgebnisRow(ByVal Ergebniswerte As String) As TBErgebnisRow - Dim rowTBErgebnisRow As TBErgebnisRow = CType(Me.NewRow,TBErgebnisRow) - Dim columnValuesArray() As Object = New Object() {Ergebniswerte} - rowTBErgebnisRow.ItemArray = columnValuesArray - Me.Rows.Add(rowTBErgebnisRow) - Return rowTBErgebnisRow + Public Overloads Function AddTBVEKTOR_ARRAYRow(ByVal Indexname As String, ByVal Wert As String) As TBVEKTOR_ARRAYRow + Dim rowTBVEKTOR_ARRAYRow As TBVEKTOR_ARRAYRow = CType(Me.NewRow,TBVEKTOR_ARRAYRow) + Dim columnValuesArray() As Object = New Object() {Indexname, Wert} + rowTBVEKTOR_ARRAYRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBVEKTOR_ARRAYRow) + Return rowTBVEKTOR_ARRAYRow End Function _ Public Overrides Function Clone() As Global.System.Data.DataTable - Dim cln As TBErgebnisDataTable = CType(MyBase.Clone,TBErgebnisDataTable) + Dim cln As TBVEKTOR_ARRAYDataTable = CType(MyBase.Clone,TBVEKTOR_ARRAYDataTable) cln.InitVars Return cln End Function @@ -1515,46 +1645,49 @@ Partial Public Class MyDataset _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable - Return New TBErgebnisDataTable() + Return New TBVEKTOR_ARRAYDataTable() End Function _ Friend Sub InitVars() - Me.columnErgebniswerte = MyBase.Columns("Ergebniswerte") + Me.columnIndexname = MyBase.Columns("Indexname") + Me.columnWert = MyBase.Columns("Wert") End Sub _ Private Sub InitClass() - Me.columnErgebniswerte = New Global.System.Data.DataColumn("Ergebniswerte", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnErgebniswerte) + Me.columnIndexname = New Global.System.Data.DataColumn("Indexname", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnIndexname) + Me.columnWert = New Global.System.Data.DataColumn("Wert", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnWert) End Sub _ - Public Function NewTBErgebnisRow() As TBErgebnisRow - Return CType(Me.NewRow,TBErgebnisRow) + Public Function NewTBVEKTOR_ARRAYRow() As TBVEKTOR_ARRAYRow + Return CType(Me.NewRow,TBVEKTOR_ARRAYRow) End Function _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow - Return New TBErgebnisRow(builder) + Return New TBVEKTOR_ARRAYRow(builder) End Function _ Protected Overrides Function GetRowType() As Global.System.Type - Return GetType(TBErgebnisRow) + Return GetType(TBVEKTOR_ARRAYRow) End Function _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) - If (Not (Me.TBErgebnisRowChangedEvent) Is Nothing) Then - RaiseEvent TBErgebnisRowChanged(Me, New TBErgebnisRowChangeEvent(CType(e.Row,TBErgebnisRow), e.Action)) + If (Not (Me.TBVEKTOR_ARRAYRowChangedEvent) Is Nothing) Then + RaiseEvent TBVEKTOR_ARRAYRowChanged(Me, New TBVEKTOR_ARRAYRowChangeEvent(CType(e.Row,TBVEKTOR_ARRAYRow), e.Action)) End If End Sub @@ -1562,8 +1695,8 @@ Partial Public Class MyDataset Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) - If (Not (Me.TBErgebnisRowChangingEvent) Is Nothing) Then - RaiseEvent TBErgebnisRowChanging(Me, New TBErgebnisRowChangeEvent(CType(e.Row,TBErgebnisRow), e.Action)) + If (Not (Me.TBVEKTOR_ARRAYRowChangingEvent) Is Nothing) Then + RaiseEvent TBVEKTOR_ARRAYRowChanging(Me, New TBVEKTOR_ARRAYRowChangeEvent(CType(e.Row,TBVEKTOR_ARRAYRow), e.Action)) End If End Sub @@ -1571,8 +1704,8 @@ Partial Public Class MyDataset Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) - If (Not (Me.TBErgebnisRowDeletedEvent) Is Nothing) Then - RaiseEvent TBErgebnisRowDeleted(Me, New TBErgebnisRowChangeEvent(CType(e.Row,TBErgebnisRow), e.Action)) + If (Not (Me.TBVEKTOR_ARRAYRowDeletedEvent) Is Nothing) Then + RaiseEvent TBVEKTOR_ARRAYRowDeleted(Me, New TBVEKTOR_ARRAYRowChangeEvent(CType(e.Row,TBVEKTOR_ARRAYRow), e.Action)) End If End Sub @@ -1580,14 +1713,14 @@ Partial Public Class MyDataset Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) - If (Not (Me.TBErgebnisRowDeletingEvent) Is Nothing) Then - RaiseEvent TBErgebnisRowDeleting(Me, New TBErgebnisRowChangeEvent(CType(e.Row,TBErgebnisRow), e.Action)) + If (Not (Me.TBVEKTOR_ARRAYRowDeletingEvent) Is Nothing) Then + RaiseEvent TBVEKTOR_ARRAYRowDeleting(Me, New TBVEKTOR_ARRAYRowChangeEvent(CType(e.Row,TBVEKTOR_ARRAYRow), e.Action)) End If End Sub _ - Public Sub RemoveTBErgebnisRow(ByVal row As TBErgebnisRow) + Public Sub RemoveTBVEKTOR_ARRAYRow(ByVal row As TBVEKTOR_ARRAYRow) Me.Rows.Remove(row) End Sub @@ -1614,7 +1747,7 @@ Partial Public Class MyDataset type.Attributes.Add(attribute1) Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() attribute2.Name = "tableTypeName" - attribute2.FixedValue = "TBErgebnisDataTable" + attribute2.FixedValue = "TBVEKTOR_ARRAYDataTable" type.Attributes.Add(attribute2) type.Particle = sequence Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable @@ -1663,18 +1796,16 @@ Partial Public Class MyDataset ''' _ - Partial Public Class TBUVDataTable - Inherits Global.System.Data.TypedTableBase(Of TBUVRow) - - Private columnID As Global.System.Data.DataColumn + Partial Public Class TBErgebnisDataTable + Inherits Global.System.Data.TypedTableBase(Of TBErgebnisRow) - Private columnUnterverzeichnis As Global.System.Data.DataColumn + Private columnErgebniswerte As Global.System.Data.DataColumn _ Public Sub New() MyBase.New - Me.TableName = "TBUV" + Me.TableName = "TBErgebnis" Me.BeginInit Me.InitClass Me.EndInit @@ -1707,17 +1838,9 @@ Partial Public Class MyDataset _ - Public ReadOnly Property IDColumn() As Global.System.Data.DataColumn + Public ReadOnly Property ErgebniswerteColumn() As Global.System.Data.DataColumn Get - Return Me.columnID - End Get - End Property - - _ - Public ReadOnly Property UnterverzeichnisColumn() As Global.System.Data.DataColumn - Get - Return Me.columnUnterverzeichnis + Return Me.columnErgebniswerte End Get End Property @@ -1732,44 +1855,44 @@ Partial Public Class MyDataset _ - Public Default ReadOnly Property Item(ByVal index As Integer) As TBUVRow + Public Default ReadOnly Property Item(ByVal index As Integer) As TBErgebnisRow Get - Return CType(Me.Rows(index),TBUVRow) + Return CType(Me.Rows(index),TBErgebnisRow) End Get End Property _ - Public Event TBUVRowChanging As TBUVRowChangeEventHandler + Public Event TBErgebnisRowChanging As TBErgebnisRowChangeEventHandler _ - Public Event TBUVRowChanged As TBUVRowChangeEventHandler + Public Event TBErgebnisRowChanged As TBErgebnisRowChangeEventHandler _ - Public Event TBUVRowDeleting As TBUVRowChangeEventHandler + Public Event TBErgebnisRowDeleting As TBErgebnisRowChangeEventHandler _ - Public Event TBUVRowDeleted As TBUVRowChangeEventHandler + Public Event TBErgebnisRowDeleted As TBErgebnisRowChangeEventHandler _ - Public Overloads Sub AddTBUVRow(ByVal row As TBUVRow) + Public Overloads Sub AddTBErgebnisRow(ByVal row As TBErgebnisRow) Me.Rows.Add(row) End Sub _ - Public Overloads Function AddTBUVRow(ByVal Unterverzeichnis As String) As TBUVRow - Dim rowTBUVRow As TBUVRow = CType(Me.NewRow,TBUVRow) - Dim columnValuesArray() As Object = New Object() {Nothing, Unterverzeichnis} - rowTBUVRow.ItemArray = columnValuesArray - Me.Rows.Add(rowTBUVRow) - Return rowTBUVRow + Public Overloads Function AddTBErgebnisRow(ByVal Ergebniswerte As String) As TBErgebnisRow + Dim rowTBErgebnisRow As TBErgebnisRow = CType(Me.NewRow,TBErgebnisRow) + Dim columnValuesArray() As Object = New Object() {Ergebniswerte} + rowTBErgebnisRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBErgebnisRow) + Return rowTBErgebnisRow End Function _ Public Overrides Function Clone() As Global.System.Data.DataTable - Dim cln As TBUVDataTable = CType(MyBase.Clone,TBUVDataTable) + Dim cln As TBErgebnisDataTable = CType(MyBase.Clone,TBErgebnisDataTable) cln.InitVars Return cln End Function @@ -1777,50 +1900,46 @@ Partial Public Class MyDataset _ Protected Overrides Function CreateInstance() As Global.System.Data.DataTable - Return New TBUVDataTable() + Return New TBErgebnisDataTable() End Function _ Friend Sub InitVars() - Me.columnID = MyBase.Columns("ID") - Me.columnUnterverzeichnis = MyBase.Columns("Unterverzeichnis") + Me.columnErgebniswerte = MyBase.Columns("Ergebniswerte") End Sub _ Private Sub InitClass() - Me.columnID = New Global.System.Data.DataColumn("ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnID) - Me.columnUnterverzeichnis = New Global.System.Data.DataColumn("Unterverzeichnis", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnUnterverzeichnis) - Me.columnID.AutoIncrement = true + Me.columnErgebniswerte = New Global.System.Data.DataColumn("Ergebniswerte", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnErgebniswerte) End Sub _ - Public Function NewTBUVRow() As TBUVRow - Return CType(Me.NewRow,TBUVRow) + Public Function NewTBErgebnisRow() As TBErgebnisRow + Return CType(Me.NewRow,TBErgebnisRow) End Function _ Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow - Return New TBUVRow(builder) + Return New TBErgebnisRow(builder) End Function _ Protected Overrides Function GetRowType() As Global.System.Type - Return GetType(TBUVRow) + Return GetType(TBErgebnisRow) End Function _ Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanged(e) - If (Not (Me.TBUVRowChangedEvent) Is Nothing) Then - RaiseEvent TBUVRowChanged(Me, New TBUVRowChangeEvent(CType(e.Row,TBUVRow), e.Action)) + If (Not (Me.TBErgebnisRowChangedEvent) Is Nothing) Then + RaiseEvent TBErgebnisRowChanged(Me, New TBErgebnisRowChangeEvent(CType(e.Row,TBErgebnisRow), e.Action)) End If End Sub @@ -1828,8 +1947,8 @@ Partial Public Class MyDataset Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowChanging(e) - If (Not (Me.TBUVRowChangingEvent) Is Nothing) Then - RaiseEvent TBUVRowChanging(Me, New TBUVRowChangeEvent(CType(e.Row,TBUVRow), e.Action)) + If (Not (Me.TBErgebnisRowChangingEvent) Is Nothing) Then + RaiseEvent TBErgebnisRowChanging(Me, New TBErgebnisRowChangeEvent(CType(e.Row,TBErgebnisRow), e.Action)) End If End Sub @@ -1837,8 +1956,8 @@ Partial Public Class MyDataset Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleted(e) - If (Not (Me.TBUVRowDeletedEvent) Is Nothing) Then - RaiseEvent TBUVRowDeleted(Me, New TBUVRowChangeEvent(CType(e.Row,TBUVRow), e.Action)) + If (Not (Me.TBErgebnisRowDeletedEvent) Is Nothing) Then + RaiseEvent TBErgebnisRowDeleted(Me, New TBErgebnisRowChangeEvent(CType(e.Row,TBErgebnisRow), e.Action)) End If End Sub @@ -1846,14 +1965,14 @@ Partial Public Class MyDataset Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) MyBase.OnRowDeleting(e) - If (Not (Me.TBUVRowDeletingEvent) Is Nothing) Then - RaiseEvent TBUVRowDeleting(Me, New TBUVRowChangeEvent(CType(e.Row,TBUVRow), e.Action)) + If (Not (Me.TBErgebnisRowDeletingEvent) Is Nothing) Then + RaiseEvent TBErgebnisRowDeleting(Me, New TBErgebnisRowChangeEvent(CType(e.Row,TBErgebnisRow), e.Action)) End If End Sub _ - Public Sub RemoveTBUVRow(ByVal row As TBUVRow) + Public Sub RemoveTBErgebnisRow(ByVal row As TBErgebnisRow) Me.Rows.Remove(row) End Sub @@ -1880,7 +1999,7 @@ Partial Public Class MyDataset type.Attributes.Add(attribute1) Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() attribute2.Name = "tableTypeName" - attribute2.FixedValue = "TBUVDataTable" + attribute2.FixedValue = "TBErgebnisDataTable" type.Attributes.Add(attribute2) type.Particle = sequence Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable @@ -1925,682 +2044,945 @@ Partial Public Class MyDataset End Class ''' - '''Represents strongly named DataRow class. + '''Represents the strongly named DataTable class. ''' - Partial Public Class TBDD_REPORTING_IMPORTRow - Inherits Global.System.Data.DataRow + _ + Partial Public Class TBUVDataTable + Inherits Global.System.Data.TypedTableBase(Of TBUVRow) - Private tableTBDD_REPORTING_IMPORT As TBDD_REPORTING_IMPORTDataTable + Private columnID As Global.System.Data.DataColumn + + Private columnUnterverzeichnis As Global.System.Data.DataColumn _ - Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) - MyBase.New(rb) - Me.tableTBDD_REPORTING_IMPORT = CType(Me.Table,TBDD_REPORTING_IMPORTDataTable) + Public Sub New() + MyBase.New + Me.TableName = "TBUV" + Me.BeginInit + Me.InitClass + Me.EndInit End Sub _ - Public Property IMPORT_ID() As Integer - Get - Return CType(Me(Me.tableTBDD_REPORTING_IMPORT.IMPORT_IDColumn),Integer) - End Get - Set - Me(Me.tableTBDD_REPORTING_IMPORT.IMPORT_IDColumn) = value - End Set - End Property + Friend Sub New(ByVal table As Global.System.Data.DataTable) + MyBase.New + Me.TableName = table.TableName + If (table.CaseSensitive <> table.DataSet.CaseSensitive) Then + Me.CaseSensitive = table.CaseSensitive + End If + If (table.Locale.ToString <> table.DataSet.Locale.ToString) Then + Me.Locale = table.Locale + End If + If (table.Namespace <> table.DataSet.Namespace) Then + Me.Namespace = table.Namespace + End If + Me.Prefix = table.Prefix + Me.MinimumCapacity = table.MinimumCapacity + End Sub _ - Public Property FILE_NAME() As String - Get - Try - Return CType(Me(Me.tableTBDD_REPORTING_IMPORT.FILE_NAMEColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FILE_NAME in Tabelle TBDD_REPORTING_IMPORT ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableTBDD_REPORTING_IMPORT.FILE_NAMEColumn) = value - End Set - End Property + Protected Sub New(ByVal info As Global.System.Runtime.Serialization.SerializationInfo, ByVal context As Global.System.Runtime.Serialization.StreamingContext) + MyBase.New(info, context) + Me.InitVars + End Sub _ - Public Property PROFILE_NAME() As String + Public ReadOnly Property IDColumn() As Global.System.Data.DataColumn Get - Return CType(Me(Me.tableTBDD_REPORTING_IMPORT.PROFILE_NAMEColumn),String) + Return Me.columnID End Get - Set - Me(Me.tableTBDD_REPORTING_IMPORT.PROFILE_NAMEColumn) = value - End Set End Property _ - Public Property VOLUME() As Decimal + Public ReadOnly Property UnterverzeichnisColumn() As Global.System.Data.DataColumn Get - Try - Return CType(Me(Me.tableTBDD_REPORTING_IMPORT.VOLUMEColumn),Decimal) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte VOLUME in Tabelle TBDD_REPORTING_IMPORT ist DBNull.", e) - End Try + Return Me.columnUnterverzeichnis End Get - Set - Me(Me.tableTBDD_REPORTING_IMPORT.VOLUMEColumn) = value - End Set End Property _ - Public Property PAGE_COUNT() As Integer + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ + Global.System.ComponentModel.Browsable(false)> _ + Public ReadOnly Property Count() As Integer Get - Try - Return CType(Me(Me.tableTBDD_REPORTING_IMPORT.PAGE_COUNTColumn),Integer) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte PAGE_COUNT in Tabelle TBDD_REPORTING_IMPORT ist DBNull.", e) - End Try + Return Me.Rows.Count End Get - Set - Me(Me.tableTBDD_REPORTING_IMPORT.PAGE_COUNTColumn) = value - End Set End Property _ - Public Property ADDED_WHEN() As Date + Public Default ReadOnly Property Item(ByVal index As Integer) As TBUVRow Get - Return CType(Me(Me.tableTBDD_REPORTING_IMPORT.ADDED_WHENColumn),Date) + Return CType(Me.Rows(index),TBUVRow) End Get - Set - Me(Me.tableTBDD_REPORTING_IMPORT.ADDED_WHENColumn) = value - End Set End Property + _ + Public Event TBUVRowChanging As TBUVRowChangeEventHandler + + _ + Public Event TBUVRowChanged As TBUVRowChangeEventHandler + + _ + Public Event TBUVRowDeleting As TBUVRowChangeEventHandler + + _ + Public Event TBUVRowDeleted As TBUVRowChangeEventHandler + _ - Public Property EXTENSION() As String - Get - Try - Return CType(Me(Me.tableTBDD_REPORTING_IMPORT.EXTENSIONColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte EXTENSION in Tabelle TBDD_REPORTING_IMPORT ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableTBDD_REPORTING_IMPORT.EXTENSIONColumn) = value - End Set - End Property + Public Overloads Sub AddTBUVRow(ByVal row As TBUVRow) + Me.Rows.Add(row) + End Sub _ - Public Function IsFILE_NAMENull() As Boolean - Return Me.IsNull(Me.tableTBDD_REPORTING_IMPORT.FILE_NAMEColumn) + Public Overloads Function AddTBUVRow(ByVal Unterverzeichnis As String) As TBUVRow + Dim rowTBUVRow As TBUVRow = CType(Me.NewRow,TBUVRow) + Dim columnValuesArray() As Object = New Object() {Nothing, Unterverzeichnis} + rowTBUVRow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBUVRow) + Return rowTBUVRow End Function _ - Public Sub SetFILE_NAMENull() - Me(Me.tableTBDD_REPORTING_IMPORT.FILE_NAMEColumn) = Global.System.Convert.DBNull - End Sub + Public Overrides Function Clone() As Global.System.Data.DataTable + Dim cln As TBUVDataTable = CType(MyBase.Clone,TBUVDataTable) + cln.InitVars + Return cln + End Function _ - Public Function IsVOLUMENull() As Boolean - Return Me.IsNull(Me.tableTBDD_REPORTING_IMPORT.VOLUMEColumn) + Protected Overrides Function CreateInstance() As Global.System.Data.DataTable + Return New TBUVDataTable() End Function _ - Public Sub SetVOLUMENull() - Me(Me.tableTBDD_REPORTING_IMPORT.VOLUMEColumn) = Global.System.Convert.DBNull + Friend Sub InitVars() + Me.columnID = MyBase.Columns("ID") + Me.columnUnterverzeichnis = MyBase.Columns("Unterverzeichnis") End Sub _ - Public Function IsPAGE_COUNTNull() As Boolean - Return Me.IsNull(Me.tableTBDD_REPORTING_IMPORT.PAGE_COUNTColumn) + Private Sub InitClass() + Me.columnID = New Global.System.Data.DataColumn("ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnID) + Me.columnUnterverzeichnis = New Global.System.Data.DataColumn("Unterverzeichnis", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnUnterverzeichnis) + Me.columnID.AutoIncrement = true + End Sub + + _ + Public Function NewTBUVRow() As TBUVRow + Return CType(Me.NewRow,TBUVRow) End Function _ - Public Sub SetPAGE_COUNTNull() - Me(Me.tableTBDD_REPORTING_IMPORT.PAGE_COUNTColumn) = Global.System.Convert.DBNull - End Sub + Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow + Return New TBUVRow(builder) + End Function _ - Public Function IsEXTENSIONNull() As Boolean - Return Me.IsNull(Me.tableTBDD_REPORTING_IMPORT.EXTENSIONColumn) + Protected Overrides Function GetRowType() As Global.System.Type + Return GetType(TBUVRow) End Function _ - Public Sub SetEXTENSIONNull() - Me(Me.tableTBDD_REPORTING_IMPORT.EXTENSIONColumn) = Global.System.Convert.DBNull + Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanged(e) + If (Not (Me.TBUVRowChangedEvent) Is Nothing) Then + RaiseEvent TBUVRowChanged(Me, New TBUVRowChangeEvent(CType(e.Row,TBUVRow), e.Action)) + End If End Sub - End Class + + _ + Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanging(e) + If (Not (Me.TBUVRowChangingEvent) Is Nothing) Then + RaiseEvent TBUVRowChanging(Me, New TBUVRowChangeEvent(CType(e.Row,TBUVRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleted(e) + If (Not (Me.TBUVRowDeletedEvent) Is Nothing) Then + RaiseEvent TBUVRowDeleted(Me, New TBUVRowChangeEvent(CType(e.Row,TBUVRow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleting(e) + If (Not (Me.TBUVRowDeletingEvent) Is Nothing) Then + RaiseEvent TBUVRowDeleting(Me, New TBUVRowChangeEvent(CType(e.Row,TBUVRow), e.Action)) + End If + End Sub + + _ + Public Sub RemoveTBUVRow(ByVal row As TBUVRow) + Me.Rows.Remove(row) + End Sub + + _ + Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType + Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() + Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() + Dim ds As MyDataset = New MyDataset() + Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any1.Namespace = "http://www.w3.org/2001/XMLSchema" + any1.MinOccurs = New Decimal(0) + any1.MaxOccurs = Decimal.MaxValue + any1.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any1) + Dim any2 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1" + any2.MinOccurs = New Decimal(1) + any2.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any2) + Dim attribute1 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute1.Name = "namespace" + attribute1.FixedValue = ds.Namespace + type.Attributes.Add(attribute1) + Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute2.Name = "tableTypeName" + attribute2.FixedValue = "TBUVDataTable" + type.Attributes.Add(attribute2) + type.Particle = sequence + Dim dsSchema As Global.System.Xml.Schema.XmlSchema = ds.GetSchemaSerializable + If xs.Contains(dsSchema.TargetNamespace) Then + Dim s1 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Dim s2 As Global.System.IO.MemoryStream = New Global.System.IO.MemoryStream() + Try + Dim schema As Global.System.Xml.Schema.XmlSchema = Nothing + dsSchema.Write(s1) + Dim schemas As Global.System.Collections.IEnumerator = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator + Do While schemas.MoveNext + schema = CType(schemas.Current,Global.System.Xml.Schema.XmlSchema) + s2.SetLength(0) + schema.Write(s2) + If (s1.Length = s2.Length) Then + s1.Position = 0 + s2.Position = 0 + + Do While ((s1.Position <> s1.Length) _ + AndAlso (s1.ReadByte = s2.ReadByte)) + + + Loop + If (s1.Position = s1.Length) Then + Return type + End If + End If + + Loop + Finally + If (Not (s1) Is Nothing) Then + s1.Close + End If + If (Not (s2) Is Nothing) Then + s2.Close + End If + End Try + End If + xs.Add(dsSchema) + Return type + End Function + End Class ''' '''Represents strongly named DataRow class. ''' - Partial Public Class TBTC_MOVE_RENAMERow + Partial Public Class TBDD_REPORTING_IMPORTRow Inherits Global.System.Data.DataRow - Private tableTBTC_MOVE_RENAME As TBTC_MOVE_RENAMEDataTable + Private tableTBDD_REPORTING_IMPORT As TBDD_REPORTING_IMPORTDataTable _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) - Me.tableTBTC_MOVE_RENAME = CType(Me.Table,TBTC_MOVE_RENAMEDataTable) + Me.tableTBDD_REPORTING_IMPORT = CType(Me.Table,TBDD_REPORTING_IMPORTDataTable) End Sub _ - Public Property GUID() As Integer - Get - Return CType(Me(Me.tableTBTC_MOVE_RENAME.GUIDColumn),Integer) - End Get - Set - Me(Me.tableTBTC_MOVE_RENAME.GUIDColumn) = value - End Set - End Property - - _ - Public Property PROFILE_NAME() As String - Get - Return CType(Me(Me.tableTBTC_MOVE_RENAME.PROFILE_NAMEColumn),String) - End Get - Set - Me(Me.tableTBTC_MOVE_RENAME.PROFILE_NAMEColumn) = value - End Set - End Property - - _ - Public Property FOLDER_FOR_INDEX() As String + Public Property IMPORT_ID() As Integer Get - Return CType(Me(Me.tableTBTC_MOVE_RENAME.FOLDER_FOR_INDEXColumn),String) + Return CType(Me(Me.tableTBDD_REPORTING_IMPORT.IMPORT_IDColumn),Integer) End Get Set - Me(Me.tableTBTC_MOVE_RENAME.FOLDER_FOR_INDEXColumn) = value + Me(Me.tableTBDD_REPORTING_IMPORT.IMPORT_IDColumn) = value End Set End Property _ - Public Property NAMECONVENTION() As String + Public Property FILE_NAME() As String Get - Return CType(Me(Me.tableTBTC_MOVE_RENAME.NAMECONVENTIONColumn),String) + Try + Return CType(Me(Me.tableTBDD_REPORTING_IMPORT.FILE_NAMEColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FILE_NAME in Tabelle TBDD_REPORTING_IMPORT ist DBNull.", e) + End Try End Get Set - Me(Me.tableTBTC_MOVE_RENAME.NAMECONVENTIONColumn) = value + Me(Me.tableTBDD_REPORTING_IMPORT.FILE_NAMEColumn) = value End Set End Property _ - Public Property ACTIVE() As Boolean + Public Property PROFILE_NAME() As String Get - Return CType(Me(Me.tableTBTC_MOVE_RENAME.ACTIVEColumn),Boolean) + Return CType(Me(Me.tableTBDD_REPORTING_IMPORT.PROFILE_NAMEColumn),String) End Get Set - Me(Me.tableTBTC_MOVE_RENAME.ACTIVEColumn) = value + Me(Me.tableTBDD_REPORTING_IMPORT.PROFILE_NAMEColumn) = value End Set End Property _ - Public Property CREATED_WHO() As String + Public Property VOLUME() As Decimal Get Try - Return CType(Me(Me.tableTBTC_MOVE_RENAME.CREATED_WHOColumn),String) + Return CType(Me(Me.tableTBDD_REPORTING_IMPORT.VOLUMEColumn),Decimal) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CREATED_WHO in Tabelle TBTC_MOVE_RENAME ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte VOLUME in Tabelle TBDD_REPORTING_IMPORT ist DBNull.", e) End Try End Get Set - Me(Me.tableTBTC_MOVE_RENAME.CREATED_WHOColumn) = value + Me(Me.tableTBDD_REPORTING_IMPORT.VOLUMEColumn) = value End Set End Property _ - Public Property CREATED_WHEN() As Date + Public Property PAGE_COUNT() As Integer Get Try - Return CType(Me(Me.tableTBTC_MOVE_RENAME.CREATED_WHENColumn),Date) + Return CType(Me(Me.tableTBDD_REPORTING_IMPORT.PAGE_COUNTColumn),Integer) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CREATED_WHEN in Tabelle TBTC_MOVE_RENAME ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte PAGE_COUNT in Tabelle TBDD_REPORTING_IMPORT ist DBNull.", e) End Try End Get Set - Me(Me.tableTBTC_MOVE_RENAME.CREATED_WHENColumn) = value + Me(Me.tableTBDD_REPORTING_IMPORT.PAGE_COUNTColumn) = value End Set End Property _ - Public Property CHANGED_WHO() As String + Public Property ADDED_WHEN() As Date Get - Try - Return CType(Me(Me.tableTBTC_MOVE_RENAME.CHANGED_WHOColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBTC_MOVE_RENAME ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBDD_REPORTING_IMPORT.ADDED_WHENColumn),Date) End Get Set - Me(Me.tableTBTC_MOVE_RENAME.CHANGED_WHOColumn) = value + Me(Me.tableTBDD_REPORTING_IMPORT.ADDED_WHENColumn) = value End Set End Property _ - Public Property CHANGED_WHEN() As Date + Public Property EXTENSION() As String Get Try - Return CType(Me(Me.tableTBTC_MOVE_RENAME.CHANGED_WHENColumn),Date) + Return CType(Me(Me.tableTBDD_REPORTING_IMPORT.EXTENSIONColumn),String) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBTC_MOVE_RENAME ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte EXTENSION in Tabelle TBDD_REPORTING_IMPORT ist DBNull.", e) End Try End Get Set - Me(Me.tableTBTC_MOVE_RENAME.CHANGED_WHENColumn) = value + Me(Me.tableTBDD_REPORTING_IMPORT.EXTENSIONColumn) = value End Set End Property _ - Public Function IsCREATED_WHONull() As Boolean - Return Me.IsNull(Me.tableTBTC_MOVE_RENAME.CREATED_WHOColumn) + Public Function IsFILE_NAMENull() As Boolean + Return Me.IsNull(Me.tableTBDD_REPORTING_IMPORT.FILE_NAMEColumn) End Function _ - Public Sub SetCREATED_WHONull() - Me(Me.tableTBTC_MOVE_RENAME.CREATED_WHOColumn) = Global.System.Convert.DBNull + Public Sub SetFILE_NAMENull() + Me(Me.tableTBDD_REPORTING_IMPORT.FILE_NAMEColumn) = Global.System.Convert.DBNull End Sub _ - Public Function IsCREATED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBTC_MOVE_RENAME.CREATED_WHENColumn) + Public Function IsVOLUMENull() As Boolean + Return Me.IsNull(Me.tableTBDD_REPORTING_IMPORT.VOLUMEColumn) End Function _ - Public Sub SetCREATED_WHENNull() - Me(Me.tableTBTC_MOVE_RENAME.CREATED_WHENColumn) = Global.System.Convert.DBNull + Public Sub SetVOLUMENull() + Me(Me.tableTBDD_REPORTING_IMPORT.VOLUMEColumn) = Global.System.Convert.DBNull End Sub _ - Public Function IsCHANGED_WHONull() As Boolean - Return Me.IsNull(Me.tableTBTC_MOVE_RENAME.CHANGED_WHOColumn) + Public Function IsPAGE_COUNTNull() As Boolean + Return Me.IsNull(Me.tableTBDD_REPORTING_IMPORT.PAGE_COUNTColumn) End Function _ - Public Sub SetCHANGED_WHONull() - Me(Me.tableTBTC_MOVE_RENAME.CHANGED_WHOColumn) = Global.System.Convert.DBNull + Public Sub SetPAGE_COUNTNull() + Me(Me.tableTBDD_REPORTING_IMPORT.PAGE_COUNTColumn) = Global.System.Convert.DBNull End Sub _ - Public Function IsCHANGED_WHENNull() As Boolean - Return Me.IsNull(Me.tableTBTC_MOVE_RENAME.CHANGED_WHENColumn) + Public Function IsEXTENSIONNull() As Boolean + Return Me.IsNull(Me.tableTBDD_REPORTING_IMPORT.EXTENSIONColumn) End Function _ - Public Sub SetCHANGED_WHENNull() - Me(Me.tableTBTC_MOVE_RENAME.CHANGED_WHENColumn) = Global.System.Convert.DBNull + Public Sub SetEXTENSIONNull() + Me(Me.tableTBDD_REPORTING_IMPORT.EXTENSIONColumn) = Global.System.Convert.DBNull End Sub End Class ''' '''Represents strongly named DataRow class. ''' - Partial Public Class TBVEKTOR_ARRAYRow + Partial Public Class TBTC_MOVE_RENAMERow Inherits Global.System.Data.DataRow - Private tableTBVEKTOR_ARRAY As TBVEKTOR_ARRAYDataTable + Private tableTBTC_MOVE_RENAME As TBTC_MOVE_RENAMEDataTable _ Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) MyBase.New(rb) - Me.tableTBVEKTOR_ARRAY = CType(Me.Table,TBVEKTOR_ARRAYDataTable) + Me.tableTBTC_MOVE_RENAME = CType(Me.Table,TBTC_MOVE_RENAMEDataTable) End Sub _ - Public Property Indexname() As String + Public Property GUID() As Integer Get - Try - Return CType(Me(Me.tableTBVEKTOR_ARRAY.IndexnameColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte Indexname in Tabelle TBVEKTOR_ARRAY ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBTC_MOVE_RENAME.GUIDColumn),Integer) End Get Set - Me(Me.tableTBVEKTOR_ARRAY.IndexnameColumn) = value + Me(Me.tableTBTC_MOVE_RENAME.GUIDColumn) = value End Set End Property _ - Public Property Wert() As String + Public Property PROFILE_NAME() As String Get - Try - Return CType(Me(Me.tableTBVEKTOR_ARRAY.WertColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte Wert in Tabelle TBVEKTOR_ARRAY ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBTC_MOVE_RENAME.PROFILE_NAMEColumn),String) End Get Set - Me(Me.tableTBVEKTOR_ARRAY.WertColumn) = value + Me(Me.tableTBTC_MOVE_RENAME.PROFILE_NAMEColumn) = value End Set End Property _ - Public Function IsIndexnameNull() As Boolean - Return Me.IsNull(Me.tableTBVEKTOR_ARRAY.IndexnameColumn) - End Function + Public Property FOLDER_FOR_INDEX() As String + Get + Return CType(Me(Me.tableTBTC_MOVE_RENAME.FOLDER_FOR_INDEXColumn),String) + End Get + Set + Me(Me.tableTBTC_MOVE_RENAME.FOLDER_FOR_INDEXColumn) = value + End Set + End Property _ - Public Sub SetIndexnameNull() - Me(Me.tableTBVEKTOR_ARRAY.IndexnameColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsWertNull() As Boolean - Return Me.IsNull(Me.tableTBVEKTOR_ARRAY.WertColumn) - End Function - - _ - Public Sub SetWertNull() - Me(Me.tableTBVEKTOR_ARRAY.WertColumn) = Global.System.Convert.DBNull - End Sub - End Class - - ''' - '''Represents strongly named DataRow class. - ''' - Partial Public Class TBErgebnisRow - Inherits Global.System.Data.DataRow - - Private tableTBErgebnis As TBErgebnisDataTable + Public Property NAMECONVENTION() As String + Get + Return CType(Me(Me.tableTBTC_MOVE_RENAME.NAMECONVENTIONColumn),String) + End Get + Set + Me(Me.tableTBTC_MOVE_RENAME.NAMECONVENTIONColumn) = value + End Set + End Property _ - Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) - MyBase.New(rb) - Me.tableTBErgebnis = CType(Me.Table,TBErgebnisDataTable) - End Sub + Public Property ACTIVE() As Boolean + Get + Return CType(Me(Me.tableTBTC_MOVE_RENAME.ACTIVEColumn),Boolean) + End Get + Set + Me(Me.tableTBTC_MOVE_RENAME.ACTIVEColumn) = value + End Set + End Property _ - Public Property Ergebniswerte() As String + Public Property CREATED_WHO() As String Get Try - Return CType(Me(Me.tableTBErgebnis.ErgebniswerteColumn),String) + Return CType(Me(Me.tableTBTC_MOVE_RENAME.CREATED_WHOColumn),String) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte Ergebniswerte in Tabelle TBErgebnis ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CREATED_WHO in Tabelle TBTC_MOVE_RENAME ist DBNull.", e) End Try End Get Set - Me(Me.tableTBErgebnis.ErgebniswerteColumn) = value + Me(Me.tableTBTC_MOVE_RENAME.CREATED_WHOColumn) = value End Set End Property _ - Public Function IsErgebniswerteNull() As Boolean - Return Me.IsNull(Me.tableTBErgebnis.ErgebniswerteColumn) - End Function - - _ - Public Sub SetErgebniswerteNull() - Me(Me.tableTBErgebnis.ErgebniswerteColumn) = Global.System.Convert.DBNull - End Sub - End Class - - ''' - '''Represents strongly named DataRow class. - ''' - Partial Public Class TBUVRow - Inherits Global.System.Data.DataRow - - Private tableTBUV As TBUVDataTable - - _ - Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) - MyBase.New(rb) - Me.tableTBUV = CType(Me.Table,TBUVDataTable) - End Sub + Public Property CREATED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBTC_MOVE_RENAME.CREATED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CREATED_WHEN in Tabelle TBTC_MOVE_RENAME ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBTC_MOVE_RENAME.CREATED_WHENColumn) = value + End Set + End Property _ - Public Property ID() As Integer + Public Property CHANGED_WHO() As String Get Try - Return CType(Me(Me.tableTBUV.IDColumn),Integer) + Return CType(Me(Me.tableTBTC_MOVE_RENAME.CHANGED_WHOColumn),String) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ID in Tabelle TBUV ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBTC_MOVE_RENAME ist DBNull.", e) End Try End Get Set - Me(Me.tableTBUV.IDColumn) = value + Me(Me.tableTBTC_MOVE_RENAME.CHANGED_WHOColumn) = value End Set End Property _ - Public Property Unterverzeichnis() As String + Public Property CHANGED_WHEN() As Date Get Try - Return CType(Me(Me.tableTBUV.UnterverzeichnisColumn),String) + Return CType(Me(Me.tableTBTC_MOVE_RENAME.CHANGED_WHENColumn),Date) Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte Unterverzeichnis in Tabelle TBUV ist DBNull.", e) + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBTC_MOVE_RENAME ist DBNull.", e) End Try End Get Set - Me(Me.tableTBUV.UnterverzeichnisColumn) = value + Me(Me.tableTBTC_MOVE_RENAME.CHANGED_WHENColumn) = value End Set End Property _ - Public Function IsIDNull() As Boolean - Return Me.IsNull(Me.tableTBUV.IDColumn) + Public Function IsCREATED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBTC_MOVE_RENAME.CREATED_WHOColumn) End Function _ - Public Sub SetIDNull() - Me(Me.tableTBUV.IDColumn) = Global.System.Convert.DBNull + Public Sub SetCREATED_WHONull() + Me(Me.tableTBTC_MOVE_RENAME.CREATED_WHOColumn) = Global.System.Convert.DBNull End Sub _ - Public Function IsUnterverzeichnisNull() As Boolean - Return Me.IsNull(Me.tableTBUV.UnterverzeichnisColumn) + Public Function IsCREATED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBTC_MOVE_RENAME.CREATED_WHENColumn) End Function _ - Public Sub SetUnterverzeichnisNull() - Me(Me.tableTBUV.UnterverzeichnisColumn) = Global.System.Convert.DBNull + Public Sub SetCREATED_WHENNull() + Me(Me.tableTBTC_MOVE_RENAME.CREATED_WHENColumn) = Global.System.Convert.DBNull End Sub - End Class - - ''' - '''Row event argument class - ''' - _ - Public Class TBDD_REPORTING_IMPORTRowChangeEvent - Inherits Global.System.EventArgs - - Private eventRow As TBDD_REPORTING_IMPORTRow - Private eventAction As Global.System.Data.DataRowAction + _ + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBTC_MOVE_RENAME.CHANGED_WHOColumn) + End Function _ - Public Sub New(ByVal row As TBDD_REPORTING_IMPORTRow, ByVal action As Global.System.Data.DataRowAction) - MyBase.New - Me.eventRow = row - Me.eventAction = action + Public Sub SetCHANGED_WHONull() + Me(Me.tableTBTC_MOVE_RENAME.CHANGED_WHOColumn) = Global.System.Convert.DBNull End Sub _ - Public ReadOnly Property Row() As TBDD_REPORTING_IMPORTRow - Get - Return Me.eventRow - End Get - End Property + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBTC_MOVE_RENAME.CHANGED_WHENColumn) + End Function _ - Public ReadOnly Property Action() As Global.System.Data.DataRowAction - Get - Return Me.eventAction - End Get - End Property + Public Sub SetCHANGED_WHENNull() + Me(Me.tableTBTC_MOVE_RENAME.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub End Class ''' - '''Row event argument class + '''Represents strongly named DataRow class. ''' - _ - Public Class TBTC_MOVE_RENAMERowChangeEvent - Inherits Global.System.EventArgs - - Private eventRow As TBTC_MOVE_RENAMERow + Partial Public Class TBTC_DI_REGEX_MATCHRow + Inherits Global.System.Data.DataRow - Private eventAction As Global.System.Data.DataRowAction + Private tableTBTC_DI_REGEX_MATCH As TBTC_DI_REGEX_MATCHDataTable _ - Public Sub New(ByVal row As TBTC_MOVE_RENAMERow, ByVal action As Global.System.Data.DataRowAction) - MyBase.New - Me.eventRow = row - Me.eventAction = action + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBTC_DI_REGEX_MATCH = CType(Me.Table,TBTC_DI_REGEX_MATCHDataTable) End Sub _ - Public ReadOnly Property Row() As TBTC_MOVE_RENAMERow + Public Property GUID() As Integer Get - Return Me.eventRow + Return CType(Me(Me.tableTBTC_DI_REGEX_MATCH.GUIDColumn),Integer) End Get + Set + Me(Me.tableTBTC_DI_REGEX_MATCH.GUIDColumn) = value + End Set End Property _ - Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Public Property PROFILE_NAME() As String Get - Return Me.eventAction + Return CType(Me(Me.tableTBTC_DI_REGEX_MATCH.PROFILE_NAMEColumn),String) End Get + Set + Me(Me.tableTBTC_DI_REGEX_MATCH.PROFILE_NAMEColumn) = value + End Set End Property - End Class - - ''' - '''Row event argument class - ''' - _ - Public Class TBVEKTOR_ARRAYRowChangeEvent - Inherits Global.System.EventArgs - - Private eventRow As TBVEKTOR_ARRAYRow - - Private eventAction As Global.System.Data.DataRowAction - - _ - Public Sub New(ByVal row As TBVEKTOR_ARRAYRow, ByVal action As Global.System.Data.DataRowAction) - MyBase.New - Me.eventRow = row - Me.eventAction = action - End Sub _ - Public ReadOnly Property Row() As TBVEKTOR_ARRAYRow + Public Property REGEX() As String Get - Return Me.eventRow + Return CType(Me(Me.tableTBTC_DI_REGEX_MATCH.REGEXColumn),String) End Get + Set + Me(Me.tableTBTC_DI_REGEX_MATCH.REGEXColumn) = value + End Set End Property _ - Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Public Property CREATED_WHO() As String Get - Return Me.eventAction + Return CType(Me(Me.tableTBTC_DI_REGEX_MATCH.CREATED_WHOColumn),String) End Get + Set + Me(Me.tableTBTC_DI_REGEX_MATCH.CREATED_WHOColumn) = value + End Set End Property - End Class - - ''' - '''Row event argument class - ''' - _ - Public Class TBErgebnisRowChangeEvent - Inherits Global.System.EventArgs - - Private eventRow As TBErgebnisRow - - Private eventAction As Global.System.Data.DataRowAction _ - Public Sub New(ByVal row As TBErgebnisRow, ByVal action As Global.System.Data.DataRowAction) - MyBase.New - Me.eventRow = row - Me.eventAction = action - End Sub + Public Property CREATED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBTC_DI_REGEX_MATCH.CREATED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CREATED_WHEN in Tabelle TBTC_DI_REGEX_MATCH ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBTC_DI_REGEX_MATCH.CREATED_WHENColumn) = value + End Set + End Property _ - Public ReadOnly Property Row() As TBErgebnisRow + Public Property CHANGED_WHO() As String Get - Return Me.eventRow + Try + Return CType(Me(Me.tableTBTC_DI_REGEX_MATCH.CHANGED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBTC_DI_REGEX_MATCH ist DBNull.", e) + End Try End Get + Set + Me(Me.tableTBTC_DI_REGEX_MATCH.CHANGED_WHOColumn) = value + End Set End Property _ - Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Public Property CHANGED_WHEN() As Date Get - Return Me.eventAction + Try + Return CType(Me(Me.tableTBTC_DI_REGEX_MATCH.CHANGED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBTC_DI_REGEX_MATCH ist DBNull.", e) + End Try End Get + Set + Me(Me.tableTBTC_DI_REGEX_MATCH.CHANGED_WHENColumn) = value + End Set End Property - End Class - - ''' - '''Row event argument class + + _ + Public Function IsCREATED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBTC_DI_REGEX_MATCH.CREATED_WHENColumn) + End Function + + _ + Public Sub SetCREATED_WHENNull() + Me(Me.tableTBTC_DI_REGEX_MATCH.CREATED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBTC_DI_REGEX_MATCH.CHANGED_WHOColumn) + End Function + + _ + Public Sub SetCHANGED_WHONull() + Me(Me.tableTBTC_DI_REGEX_MATCH.CHANGED_WHOColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBTC_DI_REGEX_MATCH.CHANGED_WHENColumn) + End Function + + _ + Public Sub SetCHANGED_WHENNull() + Me(Me.tableTBTC_DI_REGEX_MATCH.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub + End Class + + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBVEKTOR_ARRAYRow + Inherits Global.System.Data.DataRow + + Private tableTBVEKTOR_ARRAY As TBVEKTOR_ARRAYDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBVEKTOR_ARRAY = CType(Me.Table,TBVEKTOR_ARRAYDataTable) + End Sub + + _ + Public Property Indexname() As String + Get + Try + Return CType(Me(Me.tableTBVEKTOR_ARRAY.IndexnameColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte Indexname in Tabelle TBVEKTOR_ARRAY ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBVEKTOR_ARRAY.IndexnameColumn) = value + End Set + End Property + + _ + Public Property Wert() As String + Get + Try + Return CType(Me(Me.tableTBVEKTOR_ARRAY.WertColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte Wert in Tabelle TBVEKTOR_ARRAY ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBVEKTOR_ARRAY.WertColumn) = value + End Set + End Property + + _ + Public Function IsIndexnameNull() As Boolean + Return Me.IsNull(Me.tableTBVEKTOR_ARRAY.IndexnameColumn) + End Function + + _ + Public Sub SetIndexnameNull() + Me(Me.tableTBVEKTOR_ARRAY.IndexnameColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsWertNull() As Boolean + Return Me.IsNull(Me.tableTBVEKTOR_ARRAY.WertColumn) + End Function + + _ + Public Sub SetWertNull() + Me(Me.tableTBVEKTOR_ARRAY.WertColumn) = Global.System.Convert.DBNull + End Sub + End Class + + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBErgebnisRow + Inherits Global.System.Data.DataRow + + Private tableTBErgebnis As TBErgebnisDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBErgebnis = CType(Me.Table,TBErgebnisDataTable) + End Sub + + _ + Public Property Ergebniswerte() As String + Get + Try + Return CType(Me(Me.tableTBErgebnis.ErgebniswerteColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte Ergebniswerte in Tabelle TBErgebnis ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBErgebnis.ErgebniswerteColumn) = value + End Set + End Property + + _ + Public Function IsErgebniswerteNull() As Boolean + Return Me.IsNull(Me.tableTBErgebnis.ErgebniswerteColumn) + End Function + + _ + Public Sub SetErgebniswerteNull() + Me(Me.tableTBErgebnis.ErgebniswerteColumn) = Global.System.Convert.DBNull + End Sub + End Class + + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBUVRow + Inherits Global.System.Data.DataRow + + Private tableTBUV As TBUVDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBUV = CType(Me.Table,TBUVDataTable) + End Sub + + _ + Public Property ID() As Integer + Get + Try + Return CType(Me(Me.tableTBUV.IDColumn),Integer) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ID in Tabelle TBUV ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBUV.IDColumn) = value + End Set + End Property + + _ + Public Property Unterverzeichnis() As String + Get + Try + Return CType(Me(Me.tableTBUV.UnterverzeichnisColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte Unterverzeichnis in Tabelle TBUV ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBUV.UnterverzeichnisColumn) = value + End Set + End Property + + _ + Public Function IsIDNull() As Boolean + Return Me.IsNull(Me.tableTBUV.IDColumn) + End Function + + _ + Public Sub SetIDNull() + Me(Me.tableTBUV.IDColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsUnterverzeichnisNull() As Boolean + Return Me.IsNull(Me.tableTBUV.UnterverzeichnisColumn) + End Function + + _ + Public Sub SetUnterverzeichnisNull() + Me(Me.tableTBUV.UnterverzeichnisColumn) = Global.System.Convert.DBNull + End Sub + End Class + + ''' + '''Row event argument class ''' _ - Public Class TBUVRowChangeEvent + Public Class TBDD_REPORTING_IMPORTRowChangeEvent Inherits Global.System.EventArgs - Private eventRow As TBUVRow + Private eventRow As TBDD_REPORTING_IMPORTRow Private eventAction As Global.System.Data.DataRowAction _ - Public Sub New(ByVal row As TBUVRow, ByVal action As Global.System.Data.DataRowAction) + Public Sub New(ByVal row As TBDD_REPORTING_IMPORTRow, ByVal action As Global.System.Data.DataRowAction) MyBase.New Me.eventRow = row Me.eventAction = action @@ -2608,23 +2990,666 @@ Partial Public Class MyDataset _ - Public ReadOnly Property Row() As TBUVRow + Public ReadOnly Property Row() As TBDD_REPORTING_IMPORTRow Get Return Me.eventRow End Get End Property _ - Public ReadOnly Property Action() As Global.System.Data.DataRowAction - Get - Return Me.eventAction - End Get - End Property + Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBTC_MOVE_RENAMERowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBTC_MOVE_RENAMERow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBTC_MOVE_RENAMERow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBTC_MOVE_RENAMERow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBTC_DI_REGEX_MATCHRowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBTC_DI_REGEX_MATCHRow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBTC_DI_REGEX_MATCHRow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBTC_DI_REGEX_MATCHRow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBVEKTOR_ARRAYRowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBVEKTOR_ARRAYRow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBVEKTOR_ARRAYRow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBVEKTOR_ARRAYRow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBErgebnisRowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBErgebnisRow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBErgebnisRow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBErgebnisRow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class + + ''' + '''Row event argument class + ''' + _ + Public Class TBUVRowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBUVRow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBUVRow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBUVRow + Get + Return Me.eventRow + End Get + End Property + + _ + Public ReadOnly Property Action() As Global.System.Data.DataRowAction + Get + Return Me.eventAction + End Get + End Property + End Class +End Class + +Namespace MyDatasetTableAdapters + + ''' + '''Represents the connection and commands used to retrieve and save data. + ''' + _ + Partial Public Class TBDD_REPORTING_IMPORTTableAdapter + Inherits Global.System.ComponentModel.Component + + Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter + + Private _connection As Global.System.Data.SqlClient.SqlConnection + + Private _transaction As Global.System.Data.SqlClient.SqlTransaction + + Private _commandCollection() As Global.System.Data.SqlClient.SqlCommand + + Private _clearBeforeFill As Boolean + + _ + Public Sub New() + MyBase.New + Me.ClearBeforeFill = true + End Sub + + _ + Protected Friend ReadOnly Property Adapter() As Global.System.Data.SqlClient.SqlDataAdapter + Get + If (Me._adapter Is Nothing) Then + Me.InitAdapter + End If + Return Me._adapter + End Get + End Property + + _ + Friend Property Connection() As Global.System.Data.SqlClient.SqlConnection + Get + If (Me._connection Is Nothing) Then + Me.InitConnection + End If + Return Me._connection + End Get + Set + Me._connection = value + If (Not (Me.Adapter.InsertCommand) Is Nothing) Then + Me.Adapter.InsertCommand.Connection = value + End If + If (Not (Me.Adapter.DeleteCommand) Is Nothing) Then + Me.Adapter.DeleteCommand.Connection = value + End If + If (Not (Me.Adapter.UpdateCommand) Is Nothing) Then + Me.Adapter.UpdateCommand.Connection = value + End If + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + If (Not (Me.CommandCollection(i)) Is Nothing) Then + CType(Me.CommandCollection(i),Global.System.Data.SqlClient.SqlCommand).Connection = value + End If + i = (i + 1) + Loop + End Set + End Property + + _ + Friend Property Transaction() As Global.System.Data.SqlClient.SqlTransaction + Get + Return Me._transaction + End Get + Set + Me._transaction = value + Dim i As Integer = 0 + Do While (i < Me.CommandCollection.Length) + Me.CommandCollection(i).Transaction = Me._transaction + i = (i + 1) + Loop + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.DeleteCommand) Is Nothing)) Then + Me.Adapter.DeleteCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.InsertCommand) Is Nothing)) Then + Me.Adapter.InsertCommand.Transaction = Me._transaction + End If + If ((Not (Me.Adapter) Is Nothing) _ + AndAlso (Not (Me.Adapter.UpdateCommand) Is Nothing)) Then + Me.Adapter.UpdateCommand.Transaction = Me._transaction + End If + End Set + End Property + + _ + Protected ReadOnly Property CommandCollection() As Global.System.Data.SqlClient.SqlCommand() + Get + If (Me._commandCollection Is Nothing) Then + Me.InitCommandCollection + End If + Return Me._commandCollection + End Get + End Property + + _ + Public Property ClearBeforeFill() As Boolean + Get + Return Me._clearBeforeFill + End Get + Set + Me._clearBeforeFill = value + End Set + End Property + + _ + Private Sub InitAdapter() + Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() + Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() + tableMapping.SourceTable = "Table" + tableMapping.DataSetTable = "TBDD_REPORTING_IMPORT" + tableMapping.ColumnMappings.Add("IMPORT_ID", "IMPORT_ID") + tableMapping.ColumnMappings.Add("FILE_NAME", "FILE_NAME") + tableMapping.ColumnMappings.Add("PROFILE_NAME", "PROFILE_NAME") + tableMapping.ColumnMappings.Add("VOLUME", "VOLUME") + tableMapping.ColumnMappings.Add("PAGE_COUNT", "PAGE_COUNT") + tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") + tableMapping.ColumnMappings.Add("EXTENSION", "EXTENSION") + Me._adapter.TableMappings.Add(tableMapping) + Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.DeleteCommand.Connection = Me.Connection + Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBDD_REPORTING_IMPORT] WHERE (([IMPORT_ID] = @Original_IMPORT_ID) AN"& _ + "D ((@IsNull_FILE_NAME = 1 AND [FILE_NAME] IS NULL) OR ([FILE_NAME] = @Original_F"& _ + "ILE_NAME)) AND ([PROFILE_NAME] = @Original_PROFILE_NAME) AND ((@IsNull_VOLUME = "& _ + "1 AND [VOLUME] IS NULL) OR ([VOLUME] = @Original_VOLUME)) AND ((@IsNull_PAGE_COU"& _ + "NT = 1 AND [PAGE_COUNT] IS NULL) OR ([PAGE_COUNT] = @Original_PAGE_COUNT)) AND ("& _ + "(@IsNull_EXTENSION = 1 AND [EXTENSION] IS NULL) OR ([EXTENSION] = @Original_EXTE"& _ + "NSION)) AND ([ADDED_WHEN] = @Original_ADDED_WHEN))" + Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_IMPORT_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "IMPORT_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_FILE_NAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_NAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FILE_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_VOLUME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VOLUME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_VOLUME", Global.System.Data.SqlDbType.[Decimal], 0, Global.System.Data.ParameterDirection.Input, 10, 2, "VOLUME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_PAGE_COUNT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PAGE_COUNT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PAGE_COUNT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PAGE_COUNT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_EXTENSION", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EXTENSION", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_EXTENSION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EXTENSION", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.InsertCommand.Connection = Me.Connection + Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_REPORTING_IMPORT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (FILE_NAME, PROFILE_N"& _ + "AME, VOLUME, PAGE_COUNT, EXTENSION)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@FILE_NAME,@PROFILE_NAME,@VO"& _ + "LUME,@PAGE_COUNT,@EXTENSION); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT IMPORT_ID, FILE_NAME, PROFILE_NAME, VOLUM"& _ + "E, PAGE_COUNT, EXTENSION, ADDED_WHEN FROM TBDD_REPORTING_IMPORT WHERE (IMPORT_ID"& _ + " = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FILE_NAME", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VOLUME", Global.System.Data.SqlDbType.[Decimal], 9, Global.System.Data.ParameterDirection.Input, 10, 2, "VOLUME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PAGE_COUNT", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PAGE_COUNT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EXTENSION", Global.System.Data.SqlDbType.VarChar, 10, Global.System.Data.ParameterDirection.Input, 0, 0, "EXTENSION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.UpdateCommand.Connection = Me.Connection + Me._adapter.UpdateCommand.CommandText = "UPDATE [TBDD_REPORTING_IMPORT] SET [FILE_NAME] = @FILE_NAME, [PROFILE_NAME] = @PR"& _ + "OFILE_NAME, [VOLUME] = @VOLUME, [PAGE_COUNT] = @PAGE_COUNT, [EXTENSION] = @EXTEN"& _ + "SION, [ADDED_WHEN] = @ADDED_WHEN WHERE (([IMPORT_ID] = @Original_IMPORT_ID) AND "& _ + "((@IsNull_FILE_NAME = 1 AND [FILE_NAME] IS NULL) OR ([FILE_NAME] = @Original_FIL"& _ + "E_NAME)) AND ([PROFILE_NAME] = @Original_PROFILE_NAME) AND ((@IsNull_VOLUME = 1 "& _ + "AND [VOLUME] IS NULL) OR ([VOLUME] = @Original_VOLUME)) AND ((@IsNull_PAGE_COUNT"& _ + " = 1 AND [PAGE_COUNT] IS NULL) OR ([PAGE_COUNT] = @Original_PAGE_COUNT)) AND ((@"& _ + "IsNull_EXTENSION = 1 AND [EXTENSION] IS NULL) OR ([EXTENSION] = @Original_EXTENS"& _ + "ION)) AND ([ADDED_WHEN] = @Original_ADDED_WHEN));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT IMPORT_ID, FILE_NAME, "& _ + "PROFILE_NAME, VOLUME, PAGE_COUNT, EXTENSION, ADDED_WHEN FROM TBDD_REPORTING_IMPO"& _ + "RT WHERE (IMPORT_ID = @IMPORT_ID)" + Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FILE_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VOLUME", Global.System.Data.SqlDbType.[Decimal], 0, Global.System.Data.ParameterDirection.Input, 10, 2, "VOLUME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PAGE_COUNT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PAGE_COUNT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EXTENSION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EXTENSION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_IMPORT_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "IMPORT_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_FILE_NAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_NAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FILE_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_VOLUME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VOLUME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_VOLUME", Global.System.Data.SqlDbType.[Decimal], 0, Global.System.Data.ParameterDirection.Input, 10, 2, "VOLUME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_PAGE_COUNT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PAGE_COUNT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PAGE_COUNT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PAGE_COUNT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_EXTENSION", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EXTENSION", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_EXTENSION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EXTENSION", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IMPORT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "IMPORT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + End Sub + + _ + Private Sub InitConnection() + Me._connection = New Global.System.Data.SqlClient.SqlConnection() + Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DDECMConString + End Sub + + _ + Private Sub InitCommandCollection() + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} + Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(0).Connection = Me.Connection + Me._commandCollection(0).CommandText = "SELECT TBDD_REPORTING_IMPORT.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_REPORTING_IMPORT" + Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + End Sub + + _ + Public Overloads Overridable Function Fill(ByVal dataTable As MyDataset.TBDD_REPORTING_IMPORTDataTable) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(0) + If (Me.ClearBeforeFill = true) Then + dataTable.Clear + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overloads Overridable Function GetData() As MyDataset.TBDD_REPORTING_IMPORTDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Dim dataTable As MyDataset.TBDD_REPORTING_IMPORTDataTable = New MyDataset.TBDD_REPORTING_IMPORTDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataTable As MyDataset.TBDD_REPORTING_IMPORTDataTable) As Integer + Return Me.Adapter.Update(dataTable) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataSet As MyDataset) As Integer + Return Me.Adapter.Update(dataSet, "TBDD_REPORTING_IMPORT") + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(dataRows) + End Function + + _ + Public Overloads Overridable Function Delete(ByVal Original_IMPORT_ID As Integer, ByVal Original_FILE_NAME As String, ByVal Original_PROFILE_NAME As String, ByVal Original_VOLUME As Global.System.Nullable(Of Decimal), ByVal Original_PAGE_COUNT As Global.System.Nullable(Of Integer), ByVal Original_EXTENSION As String, ByVal Original_ADDED_WHEN As Date) As Integer + Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_IMPORT_ID,Integer) + If (Original_FILE_NAME Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(2).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_FILE_NAME,String) + End If + If (Original_PROFILE_NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_PROFILE_NAME") + Else + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_PROFILE_NAME,String) + End If + If (Original_VOLUME.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(4).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_VOLUME.Value,Decimal) + Else + Me.Adapter.DeleteCommand.Parameters(4).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(5).Value = Global.System.DBNull.Value + End If + If (Original_PAGE_COUNT.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(7).Value = CType(Original_PAGE_COUNT.Value,Integer) + Else + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(7).Value = Global.System.DBNull.Value + End If + If (Original_EXTENSION Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(8).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(9).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(8).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(Original_EXTENSION,String) + End If + Me.Adapter.DeleteCommand.Parameters(10).Value = CType(Original_ADDED_WHEN,Date) + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State + If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.DeleteCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.DeleteCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.DeleteCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Insert(ByVal FILE_NAME As String, ByVal PROFILE_NAME As String, ByVal VOLUME As Global.System.Nullable(Of Decimal), ByVal PAGE_COUNT As Global.System.Nullable(Of Integer), ByVal EXTENSION As String) As Integer + If (FILE_NAME Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(0).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(0).Value = CType(FILE_NAME,String) + End If + If (PROFILE_NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("PROFILE_NAME") + Else + Me.Adapter.InsertCommand.Parameters(1).Value = CType(PROFILE_NAME,String) + End If + If (VOLUME.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(2).Value = CType(VOLUME.Value,Decimal) + Else + Me.Adapter.InsertCommand.Parameters(2).Value = Global.System.DBNull.Value + End If + If (PAGE_COUNT.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(3).Value = CType(PAGE_COUNT.Value,Integer) + Else + Me.Adapter.InsertCommand.Parameters(3).Value = Global.System.DBNull.Value + End If + If (EXTENSION Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value + Else + Me.Adapter.InsertCommand.Parameters(4).Value = CType(EXTENSION,String) + End If + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State + If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.InsertCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.InsertCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Update(ByVal FILE_NAME As String, ByVal PROFILE_NAME As String, ByVal VOLUME As Global.System.Nullable(Of Decimal), ByVal PAGE_COUNT As Global.System.Nullable(Of Integer), ByVal EXTENSION As String, ByVal ADDED_WHEN As Date, ByVal Original_IMPORT_ID As Integer, ByVal Original_FILE_NAME As String, ByVal Original_PROFILE_NAME As String, ByVal Original_VOLUME As Global.System.Nullable(Of Decimal), ByVal Original_PAGE_COUNT As Global.System.Nullable(Of Integer), ByVal Original_EXTENSION As String, ByVal Original_ADDED_WHEN As Date, ByVal IMPORT_ID As Integer) As Integer + If (FILE_NAME Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(0).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(FILE_NAME,String) + End If + If (PROFILE_NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("PROFILE_NAME") + Else + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(PROFILE_NAME,String) + End If + If (VOLUME.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(VOLUME.Value,Decimal) + Else + Me.Adapter.UpdateCommand.Parameters(2).Value = Global.System.DBNull.Value + End If + If (PAGE_COUNT.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(PAGE_COUNT.Value,Integer) + Else + Me.Adapter.UpdateCommand.Parameters(3).Value = Global.System.DBNull.Value + End If + If (EXTENSION Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(EXTENSION,String) + End If + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(ADDED_WHEN,Date) + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(Original_IMPORT_ID,Integer) + If (Original_FILE_NAME Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(7).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(7).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(8).Value = CType(Original_FILE_NAME,String) + End If + If (Original_PROFILE_NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_PROFILE_NAME") + Else + Me.Adapter.UpdateCommand.Parameters(9).Value = CType(Original_PROFILE_NAME,String) + End If + If (Original_VOLUME.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(10).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(11).Value = CType(Original_VOLUME.Value,Decimal) + Else + Me.Adapter.UpdateCommand.Parameters(10).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(11).Value = Global.System.DBNull.Value + End If + If (Original_PAGE_COUNT.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(12).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_PAGE_COUNT.Value,Integer) + Else + Me.Adapter.UpdateCommand.Parameters(12).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(13).Value = Global.System.DBNull.Value + End If + If (Original_EXTENSION Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(14).Value = CType(1,Object) + Me.Adapter.UpdateCommand.Parameters(15).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(14).Value = CType(0,Object) + Me.Adapter.UpdateCommand.Parameters(15).Value = CType(Original_EXTENSION,String) + End If + Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_ADDED_WHEN,Date) + Me.Adapter.UpdateCommand.Parameters(17).Value = CType(IMPORT_ID,Integer) + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State + If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.UpdateCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.UpdateCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.UpdateCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Update(ByVal FILE_NAME As String, ByVal PROFILE_NAME As String, ByVal VOLUME As Global.System.Nullable(Of Decimal), ByVal PAGE_COUNT As Global.System.Nullable(Of Integer), ByVal EXTENSION As String, ByVal ADDED_WHEN As Date, ByVal Original_IMPORT_ID As Integer, ByVal Original_FILE_NAME As String, ByVal Original_PROFILE_NAME As String, ByVal Original_VOLUME As Global.System.Nullable(Of Decimal), ByVal Original_PAGE_COUNT As Global.System.Nullable(Of Integer), ByVal Original_EXTENSION As String, ByVal Original_ADDED_WHEN As Date) As Integer + Return Me.Update(FILE_NAME, PROFILE_NAME, VOLUME, PAGE_COUNT, EXTENSION, ADDED_WHEN, Original_IMPORT_ID, Original_FILE_NAME, Original_PROFILE_NAME, Original_VOLUME, Original_PAGE_COUNT, Original_EXTENSION, Original_ADDED_WHEN, Original_IMPORT_ID) + End Function End Class -End Class - -Namespace MyDatasetTableAdapters ''' '''Represents the connection and commands used to retrieve and save data. @@ -2635,7 +3660,7 @@ Namespace MyDatasetTableAdapters Global.System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner"& _ ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ - Partial Public Class TBDD_REPORTING_IMPORTTableAdapter + Partial Public Class TBTC_MOVE_RENAMETableAdapter Inherits Global.System.ComponentModel.Component Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter @@ -2752,81 +3777,51 @@ Namespace MyDatasetTableAdapters Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() tableMapping.SourceTable = "Table" - tableMapping.DataSetTable = "TBDD_REPORTING_IMPORT" - tableMapping.ColumnMappings.Add("IMPORT_ID", "IMPORT_ID") - tableMapping.ColumnMappings.Add("FILE_NAME", "FILE_NAME") + tableMapping.DataSetTable = "TBTC_MOVE_RENAME" + tableMapping.ColumnMappings.Add("GUID", "GUID") tableMapping.ColumnMappings.Add("PROFILE_NAME", "PROFILE_NAME") - tableMapping.ColumnMappings.Add("VOLUME", "VOLUME") - tableMapping.ColumnMappings.Add("PAGE_COUNT", "PAGE_COUNT") - tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") - tableMapping.ColumnMappings.Add("EXTENSION", "EXTENSION") + tableMapping.ColumnMappings.Add("FOLDER_FOR_INDEX", "FOLDER_FOR_INDEX") + tableMapping.ColumnMappings.Add("NAMECONVENTION", "NAMECONVENTION") + tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE") + tableMapping.ColumnMappings.Add("CREATED_WHO", "CREATED_WHO") + tableMapping.ColumnMappings.Add("CREATED_WHEN", "CREATED_WHEN") + tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") + tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection - Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBDD_REPORTING_IMPORT] WHERE (([IMPORT_ID] = @Original_IMPORT_ID) AN"& _ - "D ((@IsNull_FILE_NAME = 1 AND [FILE_NAME] IS NULL) OR ([FILE_NAME] = @Original_F"& _ - "ILE_NAME)) AND ([PROFILE_NAME] = @Original_PROFILE_NAME) AND ((@IsNull_VOLUME = "& _ - "1 AND [VOLUME] IS NULL) OR ([VOLUME] = @Original_VOLUME)) AND ((@IsNull_PAGE_COU"& _ - "NT = 1 AND [PAGE_COUNT] IS NULL) OR ([PAGE_COUNT] = @Original_PAGE_COUNT)) AND ("& _ - "(@IsNull_EXTENSION = 1 AND [EXTENSION] IS NULL) OR ([EXTENSION] = @Original_EXTE"& _ - "NSION)) AND ([ADDED_WHEN] = @Original_ADDED_WHEN))" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBTC_MOVE_RENAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_IMPORT_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "IMPORT_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_FILE_NAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_NAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FILE_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_VOLUME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VOLUME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_VOLUME", Global.System.Data.SqlDbType.[Decimal], 0, Global.System.Data.ParameterDirection.Input, 10, 2, "VOLUME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_PAGE_COUNT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PAGE_COUNT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PAGE_COUNT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PAGE_COUNT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_EXTENSION", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EXTENSION", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_EXTENSION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EXTENSION", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection - Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_REPORTING_IMPORT"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (FILE_NAME, PROFILE_N"& _ - "AME, VOLUME, PAGE_COUNT, EXTENSION)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@FILE_NAME,@PROFILE_NAME,@VO"& _ - "LUME,@PAGE_COUNT,@EXTENSION); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT IMPORT_ID, FILE_NAME, PROFILE_NAME, VOLUM"& _ - "E, PAGE_COUNT, EXTENSION, ADDED_WHEN FROM TBDD_REPORTING_IMPORT WHERE (IMPORT_ID"& _ - " = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO TBTC_MOVE_RENAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PROFILE_NAME, FOLDER_FOR_"& _ + "INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@PROFILE_NAME,@FOLDE"& _ + "R_FOR_INDEX,@NAMECONVENTION,@ACTIVE,@CREATED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_NAME, "& _ + "FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO, CREATED_WHEN, CHANGED_WHO"& _ + ", CHANGED_WHEN FROM TBTC_MOVE_RENAME WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FILE_NAME", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VOLUME", Global.System.Data.SqlDbType.[Decimal], 9, Global.System.Data.ParameterDirection.Input, 10, 2, "VOLUME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PAGE_COUNT", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PAGE_COUNT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EXTENSION", Global.System.Data.SqlDbType.VarChar, 10, Global.System.Data.ParameterDirection.Input, 0, 0, "EXTENSION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLDER_FOR_INDEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLDER_FOR_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAMECONVENTION", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "NAMECONVENTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CREATED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CREATED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection - Me._adapter.UpdateCommand.CommandText = "UPDATE [TBDD_REPORTING_IMPORT] SET [FILE_NAME] = @FILE_NAME, [PROFILE_NAME] = @PR"& _ - "OFILE_NAME, [VOLUME] = @VOLUME, [PAGE_COUNT] = @PAGE_COUNT, [EXTENSION] = @EXTEN"& _ - "SION, [ADDED_WHEN] = @ADDED_WHEN WHERE (([IMPORT_ID] = @Original_IMPORT_ID) AND "& _ - "((@IsNull_FILE_NAME = 1 AND [FILE_NAME] IS NULL) OR ([FILE_NAME] = @Original_FIL"& _ - "E_NAME)) AND ([PROFILE_NAME] = @Original_PROFILE_NAME) AND ((@IsNull_VOLUME = 1 "& _ - "AND [VOLUME] IS NULL) OR ([VOLUME] = @Original_VOLUME)) AND ((@IsNull_PAGE_COUNT"& _ - " = 1 AND [PAGE_COUNT] IS NULL) OR ([PAGE_COUNT] = @Original_PAGE_COUNT)) AND ((@"& _ - "IsNull_EXTENSION = 1 AND [EXTENSION] IS NULL) OR ([EXTENSION] = @Original_EXTENS"& _ - "ION)) AND ([ADDED_WHEN] = @Original_ADDED_WHEN));"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT IMPORT_ID, FILE_NAME, "& _ - "PROFILE_NAME, VOLUME, PAGE_COUNT, EXTENSION, ADDED_WHEN FROM TBDD_REPORTING_IMPO"& _ - "RT WHERE (IMPORT_ID = @IMPORT_ID)" + Me._adapter.UpdateCommand.CommandText = "UPDATE TBTC_MOVE_RENAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET PROFILE_NAME = @PROFILE_NAME, F"& _ + "OLDER_FOR_INDEX = @FOLDER_FOR_INDEX, NAMECONVENTION = @NAMECONVENTION, ACTIVE = "& _ + "@ACTIVE, CHANGED_WHO = @CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SEL"& _ + "ECT GUID, PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO, C"& _ + "REATED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBTC_MOVE_RENAME WHERE (GUID = @GUID"& _ + ")" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FILE_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VOLUME", Global.System.Data.SqlDbType.[Decimal], 0, Global.System.Data.ParameterDirection.Input, 10, 2, "VOLUME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PAGE_COUNT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PAGE_COUNT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@EXTENSION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EXTENSION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_IMPORT_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "IMPORT_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_FILE_NAME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_NAME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_FILE_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_VOLUME", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VOLUME", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_VOLUME", Global.System.Data.SqlDbType.[Decimal], 0, Global.System.Data.ParameterDirection.Input, 10, 2, "VOLUME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_PAGE_COUNT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PAGE_COUNT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_PAGE_COUNT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PAGE_COUNT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_EXTENSION", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EXTENSION", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_EXTENSION", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "EXTENSION", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IMPORT_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "IMPORT_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLDER_FOR_INDEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLDER_FOR_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAMECONVENTION", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "NAMECONVENTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub _ Private Sub InitCommandCollection() - Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(1) {} Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT TBDD_REPORTING_IMPORT.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_REPORTING_IMPORT" + Me._commandCollection(0).CommandText = "SELECT GUID, PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREAT"& _ + "ED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBTC_MOVE_RENAM"& _ + "E"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME))" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(1).Connection = Me.Connection + Me._commandCollection(1).CommandText = "SELECT GUID, PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREAT"& _ + "ED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBTC_MOVE_RENAM"& _ + "E"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1" + Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text + Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub _ - Public Overloads Overridable Function Fill(ByVal dataTable As MyDataset.TBDD_REPORTING_IMPORTDataTable) As Integer + Public Overloads Overridable Function Fill(ByVal dataTable As MyDataset.TBTC_MOVE_RENAMEDataTable, ByVal PROFILE_NAME As String) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) + If (PROFILE_NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("PROFILE_NAME") + Else + Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFILE_NAME,String) + End If If (Me.ClearBeforeFill = true) Then dataTable.Clear End If @@ -2863,9 +3873,48 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)> _ - Public Overloads Overridable Function GetData() As MyDataset.TBDD_REPORTING_IMPORTDataTable + Public Overloads Overridable Function GetData(ByVal PROFILE_NAME As String) As MyDataset.TBTC_MOVE_RENAMEDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) - Dim dataTable As MyDataset.TBDD_REPORTING_IMPORTDataTable = New MyDataset.TBDD_REPORTING_IMPORTDataTable() + If (PROFILE_NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("PROFILE_NAME") + Else + Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFILE_NAME,String) + End If + Dim dataTable As MyDataset.TBTC_MOVE_RENAMEDataTable = New MyDataset.TBTC_MOVE_RENAMEDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + + _ + Public Overloads Overridable Function FillByActive(ByVal dataTable As MyDataset.TBTC_MOVE_RENAMEDataTable, ByVal PROFILE_NAME As String) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(1) + If (PROFILE_NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("PROFILE_NAME") + Else + Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFILE_NAME,String) + End If + If (Me.ClearBeforeFill = true) Then + dataTable.Clear + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overloads Overridable Function GetDataByActive(ByVal PROFILE_NAME As String) As MyDataset.TBTC_MOVE_RENAMEDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(1) + If (PROFILE_NAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("PROFILE_NAME") + Else + Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFILE_NAME,String) + End If + Dim dataTable As MyDataset.TBTC_MOVE_RENAMEDataTable = New MyDataset.TBTC_MOVE_RENAMEDataTable() Me.Adapter.Fill(dataTable) Return dataTable End Function @@ -2873,7 +3922,7 @@ Namespace MyDatasetTableAdapters _ - Public Overloads Overridable Function Update(ByVal dataTable As MyDataset.TBDD_REPORTING_IMPORTDataTable) As Integer + Public Overloads Overridable Function Update(ByVal dataTable As MyDataset.TBTC_MOVE_RENAMEDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function @@ -2881,7 +3930,7 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ Public Overloads Overridable Function Update(ByVal dataSet As MyDataset) As Integer - Return Me.Adapter.Update(dataSet, "TBDD_REPORTING_IMPORT") + Return Me.Adapter.Update(dataSet, "TBTC_MOVE_RENAME") End Function _ - Public Overloads Overridable Function Delete(ByVal Original_IMPORT_ID As Integer, ByVal Original_FILE_NAME As String, ByVal Original_PROFILE_NAME As String, ByVal Original_VOLUME As Global.System.Nullable(Of Decimal), ByVal Original_PAGE_COUNT As Global.System.Nullable(Of Integer), ByVal Original_EXTENSION As String, ByVal Original_ADDED_WHEN As Date) As Integer - Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_IMPORT_ID,Integer) - If (Original_FILE_NAME Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(1).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(2).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(1).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_FILE_NAME,String) - End If - If (Original_PROFILE_NAME Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_PROFILE_NAME") - Else - Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_PROFILE_NAME,String) - End If - If (Original_VOLUME.HasValue = true) Then - Me.Adapter.DeleteCommand.Parameters(4).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_VOLUME.Value,Decimal) - Else - Me.Adapter.DeleteCommand.Parameters(4).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(5).Value = Global.System.DBNull.Value - End If - If (Original_PAGE_COUNT.HasValue = true) Then - Me.Adapter.DeleteCommand.Parameters(6).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(7).Value = CType(Original_PAGE_COUNT.Value,Integer) - Else - Me.Adapter.DeleteCommand.Parameters(6).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(7).Value = Global.System.DBNull.Value - End If - If (Original_EXTENSION Is Nothing) Then - Me.Adapter.DeleteCommand.Parameters(8).Value = CType(1,Object) - Me.Adapter.DeleteCommand.Parameters(9).Value = Global.System.DBNull.Value - Else - Me.Adapter.DeleteCommand.Parameters(8).Value = CType(0,Object) - Me.Adapter.DeleteCommand.Parameters(9).Value = CType(Original_EXTENSION,String) - End If - Me.Adapter.DeleteCommand.Parameters(10).Value = CType(Original_ADDED_WHEN,Date) + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer + Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -2957,31 +3972,27 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal FILE_NAME As String, ByVal PROFILE_NAME As String, ByVal VOLUME As Global.System.Nullable(Of Decimal), ByVal PAGE_COUNT As Global.System.Nullable(Of Integer), ByVal EXTENSION As String) As Integer - If (FILE_NAME Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(0).Value = Global.System.DBNull.Value - Else - Me.Adapter.InsertCommand.Parameters(0).Value = CType(FILE_NAME,String) - End If + Public Overloads Overridable Function Insert(ByVal PROFILE_NAME As String, ByVal FOLDER_FOR_INDEX As String, ByVal NAMECONVENTION As String, ByVal ACTIVE As Boolean, ByVal CREATED_WHO As String) As Integer If (PROFILE_NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("PROFILE_NAME") Else - Me.Adapter.InsertCommand.Parameters(1).Value = CType(PROFILE_NAME,String) + Me.Adapter.InsertCommand.Parameters(0).Value = CType(PROFILE_NAME,String) End If - If (VOLUME.HasValue = true) Then - Me.Adapter.InsertCommand.Parameters(2).Value = CType(VOLUME.Value,Decimal) + If (FOLDER_FOR_INDEX Is Nothing) Then + Throw New Global.System.ArgumentNullException("FOLDER_FOR_INDEX") Else - Me.Adapter.InsertCommand.Parameters(2).Value = Global.System.DBNull.Value + Me.Adapter.InsertCommand.Parameters(1).Value = CType(FOLDER_FOR_INDEX,String) End If - If (PAGE_COUNT.HasValue = true) Then - Me.Adapter.InsertCommand.Parameters(3).Value = CType(PAGE_COUNT.Value,Integer) + If (NAMECONVENTION Is Nothing) Then + Throw New Global.System.ArgumentNullException("NAMECONVENTION") Else - Me.Adapter.InsertCommand.Parameters(3).Value = Global.System.DBNull.Value + Me.Adapter.InsertCommand.Parameters(2).Value = CType(NAMECONVENTION,String) End If - If (EXTENSION Is Nothing) Then + Me.Adapter.InsertCommand.Parameters(3).Value = CType(ACTIVE,Boolean) + If (CREATED_WHO Is Nothing) Then Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value Else - Me.Adapter.InsertCommand.Parameters(4).Value = CType(EXTENSION,String) + Me.Adapter.InsertCommand.Parameters(4).Value = CType(CREATED_WHO,String) End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ @@ -3002,69 +4013,30 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _ - Public Overloads Overridable Function Update(ByVal FILE_NAME As String, ByVal PROFILE_NAME As String, ByVal VOLUME As Global.System.Nullable(Of Decimal), ByVal PAGE_COUNT As Global.System.Nullable(Of Integer), ByVal EXTENSION As String, ByVal ADDED_WHEN As Date, ByVal Original_IMPORT_ID As Integer, ByVal Original_FILE_NAME As String, ByVal Original_PROFILE_NAME As String, ByVal Original_VOLUME As Global.System.Nullable(Of Decimal), ByVal Original_PAGE_COUNT As Global.System.Nullable(Of Integer), ByVal Original_EXTENSION As String, ByVal Original_ADDED_WHEN As Date, ByVal IMPORT_ID As Integer) As Integer - If (FILE_NAME Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(0).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(0).Value = CType(FILE_NAME,String) - End If + Public Overloads Overridable Function Update(ByVal PROFILE_NAME As String, ByVal FOLDER_FOR_INDEX As String, ByVal NAMECONVENTION As String, ByVal ACTIVE As Boolean, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer If (PROFILE_NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("PROFILE_NAME") Else - Me.Adapter.UpdateCommand.Parameters(1).Value = CType(PROFILE_NAME,String) + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PROFILE_NAME,String) End If - If (VOLUME.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(2).Value = CType(VOLUME.Value,Decimal) + If (FOLDER_FOR_INDEX Is Nothing) Then + Throw New Global.System.ArgumentNullException("FOLDER_FOR_INDEX") Else - Me.Adapter.UpdateCommand.Parameters(2).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(FOLDER_FOR_INDEX,String) End If - If (PAGE_COUNT.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(3).Value = CType(PAGE_COUNT.Value,Integer) + If (NAMECONVENTION Is Nothing) Then + Throw New Global.System.ArgumentNullException("NAMECONVENTION") Else - Me.Adapter.UpdateCommand.Parameters(3).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(NAMECONVENTION,String) End If - If (EXTENSION Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(ACTIVE,Boolean) + If (CHANGED_WHO Is Nothing) Then Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(4).Value = CType(EXTENSION,String) - End If - Me.Adapter.UpdateCommand.Parameters(5).Value = CType(ADDED_WHEN,Date) - Me.Adapter.UpdateCommand.Parameters(6).Value = CType(Original_IMPORT_ID,Integer) - If (Original_FILE_NAME Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(7).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(8).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(7).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(8).Value = CType(Original_FILE_NAME,String) - End If - If (Original_PROFILE_NAME Is Nothing) Then - Throw New Global.System.ArgumentNullException("Original_PROFILE_NAME") - Else - Me.Adapter.UpdateCommand.Parameters(9).Value = CType(Original_PROFILE_NAME,String) - End If - If (Original_VOLUME.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(10).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(11).Value = CType(Original_VOLUME.Value,Decimal) - Else - Me.Adapter.UpdateCommand.Parameters(10).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(11).Value = Global.System.DBNull.Value - End If - If (Original_PAGE_COUNT.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(12).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(13).Value = CType(Original_PAGE_COUNT.Value,Integer) - Else - Me.Adapter.UpdateCommand.Parameters(12).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(13).Value = Global.System.DBNull.Value - End If - If (Original_EXTENSION Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(14).Value = CType(1,Object) - Me.Adapter.UpdateCommand.Parameters(15).Value = Global.System.DBNull.Value - Else - Me.Adapter.UpdateCommand.Parameters(14).Value = CType(0,Object) - Me.Adapter.UpdateCommand.Parameters(15).Value = CType(Original_EXTENSION,String) + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(CHANGED_WHO,String) End If - Me.Adapter.UpdateCommand.Parameters(16).Value = CType(Original_ADDED_WHEN,Date) - Me.Adapter.UpdateCommand.Parameters(17).Value = CType(IMPORT_ID,Integer) + Me.Adapter.UpdateCommand.Parameters(5).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(6).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -3079,14 +4051,6 @@ Namespace MyDatasetTableAdapters End If End Try End Function - - _ - Public Overloads Overridable Function Update(ByVal FILE_NAME As String, ByVal PROFILE_NAME As String, ByVal VOLUME As Global.System.Nullable(Of Decimal), ByVal PAGE_COUNT As Global.System.Nullable(Of Integer), ByVal EXTENSION As String, ByVal ADDED_WHEN As Date, ByVal Original_IMPORT_ID As Integer, ByVal Original_FILE_NAME As String, ByVal Original_PROFILE_NAME As String, ByVal Original_VOLUME As Global.System.Nullable(Of Decimal), ByVal Original_PAGE_COUNT As Global.System.Nullable(Of Integer), ByVal Original_EXTENSION As String, ByVal Original_ADDED_WHEN As Date) As Integer - Return Me.Update(FILE_NAME, PROFILE_NAME, VOLUME, PAGE_COUNT, EXTENSION, ADDED_WHEN, Original_IMPORT_ID, Original_FILE_NAME, Original_PROFILE_NAME, Original_VOLUME, Original_PAGE_COUNT, Original_EXTENSION, Original_ADDED_WHEN, Original_IMPORT_ID) - End Function End Class ''' @@ -3098,7 +4062,7 @@ Namespace MyDatasetTableAdapters Global.System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner"& _ ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ - Partial Public Class TBTC_MOVE_RENAMETableAdapter + Partial Public Class TBTC_DI_REGEX_MATCHTableAdapter Inherits Global.System.ComponentModel.Component Private WithEvents _adapter As Global.System.Data.SqlClient.SqlDataAdapter @@ -3215,12 +4179,10 @@ Namespace MyDatasetTableAdapters Me._adapter = New Global.System.Data.SqlClient.SqlDataAdapter() Dim tableMapping As Global.System.Data.Common.DataTableMapping = New Global.System.Data.Common.DataTableMapping() tableMapping.SourceTable = "Table" - tableMapping.DataSetTable = "TBTC_MOVE_RENAME" + tableMapping.DataSetTable = "TBTC_DI_REGEX_MATCH" tableMapping.ColumnMappings.Add("GUID", "GUID") tableMapping.ColumnMappings.Add("PROFILE_NAME", "PROFILE_NAME") - tableMapping.ColumnMappings.Add("FOLDER_FOR_INDEX", "FOLDER_FOR_INDEX") - tableMapping.ColumnMappings.Add("NAMECONVENTION", "NAMECONVENTION") - tableMapping.ColumnMappings.Add("ACTIVE", "ACTIVE") + tableMapping.ColumnMappings.Add("REGEX", "REGEX") tableMapping.ColumnMappings.Add("CREATED_WHO", "CREATED_WHO") tableMapping.ColumnMappings.Add("CREATED_WHEN", "CREATED_WHEN") tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") @@ -3228,35 +4190,28 @@ Namespace MyDatasetTableAdapters Me._adapter.TableMappings.Add(tableMapping) Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.DeleteCommand.Connection = Me.Connection - Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBTC_MOVE_RENAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBTC_DI_REGEX_MATCH"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (PROFILE_NAME = @PNAME)" Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PNAME", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection - Me._adapter.InsertCommand.CommandText = "INSERT INTO TBTC_MOVE_RENAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PROFILE_NAME, FOLDER_FOR_"& _ - "INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@PROFILE_NAME,@FOLDE"& _ - "R_FOR_INDEX,@NAMECONVENTION,@ACTIVE,@CREATED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_NAME, "& _ - "FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO, CREATED_WHEN, CHANGED_WHO"& _ - ", CHANGED_WHEN FROM TBTC_MOVE_RENAME WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandText = "INSERT INTO TBTC_DI_REGEX_MATCH"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (PROFILE_NAME, REGEX, C"& _ + "REATED_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@PROFILE_NAME,@REGEX,@CREATED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID,"& _ + " PROFILE_NAME, REGEX, CREATED_WHO, CREATED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM "& _ + "TBTC_DI_REGEX_MATCH WHERE (GUID = SCOPE_IDENTITY())" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLDER_FOR_INDEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLDER_FOR_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAMECONVENTION", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "NAMECONVENTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CREATED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CREATED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection - Me._adapter.UpdateCommand.CommandText = "UPDATE TBTC_MOVE_RENAME"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET PROFILE_NAME = @PROFILE_NAME, F"& _ - "OLDER_FOR_INDEX = @FOLDER_FOR_INDEX, NAMECONVENTION = @NAMECONVENTION, ACTIVE = "& _ - "@ACTIVE, CHANGED_WHO = @CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SEL"& _ - "ECT GUID, PROFILE_NAME, FOLDER_FOR_INDEX, NAMECONVENTION, ACTIVE, CREATED_WHO, C"& _ - "REATED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBTC_MOVE_RENAME WHERE (GUID = @GUID"& _ - ")" + Me._adapter.UpdateCommand.CommandText = "UPDATE TBTC_DI_REGEX_MATCH"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET PROFILE_NAME = @PROFILE_NAME"& _ + ", REGEX = @REGEX, CHANGED_WHO = @CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUI"& _ + "D); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFILE_NAME, REGEX, CREATED_WHO, CREATED_WHEN, CHANGED_WHO"& _ + ", CHANGED_WHEN FROM TBTC_DI_REGEX_MATCH WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FOLDER_FOR_INDEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "FOLDER_FOR_INDEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAMECONVENTION", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "NAMECONVENTION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFILE_NAME", Global.System.Data.SqlDbType.VarChar, 250, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFILE_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) @@ -3266,7 +4221,7 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Private Sub InitConnection() Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DDECMConString + Me._connection.ConnectionString = Global.ToolCollection.My.MySettings.Default.DD_ECM_TESTConnectionString End Sub _ - Public Overloads Overridable Function Fill(ByVal dataTable As MyDataset.TBTC_MOVE_RENAMEDataTable, ByVal PROFILE_NAME As String) As Integer + Public Overloads Overridable Function Fill(ByVal dataTable As MyDataset.TBTC_DI_REGEX_MATCHDataTable, ByVal PROFILE_NAME As String) As Integer Me.Adapter.SelectCommand = Me.CommandCollection(0) If (PROFILE_NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("PROFILE_NAME") @@ -3311,48 +4264,14 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], true)> _ - Public Overloads Overridable Function GetData(ByVal PROFILE_NAME As String) As MyDataset.TBTC_MOVE_RENAMEDataTable + Public Overloads Overridable Function GetData(ByVal PROFILE_NAME As String) As MyDataset.TBTC_DI_REGEX_MATCHDataTable Me.Adapter.SelectCommand = Me.CommandCollection(0) If (PROFILE_NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("PROFILE_NAME") Else Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFILE_NAME,String) End If - Dim dataTable As MyDataset.TBTC_MOVE_RENAMEDataTable = New MyDataset.TBTC_MOVE_RENAMEDataTable() - Me.Adapter.Fill(dataTable) - Return dataTable - End Function - - _ - Public Overloads Overridable Function FillByActive(ByVal dataTable As MyDataset.TBTC_MOVE_RENAMEDataTable, ByVal PROFILE_NAME As String) As Integer - Me.Adapter.SelectCommand = Me.CommandCollection(1) - If (PROFILE_NAME Is Nothing) Then - Throw New Global.System.ArgumentNullException("PROFILE_NAME") - Else - Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFILE_NAME,String) - End If - If (Me.ClearBeforeFill = true) Then - dataTable.Clear - End If - Dim returnValue As Integer = Me.Adapter.Fill(dataTable) - Return returnValue - End Function - - _ - Public Overloads Overridable Function GetDataByActive(ByVal PROFILE_NAME As String) As MyDataset.TBTC_MOVE_RENAMEDataTable - Me.Adapter.SelectCommand = Me.CommandCollection(1) - If (PROFILE_NAME Is Nothing) Then - Throw New Global.System.ArgumentNullException("PROFILE_NAME") - Else - Me.Adapter.SelectCommand.Parameters(0).Value = CType(PROFILE_NAME,String) - End If - Dim dataTable As MyDataset.TBTC_MOVE_RENAMEDataTable = New MyDataset.TBTC_MOVE_RENAMEDataTable() + Dim dataTable As MyDataset.TBTC_DI_REGEX_MATCHDataTable = New MyDataset.TBTC_DI_REGEX_MATCHDataTable() Me.Adapter.Fill(dataTable) Return dataTable End Function @@ -3360,7 +4279,7 @@ Namespace MyDatasetTableAdapters _ - Public Overloads Overridable Function Update(ByVal dataTable As MyDataset.TBTC_MOVE_RENAMEDataTable) As Integer + Public Overloads Overridable Function Update(ByVal dataTable As MyDataset.TBTC_DI_REGEX_MATCHDataTable) As Integer Return Me.Adapter.Update(dataTable) End Function @@ -3368,7 +4287,7 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")> _ Public Overloads Overridable Function Update(ByVal dataSet As MyDataset) As Integer - Return Me.Adapter.Update(dataSet, "TBTC_MOVE_RENAME") + Return Me.Adapter.Update(dataSet, "TBTC_DI_REGEX_MATCH") End Function _ - Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer - Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) + Public Overloads Overridable Function Delete(ByVal PNAME As String) As Integer + If (PNAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("PNAME") + Else + Me.Adapter.DeleteCommand.Parameters(0).Value = CType(PNAME,String) + End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -3410,27 +4333,21 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal PROFILE_NAME As String, ByVal FOLDER_FOR_INDEX As String, ByVal NAMECONVENTION As String, ByVal ACTIVE As Boolean, ByVal CREATED_WHO As String) As Integer + Public Overloads Overridable Function Insert(ByVal PROFILE_NAME As String, ByVal REGEX As String, ByVal CREATED_WHO As String) As Integer If (PROFILE_NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("PROFILE_NAME") Else Me.Adapter.InsertCommand.Parameters(0).Value = CType(PROFILE_NAME,String) End If - If (FOLDER_FOR_INDEX Is Nothing) Then - Throw New Global.System.ArgumentNullException("FOLDER_FOR_INDEX") - Else - Me.Adapter.InsertCommand.Parameters(1).Value = CType(FOLDER_FOR_INDEX,String) - End If - If (NAMECONVENTION Is Nothing) Then - Throw New Global.System.ArgumentNullException("NAMECONVENTION") + If (REGEX Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX") Else - Me.Adapter.InsertCommand.Parameters(2).Value = CType(NAMECONVENTION,String) + Me.Adapter.InsertCommand.Parameters(1).Value = CType(REGEX,String) End If - Me.Adapter.InsertCommand.Parameters(3).Value = CType(ACTIVE,Boolean) If (CREATED_WHO Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("CREATED_WHO") Else - Me.Adapter.InsertCommand.Parameters(4).Value = CType(CREATED_WHO,String) + Me.Adapter.InsertCommand.Parameters(2).Value = CType(CREATED_WHO,String) End If Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ @@ -3451,30 +4368,24 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _ - Public Overloads Overridable Function Update(ByVal PROFILE_NAME As String, ByVal FOLDER_FOR_INDEX As String, ByVal NAMECONVENTION As String, ByVal ACTIVE As Boolean, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + Public Overloads Overridable Function Update(ByVal PROFILE_NAME As String, ByVal REGEX As String, ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer If (PROFILE_NAME Is Nothing) Then Throw New Global.System.ArgumentNullException("PROFILE_NAME") Else Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PROFILE_NAME,String) End If - If (FOLDER_FOR_INDEX Is Nothing) Then - Throw New Global.System.ArgumentNullException("FOLDER_FOR_INDEX") - Else - Me.Adapter.UpdateCommand.Parameters(1).Value = CType(FOLDER_FOR_INDEX,String) - End If - If (NAMECONVENTION Is Nothing) Then - Throw New Global.System.ArgumentNullException("NAMECONVENTION") + If (REGEX Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX") Else - Me.Adapter.UpdateCommand.Parameters(2).Value = CType(NAMECONVENTION,String) + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(REGEX,String) End If - Me.Adapter.UpdateCommand.Parameters(3).Value = CType(ACTIVE,Boolean) If (CHANGED_WHO Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value + Me.Adapter.UpdateCommand.Parameters(2).Value = Global.System.DBNull.Value Else - Me.Adapter.UpdateCommand.Parameters(4).Value = CType(CHANGED_WHO,String) + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(CHANGED_WHO,String) End If - Me.Adapter.UpdateCommand.Parameters(5).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(6).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(GUID,Integer) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -3489,6 +4400,33 @@ Namespace MyDatasetTableAdapters End If End Try End Function + + _ + Public Overloads Overridable Function DeleteQuery(ByVal PNAME As String) As Integer + Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(1) + If (PNAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("PNAME") + Else + command.Parameters(0).Value = CType(PNAME,String) + End If + Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State + If ((command.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + command.Connection.Open + End If + Dim returnValue As Integer + Try + returnValue = command.ExecuteNonQuery + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + command.Connection.Close + End If + End Try + Return returnValue + End Function End Class ''' @@ -3508,6 +4446,8 @@ Namespace MyDatasetTableAdapters Private _tBTC_MOVE_RENAMETableAdapter As TBTC_MOVE_RENAMETableAdapter + Private _tBTC_DI_REGEX_MATCHTableAdapter As TBTC_DI_REGEX_MATCHTableAdapter + Private _backupDataSetBeforeUpdate As Boolean Private _connection As Global.System.Data.IDbConnection @@ -3551,6 +4491,20 @@ Namespace MyDatasetTableAdapters End Set End Property + _ + Public Property TBTC_DI_REGEX_MATCHTableAdapter() As TBTC_DI_REGEX_MATCHTableAdapter + Get + Return Me._tBTC_DI_REGEX_MATCHTableAdapter + End Get + Set + Me._tBTC_DI_REGEX_MATCHTableAdapter = value + End Set + End Property + _ Public Property BackupDataSetBeforeUpdate() As Boolean @@ -3578,6 +4532,10 @@ Namespace MyDatasetTableAdapters AndAlso (Not (Me._tBTC_MOVE_RENAMETableAdapter.Connection) Is Nothing)) Then Return Me._tBTC_MOVE_RENAMETableAdapter.Connection End If + If ((Not (Me._tBTC_DI_REGEX_MATCHTableAdapter) Is Nothing) _ + AndAlso (Not (Me._tBTC_DI_REGEX_MATCHTableAdapter.Connection) Is Nothing)) Then + Return Me._tBTC_DI_REGEX_MATCHTableAdapter.Connection + End If Return Nothing End Get Set @@ -3597,6 +4555,9 @@ Namespace MyDatasetTableAdapters If (Not (Me._tBTC_MOVE_RENAMETableAdapter) Is Nothing) Then count = (count + 1) End If + If (Not (Me._tBTC_DI_REGEX_MATCHTableAdapter) Is Nothing) Then + count = (count + 1) + End If Return count End Get End Property @@ -3626,6 +4587,15 @@ Namespace MyDatasetTableAdapters allChangedRows.AddRange(updatedRows) End If End If + If (Not (Me._tBTC_DI_REGEX_MATCHTableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBTC_DI_REGEX_MATCH.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBTC_DI_REGEX_MATCHTableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If Return result End Function @@ -3652,6 +4622,14 @@ Namespace MyDatasetTableAdapters allAddedRows.AddRange(addedRows) End If End If + If (Not (Me._tBTC_DI_REGEX_MATCHTableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBTC_DI_REGEX_MATCH.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBTC_DI_REGEX_MATCHTableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If Return result End Function @@ -3662,6 +4640,14 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As MyDataset, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 + If (Not (Me._tBTC_DI_REGEX_MATCHTableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBTC_DI_REGEX_MATCH.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBTC_DI_REGEX_MATCHTableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If If (Not (Me._tBTC_MOVE_RENAMETableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBTC_MOVE_RENAME.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -3729,6 +4715,11 @@ Namespace MyDatasetTableAdapters Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ "s die gleiche Verbindungszeichenfolge verwendet werden.") End If + If ((Not (Me._tBTC_DI_REGEX_MATCHTableAdapter) Is Nothing) _ + AndAlso (Me.MatchTableAdapterConnection(Me._tBTC_DI_REGEX_MATCHTableAdapter.Connection) = false)) Then + Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ + "s die gleiche Verbindungszeichenfolge verwendet werden.") + End If Dim workConnection As Global.System.Data.IDbConnection = Me.Connection If (workConnection Is Nothing) Then Throw New Global.System.ApplicationException("TableAdapterManager enthält keine Verbindungsinformationen. Legen Sie jede TableA"& _ @@ -3781,6 +4772,15 @@ Namespace MyDatasetTableAdapters adaptersWithAcceptChangesDuringUpdate.Add(Me._tBTC_MOVE_RENAMETableAdapter.Adapter) End If End If + If (Not (Me._tBTC_DI_REGEX_MATCHTableAdapter) Is Nothing) Then + revertConnections.Add(Me._tBTC_DI_REGEX_MATCHTableAdapter, Me._tBTC_DI_REGEX_MATCHTableAdapter.Connection) + Me._tBTC_DI_REGEX_MATCHTableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) + Me._tBTC_DI_REGEX_MATCHTableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) + If Me._tBTC_DI_REGEX_MATCHTableAdapter.Adapter.AcceptChangesDuringUpdate Then + Me._tBTC_DI_REGEX_MATCHTableAdapter.Adapter.AcceptChangesDuringUpdate = false + adaptersWithAcceptChangesDuringUpdate.Add(Me._tBTC_DI_REGEX_MATCHTableAdapter.Adapter) + End If + End If ' '---- Perform updates ----------- ' @@ -3849,6 +4849,10 @@ Namespace MyDatasetTableAdapters Me._tBTC_MOVE_RENAMETableAdapter.Connection = CType(revertConnections(Me._tBTC_MOVE_RENAMETableAdapter),Global.System.Data.SqlClient.SqlConnection) Me._tBTC_MOVE_RENAMETableAdapter.Transaction = Nothing End If + If (Not (Me._tBTC_DI_REGEX_MATCHTableAdapter) Is Nothing) Then + Me._tBTC_DI_REGEX_MATCHTableAdapter.Connection = CType(revertConnections(Me._tBTC_DI_REGEX_MATCHTableAdapter),Global.System.Data.SqlClient.SqlConnection) + Me._tBTC_DI_REGEX_MATCHTableAdapter.Transaction = Nothing + End If If (0 < adaptersWithAcceptChangesDuringUpdate.Count) Then Dim adapters((adaptersWithAcceptChangesDuringUpdate.Count) - 1) As Global.System.Data.Common.DataAdapter adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters) diff --git a/ToolCollection/MyDataset.vb b/ToolCollection/MyDataset.vb new file mode 100644 index 0000000..98e3433 --- /dev/null +++ b/ToolCollection/MyDataset.vb @@ -0,0 +1,2 @@ +Partial Class MyDataset +End Class diff --git a/ToolCollection/MyDataset.xsc b/ToolCollection/MyDataset.xsc index 2332df3..16c4b71 100644 --- a/ToolCollection/MyDataset.xsc +++ b/ToolCollection/MyDataset.xsc @@ -20,5 +20,19 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/ToolCollection/MyDataset.xsd b/ToolCollection/MyDataset.xsd index 51897c8..1fa89f8 100644 --- a/ToolCollection/MyDataset.xsd +++ b/ToolCollection/MyDataset.xsd @@ -2,9 +2,10 @@ - + - + + @@ -171,6 +172,81 @@ WHERE (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1 + + + + + + DELETE FROM TBTC_DI_REGEX_MATCH +WHERE (PROFILE_NAME = @PNAME) + + + + + + + + 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()) + + + + + + + + + + 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)) + + + + + + + + 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) + + + + + + + + + + + + + + + + + + + + + + + + + DELETE FROM TBTC_DI_REGEX_MATCH +WHERE (PROFILE_NAME = @PNAME) + + + + + + + + @@ -179,7 +255,7 @@ WHERE (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1 - + @@ -187,14 +263,14 @@ WHERE (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1 - + - + @@ -202,7 +278,7 @@ WHERE (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1 - + @@ -233,7 +309,7 @@ WHERE (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1 - + @@ -278,6 +354,43 @@ WHERE (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -288,5 +401,9 @@ WHERE (LOWER(PROFILE_NAME) = LOWER(@PROFILE_NAME)) AND ACTIVE = 1 + + + + \ No newline at end of file diff --git a/ToolCollection/MyDataset.xss b/ToolCollection/MyDataset.xss index 04a76b2..5224de2 100644 --- 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. --> - + - - - - - + + + + + + \ No newline at end of file diff --git a/ToolCollection/Resources/CheckConstraints_5634.png b/ToolCollection/Resources/CheckConstraints_5634.png new file mode 100644 index 0000000000000000000000000000000000000000..b758beba6108853f377e75293501ef2d045c1a5c GIT binary patch literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP%y#M z#WAEJ?(XD+Tn!E!E_Y{~{~T2N{Mym{&slF2xssK)=-CRm@t@P#;Tqa2w16{h8HbXS zh530)pNH+=W6rX5eSFxobluvjUw>H?j+^w`{=Ke#K-NRY@tJ)>d0)_(9;2M=md2^~ TpYx>x?PBnB^>bP0l+XkKzMwsJ literal 0 HcmV?d00001 diff --git a/ToolCollection/Resources/lines_Text_code_16xLG.png b/ToolCollection/Resources/lines_Text_code_16xLG.png new file mode 100644 index 0000000000000000000000000000000000000000..eb86e5cf34255e87f9cd3fe9dc807a234c48e914 GIT binary patch literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9F5M?jcysy3fAP%zKa z#WAEJZtdiQTnvgFF4-T0?q7TUEw^lrYlNZ!|7u%<6A5z|S2K9AO-f!X8kD&<^wMdG z!yIQUx7ODP&zsa@=2||f+v>&M@Rj;qnh!7RmQfTt%C*8a++{HrgPvw h{dMh{@VECThkk0bk^b>~8GoS744$rjF6*2UngCp8KuiDt literal 0 HcmV?d00001 diff --git a/ToolCollection/ToolCollection.vbproj b/ToolCollection/ToolCollection.vbproj index 42b3ee1..94fbede 100644 --- a/ToolCollection/ToolCollection.vbproj +++ b/ToolCollection/ToolCollection.vbproj @@ -227,6 +227,12 @@ Form + + frmDIRegex.vb + + + Form + frmGrundeinstellungen.vb @@ -415,6 +421,9 @@ True MyDataset.xsd + + MyDataset.xsd + ProjectInstaller.vb @@ -434,6 +443,9 @@ frmApplicationLog.vb + + frmDIRegex.vb + frmGrundeinstellungen.vb @@ -824,6 +836,8 @@ + + Always diff --git a/ToolCollection/app.config b/ToolCollection/app.config index e43e43e..53dc23d 100644 --- a/ToolCollection/app.config +++ b/ToolCollection/app.config @@ -12,6 +12,9 @@ + @@ -205,6 +208,9 @@ DigitalData\windream_VFS_RESTART + + myInvalidDateiname.pdf + @@ -251,6 +257,9 @@ False + + [\\\/:\*\?""'<>|] + diff --git a/ToolCollection/frmDIHauptseite.Designer.vb b/ToolCollection/frmDIHauptseite.Designer.vb index e128f63..571217a 100644 --- a/ToolCollection/frmDIHauptseite.Designer.vb +++ b/ToolCollection/frmDIHauptseite.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmDIHauptseite Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + 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. - _ + 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:
= Zeilenwechsel;= Fett Formatiert;" & _ + Me.Label16.Text = "Standard Einleitungstext: (HTML fähig:
= Zeilenwechsel;= Fett Formatiert;" & "= 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 diff --git a/ToolCollection/frmDIHauptseite.resx b/ToolCollection/frmDIHauptseite.resx index 51ebafe..a694f49 100644 --- a/ToolCollection/frmDIHauptseite.resx +++ b/ToolCollection/frmDIHauptseite.resx @@ -129,12 +129,15 @@ 437, 17 - - 976, 17 + + 465, 56 706, 17 + + 976, 17 + 549, 17 @@ -147,6 +150,9 @@ 292, 56 + + 728, 56 + 125 diff --git a/ToolCollection/frmDIHauptseite.vb b/ToolCollection/frmDIHauptseite.vb index df0177e..9d035ba 100644 --- 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 & " ERROR: " & Err.Description) + email.Send_EMail("Fehler bei Datei: " & oFilenameQuelle & " 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 ''' 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 diff --git a/ToolCollection/frmDIProfilEigenschaften.Designer.vb b/ToolCollection/frmDIProfilEigenschaften.Designer.vb index a16ca48..be46622 100644 --- 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 diff --git a/ToolCollection/frmDIProfilEigenschaften.vb b/ToolCollection/frmDIProfilEigenschaften.vb index ed5579d..88c2db4 100644 --- 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 \ No newline at end of file diff --git a/ToolCollection/frmDIRegex.Designer.vb b/ToolCollection/frmDIRegex.Designer.vb new file mode 100644 index 0000000..1556d30 --- /dev/null +++ b/ToolCollection/frmDIRegex.Designer.vb @@ -0,0 +1,345 @@ + _ +Partial Class frmDIRegex + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + 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. + _ + 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 diff --git a/ToolCollection/frmDIRegex.resx b/ToolCollection/frmDIRegex.resx new file mode 100644 index 0000000..3c06f0a --- /dev/null +++ b/ToolCollection/frmDIRegex.resx @@ -0,0 +1,255 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + 17, 17 + + + 134, 17 + + + 351, 17 + + + 241, 17 + + + 614, 17 + + + 871, 17 + + + + + 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/ + + + \ No newline at end of file diff --git a/ToolCollection/frmDIRegex.vb b/ToolCollection/frmDIRegex.vb new file mode 100644 index 0000000..464f167 --- /dev/null +++ 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 \ No newline at end of file diff --git a/ToolCollection/frmNIHauptseite.vb b/ToolCollection/frmNIHauptseite.vb index 51ae4c3..e96f74b 100644 --- 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 + _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 + End If + Next Else - _clsWorkfile._SetFileValidation = False + _Logger.Debug("Fehler = True - Check Log") + _Logger.Warn("Fehler = True - Check Log") + bwProfil.ReportProgress(-4) 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 - End If - Next 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 + 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 oSonderChar + + 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 diff --git a/ToolCollection/frmNIMoveRename.vb b/ToolCollection/frmNIMoveRename.vb index f45aaed..6dd1ae7 100644 --- 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() diff --git a/ToolCollection/frmStart.Designer.vb b/ToolCollection/frmStart.Designer.vb index 55b46c0..a052c05 100644 --- 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 diff --git a/ToolCollection/frmStart.resx b/ToolCollection/frmStart.resx index a3b5725..d6c618c 100644 --- a/ToolCollection/frmStart.resx +++ b/ToolCollection/frmStart.resx @@ -148,19 +148,6 @@ OKnoLBUcsaNDRD795Ki6zCeHqwAAAABJRU5ErkJggg== - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6 - JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAA7ElEQVQ4T62T0RHDIAxD/ZGN2CmjZAfW - yBzsRPuM5UCa/NV3qsFIsiFX+2uc59mP4+jFrG/blmBPnfOg/kat1cl7sV53663uCfbUOccoJFdILOH3 - x0FNaxn9mDCWxBDJIgpPJnkd3BhvJmgKFxNhADiDj6611o0HUvdhMMSss/vNBH6xMqaApI7KMlkmUA5e - XoOF7jUTMbnXiJm/TODdiUmgTl4LiJsG3EVv4Aix8pPJeAMbBvoKPoFIIRY4UxPWy1fAhQ4QFhPwYpTj - K3B7MqGm/SyGH9IrZMJ4Mpoz9VexgrEg8LCQhfd/o9kHgHwMs7GeTSYAAAAASUVORK5CYII= - - - - 134, 17 - 242, 17 @@ -172,7 +159,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAO - FAAAAk1TRnQBSQFMAgEBCQEAASABAwEgAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + FAAAAk1TRnQBSQFMAgEBCQEAATABAwEwAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAATADAAEBAQABCAYAAQwYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA diff --git a/ToolCollection/frmStart.vb b/ToolCollection/frmStart.vb index a58dafc..2822b84 100644 --- 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