diff --git a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb index c9d0c5c..91850be 100644 --- a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb +++ b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb @@ -151,7 +151,7 @@ LOGGER.Error(ex) End If Create_Session() Catch ex As Exception -LOGGER.Error(ex) + LOGGER.Error(ex) LOGGER.Info("Error while starting up WMCC and IndexService: " & ex.Message, True) End Try End Function diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb index 6f00638..277f7d1 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb @@ -43,8 +43,6 @@ Partial Public Class DD_DMSLiteDataSet Private tableTBPM_PROFILE_FILES As TBPM_PROFILE_FILESDataTable - Private tableTBPM_FILES_USER_NOT_INDEXED As TBPM_FILES_USER_NOT_INDEXEDDataTable - Private tableTBPM_PROFILE As TBPM_PROFILEDataTable Private tableTBWH_CHECK_PROFILE_CONTROLS As TBWH_CHECK_PROFILE_CONTROLSDataTable @@ -127,9 +125,6 @@ Partial Public Class DD_DMSLiteDataSet If (Not (ds.Tables("TBPM_PROFILE_FILES")) Is Nothing) Then MyBase.Tables.Add(New TBPM_PROFILE_FILESDataTable(ds.Tables("TBPM_PROFILE_FILES"))) End If - If (Not (ds.Tables("TBPM_FILES_USER_NOT_INDEXED")) Is Nothing) Then - MyBase.Tables.Add(New TBPM_FILES_USER_NOT_INDEXEDDataTable(ds.Tables("TBPM_FILES_USER_NOT_INDEXED"))) - End If If (Not (ds.Tables("TBPM_PROFILE")) Is Nothing) Then MyBase.Tables.Add(New TBPM_PROFILEDataTable(ds.Tables("TBPM_PROFILE"))) End If @@ -261,16 +256,6 @@ Partial Public Class DD_DMSLiteDataSet End Get End Property - _ - Public ReadOnly Property TBPM_FILES_USER_NOT_INDEXED() As TBPM_FILES_USER_NOT_INDEXEDDataTable - Get - Return Me.tableTBPM_FILES_USER_NOT_INDEXED - End Get - End Property - _ - Private Function ShouldSerializeTBPM_FILES_USER_NOT_INDEXED() As Boolean - Return false - End Function - _ Private Function ShouldSerializeTBPM_PROFILE() As Boolean @@ -868,9 +836,6 @@ Partial Public Class DD_DMSLiteDataSet _ Public Delegate Sub TBPM_PROFILE_FILESRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPM_PROFILE_FILESRowChangeEvent) - _ - Public Delegate Sub TBPM_FILES_USER_NOT_INDEXEDRowChangeEventHandler(ByVal sender As Object, ByVal e As TBPM_FILES_USER_NOT_INDEXEDRowChangeEvent) - _ Public Delegate Sub TBPM_PROFILERowChangeEventHandler(ByVal sender As Object, ByVal e As TBPM_PROFILERowChangeEvent) @@ -4617,286 +4582,6 @@ Partial Public Class DD_DMSLiteDataSet End Function End Class - ''' - '''Represents the strongly named DataTable class. - ''' - _ - Partial Public Class TBPM_FILES_USER_NOT_INDEXEDDataTable - Inherits Global.System.Data.TypedTableBase(Of TBPM_FILES_USER_NOT_INDEXEDRow) - - Private columnUSR_NAME As Global.System.Data.DataColumn - - Private columnPROFIL_ID As Global.System.Data.DataColumn - - Private columnFILE_PATH As Global.System.Data.DataColumn - - _ - Public Sub New() - MyBase.New - Me.TableName = "TBPM_FILES_USER_NOT_INDEXED" - Me.BeginInit - Me.InitClass - Me.EndInit - End Sub - - _ - 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 - - _ - 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 ReadOnly Property USR_NAMEColumn() As Global.System.Data.DataColumn - Get - Return Me.columnUSR_NAME - End Get - End Property - - _ - Public ReadOnly Property PROFIL_IDColumn() As Global.System.Data.DataColumn - Get - Return Me.columnPROFIL_ID - End Get - End Property - - _ - Public ReadOnly Property FILE_PATHColumn() As Global.System.Data.DataColumn - Get - Return Me.columnFILE_PATH - End Get - End Property - - _ - Public ReadOnly Property Count() As Integer - Get - Return Me.Rows.Count - End Get - End Property - - _ - Public Default ReadOnly Property Item(ByVal index As Integer) As TBPM_FILES_USER_NOT_INDEXEDRow - Get - Return CType(Me.Rows(index),TBPM_FILES_USER_NOT_INDEXEDRow) - End Get - End Property - - _ - Public Event TBPM_FILES_USER_NOT_INDEXEDRowChanging As TBPM_FILES_USER_NOT_INDEXEDRowChangeEventHandler - - _ - Public Event TBPM_FILES_USER_NOT_INDEXEDRowChanged As TBPM_FILES_USER_NOT_INDEXEDRowChangeEventHandler - - _ - Public Event TBPM_FILES_USER_NOT_INDEXEDRowDeleting As TBPM_FILES_USER_NOT_INDEXEDRowChangeEventHandler - - _ - Public Event TBPM_FILES_USER_NOT_INDEXEDRowDeleted As TBPM_FILES_USER_NOT_INDEXEDRowChangeEventHandler - - _ - Public Overloads Sub AddTBPM_FILES_USER_NOT_INDEXEDRow(ByVal row As TBPM_FILES_USER_NOT_INDEXEDRow) - Me.Rows.Add(row) - End Sub - - _ - Public Overloads Function AddTBPM_FILES_USER_NOT_INDEXEDRow(ByVal USR_NAME As String, ByVal PROFIL_ID As Integer, ByVal FILE_PATH As String) As TBPM_FILES_USER_NOT_INDEXEDRow - Dim rowTBPM_FILES_USER_NOT_INDEXEDRow As TBPM_FILES_USER_NOT_INDEXEDRow = CType(Me.NewRow,TBPM_FILES_USER_NOT_INDEXEDRow) - Dim columnValuesArray() As Object = New Object() {USR_NAME, PROFIL_ID, FILE_PATH} - rowTBPM_FILES_USER_NOT_INDEXEDRow.ItemArray = columnValuesArray - Me.Rows.Add(rowTBPM_FILES_USER_NOT_INDEXEDRow) - Return rowTBPM_FILES_USER_NOT_INDEXEDRow - End Function - - _ - Public Overrides Function Clone() As Global.System.Data.DataTable - Dim cln As TBPM_FILES_USER_NOT_INDEXEDDataTable = CType(MyBase.Clone,TBPM_FILES_USER_NOT_INDEXEDDataTable) - cln.InitVars - Return cln - End Function - - _ - Protected Overrides Function CreateInstance() As Global.System.Data.DataTable - Return New TBPM_FILES_USER_NOT_INDEXEDDataTable() - End Function - - _ - Friend Sub InitVars() - Me.columnUSR_NAME = MyBase.Columns("USR_NAME") - Me.columnPROFIL_ID = MyBase.Columns("PROFIL_ID") - Me.columnFILE_PATH = MyBase.Columns("FILE_PATH") - End Sub - - _ - Private Sub InitClass() - Me.columnUSR_NAME = New Global.System.Data.DataColumn("USR_NAME", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnUSR_NAME) - Me.columnPROFIL_ID = New Global.System.Data.DataColumn("PROFIL_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnPROFIL_ID) - Me.columnFILE_PATH = New Global.System.Data.DataColumn("FILE_PATH", GetType(String), Nothing, Global.System.Data.MappingType.Element) - MyBase.Columns.Add(Me.columnFILE_PATH) - Me.columnUSR_NAME.MaxLength = 50 - Me.columnFILE_PATH.MaxLength = 500 - End Sub - - _ - Public Function NewTBPM_FILES_USER_NOT_INDEXEDRow() As TBPM_FILES_USER_NOT_INDEXEDRow - Return CType(Me.NewRow,TBPM_FILES_USER_NOT_INDEXEDRow) - End Function - - _ - Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow - Return New TBPM_FILES_USER_NOT_INDEXEDRow(builder) - End Function - - _ - Protected Overrides Function GetRowType() As Global.System.Type - Return GetType(TBPM_FILES_USER_NOT_INDEXEDRow) - End Function - - _ - Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) - MyBase.OnRowChanged(e) - If (Not (Me.TBPM_FILES_USER_NOT_INDEXEDRowChangedEvent) Is Nothing) Then - RaiseEvent TBPM_FILES_USER_NOT_INDEXEDRowChanged(Me, New TBPM_FILES_USER_NOT_INDEXEDRowChangeEvent(CType(e.Row,TBPM_FILES_USER_NOT_INDEXEDRow), e.Action)) - End If - End Sub - - _ - Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) - MyBase.OnRowChanging(e) - If (Not (Me.TBPM_FILES_USER_NOT_INDEXEDRowChangingEvent) Is Nothing) Then - RaiseEvent TBPM_FILES_USER_NOT_INDEXEDRowChanging(Me, New TBPM_FILES_USER_NOT_INDEXEDRowChangeEvent(CType(e.Row,TBPM_FILES_USER_NOT_INDEXEDRow), e.Action)) - End If - End Sub - - _ - Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) - MyBase.OnRowDeleted(e) - If (Not (Me.TBPM_FILES_USER_NOT_INDEXEDRowDeletedEvent) Is Nothing) Then - RaiseEvent TBPM_FILES_USER_NOT_INDEXEDRowDeleted(Me, New TBPM_FILES_USER_NOT_INDEXEDRowChangeEvent(CType(e.Row,TBPM_FILES_USER_NOT_INDEXEDRow), e.Action)) - End If - End Sub - - _ - Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) - MyBase.OnRowDeleting(e) - If (Not (Me.TBPM_FILES_USER_NOT_INDEXEDRowDeletingEvent) Is Nothing) Then - RaiseEvent TBPM_FILES_USER_NOT_INDEXEDRowDeleting(Me, New TBPM_FILES_USER_NOT_INDEXEDRowChangeEvent(CType(e.Row,TBPM_FILES_USER_NOT_INDEXEDRow), e.Action)) - End If - End Sub - - _ - Public Sub RemoveTBPM_FILES_USER_NOT_INDEXEDRow(ByVal row As TBPM_FILES_USER_NOT_INDEXEDRow) - 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 DD_DMSLiteDataSet = New DD_DMSLiteDataSet() - 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 = "TBPM_FILES_USER_NOT_INDEXEDDataTable" - 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 the strongly named DataTable class. ''' @@ -10813,103 +10498,6 @@ Partial Public Class DD_DMSLiteDataSet End Sub End Class - ''' - '''Represents strongly named DataRow class. - ''' - Partial Public Class TBPM_FILES_USER_NOT_INDEXEDRow - Inherits Global.System.Data.DataRow - - Private tableTBPM_FILES_USER_NOT_INDEXED As TBPM_FILES_USER_NOT_INDEXEDDataTable - - _ - Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) - MyBase.New(rb) - Me.tableTBPM_FILES_USER_NOT_INDEXED = CType(Me.Table,TBPM_FILES_USER_NOT_INDEXEDDataTable) - End Sub - - _ - Public Property USR_NAME() As String - Get - Try - Return CType(Me(Me.tableTBPM_FILES_USER_NOT_INDEXED.USR_NAMEColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte USR_NAME in Tabelle TBPM_FILES_USER_NOT_INDEXED ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableTBPM_FILES_USER_NOT_INDEXED.USR_NAMEColumn) = value - End Set - End Property - - _ - Public Property PROFIL_ID() As Integer - Get - Try - Return CType(Me(Me.tableTBPM_FILES_USER_NOT_INDEXED.PROFIL_IDColumn),Integer) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte PROFIL_ID in Tabelle TBPM_FILES_USER_NOT_INDEXED ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableTBPM_FILES_USER_NOT_INDEXED.PROFIL_IDColumn) = value - End Set - End Property - - _ - Public Property FILE_PATH() As String - Get - Try - Return CType(Me(Me.tableTBPM_FILES_USER_NOT_INDEXED.FILE_PATHColumn),String) - Catch e As Global.System.InvalidCastException - Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte FILE_PATH in Tabelle TBPM_FILES_USER_NOT_INDEXED ist DBNull.", e) - End Try - End Get - Set - Me(Me.tableTBPM_FILES_USER_NOT_INDEXED.FILE_PATHColumn) = value - End Set - End Property - - _ - Public Function IsUSR_NAMENull() As Boolean - Return Me.IsNull(Me.tableTBPM_FILES_USER_NOT_INDEXED.USR_NAMEColumn) - End Function - - _ - Public Sub SetUSR_NAMENull() - Me(Me.tableTBPM_FILES_USER_NOT_INDEXED.USR_NAMEColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsPROFIL_IDNull() As Boolean - Return Me.IsNull(Me.tableTBPM_FILES_USER_NOT_INDEXED.PROFIL_IDColumn) - End Function - - _ - Public Sub SetPROFIL_IDNull() - Me(Me.tableTBPM_FILES_USER_NOT_INDEXED.PROFIL_IDColumn) = Global.System.Convert.DBNull - End Sub - - _ - Public Function IsFILE_PATHNull() As Boolean - Return Me.IsNull(Me.tableTBPM_FILES_USER_NOT_INDEXED.FILE_PATHColumn) - End Function - - _ - Public Sub SetFILE_PATHNull() - Me(Me.tableTBPM_FILES_USER_NOT_INDEXED.FILE_PATHColumn) = Global.System.Convert.DBNull - End Sub - End Class - ''' '''Represents strongly named DataRow class. ''' @@ -13767,42 +13355,6 @@ Partial Public Class DD_DMSLiteDataSet End Property End Class - ''' - '''Row event argument class - ''' - _ - Public Class TBPM_FILES_USER_NOT_INDEXEDRowChangeEvent - Inherits Global.System.EventArgs - - Private eventRow As TBPM_FILES_USER_NOT_INDEXEDRow - - Private eventAction As Global.System.Data.DataRowAction - - _ - Public Sub New(ByVal row As TBPM_FILES_USER_NOT_INDEXEDRow, ByVal action As Global.System.Data.DataRowAction) - MyBase.New - Me.eventRow = row - Me.eventAction = action - End Sub - - _ - Public ReadOnly Property Row() As TBPM_FILES_USER_NOT_INDEXEDRow - 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 ''' @@ -18252,378 +17804,6 @@ Namespace DD_DMSLiteDataSetTableAdapters End Function End Class - ''' - '''Represents the connection and commands used to retrieve and save data. - ''' - _ - Partial Public Class TBPM_FILES_USER_NOT_INDEXEDTableAdapter - 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 = "TBPM_FILES_USER_NOT_INDEXED" - tableMapping.ColumnMappings.Add("USR_NAME", "USR_NAME") - tableMapping.ColumnMappings.Add("PROFIL_ID", "PROFIL_ID") - tableMapping.ColumnMappings.Add("FILE_PATH", "FILE_PATH") - Me._adapter.TableMappings.Add(tableMapping) - Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() - Me._adapter.InsertCommand.Connection = Me.Connection - Me._adapter.InsertCommand.CommandText = "INSERT INTO [TBPM_FILES_USER_NOT_INDEXED] ([USR_NAME], [PROFIL_ID], [FILE_PATH]) "& _ - "VALUES (@USR_NAME, @PROFIL_ID, @FILE_PATH)" - Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USR_NAME", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "USR_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FILE_PATH", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_PATH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - End Sub - - _ - Private Sub InitConnection() - Me._connection = New Global.System.Data.SqlClient.SqlConnection() - Me._connection.ConnectionString = Global.DD_PM_WINDREAM.My.MySettings.Default.ConnectionString - End Sub - - _ - Private Sub InitCommandCollection() - Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(3) {} - Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() - Me._commandCollection(0).Connection = Me.Connection - Me._commandCollection(0).CommandText = "SELECT USR_NAME, PROFIL_ID, FILE_PATH FROM TBPM_FILES_USER_NOT_INDEXED" - Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand() - Me._commandCollection(1).Connection = Me.Connection - Me._commandCollection(1).CommandText = "DELETE FROM TBPM_FILES_USER_NOT_INDEXED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (USR_NAME = @User)" - Me._commandCollection(1).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(1).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@User", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "USR_NAME", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) - Me._commandCollection(2) = New Global.System.Data.SqlClient.SqlCommand() - Me._commandCollection(2).Connection = Me.Connection - Me._commandCollection(2).CommandText = "INSERT INTO TBPM_FILES_USER_NOT_INDEXED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (USR_NAME, PROF"& _ - "IL_ID, FILE_PATH)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@User,@PROFIL_ID,@FILE_PATH)" - Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@User", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "USR_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(2).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FILE_PATH", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_PATH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(3) = New Global.System.Data.SqlClient.SqlCommand() - Me._commandCollection(3).Connection = Me.Connection - Me._commandCollection(3).CommandText = "SELECT COUNT(*) AS Expr1"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBPM_FILES_USER_NOT_INDEXED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHE"& _ - "RE (USR_NAME = @USERNAME) AND (PROFIL_ID = @PROFIL_ID) AND (FILE_PATH = @"& _ - "FILE_PATH)" - Me._commandCollection(3).CommandType = Global.System.Data.CommandType.Text - Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USERNAME", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "USR_NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - Me._commandCollection(3).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FILE_PATH", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "FILE_PATH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) - End Sub - - _ - Public Overloads Overridable Function Fill(ByVal dataTable As DD_DMSLiteDataSet.TBPM_FILES_USER_NOT_INDEXEDDataTable) 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 DD_DMSLiteDataSet.TBPM_FILES_USER_NOT_INDEXEDDataTable - Me.Adapter.SelectCommand = Me.CommandCollection(0) - Dim dataTable As DD_DMSLiteDataSet.TBPM_FILES_USER_NOT_INDEXEDDataTable = New DD_DMSLiteDataSet.TBPM_FILES_USER_NOT_INDEXEDDataTable() - Me.Adapter.Fill(dataTable) - Return dataTable - End Function - - _ - Public Overloads Overridable Function Update(ByVal dataTable As DD_DMSLiteDataSet.TBPM_FILES_USER_NOT_INDEXEDDataTable) As Integer - Return Me.Adapter.Update(dataTable) - End Function - - _ - Public Overloads Overridable Function Update(ByVal dataSet As DD_DMSLiteDataSet) As Integer - Return Me.Adapter.Update(dataSet, "TBPM_FILES_USER_NOT_INDEXED") - 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 Insert(ByVal USR_NAME As String, ByVal PROFIL_ID As Global.System.Nullable(Of Integer), ByVal FILE_PATH As String) As Integer - If (USR_NAME Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(0).Value = Global.System.DBNull.Value - Else - Me.Adapter.InsertCommand.Parameters(0).Value = CType(USR_NAME,String) - End If - If (PROFIL_ID.HasValue = true) Then - Me.Adapter.InsertCommand.Parameters(1).Value = CType(PROFIL_ID.Value,Integer) - Else - Me.Adapter.InsertCommand.Parameters(1).Value = Global.System.DBNull.Value - End If - If (FILE_PATH Is Nothing) Then - Me.Adapter.InsertCommand.Parameters(2).Value = Global.System.DBNull.Value - Else - Me.Adapter.InsertCommand.Parameters(2).Value = CType(FILE_PATH,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 CmdDelete(ByVal User As String) As Integer - Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(1) - If (User Is Nothing) Then - command.Parameters(0).Value = Global.System.DBNull.Value - Else - command.Parameters(0).Value = CType(User,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 - - _ - Public Overloads Overridable Function cmdInsert(ByVal User As String, ByVal PROFIL_ID As Global.System.Nullable(Of Integer), ByVal FILE_PATH As String) As Integer - Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(2) - If (User Is Nothing) Then - command.Parameters(0).Value = Global.System.DBNull.Value - Else - command.Parameters(0).Value = CType(User,String) - End If - If (PROFIL_ID.HasValue = true) Then - command.Parameters(1).Value = CType(PROFIL_ID.Value,Integer) - Else - command.Parameters(1).Value = Global.System.DBNull.Value - End If - If (FILE_PATH Is Nothing) Then - command.Parameters(2).Value = Global.System.DBNull.Value - Else - command.Parameters(2).Value = CType(FILE_PATH,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 - - _ - Public Overloads Overridable Function FileExists(ByVal USERNAME As String, ByVal PROFIL_ID As Global.System.Nullable(Of Integer), ByVal FILE_PATH As String) As Global.System.Nullable(Of Integer) - Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(3) - If (USERNAME Is Nothing) Then - command.Parameters(0).Value = Global.System.DBNull.Value - Else - command.Parameters(0).Value = CType(USERNAME,String) - End If - If (PROFIL_ID.HasValue = true) Then - command.Parameters(1).Value = CType(PROFIL_ID.Value,Integer) - Else - command.Parameters(1).Value = Global.System.DBNull.Value - End If - If (FILE_PATH Is Nothing) Then - command.Parameters(2).Value = Global.System.DBNull.Value - Else - command.Parameters(2).Value = CType(FILE_PATH,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 Object - Try - returnValue = command.ExecuteScalar - Finally - If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then - command.Connection.Close - End If - End Try - If ((returnValue Is Nothing) _ - OrElse (returnValue.GetType Is GetType(Global.System.DBNull))) Then - Return New Global.System.Nullable(Of Integer)() - Else - Return New Global.System.Nullable(Of Integer)(CType(returnValue,Integer)) - End If - End Function - End Class - ''' '''Represents the connection and commands used to retrieve and save data. ''' @@ -22535,8 +21715,6 @@ Namespace DD_DMSLiteDataSetTableAdapters Private _tBPM_PROFILE_FILESTableAdapter As TBPM_PROFILE_FILESTableAdapter - Private _tBPM_FILES_USER_NOT_INDEXEDTableAdapter As TBPM_FILES_USER_NOT_INDEXEDTableAdapter - Private _tBPM_PROFILETableAdapter As TBPM_PROFILETableAdapter Private _tBPM_PROFILE_CONTROLSTableAdapter As TBPM_PROFILE_CONTROLSTableAdapter @@ -22656,20 +21834,6 @@ Namespace DD_DMSLiteDataSetTableAdapters End Set End Property - _ - Public Property TBPM_FILES_USER_NOT_INDEXEDTableAdapter() As TBPM_FILES_USER_NOT_INDEXEDTableAdapter - Get - Return Me._tBPM_FILES_USER_NOT_INDEXEDTableAdapter - End Get - Set - Me._tBPM_FILES_USER_NOT_INDEXEDTableAdapter = value - End Set - End Property - - + SELECT GUID @@ -1027,7 +1027,7 @@ ORDER BY DMS_ERSTELLT_DATE,FILE_PATH - + SELECT GUID @@ -1045,7 +1045,7 @@ ORDER BY DMS_ERSTELLT_DATE DESC - + UPDATE TBPM_PROFILE_FILES @@ -1057,7 +1057,7 @@ WHERE (GUID = @GUID) - + UPDATE TBPM_PROFILE_FILES @@ -1086,85 +1086,6 @@ ORDER BY DMS_ERSTELLT_DATE DESC - - - - - - INSERT INTO [TBPM_FILES_USER_NOT_INDEXED] ([USR_NAME], [PROFIL_ID], [FILE_PATH]) VALUES (@USR_NAME, @PROFIL_ID, @FILE_PATH) - - - - - - - - - - SELECT USR_NAME, PROFIL_ID, FILE_PATH FROM TBPM_FILES_USER_NOT_INDEXED - - - - - - - - - - - - - - - DELETE FROM TBPM_FILES_USER_NOT_INDEXED -WHERE (USR_NAME = @User) - - - - - - - - - - INSERT INTO TBPM_FILES_USER_NOT_INDEXED - (USR_NAME, DOC_ID) -VALUES (@User,@DocID) - - - - - - - - - INSERT INTO TBPM_FILES_USER_NOT_INDEXED - (USR_NAME, PROFIL_ID, FILE_PATH) -VALUES (@User,@PROFIL_ID,@FILE_PATH) - - - - - - - - - - - - SELECT COUNT(*) AS Expr1 -FROM TBPM_FILES_USER_NOT_INDEXED -WHERE (USR_NAME = @USERNAME) AND (PROFIL_ID = @PROFIL_ID) AND (FILE_PATH = @FILE_PATH) - - - - - - - - - - @@ -2084,7 +2005,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2137,7 +2058,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2233,7 +2154,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2298,7 +2219,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2328,7 +2249,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2351,7 +2272,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2462,7 +2383,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2535,7 +2456,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2584,7 +2505,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2599,28 +2520,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - - - - - - - - - - - - - - - - - - - - - - + @@ -2728,7 +2628,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2801,7 +2701,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2852,7 +2752,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -2968,7 +2868,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -3046,7 +2946,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -3087,7 +2987,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -3125,7 +3025,7 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - + @@ -3260,11 +3160,11 @@ FROM dbo.FNPM_GET_FREE_USER_FOR_PROFILE(@PROFILE_ID) AS FNPM_GET_FREE - - - - - + + + + + \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss index caebcdf..8dc7250 100644 --- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss +++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss @@ -4,29 +4,28 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - - + - + - + - + 461 @@ -38,7 +37,7 @@ - + 175 @@ -54,7 +53,7 @@ - + 515 @@ -66,19 +65,19 @@ - + 1248 - 550 + 549 - 1301 - 550 + 1300 + 549 - + 141 @@ -86,11 +85,11 @@ 141 - 344 + 343 - 1301 - 344 + 1300 + 343 diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj index abf8a10..a3a3969 100644 --- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj +++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj @@ -149,7 +149,7 @@ ..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll - ..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll diff --git a/app/DD_PM_WINDREAM/frmAdminPasswort.Designer.vb b/app/DD_PM_WINDREAM/frmAdminPasswort.Designer.vb index d7281c1..a6d9ac6 100644 --- a/app/DD_PM_WINDREAM/frmAdminPasswort.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdminPasswort.Designer.vb @@ -74,7 +74,6 @@ Partial Class frmAdminPasswort Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Me.TBPM_KONFIGURATIONTableAdapter Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing diff --git a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb index 1174134..410f74a 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.Designer.vb +++ b/app/DD_PM_WINDREAM/frmAdministration.Designer.vb @@ -809,7 +809,6 @@ Partial Class frmAdministration Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing diff --git a/app/DD_PM_WINDREAM/frmConnection.Designer.vb b/app/DD_PM_WINDREAM/frmConnection.Designer.vb index 884cd50..a1cdb27 100644 --- a/app/DD_PM_WINDREAM/frmConnection.Designer.vb +++ b/app/DD_PM_WINDREAM/frmConnection.Designer.vb @@ -531,7 +531,6 @@ Partial Class frmConnection Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing diff --git a/app/DD_PM_WINDREAM/frmControl_Detail.Designer.vb b/app/DD_PM_WINDREAM/frmControl_Detail.Designer.vb index 52679e5..1886c59 100644 --- a/app/DD_PM_WINDREAM/frmControl_Detail.Designer.vb +++ b/app/DD_PM_WINDREAM/frmControl_Detail.Designer.vb @@ -193,7 +193,6 @@ Partial Class frmControl_Detail Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Me.TBPM_CONTROL_TABLETableAdapter Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb index 379b205..5c91df6 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb @@ -410,7 +410,6 @@ Partial Class frmFormDesigner Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Me.TBPM_PROFILE_CONTROLSTableAdapter Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing diff --git a/app/DD_PM_WINDREAM/frmKonfig.Designer.vb b/app/DD_PM_WINDREAM/frmKonfig.Designer.vb index 2f7e84f..13c95dc 100644 --- a/app/DD_PM_WINDREAM/frmKonfig.Designer.vb +++ b/app/DD_PM_WINDREAM/frmKonfig.Designer.vb @@ -483,7 +483,6 @@ Partial Class frmKonfig Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Me.TBPM_KONFIGURATIONTableAdapter Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing diff --git a/app/DD_PM_WINDREAM/frmLicense.Designer.vb b/app/DD_PM_WINDREAM/frmLicense.Designer.vb index ebf792c..38a3394 100644 --- a/app/DD_PM_WINDREAM/frmLicense.Designer.vb +++ b/app/DD_PM_WINDREAM/frmLicense.Designer.vb @@ -163,7 +163,6 @@ Partial Class frmLicense Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing diff --git a/app/DD_PM_WINDREAM/frmLoginAdmin.Designer.vb b/app/DD_PM_WINDREAM/frmLoginAdmin.Designer.vb index 0367639..2eeed51 100644 --- a/app/DD_PM_WINDREAM/frmLoginAdmin.Designer.vb +++ b/app/DD_PM_WINDREAM/frmLoginAdmin.Designer.vb @@ -82,7 +82,6 @@ Partial Class frmLoginAdmin Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Me.TBPM_KONFIGURATIONTableAdapter Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing diff --git a/app/DD_PM_WINDREAM/frmMain.Designer.vb b/app/DD_PM_WINDREAM/frmMain.Designer.vb index b982ff9..daec810 100644 --- a/app/DD_PM_WINDREAM/frmMain.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb @@ -256,7 +256,6 @@ Partial Class frmMain Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index 2a92ff7..0674624 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -827,6 +827,20 @@ Public Class frmMain Decide_Load() tsslblLastSysnc.Text = "Letzte Synchronisation: " & Now.ToLongTimeString If GridControl_Docs.Visible = True And formopenClose = False Then RefreshHelper.LoadViewInfo() + Dim sql = String.Format("SELECT * FROM [dbo].[FNDD_CHECK_USER_MODULE] ('{0}','PM',{1})", Environment.UserName, CLIENT_SELECTED) + Dim DT_CHECKUSER_MODULE As DataTable = ClassDatabase.Return_Datatable(sql) + If DT_CHECKUSER_MODULE.Rows.Count = 1 Then + USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN") + If USER_LANGUAGE = "de-DE" Then + tslblUserLoggedin.Text = "User eingeloggt: " & USERCOUNT_LOGGED_IN + Else + tslblUserLoggedin.Text = "User logged in: " & USERCOUNT_LOGGED_IN + End If + End If + + + + End Sub Private Sub NotifyIcon1_Click(sender As System.Object, e As EventArgs) Handles NotifyIcon1.Click diff --git a/app/DD_PM_WINDREAM/frmMassValidator.Designer.vb b/app/DD_PM_WINDREAM/frmMassValidator.Designer.vb index 1765c8d..e9c18c2 100644 --- a/app/DD_PM_WINDREAM/frmMassValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmMassValidator.Designer.vb @@ -138,7 +138,6 @@ Partial Class frmMassValidator Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Me.TBPM_CONTROL_TABLETableAdapter Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing diff --git a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb index 1c70c9e..8fa5826 100644 --- a/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb +++ b/app/DD_PM_WINDREAM/frmSQL_DESIGNER.Designer.vb @@ -75,7 +75,6 @@ Partial Class frmSQL_DESIGNER Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Nothing Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Nothing Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Nothing diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb index af1c327..6a19034 100644 --- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb +++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb @@ -46,14 +46,12 @@ Partial Class frmValidator Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.TBDD_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() Me.TBPM_CONTROL_TABLETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter() - Me.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_FILES_USER_NOT_INDEXEDTableAdapter() Me.TBPM_KONFIGURATIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_KONFIGURATIONTableAdapter() Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter() Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter() Me.TBPM_PROFILETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILETableAdapter() Me.VWPM_CONTROL_INDEXBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.VWPM_CONTROL_INDEXTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_CONTROL_INDEXTableAdapter() - Me.TBPM_FILES_USER_NOT_INDEXEDBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components) @@ -144,7 +142,6 @@ Partial Class frmValidator Me.ContextMenuStrip1.SuspendLayout() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.VWPM_CONTROL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBPM_FILES_USER_NOT_INDEXEDBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_PROFILE_FILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() @@ -287,7 +284,6 @@ Partial Class frmValidator Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Me.TBPM_CONTROL_TABLETableAdapter Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing - Me.TableAdapterManager.TBPM_FILES_USER_NOT_INDEXEDTableAdapter = Me.TBPM_FILES_USER_NOT_INDEXEDTableAdapter Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Me.TBPM_KONFIGURATIONTableAdapter Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Me.TBPM_PROFILE_CONTROLSTableAdapter Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Me.TBPM_PROFILE_FILESTableAdapter @@ -304,10 +300,6 @@ Partial Class frmValidator ' Me.TBPM_CONTROL_TABLETableAdapter.ClearBeforeFill = True ' - 'TBPM_FILES_USER_NOT_INDEXEDTableAdapter - ' - Me.TBPM_FILES_USER_NOT_INDEXEDTableAdapter.ClearBeforeFill = True - ' 'TBPM_KONFIGURATIONTableAdapter ' Me.TBPM_KONFIGURATIONTableAdapter.ClearBeforeFill = True @@ -333,11 +325,6 @@ Partial Class frmValidator ' Me.VWPM_CONTROL_INDEXTableAdapter.ClearBeforeFill = True ' - 'TBPM_FILES_USER_NOT_INDEXEDBindingSource - ' - Me.TBPM_FILES_USER_NOT_INDEXEDBindingSource.DataMember = "TBPM_FILES_USER_NOT_INDEXED" - Me.TBPM_FILES_USER_NOT_INDEXEDBindingSource.DataSource = Me.DD_DMSLiteDataSet - ' 'TBPM_PROFILE_CONTROLSBindingSource ' Me.TBPM_PROFILE_CONTROLSBindingSource.DataMember = "TBPM_PROFILE_CONTROLS" @@ -871,7 +858,6 @@ Partial Class frmValidator Me.ContextMenuStrip1.ResumeLayout(False) CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.VWPM_CONTROL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBPM_FILES_USER_NOT_INDEXEDBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_PROFILE_FILESBindingSource, System.ComponentModel.ISupportInitialize).EndInit() @@ -917,8 +903,6 @@ Partial Class frmValidator Friend WithEvents TableAdapterManager As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager Friend WithEvents VWPM_CONTROL_INDEXBindingSource As System.Windows.Forms.BindingSource Friend WithEvents VWPM_CONTROL_INDEXTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_CONTROL_INDEXTableAdapter - Friend WithEvents TBPM_FILES_USER_NOT_INDEXEDTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_FILES_USER_NOT_INDEXEDTableAdapter - Friend WithEvents TBPM_FILES_USER_NOT_INDEXEDBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPM_PROFILE_CONTROLSTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter Friend WithEvents TBPM_PROFILE_CONTROLSBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBDD_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter diff --git a/app/DD_PM_WINDREAM/frmValidator.resx b/app/DD_PM_WINDREAM/frmValidator.resx index b33fe5e..b0b1c0b 100644 --- a/app/DD_PM_WINDREAM/frmValidator.resx +++ b/app/DD_PM_WINDREAM/frmValidator.resx @@ -184,7 +184,7 @@ 3 - 272, 173 + 533, 134 239, 22 @@ -398,25 +398,22 @@ 887, 17 - 534, 95 + 1075, 56 - 17, 173 - - - 593, 56 + 278, 134 - 698, 134 + 1183, 95 - 17, 95 + 558, 56 - 1017, 95 + 262, 95 - 229, 134 + 714, 95 1060, 17 @@ -424,26 +421,23 @@ 17, 56 - + 279, 56 - - 901, 56 - - 290, 95 + 831, 56 - 772, 95 + 17, 95 - 17, 134 + 502, 95 - 435, 134 + 920, 95 - 955, 134 + 17, 134 Top, Right @@ -455,7 +449,7 @@ 0, 141 - 694, 173 + 955, 134 Top @@ -554,7 +548,7 @@ 962, 643 - 1084, 173 + 17, 173 Segoe UI, 9.75pt @@ -656,7 +650,7 @@ 0 - 967, 173 + 1228, 134 120, 17 @@ -1067,12 +1061,6 @@ DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - TBPM_FILES_USER_NOT_INDEXEDTableAdapter - - - DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_FILES_USER_NOT_INDEXEDTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - TBPM_KONFIGURATIONTableAdapter @@ -1109,12 +1097,6 @@ DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_CONTROL_INDEXTableAdapter, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - TBPM_FILES_USER_NOT_INDEXEDBindingSource - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - TBPM_PROFILE_CONTROLSBindingSource @@ -1545,7 +1527,7 @@ 0 - 429, 173 + 690, 134 Segoe UI Semibold, 9pt, style=Bold, Italic @@ -1635,18 +1617,18 @@ 1 - 546, 173 + 807, 134 - 819, 173 + 1080, 134 - 1191, 173 + 124, 173 - 17, 212 + 273, 173 - 327, 212 + 583, 173 \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 26174d0..87043b2 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -125,7 +125,8 @@ Public Class frmValidator End Try Try - TBPM_FILES_USER_NOT_INDEXEDTableAdapter.CmdDelete(Environment.UserName) + Dim oDel = $"DELETE FROM TBPM_FILES_USER_NOT_INDEXED WHERE UPPER(USR_NAME) = UPPER('{USER_USERNAME}')" + ClassDatabase.Execute_non_Query(oDel) Catch ex As Exception LOGGER.Error(ex) MsgBox("Fehler bei Übersprungene Files löschen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) @@ -320,7 +321,7 @@ Public Class frmValidator Dim _step = 0 Try _step = 1 - TBPM_FILES_USER_NOT_INDEXEDTableAdapter.Connection.ConnectionString = CONNECTION_STRING + TBPM_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = CONNECTION_STRING TBDD_CONNECTIONTableAdapter.Connection.ConnectionString = CONNECTION_STRING TBPM_PROFILE_FILESTableAdapter.Connection.ConnectionString = CONNECTION_STRING @@ -1303,22 +1304,24 @@ Public Class frmValidator Replace("K:", "\\windream\objects") End Function - Function Next_GUID(Filepath As String, ProfilId As Integer, OrderByNewest As Boolean) As Integer - Dim oFilePath = ReplaceWindreamDriveLetter(Filepath).ToUpper() - Dim oSQL = $" - SELECT GUID FROM TBPM_PROFILE_FILES WHERE - PROFIL_ID = {CURRENT_ProfilGUID} AND EDIT = 0 AND IN_WORK = 0 AND - UPPER(REPLACE(FILE_PATH, 'W:','\\windream\objects')) <> '{oFilePath}' AND - UPPER(REPLACE(FILE_PATH, 'W:','\\windream\objects')) NOT IN ( - SELECT UPPER(FILE_PATH) - FROM TBPM_FILES_USER_NOT_INDEXED - WHERE (PROFIL_ID = {ProfilId}) AND (UPPER(USR_NAME) = UPPER('{Environment.UserName}')) - ) - {IIf(OrderByNewest, " ORDER BY DMS_ERSTELLT_DATE DESC", "")} - " + 'Function Next_GUID() As Integer + ' 'Dim id = CURRENT_DOC_GUID + ' 'Dim oFilePath = ReplaceWindreamDriveLetter(Filepath).ToUpper() + ' Dim oSQL = $"SELECT [dbo].[FNPM_GET_NEXT_DOC_GUID] ({CURRENT_ProfilGUID},{PROFIL_sortbynewest},{CURRENT_DOC_GUID},'{USER_USERNAME}')" - Return ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, True) - End Function + ' 'SELECT GUID FROM TBPM_PROFILE_FILES WHERE + ' ' PROFIL_ID = {CURRENT_ProfilGUID} AND EDIT = 0 AND IN_WORK = 0 AND + ' ' UPPER(REPLACE(FILE_PATH, 'W:','\\windream\objects')) <> '{oFilePath}' AND + ' ' UPPER(REPLACE(FILE_PATH, 'W:','\\windream\objects')) NOT IN ( + ' ' SELECT UPPER(FILE_PATH) + ' ' FROM TBPM_FILES_USER_NOT_INDEXED + ' ' WHERE (PROFIL_ID = {ProfilId}) AND (UPPER(USR_NAME) = UPPER('{Environment.UserName}')) + ' ' ) + ' ' {IIf(OrderByNewest, " ORDER BY DMS_ERSTELLT_DATE DESC", "")} + ' ' " + + ' Return ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, True) + 'End Function Function Get_Next_GUID() As Integer Try @@ -1331,7 +1334,13 @@ Public Class frmValidator ' newGUID = TBPM_PROFILE_FILESTableAdapter.cmdGetNextFile_GUID(CURRENT_ProfilGUID, OLD_Document_Path, Environment.UserName) 'End If LOGGER.Debug("Old Document_Path: " & OLD_Document_Path) - newGUID = Next_GUID(OLD_Document_Path, CURRENT_ProfilGUID, PROFIL_sortbynewest) + Dim oBIT As Integer = 0 + If PROFIL_sortbynewest = True Then + oBIT = 1 + End If + Dim oSQL = $"SELECT [dbo].[FNPM_GET_NEXT_DOC_GUID] ({CURRENT_ProfilGUID},{oBIT},{CURRENT_DOC_GUID},'{USER_USERNAME}')" + + newGUID = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING, True) WMDocPathWindows = "" CURRENT_DOC_PATH = "" @@ -1339,7 +1348,7 @@ Public Class frmValidator If newGUID > 0 Then LOGGER.Debug("newGUID: " & newGUID.ToString) - Else + ElseIf newGUID <> 0 Then LOGGER.Info(" >> ACHTUNG: Ausnahme in GetNextGUID - Es konnte keine GUID abgerufen werden!") newGUID = 0 End If @@ -1365,7 +1374,7 @@ Public Class frmValidator End If If CURRENT_DOC_GUID = 0 Then Dim DT As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_FILES - CURRENT_DOC_GUID = DT.Rows(0).Item("GUID") + CURRENT_DOC_GUID = 0 'DT.Rows(0).Item("GUID") AnzDoks = DT.Rows.Count Else AnzDoks = 1 @@ -1422,7 +1431,7 @@ Public Class frmValidator Catch ex As Exception Dim _err1 As Boolean = False LOGGER.Error(ex) - allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "error in creatin WMObject - DocGUID: " & CURRENT_DOC_GUID & " - ERROR: " & ex.Message, Environment.UserName) + allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "error in creating WMObject - DocGUID: " & CURRENT_DOC_GUID & " - ERROR: " & ex.Message, Environment.UserName) LOGGER.Info("Unexpected error creating WMObject(1) in GetWMDocFileString: " & ex.Message) LOGGER.Info("Error Number: " & Err.Number.ToString) errormessage = $"Could not create a WMObject(1) for [{oWMOwnPath}]!" @@ -1501,6 +1510,8 @@ Public Class frmValidator LOGGER.Debug($"CURRENT_JUMP_DOC_GUID: {CURRENT_JUMP_DOC_GUID}'") If CURRENT_JUMP_DOC_GUID = 0 Then CURRENT_DOC_GUID = Get_Next_GUID() + ElseIf first = False Then + CURRENT_DOC_GUID = 0 End If LOGGER.Debug("Dokument-GUID: '" & CURRENT_DOC_GUID.ToString & "'") If CURRENT_DOC_GUID > 0 Then @@ -1521,34 +1532,9 @@ Public Class frmValidator tstrlbl_Info.Text = "Datei " & docCounter.ToString & " von " & Anzahl_ValDoks.ToString LOGGER.Info(">> Validierung für Dokument '" & WMDocPathWindows & "' gestartet") - 'Try - ' CURRENT_WMFILE = WINDREAM.oSession.GetWMObjectByPath(WMEntity.WMEntityDocument, WINDREAM.NormalizePath(WMDocFileString)) - 'Catch ex As Exception - ' LOGGER.Error(ex) - ' allgFunk.Insert_LogEntry(CURRENT_ProfilGUID, "Fehler bei Erzeugen windream-Objekt - DocGUID: " & CURRENT_DOC_GUID & " - ERROR: " & ex.Message, Environment.UserName) - ' LOGGER.Info("Fehler bei Erzeugen windream-Objekt in (LoadNextDokument): " & ex.Message) - ' LOGGER.Info("Error Number: " & Err.Number.ToString) - ' Dim _err1 As Boolean = False - ' 'Nochmaliger Versuch windream zu initialiseren - ' If Init_windream() = True Then - ' Try - ' CURRENT_WMFILE = WINDREAM.oSession.GetWMObjectByPath(WMEntity.WMEntityDocument, WINDREAM.NormalizePath(WMDocPathWindows)) - ' Catch ex1 As Exception - ' LOGGER.Info("1- Fehler bei 2. Versuch windream-Objekt: " & ex1.Message) - ' oErrorMessage = $"1-Could not create a WMObject for [{WMDocPathWindows}]!" - ' _err1 = True - ' End Try - ' Else - ' oErrorMessage = "2-Could not login to ECM - Please check Your log for further details!" - ' _err1 = True - ' End If - ' If _err1 = True Then - ' errormessage = oErrorMessage - ' frmError.ShowDialog() - ' Exit Sub - ' End If - - 'End Try + Dim oSQL = $"SELECT DOC_ID FROM TBPM_PROFILE_FILES WHERE GUID = {CURRENT_DOC_GUID}" + CURRENT_DOC_ID = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) + tsslblDocID.Text = "Document-ID: " & CURRENT_DOC_ID & " - GUID: " & CURRENT_DOC_GUID LOGGER.Debug("WMDoc created...") oErrorMessage = Windream_get_Doc_info() @@ -3665,11 +3651,10 @@ Public Class frmValidator 'Das Dokument freigeben TBPM_PROFILE_FILESTableAdapter.CmdSETWORK(False, "", CURRENT_DOC_GUID) - If TBPM_FILES_USER_NOT_INDEXEDTableAdapter.FileExists(Environment.UserName, CURRENT_ProfilGUID, WMDocPathWindows) = 0 Then - TBPM_FILES_USER_NOT_INDEXEDTableAdapter.cmdInsert(Environment.UserName, CURRENT_ProfilGUID, WMDocPathWindows) - End If + Dim oSQL = $"EXECUTE PRPM_FILES_NOT_INDEXED '{USER_USERNAME}',{CURRENT_ProfilGUID},'{WMDocPathWindows}',{CURRENT_DOC_GUID}" + ClassDatabase.Execute_non_Query(oSQL) - LOGGER.Debug("Dokument freigegeben") + LOGGER.Debug($"Skipped DocGUID {CURRENT_DOC_GUID}") LOGGER.Info("") Load_Next_Document(False) Catch ex As Exception