diff --git a/Global_Indexer/MyDataset.Designer.vb b/Global_Indexer/MyDataset.Designer.vb index c633ef8..529b8df 100644 --- a/Global_Indexer/MyDataset.Designer.vb +++ b/Global_Indexer/MyDataset.Designer.vb @@ -4556,6 +4556,8 @@ Partial Public Class MyDataset Private columnSQL_ACTIVE As Global.System.Data.DataColumn + Private columnSEQUENCE As Global.System.Data.DataColumn + _ Public Sub New() @@ -4735,6 +4737,14 @@ Partial Public Class MyDataset End Get End Property + _ + Public ReadOnly Property SEQUENCEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSEQUENCE + End Get + End Property + _ @@ -4790,9 +4800,10 @@ Partial Public Class MyDataset ByVal Indexiert As Boolean, _ ByVal Indexwert As String, _ ByVal VALUE As String, _ - ByVal SQL_ACTIVE As Boolean) As VWDDINDEX_AUTOMRow + ByVal SQL_ACTIVE As Boolean, _ + ByVal SEQUENCE As Byte) As VWDDINDEX_AUTOMRow Dim rowVWDDINDEX_AUTOMRow As VWDDINDEX_AUTOMRow = CType(Me.NewRow,VWDDINDEX_AUTOMRow) - Dim columnValuesArray() As Object = New Object() {GUID, INDEXNAME, COMMENT, DOCTYPE_ID, DOKUMENTART, KURZNAME, CONNECTION_ID, CONNECTION, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, SQL_RESULT, Indexiert, Indexwert, VALUE, SQL_ACTIVE} + Dim columnValuesArray() As Object = New Object() {GUID, INDEXNAME, COMMENT, DOCTYPE_ID, DOKUMENTART, KURZNAME, CONNECTION_ID, CONNECTION, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, SQL_RESULT, Indexiert, Indexwert, VALUE, SQL_ACTIVE, SEQUENCE} rowVWDDINDEX_AUTOMRow.ItemArray = columnValuesArray Me.Rows.Add(rowVWDDINDEX_AUTOMRow) Return rowVWDDINDEX_AUTOMRow @@ -4839,6 +4850,7 @@ Partial Public Class MyDataset Me.columnIndexwert = MyBase.Columns("Indexwert") Me.columnVALUE = MyBase.Columns("VALUE") Me.columnSQL_ACTIVE = MyBase.Columns("SQL_ACTIVE") + Me.columnSEQUENCE = MyBase.Columns("SEQUENCE") End Sub _ Public Sub New() @@ -5206,6 +5225,22 @@ Partial Public Class MyDataset End Get End Property + _ + Public ReadOnly Property SEQUENCEColumn() As Global.System.Data.DataColumn + Get + Return Me.columnSEQUENCE + End Get + End Property + + _ + Public ReadOnly Property SEQUENCE1Column() As Global.System.Data.DataColumn + Get + Return Me.columnSEQUENCE1 + End Get + End Property + _ @@ -5243,9 +5278,9 @@ Partial Public Class MyDataset _ - Public Overloads Function AddTBDD_INDEX_AUTOMRow(ByVal parentTBDD_DOKUMENTARTRowByFK_TBDD_INDEX_AUTOM_DOCID As TBDD_DOKUMENTARTRow, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Short, ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal SQL_RESULT As String, ByVal SQL_ACTIVE As Boolean) As TBDD_INDEX_AUTOMRow + Public Overloads Function AddTBDD_INDEX_AUTOMRow(ByVal parentTBDD_DOKUMENTARTRowByFK_TBDD_INDEX_AUTOM_DOCID As TBDD_DOKUMENTARTRow, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Short, ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date, ByVal SQL_RESULT As String, ByVal SQL_ACTIVE As Boolean, ByVal SEQUENCE As String, ByVal SEQUENCE1 As Byte) As TBDD_INDEX_AUTOMRow Dim rowTBDD_INDEX_AUTOMRow As TBDD_INDEX_AUTOMRow = CType(Me.NewRow,TBDD_INDEX_AUTOMRow) - Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_ACTIVE} + Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_ACTIVE, SEQUENCE, SEQUENCE1} If (Not (parentTBDD_DOKUMENTARTRowByFK_TBDD_INDEX_AUTOM_DOCID) Is Nothing) Then columnValuesArray(1) = parentTBDD_DOKUMENTARTRowByFK_TBDD_INDEX_AUTOM_DOCID(0) End If @@ -5290,6 +5325,8 @@ Partial Public Class MyDataset Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") Me.columnSQL_RESULT = MyBase.Columns("SQL_RESULT") Me.columnSQL_ACTIVE = MyBase.Columns("SQL_ACTIVE") + Me.columnSEQUENCE = MyBase.Columns("SEQUENCE") + Me.columnSEQUENCE1 = MyBase.Columns("SEQUENCE1") End Sub _ + Public Property SEQUENCE() As Byte + Get + Return CType(Me(Me.tableVWDDINDEX_AUTOM.SEQUENCEColumn),Byte) + End Get + Set + Me(Me.tableVWDDINDEX_AUTOM.SEQUENCEColumn) = value + End Set + End Property + _ Public Function IsCOMMENTNull() As Boolean @@ -12127,11 +12183,7 @@ Partial Public Class MyDataset Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property CONNECTION_ID() As Short Get - Try - Return CType(Me(Me.tableTBDD_INDEX_AUTOM.CONNECTION_IDColumn),Short) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CONNECTION_ID in Tabelle TBDD_INDEX_AUTOM ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBDD_INDEX_AUTOM.CONNECTION_IDColumn),Short) End Get Set Me(Me.tableTBDD_INDEX_AUTOM.CONNECTION_IDColumn) = value @@ -12224,11 +12276,7 @@ Partial Public Class MyDataset Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")> _ Public Property SQL_RESULT() As String Get - Try - Return CType(Me(Me.tableTBDD_INDEX_AUTOM.SQL_RESULTColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte SQL_RESULT in Tabelle TBDD_INDEX_AUTOM ist DBNull.", e) - End Try + Return CType(Me(Me.tableTBDD_INDEX_AUTOM.SQL_RESULTColumn),String) End Get Set Me(Me.tableTBDD_INDEX_AUTOM.SQL_RESULTColumn) = value @@ -12246,6 +12294,32 @@ Partial Public Class MyDataset End Set End Property + _ + Public Property SEQUENCE() As String + Get + Try + Return CType(Me(Me.tableTBDD_INDEX_AUTOM.SEQUENCEColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte SEQUENCE in Tabelle TBDD_INDEX_AUTOM ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBDD_INDEX_AUTOM.SEQUENCEColumn) = value + End Set + End Property + + _ + Public Property SEQUENCE1() As Byte + Get + Return CType(Me(Me.tableTBDD_INDEX_AUTOM.SEQUENCE1Column),Byte) + End Get + Set + Me(Me.tableTBDD_INDEX_AUTOM.SEQUENCE1Column) = value + End Set + End Property + _ Public Property TBDD_DOKUMENTARTRow() As TBDD_DOKUMENTARTRow @@ -12269,18 +12343,6 @@ Partial Public Class MyDataset Me(Me.tableTBDD_INDEX_AUTOM.VALUEColumn) = Global.System.Convert.DBNull End Sub - _ - Public Function IsCONNECTION_IDNull() As Boolean - Return Me.IsNull(Me.tableTBDD_INDEX_AUTOM.CONNECTION_IDColumn) - End Function - - _ - Public Sub SetCONNECTION_IDNull() - Me(Me.tableTBDD_INDEX_AUTOM.CONNECTION_IDColumn) = Global.System.Convert.DBNull - End Sub - _ Public Function IsCOMMENTNull() As Boolean @@ -12331,14 +12393,14 @@ Partial Public Class MyDataset _ - Public Function IsSQL_RESULTNull() As Boolean - Return Me.IsNull(Me.tableTBDD_INDEX_AUTOM.SQL_RESULTColumn) + Public Function IsSEQUENCENull() As Boolean + Return Me.IsNull(Me.tableTBDD_INDEX_AUTOM.SEQUENCEColumn) End Function _ - Public Sub SetSQL_RESULTNull() - Me(Me.tableTBDD_INDEX_AUTOM.SQL_RESULTColumn) = Global.System.Convert.DBNull + Public Sub SetSEQUENCENull() + Me(Me.tableTBDD_INDEX_AUTOM.SEQUENCEColumn) = Global.System.Convert.DBNull End Sub End Class @@ -17955,6 +18017,7 @@ Namespace MyDatasetTableAdapters tableMapping.ColumnMappings.Add("SQL_RESULT", "SQL_RESULT") tableMapping.ColumnMappings.Add("VALUE", "VALUE") tableMapping.ColumnMappings.Add("SQL_ACTIVE", "SQL_ACTIVE") + tableMapping.ColumnMappings.Add("SEQUENCE", "SEQUENCE") Me._adapter.TableMappings.Add(tableMapping) End Sub @@ -17973,8 +18036,8 @@ Namespace MyDatasetTableAdapters Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).CommandText = "SELECT GUID, INDEXNAME, COMMENT, DOCTYPE_ID, DOKUMENTART, KURZNAME, CONNEC"& _ "TION_ID, CONNECTION, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, SQL_RE"& _ - "SULT, VALUE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SQL_ACTIVE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VWDDINDEX_AU"& _ - "TOM"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (DOCTYPE_ID = @DOCTYPE)" + "SULT, VALUE, SQL_ACTIVE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" SEQUENCE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM VW"& _ + "DDINDEX_AUTOM"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (DOCTYPE_ID = @DOCTYPE)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY SEQUENCE" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub @@ -18146,20 +18209,49 @@ Namespace MyDatasetTableAdapters tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") tableMapping.ColumnMappings.Add("SQL_RESULT", "SQL_RESULT") tableMapping.ColumnMappings.Add("SQL_ACTIVE", "SQL_ACTIVE") + tableMapping.ColumnMappings.Add("SEQUENCE", "SEQUENCE1") 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_INDEX_AUTOM"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID)" + Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBDD_INDEX_AUTOM] WHERE (([GUID] = @Original_GUID) AND ([DOCTYPE_ID]"& _ + " = @Original_DOCTYPE_ID) AND ([INDEXNAME] = @Original_INDEXNAME) AND ((@IsNull_V"& _ + "ALUE = 1 AND [VALUE] IS NULL) OR ([VALUE] = @Original_VALUE)) AND ([CONNECTION_I"& _ + "D] = @Original_CONNECTION_ID) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) O"& _ + "R ([COMMENT] = @Original_COMMENT)) AND ([ACTIVE] = @Original_ACTIVE) AND ([ADDED"& _ + "_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NU"& _ + "LL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND "& _ + "[CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull"& _ + "_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHA"& _ + "NGED_WHEN)) AND ([SQL_RESULT] = @Original_SQL_RESULT) AND ([SQL_ACTIVE] = @Origi"& _ + "nal_SQL_ACTIVE))" 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("@Original_GUID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_INDEXNAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEXNAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_VALUE", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VALUE", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_VALUE", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "VALUE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_COMMENT", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_COMMENT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "COMMENT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_ADDED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.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("@IsNull_CHANGED_WHO", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_CHANGED_WHEN", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, true, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CHANGED_WHEN", Global.System.Data.SqlDbType.DateTime, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHEN", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SQL_RESULT", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RESULT", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_SQL_ACTIVE", Global.System.Data.SqlDbType.Bit, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ACTIVE", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.InsertCommand.Connection = Me.Connection Me._adapter.InsertCommand.CommandText = "INSERT INTO TBDD_INDEX_AUTOM"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (DOCTYPE_ID, INDEXNAME, VA"& _ - "LUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, SQL_RESULT, SQL_ACTIVE)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES "& _ - " (@DOCTYPE_ID,@INDEXNAME,@VALUE,@CONNECTION_ID,@COMMENT,@ACTIVE,@ADDED_WHO"& _ - ",@SQL_RESULT,@SQL_ACTIVE); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECT"& _ - "ION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_R"& _ - "ESULT FROM TBDD_INDEX_AUTOM WHERE (GUID = SCOPE_IDENTITY())" + "LUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, SQL_RESULT, SQL_ACTIVE, SEQUENCE"& _ + ")"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@DOCTYPE_ID,@INDEXNAME,@VALUE,@CONNECTION_ID,@COMMENT,@ACTIVE,"& _ + "@ADDED_WHO,@SQL_RESULT,@SQL_ACTIVE,@SEQUENCE); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE_ID, INDE"& _ + "XNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO"& _ + ", CHANGED_WHEN, SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE (GUID = SCOPE_IDENTITY())"& _ + "" Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INDEXNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEXNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -18170,15 +18262,16 @@ Namespace MyDatasetTableAdapters Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_RESULT", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RESULT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() Me._adapter.UpdateCommand.Connection = Me.Connection Me._adapter.UpdateCommand.CommandText = "UPDATE TBDD_INDEX_AUTOM"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET DOCTYPE_ID = @DOCTYPE_ID, INDEX"& _ "NAME = @INDEXNAME, VALUE = @VALUE, CONNECTION_ID = @CONNECTION_ID, COMMENT = @CO"& _ "MMENT, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" "& _ - "SQL_RESULT = @SQL_RESULT, SQL_ACTIVE = @SQL_ACTIVE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Origin"& _ - "al_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, "& _ - "ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT FROM TBDD_I"& _ - "NDEX_AUTOM WHERE (GUID = @GUID)" + "SQL_RESULT = @SQL_RESULT, SQL_ACTIVE = @SQL_ACTIVE, SEQUENCE = @SEQUENCE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE "& _ + " (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, C"& _ + "ONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN,"& _ + " SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE (GUID = @GUID)" Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@INDEXNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "INDEXNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) @@ -18189,6 +18282,7 @@ Namespace MyDatasetTableAdapters 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("@SQL_RESULT", Global.System.Data.SqlDbType.VarChar, 2000, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_RESULT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ACTIVE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ACTIVE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.TinyInt, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) End Sub @@ -18207,8 +18301,9 @@ Namespace MyDatasetTableAdapters Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() Me._commandCollection(0).Connection = Me.Connection Me._commandCollection(0).CommandText = "SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE,"& _ - " ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_ACTIVE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM "& _ - " TBDD_INDEX_AUTOM"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (DOCTYPE_ID = @DOCTYPE_ID)" + " ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_ACTIVE, SEQUE"& _ + "NCE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBDD_INDEX_AUTOM"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (DOCTYPE_ID = @DOCTYPE_ID)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)& _ + "ORDER BY SEQUENCE" Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text Me._commandCollection(0).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) End Sub @@ -18271,8 +18366,62 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Delete, true)> _ - Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer) As Integer + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_DOCTYPE_ID As Integer, ByVal Original_INDEXNAME As String, ByVal Original_VALUE As String, ByVal Original_CONNECTION_ID As Short, ByVal Original_COMMENT As String, ByVal Original_ACTIVE As Boolean, ByVal Original_ADDED_WHO As String, ByVal Original_ADDED_WHEN As Global.System.Nullable(Of Date), ByVal Original_CHANGED_WHO As String, ByVal Original_CHANGED_WHEN As Global.System.Nullable(Of Date), ByVal Original_SQL_RESULT As String, ByVal Original_SQL_ACTIVE As Boolean) As Integer Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_DOCTYPE_ID,Integer) + If (Original_INDEXNAME Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_INDEXNAME") + Else + Me.Adapter.DeleteCommand.Parameters(2).Value = CType(Original_INDEXNAME,String) + End If + If (Original_VALUE Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(4).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_VALUE,String) + End If + Me.Adapter.DeleteCommand.Parameters(5).Value = CType(Original_CONNECTION_ID,Short) + If (Original_COMMENT Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(7).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(7).Value = CType(Original_COMMENT,String) + End If + Me.Adapter.DeleteCommand.Parameters(8).Value = CType(Original_ACTIVE,Boolean) + If (Original_ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Else + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(Original_ADDED_WHO,String) + End If + If (Original_ADDED_WHEN.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(10).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(11).Value = CType(Original_ADDED_WHEN.Value,Date) + Else + Me.Adapter.DeleteCommand.Parameters(10).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(11).Value = Global.System.DBNull.Value + End If + If (Original_CHANGED_WHO Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(12).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(13).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(12).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(13).Value = CType(Original_CHANGED_WHO,String) + End If + If (Original_CHANGED_WHEN.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(14).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(15).Value = CType(Original_CHANGED_WHEN.Value,Date) + Else + Me.Adapter.DeleteCommand.Parameters(14).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(15).Value = Global.System.DBNull.Value + End If + If (Original_SQL_RESULT Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_SQL_RESULT") + Else + Me.Adapter.DeleteCommand.Parameters(16).Value = CType(Original_SQL_RESULT,String) + End If + Me.Adapter.DeleteCommand.Parameters(17).Value = CType(Original_SQL_ACTIVE,Boolean) 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 @@ -18292,7 +18441,7 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Insert, true)> _ - Public Overloads Overridable Function Insert(ByVal DOCTYPE_ID As Integer, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Global.System.Nullable(Of Short), ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal SQL_RESULT As String, ByVal SQL_ACTIVE As Boolean) As Integer + Public Overloads Overridable Function Insert(ByVal DOCTYPE_ID As Integer, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Short, ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal ADDED_WHO As String, ByVal SQL_RESULT As String, ByVal SQL_ACTIVE As Boolean, ByVal SEQUENCE As Byte) As Integer Me.Adapter.InsertCommand.Parameters(0).Value = CType(DOCTYPE_ID,Integer) If (INDEXNAME Is Nothing) Then Throw New Global.System.ArgumentNullException("INDEXNAME") @@ -18304,11 +18453,7 @@ Namespace MyDatasetTableAdapters Else Me.Adapter.InsertCommand.Parameters(2).Value = CType(VALUE,String) End If - If (CONNECTION_ID.HasValue = true) Then - Me.Adapter.InsertCommand.Parameters(3).Value = CType(CONNECTION_ID.Value,Short) - Else - Me.Adapter.InsertCommand.Parameters(3).Value = Global.System.DBNull.Value - End If + Me.Adapter.InsertCommand.Parameters(3).Value = CType(CONNECTION_ID,Short) If (COMMENT Is Nothing) Then Me.Adapter.InsertCommand.Parameters(4).Value = Global.System.DBNull.Value Else @@ -18321,11 +18466,12 @@ Namespace MyDatasetTableAdapters Me.Adapter.InsertCommand.Parameters(6).Value = CType(ADDED_WHO,String) End If If (SQL_RESULT Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(7).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("SQL_RESULT") Else Me.Adapter.InsertCommand.Parameters(7).Value = CType(SQL_RESULT,String) End If Me.Adapter.InsertCommand.Parameters(8).Value = CType(SQL_ACTIVE,Boolean) + Me.Adapter.InsertCommand.Parameters(9).Value = CType(SEQUENCE,Byte) Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ <> Global.System.Data.ConnectionState.Open) Then @@ -18345,7 +18491,7 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"), _ Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"), _ Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Update, true)> _ - Public Overloads Overridable Function Update(ByVal DOCTYPE_ID As Integer, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Global.System.Nullable(Of Short), ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal CHANGED_WHO As String, ByVal SQL_RESULT As String, ByVal SQL_ACTIVE As Boolean, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + Public Overloads Overridable Function Update(ByVal DOCTYPE_ID As Integer, ByVal INDEXNAME As String, ByVal VALUE As String, ByVal CONNECTION_ID As Short, ByVal COMMENT As String, ByVal ACTIVE As Boolean, ByVal CHANGED_WHO As String, ByVal SQL_RESULT As String, ByVal SQL_ACTIVE As Boolean, ByVal SEQUENCE As Byte, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer Me.Adapter.UpdateCommand.Parameters(0).Value = CType(DOCTYPE_ID,Integer) If (INDEXNAME Is Nothing) Then Throw New Global.System.ArgumentNullException("INDEXNAME") @@ -18357,11 +18503,7 @@ Namespace MyDatasetTableAdapters Else Me.Adapter.UpdateCommand.Parameters(2).Value = CType(VALUE,String) End If - If (CONNECTION_ID.HasValue = true) Then - Me.Adapter.UpdateCommand.Parameters(3).Value = CType(CONNECTION_ID.Value,Short) - Else - Me.Adapter.UpdateCommand.Parameters(3).Value = Global.System.DBNull.Value - End If + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(CONNECTION_ID,Short) If (COMMENT Is Nothing) Then Me.Adapter.UpdateCommand.Parameters(4).Value = Global.System.DBNull.Value Else @@ -18374,13 +18516,14 @@ Namespace MyDatasetTableAdapters Me.Adapter.UpdateCommand.Parameters(6).Value = CType(CHANGED_WHO,String) End If If (SQL_RESULT Is Nothing) Then - Me.Adapter.UpdateCommand.Parameters(7).Value = Global.System.DBNull.Value + Throw New Global.System.ArgumentNullException("SQL_RESULT") Else Me.Adapter.UpdateCommand.Parameters(7).Value = CType(SQL_RESULT,String) End If Me.Adapter.UpdateCommand.Parameters(8).Value = CType(SQL_ACTIVE,Boolean) - Me.Adapter.UpdateCommand.Parameters(9).Value = CType(Original_GUID,Integer) - Me.Adapter.UpdateCommand.Parameters(10).Value = CType(GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(9).Value = CType(SEQUENCE,Byte) + Me.Adapter.UpdateCommand.Parameters(10).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(11).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 diff --git a/Global_Indexer/MyDataset.xsd b/Global_Indexer/MyDataset.xsd index e0cf5b5..f114d7c 100644 --- a/Global_Indexer/MyDataset.xsd +++ b/Global_Indexer/MyDataset.xsd @@ -591,15 +591,16 @@ WHERE (DOK_ID = @DokID) - + - SELECT GUID, INDEXNAME, COMMENT, DOCTYPE_ID, DOKUMENTART, KURZNAME, CONNECTION_ID, CONNECTION, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, SQL_RESULT, VALUE, - SQL_ACTIVE + SELECT GUID, INDEXNAME, COMMENT, DOCTYPE_ID, DOKUMENTART, KURZNAME, CONNECTION_ID, CONNECTION, SQL_PROVIDER, SERVER, DATENBANK, USERNAME, PASSWORD, SQL_RESULT, VALUE, SQL_ACTIVE, + SEQUENCE FROM VWDDINDEX_AUTOM -WHERE (DOCTYPE_ID = @DOCTYPE) +WHERE (DOCTYPE_ID = @DOCTYPE) +ORDER BY SEQUENCE - + @@ -622,69 +623,89 @@ WHERE (DOCTYPE_ID = @DOCTYPE) + - + - DELETE FROM TBDD_INDEX_AUTOM -WHERE (GUID = @Original_GUID) + DELETE FROM [TBDD_INDEX_AUTOM] WHERE (([GUID] = @Original_GUID) AND ([DOCTYPE_ID] = @Original_DOCTYPE_ID) AND ([INDEXNAME] = @Original_INDEXNAME) AND ((@IsNull_VALUE = 1 AND [VALUE] IS NULL) OR ([VALUE] = @Original_VALUE)) AND ([CONNECTION_ID] = @Original_CONNECTION_ID) AND ((@IsNull_COMMENT = 1 AND [COMMENT] IS NULL) OR ([COMMENT] = @Original_COMMENT)) AND ([ACTIVE] = @Original_ACTIVE) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND ((@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_ADDED_WHEN)) AND ((@IsNull_CHANGED_WHO = 1 AND [CHANGED_WHO] IS NULL) OR ([CHANGED_WHO] = @Original_CHANGED_WHO)) AND ((@IsNull_CHANGED_WHEN = 1 AND [CHANGED_WHEN] IS NULL) OR ([CHANGED_WHEN] = @Original_CHANGED_WHEN)) AND ([SQL_RESULT] = @Original_SQL_RESULT) AND ([SQL_ACTIVE] = @Original_SQL_ACTIVE)) - + + + + + + + + + + + + + + + + + + - + INSERT INTO TBDD_INDEX_AUTOM - (DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, SQL_RESULT, SQL_ACTIVE) -VALUES (@DOCTYPE_ID,@INDEXNAME,@VALUE,@CONNECTION_ID,@COMMENT,@ACTIVE,@ADDED_WHO,@SQL_RESULT,@SQL_ACTIVE); + (DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, SQL_RESULT, SQL_ACTIVE, SEQUENCE) +VALUES (@DOCTYPE_ID,@INDEXNAME,@VALUE,@CONNECTION_ID,@COMMENT,@ACTIVE,@ADDED_WHO,@SQL_RESULT,@SQL_ACTIVE,@SEQUENCE); SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE (GUID = SCOPE_IDENTITY()) - - - - - - - - - + + + + + + + + + + - SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_ACTIVE + SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT, SQL_ACTIVE, SEQUENCE FROM TBDD_INDEX_AUTOM -WHERE (DOCTYPE_ID = @DOCTYPE_ID) +WHERE (DOCTYPE_ID = @DOCTYPE_ID) +ORDER BY SEQUENCE - + - + UPDATE TBDD_INDEX_AUTOM SET DOCTYPE_ID = @DOCTYPE_ID, INDEXNAME = @INDEXNAME, VALUE = @VALUE, CONNECTION_ID = @CONNECTION_ID, COMMENT = @COMMENT, ACTIVE = @ACTIVE, CHANGED_WHO = @CHANGED_WHO, - SQL_RESULT = @SQL_RESULT, SQL_ACTIVE = @SQL_ACTIVE -WHERE (GUID = @Original_GUID); + SQL_RESULT = @SQL_RESULT, SQL_ACTIVE = @SQL_ACTIVE, SEQUENCE = @SEQUENCE +WHERE (GUID = @Original_GUID); SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, SQL_RESULT FROM TBDD_INDEX_AUTOM WHERE (GUID = @GUID) - - - - - - - - - - - + + + + + + + + + + + + @@ -704,6 +725,7 @@ SELECT GUID, DOCTYPE_ID, INDEXNAME, VALUE, CONNECTION_ID, COMMENT, ACTIVE, ADDED + @@ -1190,7 +1212,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1255,7 +1277,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1338,7 +1360,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1375,7 +1397,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1389,7 +1411,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1403,7 +1425,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1485,7 +1507,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1558,7 +1580,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1671,7 +1693,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1764,10 +1786,11 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN + - + @@ -1786,7 +1809,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1811,7 +1834,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1819,10 +1842,12 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN + + - + @@ -1830,7 +1855,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1880,7 +1905,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -1952,7 +1977,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2033,7 +2058,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2047,7 +2072,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2056,7 +2081,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2081,7 +2106,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2120,7 +2145,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2158,7 +2183,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2180,7 +2205,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2192,7 +2217,7 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - + @@ -2308,14 +2333,14 @@ SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN - - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/Global_Indexer/MyDataset.xss b/Global_Indexer/MyDataset.xss index c891b00..4f6b393 100644 --- a/Global_Indexer/MyDataset.xss +++ b/Global_Indexer/MyDataset.xss @@ -4,30 +4,30 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - + + + - + - + - + - - - - - - - - + + + + + + + + - + @@ -106,7 +106,7 @@ - + 397 @@ -118,7 +118,7 @@ - + 380 diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb index 5e1aa47..c82d433 100644 --- a/Global_Indexer/frmAdministration.Designer.vb +++ b/Global_Indexer/frmAdministration.Designer.vb @@ -45,6 +45,7 @@ Partial Class frmAdministration Dim COMMENTLabel2 As System.Windows.Forms.Label Dim IDXMAN_IDLabel As System.Windows.Forms.Label Dim GUIDLabel5 As System.Windows.Forms.Label + Dim Label12 As System.Windows.Forms.Label Dim GUIDLabel4 As System.Windows.Forms.Label Dim INDEXNAMELabel As System.Windows.Forms.Label Dim COMMENTLabel1 As System.Windows.Forms.Label @@ -243,6 +244,7 @@ Partial Class frmAdministration Me.INDEXNAME_AutoIndexCMB = New System.Windows.Forms.ComboBox() Me.btnSQLViewAuto = New System.Windows.Forms.Button() Me.SQL_ACTIVECheckBox = New System.Windows.Forms.CheckBox() + Me.TextBox8 = New System.Windows.Forms.TextBox() Me.GUIDAUTO_INDEXTextbox = New System.Windows.Forms.TextBox() Me.VALUETextBox = New System.Windows.Forms.TextBox() Me.COMMENTTextBox1 = New System.Windows.Forms.TextBox() @@ -327,6 +329,7 @@ Partial Class frmAdministration COMMENTLabel2 = New System.Windows.Forms.Label() IDXMAN_IDLabel = New System.Windows.Forms.Label() GUIDLabel5 = New System.Windows.Forms.Label() + Label12 = New System.Windows.Forms.Label() GUIDLabel4 = New System.Windows.Forms.Label() INDEXNAMELabel = New System.Windows.Forms.Label() COMMENTLabel1 = New System.Windows.Forms.Label() @@ -1819,7 +1822,9 @@ Partial Class frmAdministration Me.XtraTabPageAutoIndex.Controls.Add(Me.INDEXNAME_AutoIndexCMB) Me.XtraTabPageAutoIndex.Controls.Add(Me.btnSQLViewAuto) Me.XtraTabPageAutoIndex.Controls.Add(Me.SQL_ACTIVECheckBox) + Me.XtraTabPageAutoIndex.Controls.Add(Label12) Me.XtraTabPageAutoIndex.Controls.Add(GUIDLabel4) + Me.XtraTabPageAutoIndex.Controls.Add(Me.TextBox8) Me.XtraTabPageAutoIndex.Controls.Add(Me.GUIDAUTO_INDEXTextbox) Me.XtraTabPageAutoIndex.Controls.Add(INDEXNAMELabel) Me.XtraTabPageAutoIndex.Controls.Add(Me.VALUETextBox) @@ -1923,11 +1928,22 @@ Partial Class frmAdministration Me.SQL_ACTIVECheckBox.Name = "SQL_ACTIVECheckBox" Me.SQL_ACTIVECheckBox.UseVisualStyleBackColor = True ' + 'Label12 + ' + resources.ApplyResources(Label12, "Label12") + Label12.Name = "Label12" + ' 'GUIDLabel4 ' resources.ApplyResources(GUIDLabel4, "GUIDLabel4") GUIDLabel4.Name = "GUIDLabel4" ' + 'TextBox8 + ' + Me.TextBox8.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "SEQUENCE1", True)) + resources.ApplyResources(Me.TextBox8, "TextBox8") + Me.TextBox8.Name = "TextBox8" + ' 'GUIDAUTO_INDEXTextbox ' Me.GUIDAUTO_INDEXTextbox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBDD_INDEX_AUTOMBindingSource, "GUID", True)) @@ -2755,4 +2771,5 @@ Partial Class frmAdministration Friend WithEvents txtManIndexSQL As TextBox Friend WithEvents txtAutomIndexConnectionId As TextBox Friend WithEvents txtAutomIndexSQLResult As TextBox + Friend WithEvents TextBox8 As TextBox End Class diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index 25da08a..e97b7fd 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -307,7 +307,7 @@ 170 - 1072, 239 + 1072, 246 88 @@ -358,7 +358,7 @@ Panel2 - 1072, 554 + 1072, 561 88 @@ -1049,13 +1049,13 @@ Grundeinstellungen - 1310, 158 + 1310, 157 - 0, 772 + 0, 774 - 1310, 24 + 1310, 22 RibbonStatusBar1 @@ -1184,7 +1184,7 @@ 150 - 1072, 270 + 1072, 277 1 @@ -1238,7 +1238,7 @@ Panel2 - 1072, 554 + 1072, 561 0 @@ -1259,7 +1259,7 @@ Fill - 0, 158 + 0, 157 127, 17 @@ -1304,7 +1304,7 @@ 277 - 224, 584 + 224, 587 93 @@ -2237,7 +2237,7 @@ Bottom - 0, 276 + 0, 281 True @@ -3210,7 +3210,7 @@ der Datei 150, 0 - 922, 278 + 922, 280 96 @@ -3234,7 +3234,7 @@ der Datei 0, 0 - 150, 278 + 150, 280 95 @@ -3269,7 +3269,7 @@ der Datei - 1072, 278 + 1072, 280 manuelle Indexe @@ -3305,7 +3305,7 @@ der Datei 0, 0 - 150, 278 + 150, 280 97 @@ -4202,7 +4202,7 @@ der Datei - 1072, 278 + 1072, 280 Nachbearbeitungsfunktionen manueller Index @@ -4314,7 +4314,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 0, 0 - 150, 278 + 150, 280 90 @@ -4541,6 +4541,42 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 10 + + False + + + True + + + Segoe UI, 9pt, style=Italic + + + NoControl + + + 268, 69 + + + 72, 15 + + + 4 + + + Reihenfolge: + + + Label12 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPageAutoIndex + + + 11 + False @@ -4572,7 +4608,31 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 11 + 12 + + + Tahoma, 8.25pt + + + 271, 86 + + + 90, 21 + + + 5 + + + TextBox8 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPageAutoIndex + + + 13 Tahoma, 8.25pt @@ -4596,7 +4656,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 12 + 14 False @@ -4626,7 +4686,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 13 + 15 False @@ -4650,7 +4710,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 14 + 16 False @@ -4680,7 +4740,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 15 + 17 False @@ -4704,7 +4764,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 16 + 18 163, 44 @@ -4728,7 +4788,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 17 + 19 False @@ -4761,7 +4821,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 18 + 20 Segoe UI, 9pt, style=Italic @@ -4785,7 +4845,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 19 + 21 False @@ -4818,7 +4878,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 20 + 22 Segoe UI, 9pt, style=Italic @@ -4842,7 +4902,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 21 + 23 False @@ -4875,7 +4935,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 22 + 24 Segoe UI, 9pt, style=Italic @@ -4899,7 +4959,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 23 + 25 False @@ -4932,7 +4992,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 24 + 26 Segoe UI, 9pt, style=Italic @@ -4956,7 +5016,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 25 + 27 False @@ -4980,7 +5040,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei XtraTabPageAutoIndex - 26 + 28 @@ -5004,7 +5064,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1072, 278 + 1072, 280 automatische/feste Indexe @@ -5441,7 +5501,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1072, 278 + 1072, 280 Dynamischer Ordnerpfad @@ -5896,7 +5956,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1072, 278 + 1072, 280 Automatische Profilauswahl @@ -6328,7 +6388,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3, 4, 3, 4 - 1074, 582 + 1074, 587 Profil-Verwaltung @@ -6346,7 +6406,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 0 - 1076, 614 + 1076, 617 1 @@ -6385,7 +6445,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1072, 554 + 1072, 561 Gruppen-Zuordnung @@ -6403,7 +6463,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 1 - 1074, 582 + 1074, 587 89 @@ -6433,7 +6493,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei - 1072, 554 + 1072, 561 Benutzer-Zuordnung @@ -6485,7 +6545,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 3, 4, 3, 4 - 1074, 582 + 1074, 587 Profil-Zuordnung @@ -6518,7 +6578,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei Panel2 - 1310, 614 + 1310, 617 4 @@ -6611,7 +6671,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei True - 201 + 315 7, 17 diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index a794a1e..0b2f8fc 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -1257,17 +1257,6 @@ Public Class frmIndex _Logger.Debug("Checks for file [{0}]", oTempPath) _Logger.Debug("File streamed to Windream: {0}", oStreamSuccessful) _Logger.Debug("File exists in Destination: {0}", File.Exists(oTempPath)) - _Logger.Debug("File should be deleted: {0}", CURR_DELETE_ORIGIN) - - If File.Exists(oTempPath) And oStreamSuccessful Then - If CURR_DELETE_ORIGIN = True Then - Try - My.Computer.FileSystem.DeleteFile(CURRENT_WORKFILE) - Catch ex As Exception - _Logger.Error(ex) - End Try - End If - End If Return oStreamSuccessful Catch ex As Exception @@ -1290,12 +1279,15 @@ Public Class frmIndex CURRENT_NEWFILENAME = neuername Loop End If - 'Die Datei wird nun verschoben - If CURR_DELETE_ORIGIN = True Then - My.Computer.FileSystem.MoveFile(CURRENT_WORKFILE, CURRENT_NEWFILENAME) - Else - My.Computer.FileSystem.CopyFile(CURRENT_WORKFILE, CURRENT_NEWFILENAME) - End If + + 'Die Datei wird nun an den neuen Ort kopiert + My.Computer.FileSystem.MoveFile(CURRENT_WORKFILE, CURRENT_NEWFILENAME) + + 'If CURR_DELETE_ORIGIN = True Then + ' My.Computer.FileSystem.MoveFile(CURRENT_WORKFILE, CURRENT_NEWFILENAME) + 'Else + ' My.Computer.FileSystem.CopyFile(CURRENT_WORKFILE, CURRENT_NEWFILENAME) + 'End If Dim Insert_String As String Try @@ -2197,6 +2189,17 @@ Public Class frmIndex _Logger.Info("Datei '" & CURRENT_NEWFILENAME & "' erfolgreich erzeugt.") Dim oDEL As String = "DELETE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID ClassDatabase.Execute_non_Query(oDEL, True) + + If CURR_DELETE_ORIGIN = True Then + _Logger.Info("Datei [" & CURRENT_WORKFILE & "] wird gelöscht.") + Try + System.IO.File.Delete(CURRENT_WORKFILE) + Catch ex As Exception + _Logger.Error(ex) + End Try + _Logger.Info("Datei [" & CURRENT_WORKFILE & "] wurde gelöscht.") + End If + Return True End If