diff --git a/Global_Indexer/App.config b/Global_Indexer/App.config index 90308d9..1941d11 100644 --- a/Global_Indexer/App.config +++ b/Global_Indexer/App.config @@ -9,7 +9,9 @@ - + @@ -35,7 +37,10 @@ False - + + + + myFilename.pdf diff --git a/Global_Indexer/ClassFilehandle.vb b/Global_Indexer/ClassFilehandle.vb index c46bcfe..b5b4119 100644 --- a/Global_Indexer/ClassFilehandle.vb +++ b/Global_Indexer/ClassFilehandle.vb @@ -188,8 +188,7 @@ Public Class ClassFilehandle ''' Dateiname ohne Pfadangabe ''' Ersatzzeichen für alle unzulässigen Zeichen ''' im Dateinamen - Public Shared Function CleanFilename(ByVal sFilename As String, - Optional ByVal REPLACEChar As String = "") As String + Public Shared Function CleanFilename(ByVal sFilename As String, Optional ByVal REPLACEChar As String = "") As String If LogErrorsOnly = False Then ClassLogger.Add(" >> Filename before CleanFilename: '" & sFilename & "'", False) If sFilename.Contains(".\") Then sFilename = sFilename.Replace(".\", "\") @@ -201,8 +200,10 @@ Public Class ClassFilehandle ' sFilename = sFilename.Replace("..", ".") 'End If ' alle nicht zulässigen Zeichen ersetzen - sFilename = System.Text.RegularExpressions.Regex.Replace( - sFilename, REGEX_CLEAN_FILENAME, REPLACEChar) + sFilename = System.Text.RegularExpressions.Regex.Replace(sFilename, REGEX_CLEAN_FILENAME, REPLACEChar) + sFilename = System.Text.RegularExpressions.Regex.Replace(sFilename, "[\\/:*?""<>|\r\n]", "", System.Text.RegularExpressions.RegexOptions.Singleline) + 'Dim oCleanFileName As String = String.Join(REPLACEChar, sFilename.Split(Path.GetInvalidFileNameChars())) + Dim oCleanFileName As New System.IO.FileInfo(System.Text.RegularExpressions.Regex.Replace(sFilename, String.Format("[{0}]", String.Join(String.Empty, Path.GetInvalidFileNameChars)), REPLACEChar)) If LogErrorsOnly = False Then ClassLogger.Add(" >> Filename after CleanFilename: '" & sFilename & "'", False) Return sFilename End Function diff --git a/Global_Indexer/ClassInit.vb b/Global_Indexer/ClassInit.vb index 83ad7d4..ad1a726 100644 --- a/Global_Indexer/ClassInit.vb +++ b/Global_Indexer/ClassInit.vb @@ -14,7 +14,6 @@ Public Class ClassInit ClassLogger.Add(">> Username: " & Environment.UserName, False) LOGCONFIG = New LogConfig(LogConfig.PathType.AppData) LOGGER = LOGCONFIG.GetLogger("Globix") - LOGGER.Info("Programmstart") LOGGER.Info("Username: {0}", Environment.UserName) End Sub @@ -76,11 +75,14 @@ Public Class ClassInit Public Function Load_BasicConfig() Try ClassDatabase.Init() - Dim sql As String = "select * from tbdd_Modules where NAME = 'Global-Indexer'" - Dim DT As DataTable = ClassDatabase.Return_Datatable(sql) + Dim oSql As String = "select * from tbdd_Modules where NAME = 'Global-Indexer'" + Dim DT As DataTable = ClassDatabase.Return_Datatable(oSql) If DT.Rows.Count = 1 Then GI_withWindream = DT.Rows(0).Item("BIT1") vWLaufwerk = DT.Rows(0).Item("STRING1") + + DTTBGI_REGEX_DOCTYPE = ClassDatabase.Return_Datatable("SELECT T1.DOCTYPE as DocType, T.* FROM TBGI_REGEX_DOCTYPE T, VWGI_DOCTYPE T1 WHERE T.DOCTYPE_ID = T1.DOCTYPE_ID") + Return True Else Return False End If @@ -199,7 +201,7 @@ Public Class ClassInit Try Dim sql = "SELECT MAX(GUID) FROM TBDD_USER WHERE (LOWER(USERNAME) = LOWER('@user'))" sql = sql.Replace("@user", Environment.UserName) - ClassLogger.Add(">> Username: " & Environment.UserName, False) + ' ClassLogger.Add(">> Username: " & Environment.UserName, False) USER_ID = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) Try diff --git a/Global_Indexer/Global_Indexer.vbproj b/Global_Indexer/Global_Indexer.vbproj index ce3ee88..e4fd5a4 100644 --- a/Global_Indexer/Global_Indexer.vbproj +++ b/Global_Indexer/Global_Indexer.vbproj @@ -144,6 +144,9 @@ False + + ..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + ..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll diff --git a/Global_Indexer/ModuleCURRENT.vb b/Global_Indexer/ModuleCURRENT.vb index 9cda48e..106ce0d 100644 --- a/Global_Indexer/ModuleCURRENT.vb +++ b/Global_Indexer/ModuleCURRENT.vb @@ -58,6 +58,7 @@ Module ModuleCURRENT Public DTACTUAL_FILES As DataTable Public DTEXCLUDE_FILES As DataTable + Public DTTBGI_REGEX_DOCTYPE As DataTable Public CURRENT_SQLRESULT As String Public DTSQL_RESULT As DataTable diff --git a/Global_Indexer/My Project/AssemblyInfo.vb b/Global_Indexer/My Project/AssemblyInfo.vb index c66aa06..20b2e28 100644 --- a/Global_Indexer/My Project/AssemblyInfo.vb +++ b/Global_Indexer/My Project/AssemblyInfo.vb @@ -33,7 +33,7 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + \ No newline at end of file diff --git a/Global_Indexer/My Project/Settings.Designer.vb b/Global_Indexer/My Project/Settings.Designer.vb index c36a9ca..f4ca914 100644 --- a/Global_Indexer/My Project/Settings.Designer.vb +++ b/Global_Indexer/My Project/Settings.Designer.vb @@ -162,6 +162,18 @@ Namespace My Me("REGEX_Replace") = value End Set End Property + + _ + Public Property FilenameTest() As String + Get + Return CType(Me("FilenameTest"),String) + End Get + Set + Me("FilenameTest") = value + End Set + End Property End Class End Namespace diff --git a/Global_Indexer/My Project/Settings.settings b/Global_Indexer/My Project/Settings.settings index 1b11124..81052ba 100644 --- a/Global_Indexer/My Project/Settings.settings +++ b/Global_Indexer/My Project/Settings.settings @@ -34,5 +34,8 @@ + + myFilename.pdf + \ No newline at end of file diff --git a/Global_Indexer/MyDataset.Designer.vb b/Global_Indexer/MyDataset.Designer.vb index e73964b..9dec06d 100644 --- a/Global_Indexer/MyDataset.Designer.vb +++ b/Global_Indexer/MyDataset.Designer.vb @@ -77,6 +77,8 @@ Partial Public Class MyDataset Private tableTBGI_HISTORY As TBGI_HISTORYDataTable + Private tableTBGI_REGEX_DOCTYPE As TBGI_REGEX_DOCTYPEDataTable + Private tableTBTempFiles2Index As TBTempFiles2IndexDataTable Private tableTBTEMP_INDEXRESULTS As TBTEMP_INDEXRESULTSDataTable @@ -113,6 +115,8 @@ Partial Public Class MyDataset Private relationFK_TBHOTKEY_WINDOW_HOOK_PROFILE_ID As Global.System.Data.DataRelation + Private relationFK_TBGI_REGEX_DOCTYPE_DTID As Global.System.Data.DataRelation + Private _schemaSerializationMode As Global.System.Data.SchemaSerializationMode = Global.System.Data.SchemaSerializationMode.IncludeSchema _ + Public ReadOnly Property TBGI_REGEX_DOCTYPE() As TBGI_REGEX_DOCTYPEDataTable + Get + Return Me.tableTBGI_REGEX_DOCTYPE + End Get + End Property + _ + Private Function ShouldSerializeTBGI_REGEX_DOCTYPE() As Boolean + Return false + End Function + _ Private Function ShouldSerializeTBTempFiles2Index() As Boolean @@ -1321,6 +1358,9 @@ Partial Public Class MyDataset _ Public Delegate Sub TBGI_HISTORYRowChangeEventHandler(ByVal sender As Object, ByVal e As TBGI_HISTORYRowChangeEvent) + _ + Public Delegate Sub TBGI_REGEX_DOCTYPERowChangeEventHandler(ByVal sender As Object, ByVal e As TBGI_REGEX_DOCTYPERowChangeEvent) + _ Public Delegate Sub TBTempFiles2IndexRowChangeEventHandler(ByVal sender As Object, ByVal e As TBTempFiles2IndexRowChangeEvent) @@ -11657,6 +11697,356 @@ Partial Public Class MyDataset End Function End Class + ''' + '''Represents the strongly named DataTable class. + ''' + _ + Partial Public Class TBGI_REGEX_DOCTYPEDataTable + Inherits Global.System.Data.TypedTableBase(Of TBGI_REGEX_DOCTYPERow) + + Private columnGUID As Global.System.Data.DataColumn + + Private columnREGEX As Global.System.Data.DataColumn + + Private columnDOCTYPE_ID As Global.System.Data.DataColumn + + Private columnADDED_WHO As Global.System.Data.DataColumn + + Private columnADDED_WHEN As Global.System.Data.DataColumn + + Private columnCHANGED_WHO As Global.System.Data.DataColumn + + Private columnCHANGED_WHEN As Global.System.Data.DataColumn + + _ + Public Sub New() + MyBase.New + Me.TableName = "TBGI_REGEX_DOCTYPE" + 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 GUIDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnGUID + End Get + End Property + + _ + Public ReadOnly Property REGEXColumn() As Global.System.Data.DataColumn + Get + Return Me.columnREGEX + End Get + End Property + + _ + Public ReadOnly Property DOCTYPE_IDColumn() As Global.System.Data.DataColumn + Get + Return Me.columnDOCTYPE_ID + End Get + End Property + + _ + Public ReadOnly Property ADDED_WHOColumn() As Global.System.Data.DataColumn + Get + Return Me.columnADDED_WHO + End Get + End Property + + _ + Public ReadOnly Property ADDED_WHENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnADDED_WHEN + End Get + End Property + + _ + Public ReadOnly Property CHANGED_WHOColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCHANGED_WHO + End Get + End Property + + _ + Public ReadOnly Property CHANGED_WHENColumn() As Global.System.Data.DataColumn + Get + Return Me.columnCHANGED_WHEN + End Get + End Property + + _ + 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 TBGI_REGEX_DOCTYPERow + Get + Return CType(Me.Rows(index),TBGI_REGEX_DOCTYPERow) + End Get + End Property + + _ + Public Event TBGI_REGEX_DOCTYPERowChanging As TBGI_REGEX_DOCTYPERowChangeEventHandler + + _ + Public Event TBGI_REGEX_DOCTYPERowChanged As TBGI_REGEX_DOCTYPERowChangeEventHandler + + _ + Public Event TBGI_REGEX_DOCTYPERowDeleting As TBGI_REGEX_DOCTYPERowChangeEventHandler + + _ + Public Event TBGI_REGEX_DOCTYPERowDeleted As TBGI_REGEX_DOCTYPERowChangeEventHandler + + _ + Public Overloads Sub AddTBGI_REGEX_DOCTYPERow(ByVal row As TBGI_REGEX_DOCTYPERow) + Me.Rows.Add(row) + End Sub + + _ + Public Overloads Function AddTBGI_REGEX_DOCTYPERow(ByVal REGEX As String, ByVal parentTBDD_DOKUMENTARTRowByFK_TBGI_REGEX_DOCTYPE_DTID As TBDD_DOKUMENTARTRow, ByVal ADDED_WHO As String, ByVal ADDED_WHEN As Date, ByVal CHANGED_WHO As String, ByVal CHANGED_WHEN As Date) As TBGI_REGEX_DOCTYPERow + Dim rowTBGI_REGEX_DOCTYPERow As TBGI_REGEX_DOCTYPERow = CType(Me.NewRow,TBGI_REGEX_DOCTYPERow) + Dim columnValuesArray() As Object = New Object() {Nothing, REGEX, Nothing, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN} + If (Not (parentTBDD_DOKUMENTARTRowByFK_TBGI_REGEX_DOCTYPE_DTID) Is Nothing) Then + columnValuesArray(2) = parentTBDD_DOKUMENTARTRowByFK_TBGI_REGEX_DOCTYPE_DTID(0) + End If + rowTBGI_REGEX_DOCTYPERow.ItemArray = columnValuesArray + Me.Rows.Add(rowTBGI_REGEX_DOCTYPERow) + Return rowTBGI_REGEX_DOCTYPERow + End Function + + _ + Public Function FindByGUID(ByVal GUID As Integer) As TBGI_REGEX_DOCTYPERow + Return CType(Me.Rows.Find(New Object() {GUID}),TBGI_REGEX_DOCTYPERow) + End Function + + _ + Public Overrides Function Clone() As Global.System.Data.DataTable + Dim cln As TBGI_REGEX_DOCTYPEDataTable = CType(MyBase.Clone,TBGI_REGEX_DOCTYPEDataTable) + cln.InitVars + Return cln + End Function + + _ + Protected Overrides Function CreateInstance() As Global.System.Data.DataTable + Return New TBGI_REGEX_DOCTYPEDataTable() + End Function + + _ + Friend Sub InitVars() + Me.columnGUID = MyBase.Columns("GUID") + Me.columnREGEX = MyBase.Columns("REGEX") + Me.columnDOCTYPE_ID = MyBase.Columns("DOCTYPE_ID") + Me.columnADDED_WHO = MyBase.Columns("ADDED_WHO") + Me.columnADDED_WHEN = MyBase.Columns("ADDED_WHEN") + Me.columnCHANGED_WHO = MyBase.Columns("CHANGED_WHO") + Me.columnCHANGED_WHEN = MyBase.Columns("CHANGED_WHEN") + End Sub + + _ + Private Sub InitClass() + Me.columnGUID = New Global.System.Data.DataColumn("GUID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnGUID) + Me.columnREGEX = New Global.System.Data.DataColumn("REGEX", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnREGEX) + Me.columnDOCTYPE_ID = New Global.System.Data.DataColumn("DOCTYPE_ID", GetType(Integer), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnDOCTYPE_ID) + Me.columnADDED_WHO = New Global.System.Data.DataColumn("ADDED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnADDED_WHO) + Me.columnADDED_WHEN = New Global.System.Data.DataColumn("ADDED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnADDED_WHEN) + Me.columnCHANGED_WHO = New Global.System.Data.DataColumn("CHANGED_WHO", GetType(String), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCHANGED_WHO) + Me.columnCHANGED_WHEN = New Global.System.Data.DataColumn("CHANGED_WHEN", GetType(Date), Nothing, Global.System.Data.MappingType.Element) + MyBase.Columns.Add(Me.columnCHANGED_WHEN) + Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true)) + Me.columnGUID.AutoIncrement = true + Me.columnGUID.AutoIncrementSeed = 1 + Me.columnGUID.AllowDBNull = false + Me.columnGUID.ReadOnly = true + Me.columnGUID.Unique = true + Me.columnREGEX.AllowDBNull = false + Me.columnREGEX.MaxLength = 500 + Me.columnADDED_WHO.AllowDBNull = false + Me.columnADDED_WHO.MaxLength = 50 + Me.columnCHANGED_WHO.MaxLength = 50 + End Sub + + _ + Public Function NewTBGI_REGEX_DOCTYPERow() As TBGI_REGEX_DOCTYPERow + Return CType(Me.NewRow,TBGI_REGEX_DOCTYPERow) + End Function + + _ + Protected Overrides Function NewRowFromBuilder(ByVal builder As Global.System.Data.DataRowBuilder) As Global.System.Data.DataRow + Return New TBGI_REGEX_DOCTYPERow(builder) + End Function + + _ + Protected Overrides Function GetRowType() As Global.System.Type + Return GetType(TBGI_REGEX_DOCTYPERow) + End Function + + _ + Protected Overrides Sub OnRowChanged(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanged(e) + If (Not (Me.TBGI_REGEX_DOCTYPERowChangedEvent) Is Nothing) Then + RaiseEvent TBGI_REGEX_DOCTYPERowChanged(Me, New TBGI_REGEX_DOCTYPERowChangeEvent(CType(e.Row,TBGI_REGEX_DOCTYPERow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowChanging(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowChanging(e) + If (Not (Me.TBGI_REGEX_DOCTYPERowChangingEvent) Is Nothing) Then + RaiseEvent TBGI_REGEX_DOCTYPERowChanging(Me, New TBGI_REGEX_DOCTYPERowChangeEvent(CType(e.Row,TBGI_REGEX_DOCTYPERow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleted(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleted(e) + If (Not (Me.TBGI_REGEX_DOCTYPERowDeletedEvent) Is Nothing) Then + RaiseEvent TBGI_REGEX_DOCTYPERowDeleted(Me, New TBGI_REGEX_DOCTYPERowChangeEvent(CType(e.Row,TBGI_REGEX_DOCTYPERow), e.Action)) + End If + End Sub + + _ + Protected Overrides Sub OnRowDeleting(ByVal e As Global.System.Data.DataRowChangeEventArgs) + MyBase.OnRowDeleting(e) + If (Not (Me.TBGI_REGEX_DOCTYPERowDeletingEvent) Is Nothing) Then + RaiseEvent TBGI_REGEX_DOCTYPERowDeleting(Me, New TBGI_REGEX_DOCTYPERowChangeEvent(CType(e.Row,TBGI_REGEX_DOCTYPERow), e.Action)) + End If + End Sub + + _ + Public Sub RemoveTBGI_REGEX_DOCTYPERow(ByVal row As TBGI_REGEX_DOCTYPERow) + Me.Rows.Remove(row) + End Sub + + _ + Public Shared Function GetTypedTableSchema(ByVal xs As Global.System.Xml.Schema.XmlSchemaSet) As Global.System.Xml.Schema.XmlSchemaComplexType + Dim type As Global.System.Xml.Schema.XmlSchemaComplexType = New Global.System.Xml.Schema.XmlSchemaComplexType() + Dim sequence As Global.System.Xml.Schema.XmlSchemaSequence = New Global.System.Xml.Schema.XmlSchemaSequence() + Dim ds As MyDataset = New MyDataset() + Dim any1 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any1.Namespace = "http://www.w3.org/2001/XMLSchema" + any1.MinOccurs = New Decimal(0) + any1.MaxOccurs = Decimal.MaxValue + any1.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any1) + Dim any2 As Global.System.Xml.Schema.XmlSchemaAny = New Global.System.Xml.Schema.XmlSchemaAny() + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1" + any2.MinOccurs = New Decimal(1) + any2.ProcessContents = Global.System.Xml.Schema.XmlSchemaContentProcessing.Lax + sequence.Items.Add(any2) + Dim attribute1 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute1.Name = "namespace" + attribute1.FixedValue = ds.Namespace + type.Attributes.Add(attribute1) + Dim attribute2 As Global.System.Xml.Schema.XmlSchemaAttribute = New Global.System.Xml.Schema.XmlSchemaAttribute() + attribute2.Name = "tableTypeName" + attribute2.FixedValue = "TBGI_REGEX_DOCTYPEDataTable" + 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. ''' @@ -13087,6 +13477,16 @@ Partial Public Class MyDataset Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBDD_INDEX_MAN_DAID")),TBDD_INDEX_MANRow()) End If End Function + + _ + Public Function GetTBGI_REGEX_DOCTYPERows() As TBGI_REGEX_DOCTYPERow() + If (Me.Table.ChildRelations("FK_TBGI_REGEX_DOCTYPE_DTID") Is Nothing) Then + Return New TBGI_REGEX_DOCTYPERow(-1) {} + Else + Return CType(MyBase.GetChildRows(Me.Table.ChildRelations("FK_TBGI_REGEX_DOCTYPE_DTID")),TBGI_REGEX_DOCTYPERow()) + End If + End Function End Class ''' @@ -18042,6 +18442,174 @@ Partial Public Class MyDataset End Sub End Class + ''' + '''Represents strongly named DataRow class. + ''' + Partial Public Class TBGI_REGEX_DOCTYPERow + Inherits Global.System.Data.DataRow + + Private tableTBGI_REGEX_DOCTYPE As TBGI_REGEX_DOCTYPEDataTable + + _ + Friend Sub New(ByVal rb As Global.System.Data.DataRowBuilder) + MyBase.New(rb) + Me.tableTBGI_REGEX_DOCTYPE = CType(Me.Table,TBGI_REGEX_DOCTYPEDataTable) + End Sub + + _ + Public Property GUID() As Integer + Get + Return CType(Me(Me.tableTBGI_REGEX_DOCTYPE.GUIDColumn),Integer) + End Get + Set + Me(Me.tableTBGI_REGEX_DOCTYPE.GUIDColumn) = value + End Set + End Property + + _ + Public Property REGEX() As String + Get + Return CType(Me(Me.tableTBGI_REGEX_DOCTYPE.REGEXColumn),String) + End Get + Set + Me(Me.tableTBGI_REGEX_DOCTYPE.REGEXColumn) = value + End Set + End Property + + _ + Public Property DOCTYPE_ID() As Integer + Get + Try + Return CType(Me(Me.tableTBGI_REGEX_DOCTYPE.DOCTYPE_IDColumn),Integer) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte DOCTYPE_ID in Tabelle TBGI_REGEX_DOCTYPE ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBGI_REGEX_DOCTYPE.DOCTYPE_IDColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHO() As String + Get + Return CType(Me(Me.tableTBGI_REGEX_DOCTYPE.ADDED_WHOColumn),String) + End Get + Set + Me(Me.tableTBGI_REGEX_DOCTYPE.ADDED_WHOColumn) = value + End Set + End Property + + _ + Public Property ADDED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBGI_REGEX_DOCTYPE.ADDED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte ADDED_WHEN in Tabelle TBGI_REGEX_DOCTYPE ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBGI_REGEX_DOCTYPE.ADDED_WHENColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHO() As String + Get + Try + Return CType(Me(Me.tableTBGI_REGEX_DOCTYPE.CHANGED_WHOColumn),String) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHO in Tabelle TBGI_REGEX_DOCTYPE ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBGI_REGEX_DOCTYPE.CHANGED_WHOColumn) = value + End Set + End Property + + _ + Public Property CHANGED_WHEN() As Date + Get + Try + Return CType(Me(Me.tableTBGI_REGEX_DOCTYPE.CHANGED_WHENColumn),Date) + Catch e As Global.System.InvalidCastException + Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CHANGED_WHEN in Tabelle TBGI_REGEX_DOCTYPE ist DBNull.", e) + End Try + End Get + Set + Me(Me.tableTBGI_REGEX_DOCTYPE.CHANGED_WHENColumn) = value + End Set + End Property + + _ + Public Property TBDD_DOKUMENTARTRow() As TBDD_DOKUMENTARTRow + Get + Return CType(Me.GetParentRow(Me.Table.ParentRelations("FK_TBGI_REGEX_DOCTYPE_DTID")),TBDD_DOKUMENTARTRow) + End Get + Set + Me.SetParentRow(value, Me.Table.ParentRelations("FK_TBGI_REGEX_DOCTYPE_DTID")) + End Set + End Property + + _ + Public Function IsDOCTYPE_IDNull() As Boolean + Return Me.IsNull(Me.tableTBGI_REGEX_DOCTYPE.DOCTYPE_IDColumn) + End Function + + _ + Public Sub SetDOCTYPE_IDNull() + Me(Me.tableTBGI_REGEX_DOCTYPE.DOCTYPE_IDColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsADDED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBGI_REGEX_DOCTYPE.ADDED_WHENColumn) + End Function + + _ + Public Sub SetADDED_WHENNull() + Me(Me.tableTBGI_REGEX_DOCTYPE.ADDED_WHENColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHONull() As Boolean + Return Me.IsNull(Me.tableTBGI_REGEX_DOCTYPE.CHANGED_WHOColumn) + End Function + + _ + Public Sub SetCHANGED_WHONull() + Me(Me.tableTBGI_REGEX_DOCTYPE.CHANGED_WHOColumn) = Global.System.Convert.DBNull + End Sub + + _ + Public Function IsCHANGED_WHENNull() As Boolean + Return Me.IsNull(Me.tableTBGI_REGEX_DOCTYPE.CHANGED_WHENColumn) + End Function + + _ + Public Sub SetCHANGED_WHENNull() + Me(Me.tableTBGI_REGEX_DOCTYPE.CHANGED_WHENColumn) = Global.System.Convert.DBNull + End Sub + End Class + ''' '''Represents strongly named DataRow class. ''' @@ -19323,6 +19891,42 @@ Partial Public Class MyDataset End Property End Class + ''' + '''Row event argument class + ''' + _ + Public Class TBGI_REGEX_DOCTYPERowChangeEvent + Inherits Global.System.EventArgs + + Private eventRow As TBGI_REGEX_DOCTYPERow + + Private eventAction As Global.System.Data.DataRowAction + + _ + Public Sub New(ByVal row As TBGI_REGEX_DOCTYPERow, ByVal action As Global.System.Data.DataRowAction) + MyBase.New + Me.eventRow = row + Me.eventAction = action + End Sub + + _ + Public ReadOnly Property Row() As TBGI_REGEX_DOCTYPERow + 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 ''' @@ -28258,6 +28862,386 @@ Namespace MyDatasetTableAdapters End Function End Class + ''' + '''Represents the connection and commands used to retrieve and save data. + ''' + _ + Partial Public Class TBGI_REGEX_DOCTYPETableAdapter + 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 = "TBGI_REGEX_DOCTYPE" + tableMapping.ColumnMappings.Add("GUID", "GUID") + tableMapping.ColumnMappings.Add("REGEX", "REGEX") + tableMapping.ColumnMappings.Add("DOCTYPE_ID", "DOCTYPE_ID") + tableMapping.ColumnMappings.Add("ADDED_WHO", "ADDED_WHO") + tableMapping.ColumnMappings.Add("ADDED_WHEN", "ADDED_WHEN") + tableMapping.ColumnMappings.Add("CHANGED_WHO", "CHANGED_WHO") + tableMapping.ColumnMappings.Add("CHANGED_WHEN", "CHANGED_WHEN") + Me._adapter.TableMappings.Add(tableMapping) + Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.DeleteCommand.Connection = Me.Connection + Me._adapter.DeleteCommand.CommandText = "DELETE FROM [TBGI_REGEX_DOCTYPE] WHERE (([GUID] = @Original_GUID) AND ([REGEX] = "& _ + "@Original_REGEX) AND ((@IsNull_DOCTYPE_ID = 1 AND [DOCTYPE_ID] IS NULL) OR ([DOC"& _ + "TYPE_ID] = @Original_DOCTYPE_ID)) AND ([ADDED_WHO] = @Original_ADDED_WHO) AND (("& _ + "@IsNull_ADDED_WHEN = 1 AND [ADDED_WHEN] IS NULL) OR ([ADDED_WHEN] = @Original_AD"& _ + "DED_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)))" + 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, 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_REGEX", Global.System.Data.SqlDbType.VarChar, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IsNull_DOCTYPE_ID", Global.System.Data.SqlDbType.Int, 0, Global.System.Data.ParameterDirection.Input, 0, 0, "DOCTYPE_ID", Global.System.Data.DataRowVersion.Original, true, 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_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.InsertCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.InsertCommand.Connection = Me.Connection + Me._adapter.InsertCommand.CommandText = "INSERT INTO TBGI_REGEX_DOCTYPE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&" (REGEX, DOCTYPE_ID, ADDE"& _ + "D_WHO)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES (@REGEX,@DOCTYPE_ID,@ADDED_WHO); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, REGEX, DOC"& _ + "TYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBGI_REGEX_DOCTYP"& _ + "E WHERE (GUID = SCOPE_IDENTITY())" + Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@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("@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.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand() + Me._adapter.UpdateCommand.Connection = Me.Connection + Me._adapter.UpdateCommand.CommandText = "UPDATE TBGI_REGEX_DOCTYPE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET REGEX = @REGEX, DOCTYPE_ID = "& _ + "@DOCTYPE_ID, CHANGED_WHO = @CHANGED_WHO"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHE"& _ + "N FROM TBGI_REGEX_DOCTYPE WHERE (GUID = @GUID)" + Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX", Global.System.Data.SqlDbType.VarChar, 500, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@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("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", "")) + End Sub + + _ + Private Sub InitConnection() + Me._connection = New Global.System.Data.SqlClient.SqlConnection() + Me._connection.ConnectionString = Global.Global_Indexer.My.MySettings.Default.DD_ECMConnectionString + End Sub + + _ + Private Sub InitCommandCollection() + Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(0) {} + Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand() + Me._commandCollection(0).Connection = Me.Connection + Me._commandCollection(0).CommandText = "SELECT TBGI_REGEX_DOCTYPE.*"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM TBGI_REGEX_DOCTYPE" + Me._commandCollection(0).CommandType = Global.System.Data.CommandType.Text + End Sub + + _ + Public Overloads Overridable Function Fill(ByVal dataTable As MyDataset.TBGI_REGEX_DOCTYPEDataTable) As Integer + Me.Adapter.SelectCommand = Me.CommandCollection(0) + If (Me.ClearBeforeFill = true) Then + dataTable.Clear + End If + Dim returnValue As Integer = Me.Adapter.Fill(dataTable) + Return returnValue + End Function + + _ + Public Overloads Overridable Function GetData() As MyDataset.TBGI_REGEX_DOCTYPEDataTable + Me.Adapter.SelectCommand = Me.CommandCollection(0) + Dim dataTable As MyDataset.TBGI_REGEX_DOCTYPEDataTable = New MyDataset.TBGI_REGEX_DOCTYPEDataTable() + Me.Adapter.Fill(dataTable) + Return dataTable + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataTable As MyDataset.TBGI_REGEX_DOCTYPEDataTable) As Integer + Return Me.Adapter.Update(dataTable) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataSet As MyDataset) As Integer + Return Me.Adapter.Update(dataSet, "TBGI_REGEX_DOCTYPE") + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRow As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(New Global.System.Data.DataRow() {dataRow}) + End Function + + _ + Public Overloads Overridable Function Update(ByVal dataRows() As Global.System.Data.DataRow) As Integer + Return Me.Adapter.Update(dataRows) + End Function + + _ + Public Overloads Overridable Function Delete(ByVal Original_GUID As Integer, ByVal Original_REGEX As String, ByVal Original_DOCTYPE_ID As Global.System.Nullable(Of Integer), 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)) As Integer + Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_GUID,Integer) + If (Original_REGEX Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_REGEX") + Else + Me.Adapter.DeleteCommand.Parameters(1).Value = CType(Original_REGEX,String) + End If + If (Original_DOCTYPE_ID.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(2).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(3).Value = CType(Original_DOCTYPE_ID.Value,Integer) + Else + Me.Adapter.DeleteCommand.Parameters(2).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(3).Value = Global.System.DBNull.Value + End If + If (Original_ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("Original_ADDED_WHO") + Else + Me.Adapter.DeleteCommand.Parameters(4).Value = CType(Original_ADDED_WHO,String) + End If + If (Original_ADDED_WHEN.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(5).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(6).Value = CType(Original_ADDED_WHEN.Value,Date) + Else + Me.Adapter.DeleteCommand.Parameters(5).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(6).Value = Global.System.DBNull.Value + End If + If (Original_CHANGED_WHO Is Nothing) Then + Me.Adapter.DeleteCommand.Parameters(7).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(8).Value = Global.System.DBNull.Value + Else + Me.Adapter.DeleteCommand.Parameters(7).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(8).Value = CType(Original_CHANGED_WHO,String) + End If + If (Original_CHANGED_WHEN.HasValue = true) Then + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(0,Object) + Me.Adapter.DeleteCommand.Parameters(10).Value = CType(Original_CHANGED_WHEN.Value,Date) + Else + Me.Adapter.DeleteCommand.Parameters(9).Value = CType(1,Object) + Me.Adapter.DeleteCommand.Parameters(10).Value = Global.System.DBNull.Value + End If + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State + If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.DeleteCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.DeleteCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.DeleteCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Insert(ByVal REGEX As String, ByVal DOCTYPE_ID As Global.System.Nullable(Of Integer), ByVal ADDED_WHO As String) As Integer + If (REGEX Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX") + Else + Me.Adapter.InsertCommand.Parameters(0).Value = CType(REGEX,String) + End If + If (DOCTYPE_ID.HasValue = true) Then + Me.Adapter.InsertCommand.Parameters(1).Value = CType(DOCTYPE_ID.Value,Integer) + Else + Me.Adapter.InsertCommand.Parameters(1).Value = Global.System.DBNull.Value + End If + If (ADDED_WHO Is Nothing) Then + Throw New Global.System.ArgumentNullException("ADDED_WHO") + Else + Me.Adapter.InsertCommand.Parameters(2).Value = CType(ADDED_WHO,String) + End If + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State + If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.InsertCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.InsertCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.InsertCommand.Connection.Close + End If + End Try + End Function + + _ + Public Overloads Overridable Function Update(ByVal REGEX As String, ByVal DOCTYPE_ID As Global.System.Nullable(Of Integer), ByVal CHANGED_WHO As String, ByVal Original_GUID As Integer, ByVal GUID As Integer) As Integer + If (REGEX Is Nothing) Then + Throw New Global.System.ArgumentNullException("REGEX") + Else + Me.Adapter.UpdateCommand.Parameters(0).Value = CType(REGEX,String) + End If + If (DOCTYPE_ID.HasValue = true) Then + Me.Adapter.UpdateCommand.Parameters(1).Value = CType(DOCTYPE_ID.Value,Integer) + Else + Me.Adapter.UpdateCommand.Parameters(1).Value = Global.System.DBNull.Value + End If + If (CHANGED_WHO Is Nothing) Then + Me.Adapter.UpdateCommand.Parameters(2).Value = Global.System.DBNull.Value + Else + Me.Adapter.UpdateCommand.Parameters(2).Value = CType(CHANGED_WHO,String) + End If + Me.Adapter.UpdateCommand.Parameters(3).Value = CType(Original_GUID,Integer) + Me.Adapter.UpdateCommand.Parameters(4).Value = CType(GUID,Integer) + Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State + If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open) _ + <> Global.System.Data.ConnectionState.Open) Then + Me.Adapter.UpdateCommand.Connection.Open + End If + Try + Dim returnValue As Integer = Me.Adapter.UpdateCommand.ExecuteNonQuery + Return returnValue + Finally + If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then + Me.Adapter.UpdateCommand.Connection.Close + End If + End Try + End Function + End Class + ''' '''TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios ''' @@ -28303,6 +29287,8 @@ Namespace MyDatasetTableAdapters Private _tBHOTKEY_WINDOW_HOOKTableAdapter As TBHOTKEY_WINDOW_HOOKTableAdapter + Private _tBGI_REGEX_DOCTYPETableAdapter As TBGI_REGEX_DOCTYPETableAdapter + Private _backupDataSetBeforeUpdate As Boolean Private _connection As Global.System.Data.IDbConnection @@ -28542,6 +29528,20 @@ Namespace MyDatasetTableAdapters End Set End Property + _ + Public Property TBGI_REGEX_DOCTYPETableAdapter() As TBGI_REGEX_DOCTYPETableAdapter + Get + Return Me._tBGI_REGEX_DOCTYPETableAdapter + End Get + Set + Me._tBGI_REGEX_DOCTYPETableAdapter = value + End Set + End Property + _ Public Property BackupDataSetBeforeUpdate() As Boolean @@ -28625,6 +29625,10 @@ Namespace MyDatasetTableAdapters AndAlso (Not (Me._tBHOTKEY_WINDOW_HOOKTableAdapter.Connection) Is Nothing)) Then Return Me._tBHOTKEY_WINDOW_HOOKTableAdapter.Connection End If + If ((Not (Me._tBGI_REGEX_DOCTYPETableAdapter) Is Nothing) _ + AndAlso (Not (Me._tBGI_REGEX_DOCTYPETableAdapter.Connection) Is Nothing)) Then + Return Me._tBGI_REGEX_DOCTYPETableAdapter.Connection + End If Return Nothing End Get Set @@ -28686,6 +29690,9 @@ Namespace MyDatasetTableAdapters If (Not (Me._tBHOTKEY_WINDOW_HOOKTableAdapter) Is Nothing) Then count = (count + 1) End If + If (Not (Me._tBGI_REGEX_DOCTYPETableAdapter) Is Nothing) Then + count = (count + 1) + End If Return count End Get End Property @@ -28841,6 +29848,15 @@ Namespace MyDatasetTableAdapters allChangedRows.AddRange(updatedRows) End If End If + If (Not (Me._tBGI_REGEX_DOCTYPETableAdapter) Is Nothing) Then + Dim updatedRows() As Global.System.Data.DataRow = dataSet.TBGI_REGEX_DOCTYPE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.ModifiedCurrent) + updatedRows = Me.GetRealUpdatedRows(updatedRows, allAddedRows) + If ((Not (updatedRows) Is Nothing) _ + AndAlso (0 < updatedRows.Length)) Then + result = (result + Me._tBGI_REGEX_DOCTYPETableAdapter.Update(updatedRows)) + allChangedRows.AddRange(updatedRows) + End If + End If Return result End Function @@ -28979,6 +29995,14 @@ Namespace MyDatasetTableAdapters allAddedRows.AddRange(addedRows) End If End If + If (Not (Me._tBGI_REGEX_DOCTYPETableAdapter) Is Nothing) Then + Dim addedRows() As Global.System.Data.DataRow = dataSet.TBGI_REGEX_DOCTYPE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Added) + If ((Not (addedRows) Is Nothing) _ + AndAlso (0 < addedRows.Length)) Then + result = (result + Me._tBGI_REGEX_DOCTYPETableAdapter.Update(addedRows)) + allAddedRows.AddRange(addedRows) + End If + End If Return result End Function @@ -28989,6 +30013,14 @@ Namespace MyDatasetTableAdapters Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")> _ Private Function UpdateDeletedRows(ByVal dataSet As MyDataset, ByVal allChangedRows As Global.System.Collections.Generic.List(Of Global.System.Data.DataRow)) As Integer Dim result As Integer = 0 + If (Not (Me._tBGI_REGEX_DOCTYPETableAdapter) Is Nothing) Then + Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBGI_REGEX_DOCTYPE.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) + If ((Not (deletedRows) Is Nothing) _ + AndAlso (0 < deletedRows.Length)) Then + result = (result + Me._tBGI_REGEX_DOCTYPETableAdapter.Update(deletedRows)) + allChangedRows.AddRange(deletedRows) + End If + End If If (Not (Me._tBGI_CONFIGURATIONTableAdapter) Is Nothing) Then Dim deletedRows() As Global.System.Data.DataRow = dataSet.TBGI_CONFIGURATION.Select(Nothing, Nothing, Global.System.Data.DataViewRowState.Deleted) If ((Not (deletedRows) Is Nothing) _ @@ -29238,6 +30270,11 @@ Namespace MyDatasetTableAdapters Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ "s die gleiche Verbindungszeichenfolge verwendet werden.") End If + If ((Not (Me._tBGI_REGEX_DOCTYPETableAdapter) Is Nothing) _ + AndAlso (Me.MatchTableAdapterConnection(Me._tBGI_REGEX_DOCTYPETableAdapter.Connection) = false)) Then + Throw New Global.System.ArgumentException("Für alle von einem TableAdapterManager verwalteten Instanzen von TableAdapter mus"& _ + "s die gleiche Verbindungszeichenfolge verwendet werden.") + End If Dim workConnection As Global.System.Data.IDbConnection = Me.Connection If (workConnection Is Nothing) Then Throw New Global.System.ApplicationException("TableAdapterManager enthält keine Verbindungsinformationen. Legen Sie jede TableA"& _ @@ -29416,6 +30453,15 @@ Namespace MyDatasetTableAdapters adaptersWithAcceptChangesDuringUpdate.Add(Me._tBHOTKEY_WINDOW_HOOKTableAdapter.Adapter) End If End If + If (Not (Me._tBGI_REGEX_DOCTYPETableAdapter) Is Nothing) Then + revertConnections.Add(Me._tBGI_REGEX_DOCTYPETableAdapter, Me._tBGI_REGEX_DOCTYPETableAdapter.Connection) + Me._tBGI_REGEX_DOCTYPETableAdapter.Connection = CType(workConnection,Global.System.Data.SqlClient.SqlConnection) + Me._tBGI_REGEX_DOCTYPETableAdapter.Transaction = CType(workTransaction,Global.System.Data.SqlClient.SqlTransaction) + If Me._tBGI_REGEX_DOCTYPETableAdapter.Adapter.AcceptChangesDuringUpdate Then + Me._tBGI_REGEX_DOCTYPETableAdapter.Adapter.AcceptChangesDuringUpdate = false + adaptersWithAcceptChangesDuringUpdate.Add(Me._tBGI_REGEX_DOCTYPETableAdapter.Adapter) + End If + End If ' '---- Perform updates ----------- ' @@ -29540,6 +30586,10 @@ Namespace MyDatasetTableAdapters Me._tBHOTKEY_WINDOW_HOOKTableAdapter.Connection = CType(revertConnections(Me._tBHOTKEY_WINDOW_HOOKTableAdapter),Global.System.Data.SqlClient.SqlConnection) Me._tBHOTKEY_WINDOW_HOOKTableAdapter.Transaction = Nothing End If + If (Not (Me._tBGI_REGEX_DOCTYPETableAdapter) Is Nothing) Then + Me._tBGI_REGEX_DOCTYPETableAdapter.Connection = CType(revertConnections(Me._tBGI_REGEX_DOCTYPETableAdapter),Global.System.Data.SqlClient.SqlConnection) + Me._tBGI_REGEX_DOCTYPETableAdapter.Transaction = Nothing + End If If (0 < adaptersWithAcceptChangesDuringUpdate.Count) Then Dim adapters((adaptersWithAcceptChangesDuringUpdate.Count) - 1) As Global.System.Data.Common.DataAdapter adaptersWithAcceptChangesDuringUpdate.CopyTo(adapters) diff --git a/Global_Indexer/MyDataset.xsc b/Global_Indexer/MyDataset.xsc index 842f8e2..8bee556 100644 --- a/Global_Indexer/MyDataset.xsc +++ b/Global_Indexer/MyDataset.xsc @@ -336,5 +336,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Global_Indexer/MyDataset.xsd b/Global_Indexer/MyDataset.xsd index a400f71..0625c7d 100644 --- a/Global_Indexer/MyDataset.xsd +++ b/Global_Indexer/MyDataset.xsd @@ -1747,6 +1747,75 @@ ORDER BY GUID DESC + + + + + + DELETE FROM [TBGI_REGEX_DOCTYPE] WHERE (([GUID] = @Original_GUID) AND ([REGEX] = @Original_REGEX) AND ((@IsNull_DOCTYPE_ID = 1 AND [DOCTYPE_ID] IS NULL) OR ([DOCTYPE_ID] = @Original_DOCTYPE_ID)) 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))) + + + + + + + + + + + + + + + + + + INSERT INTO TBGI_REGEX_DOCTYPE + (REGEX, DOCTYPE_ID, ADDED_WHO) +VALUES (@REGEX,@DOCTYPE_ID,@ADDED_WHO); +SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBGI_REGEX_DOCTYPE WHERE (GUID = SCOPE_IDENTITY()) + + + + + + + + + + SELECT TBGI_REGEX_DOCTYPE.* +FROM TBGI_REGEX_DOCTYPE + + + + + + UPDATE TBGI_REGEX_DOCTYPE +SET REGEX = @REGEX, DOCTYPE_ID = @DOCTYPE_ID, CHANGED_WHO = @CHANGED_WHO +WHERE (GUID = @Original_GUID); +SELECT GUID, REGEX, DOCTYPE_ID, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN FROM TBGI_REGEX_DOCTYPE WHERE (GUID = @GUID) + + + + + + + + + + + + + + + + + + + + + + @@ -1755,7 +1824,7 @@ ORDER BY GUID DESC - + @@ -1820,7 +1889,7 @@ ORDER BY GUID DESC - + @@ -1903,7 +1972,7 @@ ORDER BY GUID DESC - + @@ -1940,7 +2009,7 @@ ORDER BY GUID DESC - + @@ -1954,7 +2023,7 @@ ORDER BY GUID DESC - + @@ -1968,7 +2037,7 @@ ORDER BY GUID DESC - + @@ -2050,7 +2119,7 @@ ORDER BY GUID DESC - + @@ -2123,7 +2192,7 @@ ORDER BY GUID DESC - + @@ -2236,7 +2305,7 @@ ORDER BY GUID DESC - + @@ -2332,7 +2401,7 @@ ORDER BY GUID DESC - + @@ -2387,7 +2456,7 @@ ORDER BY GUID DESC - + @@ -2395,7 +2464,7 @@ ORDER BY GUID DESC - + @@ -2445,7 +2514,7 @@ ORDER BY GUID DESC - + @@ -2517,7 +2586,7 @@ ORDER BY GUID DESC - + @@ -2598,7 +2667,7 @@ ORDER BY GUID DESC - + @@ -2612,7 +2681,7 @@ ORDER BY GUID DESC - + @@ -2621,7 +2690,7 @@ ORDER BY GUID DESC - + @@ -2651,7 +2720,7 @@ ORDER BY GUID DESC - + @@ -2676,7 +2745,7 @@ ORDER BY GUID DESC - + @@ -2715,7 +2784,7 @@ ORDER BY GUID DESC - + @@ -2747,7 +2816,7 @@ ORDER BY GUID DESC - + @@ -2819,7 +2888,7 @@ ORDER BY GUID DESC - + @@ -2858,7 +2927,7 @@ ORDER BY GUID DESC - + @@ -2872,7 +2941,7 @@ ORDER BY GUID DESC - + @@ -2918,7 +2987,7 @@ ORDER BY GUID DESC - + @@ -2978,7 +3047,7 @@ ORDER BY GUID DESC - + @@ -3010,7 +3079,7 @@ ORDER BY GUID DESC - + @@ -3048,7 +3117,7 @@ ORDER BY GUID DESC - + @@ -3070,7 +3139,7 @@ ORDER BY GUID DESC - + @@ -3082,6 +3151,37 @@ ORDER BY GUID DESC + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3188,24 +3288,29 @@ ORDER BY GUID DESC + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Global_Indexer/MyDataset.xss b/Global_Indexer/MyDataset.xss index a40f0f5..4a0bae4 100644 --- a/Global_Indexer/MyDataset.xss +++ b/Global_Indexer/MyDataset.xss @@ -4,40 +4,41 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + 431 @@ -49,7 +50,7 @@ - + 543 @@ -61,7 +62,7 @@ - + 397 @@ -73,7 +74,7 @@ - + 605 @@ -89,7 +90,7 @@ - + 959 @@ -101,7 +102,7 @@ - + 1096 @@ -117,7 +118,7 @@ - + 951 @@ -133,7 +134,7 @@ - + 94 @@ -153,7 +154,7 @@ - + 129 @@ -169,7 +170,7 @@ - + 183 @@ -181,7 +182,7 @@ - + 88 @@ -201,7 +202,7 @@ - + 117 @@ -221,7 +222,7 @@ - + 765 @@ -237,7 +238,7 @@ - + 409 @@ -257,7 +258,7 @@ - + 38 @@ -277,5 +278,21 @@ + + + + 380 + 689 + + + 380 + 898 + + + 1027 + 898 + + + \ No newline at end of file diff --git a/Global_Indexer/frmAdministration.Designer.vb b/Global_Indexer/frmAdministration.Designer.vb index 0dc1ce3..524b395 100644 --- a/Global_Indexer/frmAdministration.Designer.vb +++ b/Global_Indexer/frmAdministration.Designer.vb @@ -93,6 +93,13 @@ Partial Class frmAdministration Dim Label9 As System.Windows.Forms.Label Dim LANGUAGELabel As System.Windows.Forms.Label Dim SHORTNAMELabel As System.Windows.Forms.Label + Dim GUIDLabel7 As System.Windows.Forms.Label + Dim REGEXLabel As System.Windows.Forms.Label + Dim DOCTYPE_IDLabel As System.Windows.Forms.Label + Dim ADDED_WHOLabel6 As System.Windows.Forms.Label + Dim ADDED_WHENLabel6 As System.Windows.Forms.Label + Dim CHANGED_WHOLabel6 As System.Windows.Forms.Label + Dim CHANGED_WHENLabel6 As System.Windows.Forms.Label Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage() @@ -378,6 +385,32 @@ Partial Class frmAdministration Me.btnidxemail_Save = New System.Windows.Forms.Button() Me.btnidxemail_add = New System.Windows.Forms.Button() Me.ListBoxObjekttypen = New System.Windows.Forms.ListBox() + Me.XtraTabPage11 = New DevExpress.XtraTab.XtraTabPage() + Me.GroupBox7 = New System.Windows.Forms.GroupBox() + Me.cmbDoctypeRegex = New System.Windows.Forms.ComboBox() + Me.TBGI_REGEX_DOCTYPEBindingSource = New System.Windows.Forms.BindingSource(Me.components) + Me.txtFilenameTest = New System.Windows.Forms.TextBox() + Me.Label11 = New System.Windows.Forms.Label() + Me.Button5 = New System.Windows.Forms.Button() + Me.GUIDTextBox = New System.Windows.Forms.TextBox() + Me.REGEXTextBox = New System.Windows.Forms.TextBox() + Me.ADDED_WHOTextBox6 = New System.Windows.Forms.TextBox() + Me.ADDED_WHENTextBox6 = New System.Windows.Forms.TextBox() + Me.CHANGED_WHOTextBox1 = New System.Windows.Forms.TextBox() + Me.CHANGED_WHENTextBox6 = New System.Windows.Forms.TextBox() + Me.BindingNavigator3 = New System.Windows.Forms.BindingNavigator(Me.components) + Me.BindingNavigatorCountItem1 = New System.Windows.Forms.ToolStripLabel() + Me.BindingNavigatorDeleteItem1 = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorMoveFirstItem1 = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorMovePreviousItem1 = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorSeparator3 = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorPositionItem1 = New System.Windows.Forms.ToolStripTextBox() + Me.BindingNavigatorSeparator4 = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorMoveNextItem1 = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorMoveLastItem1 = New System.Windows.Forms.ToolStripButton() + Me.BindingNavigatorSeparator5 = New System.Windows.Forms.ToolStripSeparator() + Me.BindingNavigatorAddNewItem1 = New System.Windows.Forms.ToolStripButton() + Me.ToolStripButton42 = New System.Windows.Forms.ToolStripButton() Me.TBGI_CONFIGURATIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_DOKUMENTARTTableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBDD_DOKUMENTARTTableAdapter() Me.TableAdapterManager = New Global_Indexer.MyDatasetTableAdapters.TableAdapterManager() @@ -396,6 +429,7 @@ Partial Class frmAdministration Me.TBDD_GROUPS_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.TBDD_GROUPS_USERTableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBDD_GROUPS_USERTableAdapter() Me.VWGI_DOCTYPE_GROUPTableAdapter = New Global_Indexer.MyDatasetTableAdapters.VWGI_DOCTYPE_GROUPTableAdapter() + Me.TBGI_REGEX_DOCTYPETableAdapter = New Global_Indexer.MyDatasetTableAdapters.TBGI_REGEX_DOCTYPETableAdapter() GUIDLabel = New System.Windows.Forms.Label() BEZEICHNUNGLabel = New System.Windows.Forms.Label() EINGANGSART_IDLabel = New System.Windows.Forms.Label() @@ -465,6 +499,13 @@ Partial Class frmAdministration Label9 = New System.Windows.Forms.Label() LANGUAGELabel = New System.Windows.Forms.Label() SHORTNAMELabel = New System.Windows.Forms.Label() + GUIDLabel7 = New System.Windows.Forms.Label() + REGEXLabel = New System.Windows.Forms.Label() + DOCTYPE_IDLabel = New System.Windows.Forms.Label() + ADDED_WHOLabel6 = New System.Windows.Forms.Label() + ADDED_WHENLabel6 = New System.Windows.Forms.Label() + CHANGED_WHOLabel6 = New System.Windows.Forms.Label() + CHANGED_WHENLabel6 = New System.Windows.Forms.Label() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.XtraTabPage1.SuspendLayout() @@ -519,6 +560,11 @@ Partial Class frmAdministration Me.GroupBox1.SuspendLayout() Me.pnlObjekttype_Config.SuspendLayout() CType(Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabPage11.SuspendLayout() + Me.GroupBox7.SuspendLayout() + CType(Me.TBGI_REGEX_DOCTYPEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.BindingNavigator3, System.ComponentModel.ISupportInitialize).BeginInit() + Me.BindingNavigator3.SuspendLayout() CType(Me.TBGI_CONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBDD_GROUPS_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -868,6 +914,41 @@ Partial Class frmAdministration resources.ApplyResources(SHORTNAMELabel, "SHORTNAMELabel") SHORTNAMELabel.Name = "SHORTNAMELabel" ' + 'GUIDLabel7 + ' + resources.ApplyResources(GUIDLabel7, "GUIDLabel7") + GUIDLabel7.Name = "GUIDLabel7" + ' + 'REGEXLabel + ' + resources.ApplyResources(REGEXLabel, "REGEXLabel") + REGEXLabel.Name = "REGEXLabel" + ' + 'DOCTYPE_IDLabel + ' + resources.ApplyResources(DOCTYPE_IDLabel, "DOCTYPE_IDLabel") + DOCTYPE_IDLabel.Name = "DOCTYPE_IDLabel" + ' + 'ADDED_WHOLabel6 + ' + resources.ApplyResources(ADDED_WHOLabel6, "ADDED_WHOLabel6") + ADDED_WHOLabel6.Name = "ADDED_WHOLabel6" + ' + 'ADDED_WHENLabel6 + ' + resources.ApplyResources(ADDED_WHENLabel6, "ADDED_WHENLabel6") + ADDED_WHENLabel6.Name = "ADDED_WHENLabel6" + ' + 'CHANGED_WHOLabel6 + ' + resources.ApplyResources(CHANGED_WHOLabel6, "CHANGED_WHOLabel6") + CHANGED_WHOLabel6.Name = "CHANGED_WHOLabel6" + ' + 'CHANGED_WHENLabel6 + ' + resources.ApplyResources(CHANGED_WHENLabel6, "CHANGED_WHENLabel6") + CHANGED_WHENLabel6.Name = "CHANGED_WHENLabel6" + ' 'StatusStrip1 ' Me.StatusStrip1.ImageScalingSize = New System.Drawing.Size(20, 20) @@ -884,7 +965,7 @@ Partial Class frmAdministration resources.ApplyResources(Me.XtraTabControl1, "XtraTabControl1") Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage1 - Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2, Me.XtraTabPage5}) + Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2, Me.XtraTabPage5, Me.XtraTabPage11}) ' 'XtraTabPage1 ' @@ -2112,7 +2193,7 @@ Partial Class frmAdministration Me.TBDD_DOKUMENTARTBindingNavigator.AddNewItem = Me.BindingNavigatorAddNewItem Me.TBDD_DOKUMENTARTBindingNavigator.BindingSource = Me.TBDD_DOKUMENTARTBindingSource Me.TBDD_DOKUMENTARTBindingNavigator.CountItem = Me.BindingNavigatorCountItem - Me.TBDD_DOKUMENTARTBindingNavigator.CountItemFormat = "of {0} Documenttypes" + Me.TBDD_DOKUMENTARTBindingNavigator.CountItemFormat = "von {0} Dokumentarten" Me.TBDD_DOKUMENTARTBindingNavigator.DeleteItem = Nothing Me.TBDD_DOKUMENTARTBindingNavigator.ImageScalingSize = New System.Drawing.Size(20, 20) Me.TBDD_DOKUMENTARTBindingNavigator.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem, Me.BindingNavigatorMovePreviousItem, Me.BindingNavigatorSeparator, Me.BindingNavigatorPositionItem, Me.BindingNavigatorCountItem, Me.BindingNavigatorSeparator1, Me.BindingNavigatorMoveNextItem, Me.BindingNavigatorMoveLastItem, Me.BindingNavigatorSeparator2, Me.BindingNavigatorAddNewItem, Me.BindingNavigatorDeleteItem, Me.TBDD_DOKUMENTARTBindingNavigatorSaveItem, Me.ToolStripComboBox1, Me.ToolStripButton40, Me.tsbtnCopyDoctype}) @@ -2188,8 +2269,9 @@ Partial Class frmAdministration 'TBDD_DOKUMENTARTBindingNavigatorSaveItem ' Me.TBDD_DOKUMENTARTBindingNavigatorSaveItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image - resources.ApplyResources(Me.TBDD_DOKUMENTARTBindingNavigatorSaveItem, "TBDD_DOKUMENTARTBindingNavigatorSaveItem") + Me.TBDD_DOKUMENTARTBindingNavigatorSaveItem.Image = Global.Global_Indexer.My.Resources.Resources.save_16xLG Me.TBDD_DOKUMENTARTBindingNavigatorSaveItem.Name = "TBDD_DOKUMENTARTBindingNavigatorSaveItem" + resources.ApplyResources(Me.TBDD_DOKUMENTARTBindingNavigatorSaveItem, "TBDD_DOKUMENTARTBindingNavigatorSaveItem") ' 'ToolStripComboBox1 ' @@ -2993,6 +3075,190 @@ Partial Class frmAdministration resources.ApplyResources(Me.ListBoxObjekttypen, "ListBoxObjekttypen") Me.ListBoxObjekttypen.Name = "ListBoxObjekttypen" ' + 'XtraTabPage11 + ' + Me.XtraTabPage11.Controls.Add(Me.GroupBox7) + Me.XtraTabPage11.Name = "XtraTabPage11" + resources.ApplyResources(Me.XtraTabPage11, "XtraTabPage11") + ' + 'GroupBox7 + ' + Me.GroupBox7.Controls.Add(Me.cmbDoctypeRegex) + Me.GroupBox7.Controls.Add(Me.txtFilenameTest) + Me.GroupBox7.Controls.Add(Me.Label11) + Me.GroupBox7.Controls.Add(Me.Button5) + Me.GroupBox7.Controls.Add(GUIDLabel7) + Me.GroupBox7.Controls.Add(Me.GUIDTextBox) + Me.GroupBox7.Controls.Add(REGEXLabel) + Me.GroupBox7.Controls.Add(Me.REGEXTextBox) + Me.GroupBox7.Controls.Add(DOCTYPE_IDLabel) + Me.GroupBox7.Controls.Add(ADDED_WHOLabel6) + Me.GroupBox7.Controls.Add(Me.ADDED_WHOTextBox6) + Me.GroupBox7.Controls.Add(ADDED_WHENLabel6) + Me.GroupBox7.Controls.Add(Me.ADDED_WHENTextBox6) + Me.GroupBox7.Controls.Add(CHANGED_WHOLabel6) + Me.GroupBox7.Controls.Add(Me.CHANGED_WHOTextBox1) + Me.GroupBox7.Controls.Add(CHANGED_WHENLabel6) + Me.GroupBox7.Controls.Add(Me.CHANGED_WHENTextBox6) + Me.GroupBox7.Controls.Add(Me.BindingNavigator3) + resources.ApplyResources(Me.GroupBox7, "GroupBox7") + Me.GroupBox7.Name = "GroupBox7" + Me.GroupBox7.TabStop = False + ' + 'cmbDoctypeRegex + ' + Me.cmbDoctypeRegex.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBGI_REGEX_DOCTYPEBindingSource, "DOCTYPE_ID", True)) + Me.cmbDoctypeRegex.FormattingEnabled = True + resources.ApplyResources(Me.cmbDoctypeRegex, "cmbDoctypeRegex") + Me.cmbDoctypeRegex.Name = "cmbDoctypeRegex" + ' + 'TBGI_REGEX_DOCTYPEBindingSource + ' + Me.TBGI_REGEX_DOCTYPEBindingSource.DataMember = "TBGI_REGEX_DOCTYPE" + Me.TBGI_REGEX_DOCTYPEBindingSource.DataSource = Me.MyDataset + ' + 'txtFilenameTest + ' + Me.txtFilenameTest.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.Global_Indexer.My.MySettings.Default, "FilenameTest", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged)) + resources.ApplyResources(Me.txtFilenameTest, "txtFilenameTest") + Me.txtFilenameTest.Name = "txtFilenameTest" + Me.txtFilenameTest.Text = Global.Global_Indexer.My.MySettings.Default.FilenameTest + ' + 'Label11 + ' + resources.ApplyResources(Me.Label11, "Label11") + Me.Label11.Name = "Label11" + ' + 'Button5 + ' + resources.ApplyResources(Me.Button5, "Button5") + Me.Button5.Name = "Button5" + Me.Button5.UseVisualStyleBackColor = True + ' + 'GUIDTextBox + ' + Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "GUID", True)) + resources.ApplyResources(Me.GUIDTextBox, "GUIDTextBox") + Me.GUIDTextBox.Name = "GUIDTextBox" + Me.GUIDTextBox.ReadOnly = True + ' + 'REGEXTextBox + ' + Me.REGEXTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "REGEX", True)) + resources.ApplyResources(Me.REGEXTextBox, "REGEXTextBox") + Me.REGEXTextBox.Name = "REGEXTextBox" + ' + 'ADDED_WHOTextBox6 + ' + Me.ADDED_WHOTextBox6.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "ADDED_WHO", True)) + resources.ApplyResources(Me.ADDED_WHOTextBox6, "ADDED_WHOTextBox6") + Me.ADDED_WHOTextBox6.Name = "ADDED_WHOTextBox6" + Me.ADDED_WHOTextBox6.ReadOnly = True + ' + 'ADDED_WHENTextBox6 + ' + Me.ADDED_WHENTextBox6.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "ADDED_WHEN", True)) + resources.ApplyResources(Me.ADDED_WHENTextBox6, "ADDED_WHENTextBox6") + Me.ADDED_WHENTextBox6.Name = "ADDED_WHENTextBox6" + Me.ADDED_WHENTextBox6.ReadOnly = True + ' + 'CHANGED_WHOTextBox1 + ' + Me.CHANGED_WHOTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "CHANGED_WHO", True)) + resources.ApplyResources(Me.CHANGED_WHOTextBox1, "CHANGED_WHOTextBox1") + Me.CHANGED_WHOTextBox1.Name = "CHANGED_WHOTextBox1" + Me.CHANGED_WHOTextBox1.ReadOnly = True + ' + 'CHANGED_WHENTextBox6 + ' + Me.CHANGED_WHENTextBox6.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBGI_REGEX_DOCTYPEBindingSource, "CHANGED_WHEN", True)) + resources.ApplyResources(Me.CHANGED_WHENTextBox6, "CHANGED_WHENTextBox6") + Me.CHANGED_WHENTextBox6.Name = "CHANGED_WHENTextBox6" + Me.CHANGED_WHENTextBox6.ReadOnly = True + ' + 'BindingNavigator3 + ' + Me.BindingNavigator3.AddNewItem = Nothing + Me.BindingNavigator3.BindingSource = Me.TBGI_REGEX_DOCTYPEBindingSource + Me.BindingNavigator3.CountItem = Me.BindingNavigatorCountItem1 + Me.BindingNavigator3.DeleteItem = Me.BindingNavigatorDeleteItem1 + Me.BindingNavigator3.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.BindingNavigatorMoveFirstItem1, Me.BindingNavigatorMovePreviousItem1, Me.BindingNavigatorSeparator3, Me.BindingNavigatorPositionItem1, Me.BindingNavigatorCountItem1, Me.BindingNavigatorSeparator4, Me.BindingNavigatorMoveNextItem1, Me.BindingNavigatorMoveLastItem1, Me.BindingNavigatorSeparator5, Me.BindingNavigatorAddNewItem1, Me.ToolStripButton42, Me.BindingNavigatorDeleteItem1}) + resources.ApplyResources(Me.BindingNavigator3, "BindingNavigator3") + Me.BindingNavigator3.MoveFirstItem = Me.BindingNavigatorMoveFirstItem1 + Me.BindingNavigator3.MoveLastItem = Me.BindingNavigatorMoveLastItem1 + Me.BindingNavigator3.MoveNextItem = Me.BindingNavigatorMoveNextItem1 + Me.BindingNavigator3.MovePreviousItem = Me.BindingNavigatorMovePreviousItem1 + Me.BindingNavigator3.Name = "BindingNavigator3" + Me.BindingNavigator3.PositionItem = Me.BindingNavigatorPositionItem1 + ' + 'BindingNavigatorCountItem1 + ' + Me.BindingNavigatorCountItem1.Name = "BindingNavigatorCountItem1" + resources.ApplyResources(Me.BindingNavigatorCountItem1, "BindingNavigatorCountItem1") + ' + 'BindingNavigatorDeleteItem1 + ' + Me.BindingNavigatorDeleteItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorDeleteItem1, "BindingNavigatorDeleteItem1") + Me.BindingNavigatorDeleteItem1.Name = "BindingNavigatorDeleteItem1" + ' + 'BindingNavigatorMoveFirstItem1 + ' + Me.BindingNavigatorMoveFirstItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMoveFirstItem1, "BindingNavigatorMoveFirstItem1") + Me.BindingNavigatorMoveFirstItem1.Name = "BindingNavigatorMoveFirstItem1" + ' + 'BindingNavigatorMovePreviousItem1 + ' + Me.BindingNavigatorMovePreviousItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMovePreviousItem1, "BindingNavigatorMovePreviousItem1") + Me.BindingNavigatorMovePreviousItem1.Name = "BindingNavigatorMovePreviousItem1" + ' + 'BindingNavigatorSeparator3 + ' + Me.BindingNavigatorSeparator3.Name = "BindingNavigatorSeparator3" + resources.ApplyResources(Me.BindingNavigatorSeparator3, "BindingNavigatorSeparator3") + ' + 'BindingNavigatorPositionItem1 + ' + resources.ApplyResources(Me.BindingNavigatorPositionItem1, "BindingNavigatorPositionItem1") + Me.BindingNavigatorPositionItem1.Name = "BindingNavigatorPositionItem1" + ' + 'BindingNavigatorSeparator4 + ' + Me.BindingNavigatorSeparator4.Name = "BindingNavigatorSeparator4" + resources.ApplyResources(Me.BindingNavigatorSeparator4, "BindingNavigatorSeparator4") + ' + 'BindingNavigatorMoveNextItem1 + ' + Me.BindingNavigatorMoveNextItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMoveNextItem1, "BindingNavigatorMoveNextItem1") + Me.BindingNavigatorMoveNextItem1.Name = "BindingNavigatorMoveNextItem1" + ' + 'BindingNavigatorMoveLastItem1 + ' + Me.BindingNavigatorMoveLastItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorMoveLastItem1, "BindingNavigatorMoveLastItem1") + Me.BindingNavigatorMoveLastItem1.Name = "BindingNavigatorMoveLastItem1" + ' + 'BindingNavigatorSeparator5 + ' + Me.BindingNavigatorSeparator5.Name = "BindingNavigatorSeparator5" + resources.ApplyResources(Me.BindingNavigatorSeparator5, "BindingNavigatorSeparator5") + ' + 'BindingNavigatorAddNewItem1 + ' + Me.BindingNavigatorAddNewItem1.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + resources.ApplyResources(Me.BindingNavigatorAddNewItem1, "BindingNavigatorAddNewItem1") + Me.BindingNavigatorAddNewItem1.Name = "BindingNavigatorAddNewItem1" + ' + 'ToolStripButton42 + ' + Me.ToolStripButton42.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image + Me.ToolStripButton42.Image = Global.Global_Indexer.My.Resources.Resources.save_16xLG + resources.ApplyResources(Me.ToolStripButton42, "ToolStripButton42") + Me.ToolStripButton42.Name = "ToolStripButton42" + ' 'TBGI_CONFIGURATIONBindingSource ' Me.TBGI_CONFIGURATIONBindingSource.DataMember = "TBGI_CONFIGURATION" @@ -3016,6 +3282,7 @@ Partial Class frmAdministration Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBGI_CONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter = Nothing + Me.TableAdapterManager.TBGI_REGEX_DOCTYPETableAdapter = Nothing Me.TableAdapterManager.TBHOTKEY_PATTERNS_REWORKTableAdapter = Nothing Me.TableAdapterManager.TBHOTKEY_PATTERNSTableAdapter = Nothing Me.TableAdapterManager.TBHOTKEY_PROFILETableAdapter = Nothing @@ -3084,6 +3351,10 @@ Partial Class frmAdministration ' Me.VWGI_DOCTYPE_GROUPTableAdapter.ClearBeforeFill = True ' + 'TBGI_REGEX_DOCTYPETableAdapter + ' + Me.TBGI_REGEX_DOCTYPETableAdapter.ClearBeforeFill = True + ' 'frmAdministration ' resources.ApplyResources(Me, "$this") @@ -3165,6 +3436,13 @@ Partial Class frmAdministration Me.pnlObjekttype_Config.ResumeLayout(False) Me.pnlObjekttype_Config.PerformLayout() CType(Me.TBGI_OBJECTTYPE_EMAIL_INDEXBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabPage11.ResumeLayout(False) + Me.GroupBox7.ResumeLayout(False) + Me.GroupBox7.PerformLayout() + CType(Me.TBGI_REGEX_DOCTYPEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.BindingNavigator3, System.ComponentModel.ISupportInitialize).EndInit() + Me.BindingNavigator3.ResumeLayout(False) + Me.BindingNavigator3.PerformLayout() CType(Me.TBGI_CONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBDD_GROUPS_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) @@ -3474,4 +3752,31 @@ Partial Class frmAdministration Friend WithEvents VKT_PREVENT_MULTIPLE_VALUESCheckbox As CheckBox Friend WithEvents VKT_ADD_ITEMCheckbox As CheckBox Friend WithEvents Label10 As Label + Friend WithEvents XtraTabPage11 As DevExpress.XtraTab.XtraTabPage + Friend WithEvents GroupBox7 As GroupBox + Friend WithEvents BindingNavigator3 As BindingNavigator + Friend WithEvents BindingNavigatorAddNewItem1 As ToolStripButton + Friend WithEvents BindingNavigatorCountItem1 As ToolStripLabel + Friend WithEvents BindingNavigatorDeleteItem1 As ToolStripButton + Friend WithEvents BindingNavigatorMoveFirstItem1 As ToolStripButton + Friend WithEvents BindingNavigatorMovePreviousItem1 As ToolStripButton + Friend WithEvents BindingNavigatorSeparator3 As ToolStripSeparator + Friend WithEvents BindingNavigatorPositionItem1 As ToolStripTextBox + Friend WithEvents BindingNavigatorSeparator4 As ToolStripSeparator + Friend WithEvents BindingNavigatorMoveNextItem1 As ToolStripButton + Friend WithEvents BindingNavigatorMoveLastItem1 As ToolStripButton + Friend WithEvents BindingNavigatorSeparator5 As ToolStripSeparator + Friend WithEvents ToolStripButton42 As ToolStripButton + Friend WithEvents TBGI_REGEX_DOCTYPEBindingSource As BindingSource + Friend WithEvents TBGI_REGEX_DOCTYPETableAdapter As MyDatasetTableAdapters.TBGI_REGEX_DOCTYPETableAdapter + Friend WithEvents txtFilenameTest As TextBox + Friend WithEvents Label11 As Label + Friend WithEvents Button5 As Button + Friend WithEvents GUIDTextBox As TextBox + Friend WithEvents REGEXTextBox As TextBox + Friend WithEvents ADDED_WHOTextBox6 As TextBox + Friend WithEvents ADDED_WHENTextBox6 As TextBox + Friend WithEvents CHANGED_WHOTextBox1 As TextBox + Friend WithEvents CHANGED_WHENTextBox6 As TextBox + Friend WithEvents cmbDoctypeRegex As ComboBox End Class diff --git a/Global_Indexer/frmAdministration.resx b/Global_Indexer/frmAdministration.resx index 4088f9a..3de5f7b 100644 --- a/Global_Indexer/frmAdministration.resx +++ b/Global_Indexer/frmAdministration.resx @@ -2345,6 +2345,216 @@ 1 + + False + + + True + + + 11, 55 + + + 22, 13 + + + 1 + + + ID: + + + GUIDLabel7 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 4 + + + False + + + True + + + 11, 85 + + + 103, 13 + + + 3 + + + Regular Expression: + + + REGEXLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 6 + + + False + + + True + + + 11, 112 + + + 73, 13 + + + 5 + + + Dokumentart: + + + DOCTYPE_IDLabel + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 8 + + + False + + + True + + + 11, 143 + + + 65, 13 + + + 7 + + + Erstellt wer: + + + ADDED_WHOLabel6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 9 + + + False + + + True + + + 11, 170 + + + 69, 13 + + + 9 + + + Ersellt wann: + + + ADDED_WHENLabel6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 11 + + + False + + + True + + + 11, 197 + + + 77, 13 + + + 11 + + + Geändert wer: + + + CHANGED_WHOLabel6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 13 + + + False + + + True + + + 11, 224 + + + 85, 13 + + + 13 + + + Geändert wann: + + + CHANGED_WHENLabel6 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 15 + 17, 17 @@ -5616,7 +5826,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 81 - Create Folder for Index + Dynamic Folder GroupBox4 @@ -5634,7 +5844,7 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 1009, 406 - Create Folder for Index + Dynamischer Ordnerpfad XtraTabPage10 @@ -5955,10 +6165,10 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei Neu hinzufügen - 122, 24 + 130, 24 - of {0} Documenttypes + von {0} Dokumentarten Die Gesamtanzahl der Elemente. @@ -6084,13 +6294,6 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei Löschen - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAAExJREFUOE9joAr49u3bf1IxVCsEgAWC58Dxh/cf4RhZDETHTNiHaQgpBoAwzBCo - dtINAGGiDUDGyGpoawAxeNSAQWkAORiqnRLAwAAA9EMMU8Daa3MAAAAASUVORK5CYII= - - 24, 24 @@ -8405,6 +8608,460 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 2 + + 17, 290 + + + 124, 109 + + + 569, 21 + + + 18 + + + cmbDoctypeRegex + + + System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 0 + + + 712, 79 + + + 207, 21 + + + 17 + + + txtFilenameTest + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 1 + + + True + + + 709, 60 + + + 86, 13 + + + 16 + + + Dateiname Test: + + + Label11 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 2 + + + 925, 77 + + + 75, 23 + + + 15 + + + Test RegEx + + + Button5 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 3 + + + 124, 52 + + + 65, 21 + + + 2 + + + GUIDTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 5 + + + 124, 79 + + + 569, 21 + + + 4 + + + REGEXTextBox + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 7 + + + 124, 140 + + + 121, 21 + + + 8 + + + ADDED_WHOTextBox6 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 10 + + + 124, 167 + + + 121, 21 + + + 10 + + + ADDED_WHENTextBox6 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 12 + + + 124, 194 + + + 121, 21 + + + 12 + + + CHANGED_WHOTextBox1 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 14 + + + 124, 221 + + + 121, 21 + + + 14 + + + CHANGED_WHENTextBox6 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 16 + + + 1029, 251 + + + 44, 22 + + + von {0} + + + Die Gesamtanzahl der Elemente. + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAW9JREFUOE+1kE0ow2Ecx3dV3krt4oJaOSCTvIRkMqSxyITIzCQHDouEdnFwIOVC + DrhIDiQl5UTiNG/z2ppafy1S2gX/uDwfY6i1v7Hie3nqeb7fz+/7/FR/Ilwn0G0Exw4fV5GJlXlEZxXC + rIet9bAQvB5Ymgn2sLYAvSZEux7RUQFzE4qQt4bCXAYjPaHvnDoCkLpsRGMB2JqCTGLIijDlwqQ9bEMV + i9OIytR3EMNWcJ/BWH8A6j8/bOGFxwXNxYEvGbMQ9XnQ1/K78KfY3/VXzkMY0qFGG2H4RoLGQshJQNbG + 86CNhdrsX9a/uQZTPhQl4rMY4OLofbl3aX7I8uwPC7y/g1YdjyVJuEvT8e1tfwUYteHUxCCfHChDeHmG + QQvokjlOU+PbWA0x3pZnILVVI3uvQyHsbiLnqnGmRCF1NYD8pDhpRxOH7HQoAKZGkFKjceszQbpSrumX + bO+G80MFwKUTxgfgcO/b8D9IpXoFiiMDHIQm0skAAAAASUVORK5CYII= + + + + True + + + 23, 22 + + + Löschen + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASpJREFUOE9jGDygcNbz/00Lnv/PnPj4P1QIA4S3P8Apx5A789n/VUfe/8elKL77 + wf/ghmu4DciY8vT/wn0fsCqK73n4f+n+///9qy/gNiCh58n/aVveYyiKaL8P1pw56/9/r9ITuA2I7Hr0 + v3f1BxRFoa33wJpb1wFt7/z73yX/AG4DApsf/q+b/w6uKLjl7v9Fe///7wBqzpjz879d3c//9hnbcRvg + UXX/f/60NyiK7Ipv/0+f8/u/f9e3/zqF7/5bJKzHbYB96d3/2ZNfYyjSTzn/36ToxX+VrE//jSOX4TbA + Iu/O/9T+11gVGSSd+C+b9vW/bvA83AYYZt3+H9byEqci/dTL/zV8p+E2QCftxn+/6od4Fal4TMBtgFPu + lf8gBXgVDULAwAAA8HbAq6XlmnAAAAAASUVORK5CYII= + + + + True + + + 23, 22 + + + Erste verschieben + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAALZJREFUOE9jGDogvP3BfyiTdBDf/eB/cMM18gyI73n4f+n+///9qy+QbkBE+32w + 5sxZ//97lZ4gzYDQ1ntgza3rgLZ3/v3vkn+AeAOCW+7+X7T3//8OoOaMOT//29X9/G+fsZ00F9gV3/6f + Puf3f/+ub/91Ct/9t0hYT3oY6Kec/29S9OK/Stan/8aRy0g3AAQMkk78l037+l83eB55BoCAfurl/xq+ + 08g3AARUPCZQZsBgBQwMANAUYJgEulBVAAAAAElFTkSuQmCC + + + + True + + + 23, 22 + + + Vorherige verschieben + + + 6, 25 + + + Position + + + False + + + 50, 23 + + + 0 + + + Aktuelle Position + + + 6, 25 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAKNJREFUOE9jGHygcNbz/1AmeSB35rP/Cd33yDckY8rT//P2//6f0HWHPEMSep78 + n73v1//OrX//u5VeJt2QyK5H/6ds+/W/ZOnf/wnT//63yT1LmiGBzQ//t659D9ZsXPLlv3T0tf/GkcuI + N8Sj6v7/krnv4JoVXXpIc4F96d3/gS3PyNMMAhZ5d/7bFFwhTzMIGGbdJl8zCOik3SBf81AEDAwAoH5f + oAc0QjgAAAAASUVORK5CYII= + + + + True + + + 23, 22 + + + Nächste verschieben + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAASxJREFUOE9jGFygcNbz/1AmBgDJNS14/j9z4mOcahhyZz77n9B9D6sCkNyqI+// + h7c/wG1AxpSn/+ft//0/oesOhiKQ3MJ9H/4HN1zDbUBCz5P/s/f9+t+59e9/t9LLKApBctO2vP/vX30B + twGRXY/+T9n263/J0r//E6b//W+TexauGCTXu/rDf6/SE7gNCGx++L917XuwZuOSL/+lo6/9N45cBtYA + kqub/+6/S/4B3AZ4VN3/XzL3HVyzoksPXDFILn/am//2GdtxG2Bfevd/YMszDM0gAJLLnvz6v0XCetwG + WOTd+W9TcAVDMwiA5FL7X8O9hBUYZt3GqhkEQHJhLS//6wbPw22ATtoNnJIgOb/qh/81fKfhNgAfcMq9 + 8l/FYwIYQ4UGBWBgAAC+0b+zuQxOnAAAAABJRU5ErkJggg== + + + + True + + + 23, 22 + + + Letzte verschieben + + + 6, 25 + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO + wwAADsMBx2+oZAAAAUpJREFUOE9jGLzg7gL2/7fmcf6/Oofr/8UZvP+hwsSD60CNfx41/v/zsOH/yckC + pBtwfjov3ICDPSKkG3B8kiBQc93/Pw+q/u9oFydswKWZPP/PTuX7fxKo8Ui/0P993SJAzeX//94r+r++ + Qeb/qhq5/0srFf/PL1X+P6tIFdPAU0B//nlYD9RUC8SV///cKwHivP9/72b+/3sn+f/f23H//92MAOKQ + /5NyNDENONQrDHbu3/ulQI0FQI3ZQI2pQI0J///digZqDPv/70bQ/3/X/f53peliGrCzXeL/lmap/+vA + zpX/v6RC8f/fWzFAjeH/p+Zp/J+QpfW/O0P3f3uq/v/mREPCYTIb6E+Qc//dCPjfk6FDWAM6APnz3w1/ + IPb735qsT7oB3em6YP+CcH2cEekGtCQZ/G+IN/xfE2v8vzLahHQD6AQYGAAkI9iedfyIaQAAAABJRU5E + rkJggg== + + + + True + + + 23, 22 + + + Neu hinzufügen + + + Magenta + + + 23, 22 + + + Speichern + + + 3, 17 + + + 1284, 25 + + + 0 + + + BindingNavigator3 + + + BindingNavigator3 + + + System.Windows.Forms.BindingNavigator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + GroupBox7 + + + 17 + + + Top + + + 0, 0 + + + 1290, 263 + + + 0 + + + Dokumentart - Dateiname + + + GroupBox7 + + + System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + XtraTabPage11 + + + 0 + + + 1290, 752 + + + RegEx + + + XtraTabPage11 + + + DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + XtraTabControl1 + + + 3 + XtraTabControl1 @@ -8471,6 +9128,9 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei 770, 251 + + 271, 290 + True @@ -9146,6 +9806,84 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + TBGI_REGEX_DOCTYPEBindingSource + + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorCountItem1 + + + System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorDeleteItem1 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorMoveFirstItem1 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorMovePreviousItem1 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorSeparator3 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorPositionItem1 + + + System.Windows.Forms.ToolStripTextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorSeparator4 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorMoveNextItem1 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorMoveLastItem1 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorSeparator5 + + + System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + BindingNavigatorAddNewItem1 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ToolStripButton42 + + + System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + TBGI_CONFIGURATIONBindingSource @@ -9254,6 +9992,12 @@ Die erhaltenen Werte können in Indizes geschrieben oder zur Benennung der Datei Global_Indexer.MyDatasetTableAdapters.VWGI_DOCTYPE_GROUPTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + TBGI_REGEX_DOCTYPETableAdapter + + + Global_Indexer.MyDatasetTableAdapters.TBGI_REGEX_DOCTYPETableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + frmAdministration diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index 47941dc..ed8d12a 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -1,4 +1,5 @@ Imports System.ComponentModel +Imports System.Text.RegularExpressions Public Class frmAdministration Public Shared _Namenkonvention As String @@ -13,6 +14,8 @@ Public Class frmAdministration End Sub Private Sub frmAdministration_Load(sender As Object, e As EventArgs) Handles MyBase.Load + 'TODO: Diese Codezeile lädt Daten in die Tabelle "MyDataset.TBGI_REGEX_DOCTYPE". Sie können sie bei Bedarf verschieben oder entfernen. + 'TODO: Diese Codezeile lädt Daten in die Tabelle "MyDataset.TBDD_USER_GROUPS". Sie können sie bei Bedarf verschieben oder entfernen. Try ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. @@ -31,6 +34,7 @@ Public Class frmAdministration Me.VWGI_USER_GROUPS_RELATIONTableAdapter.Connection.ConnectionString = MyConnectionString Me.TBDD_GROUPS_USERTableAdapter.Connection.ConnectionString = MyConnectionString Me.VWGI_DOCTYPE_GROUPTableAdapter.Connection.ConnectionString = MyConnectionString + Me.TBGI_REGEX_DOCTYPETableAdapter.Connection.ConnectionString = MyConnectionString Catch ex As Exception MsgBox("Error in load Connection-Strings - Check Database Connection - Form will be closed: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) Me.Close() @@ -41,6 +45,7 @@ Public Class frmAdministration Try Me.TBDD_EINGANGSARTENTableAdapter.Fill(Me.MyDataset.TBDD_EINGANGSARTEN) Me.TBDD_MODULESTableAdapter.Fill(Me.MyDataset.TBDD_MODULES) + Me.TBGI_REGEX_DOCTYPETableAdapter.Fill(Me.MyDataset.TBGI_REGEX_DOCTYPE) Catch ex As Exception MsgBox("Error in frmAdministration_Load: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) End Try @@ -160,7 +165,13 @@ Public Class frmAdministration TBDD_DOKUMENTARTTableAdapter.Update(MyDataset.TBDD_DOKUMENTART) lblSaveDokart.Visible = True If IsInsert = True Then - Add_Zuordnung(ClassDatabase.Execute_Scalar("SELECT MAX(GUID) FROM TBDD_DOKUMENTART", MyConnectionString)) + Dim oNewID As Integer + oNewID = ClassDatabase.Execute_Scalar("SELECT MAX(GUID) FROM TBDD_DOKUMENTART", MyConnectionString) + If IsNumeric(oNewID) Then + Dim osql = $" EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'GLOBIX',{oNewID}" + ClassDatabase.Execute_non_Query(osql) + End If + End If Else lblSaveDokart.Visible = False @@ -215,7 +226,7 @@ Public Class frmAdministration End Try MyDataset.TBDD_DOKUMENTART.ERSTELLTWERColumn.DefaultValue = Environment.UserName - enableControls(XtraTabPage1) + MyDataset.TBDD_DOKUMENTART.OBJEKTTYPColumn.DefaultValue = "" IsInsert = True End Sub @@ -227,18 +238,18 @@ Public Class frmAdministration End Try End Sub - Sub Add_Zuordnung(id As Integer) - If cmbWHModule.SelectedIndex <> -1 Then - TBDD_DOKART_MODULETableAdapter.cmdInsertDokartModule(id, cmbWHModule.SelectedValue, Environment.UserName) - Load_ZuordnungDokart_Module(id) - End If - End Sub Private Sub btnadd_Click(sender As Object, e As EventArgs) Handles btnadd.Click - Add_Zuordnung(Me.DOKART_GUIDTextBox.Text) + + Dim osql = $" EXEC PRDD_CHECK_REL_DOCTYPE_MODULE 'GLOBIX',{DOKART_GUIDTextBox.Text}" + ClassDatabase.Execute_non_Query(osql) + LoadGlobix_Doctypes() End Sub Private Sub OBJEKTTYPComboBox_SelectedIndexChanged(sender As Object, e As EventArgs) Handles OBJEKTTYPComboBox.SelectedIndexChanged - load_WDIndices() + If WINDREAM_DIRECTCheckBox.Checked = False Then + load_WDIndices() + End If + End Sub Sub load_WDIndices() @@ -288,6 +299,7 @@ Public Class frmAdministration tscmbUser.SelectedIndex = 0 TBDD_INDEX_MANBindingNav.Visible = True TBDD_INDEX_MANBindingNav.Visible = True + WM_CHECKED_CHANGE() End Sub Private Sub btndeleteZuordnung_Click(sender As Object, e As EventArgs) Handles btndeleteZuordnung.Click @@ -467,6 +479,16 @@ Public Class frmAdministration Load_UserGroups() Case 2 ObjektTypenListBoxEintragen() + Case 3 + Me.TBGI_REGEX_DOCTYPETableAdapter.Fill(Me.MyDataset.TBGI_REGEX_DOCTYPE) + Dim osql = "SELECT GUID, BEZEICHNUNG FROM TBDD_DOKUMENTART WHERE (GUID IN (SELECT T.DOKART_ID FROM TBDD_DOKUMENTART_MODULE AS T INNER JOIN " & + "TBDD_MODULES AS T1 ON T.MODULE_ID = T1.GUID WHERE (T1.NAME = 'Global-Indexer'))) ORDER BY SEQUENCE, BEZEICHNUNG" + Dim oDT As DataTable = ClassDatabase.Return_Datatable(osql) + If Not IsNothing(oDT) Then + cmbDoctypeRegex.DataSource = oDT + cmbDoctypeRegex.ValueMember = "GUID" + cmbDoctypeRegex.DisplayMember = "BEZEICHNUNG" + End If End Select End Sub @@ -523,6 +545,9 @@ Public Class frmAdministration End Sub Private Sub WINDREAM_DIRECTCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles WINDREAM_DIRECTCheckBox.CheckedChanged + WM_CHECKED_CHANGE() + End Sub + Sub WM_CHECKED_CHANGE() If WINDREAM_DIRECTCheckBox.Checked Then OBJEKTTYPComboBox.Visible = True lblObjekttyp.Visible = True @@ -538,7 +563,6 @@ Public Class frmAdministration WD_INDEXComboBox.Visible = False End If End Sub - Private Sub Button2_Click(sender As Object, e As EventArgs) ClassWindream.GetSystemIndices("") End Sub @@ -941,13 +965,15 @@ Public Class frmAdministration End Sub Private Sub ToolStripButton40_Click(sender As Object, e As EventArgs) Handles ToolStripButton40.Click + LoadGlobix_Doctypes() + End Sub + Sub LoadGlobix_Doctypes() Dim str = "Global-Indexer Dokarten" If ToolStripComboBox1.Text <> "" Then str = ToolStripComboBox1.Text End If Load_Dokart(str) End Sub - Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click frmLicense.ShowDialog() End Sub @@ -1212,4 +1238,70 @@ Public Class frmAdministration Return False End Try End Function + + Private Sub BindingNavigatorAddNewItem_Click(sender As Object, e As EventArgs) Handles BindingNavigatorAddNewItem.Click + + End Sub + + Private Sub ToolStripButton42_Click(sender As Object, e As EventArgs) Handles ToolStripButton42.Click + Try + Me.TBGI_REGEX_DOCTYPEBindingSource.EndEdit() + Catch ex As Exception + + MsgBox("Error in Save Regex1: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) + Exit Sub + End Try + + If MyDataset.TBGI_REGEX_DOCTYPE.GetChanges Is Nothing = False Then + Me.CHANGED_WHOTextBox1.Text = Environment.UserName + Try + Me.TBGI_REGEX_DOCTYPEBindingSource.EndEdit() + Catch ex As Exception + + MsgBox("Error in Save Regex2: " & vbNewLine & ex.Message, MsgBoxStyle.Exclamation) + + End Try + TBGI_REGEX_DOCTYPETableAdapter.Update(MyDataset.TBGI_REGEX_DOCTYPE) + + End If + End Sub + + Private Sub BindingNavigatorAddNewItem1_Click(sender As Object, e As EventArgs) Handles BindingNavigatorAddNewItem1.Click + Me.TBGI_REGEX_DOCTYPEBindingSource.AddNew() + End Sub + + Private Sub TBGI_REGEX_DOCTYPEBindingSource_AddingNew(sender As Object, e As AddingNewEventArgs) Handles TBGI_REGEX_DOCTYPEBindingSource.AddingNew + MyDataset.TBGI_REGEX_DOCTYPE.ADDED_WHOColumn.DefaultValue = Environment.UserName + MyDataset.TBGI_REGEX_DOCTYPE.REGEXColumn.DefaultValue = txtFilenameTest.Text + End Sub + + Private Sub XtraTabPage1_Paint(sender As Object, e As PaintEventArgs) Handles XtraTabPage1.Paint + + End Sub + + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + My.Settings.Save() + + Try + If Regex.IsMatch(txtFilenameTest.Text, REGEXTextBox.Text) Then + MsgBox("The RegEx resulted in a proper match!", MsgBoxStyle.Information, "Perfect:") + Else + MsgBox("No Match- There might be an error in the RegEx!", MsgBoxStyle.Information, "Something wrong:") + End If + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Testing Regex: ") + End Try + End Sub + + Private Sub BindingNavigatorDeleteItem1_Click(sender As Object, e As EventArgs) Handles BindingNavigatorDeleteItem1.Click + Try + Dim oSQL = $"DELETE FROM TBGI_REGEX_DOCTYPE WHERE GUID = {GUIDTextBox.Text}" + If ClassDatabase.Execute_non_Query(oSQL, True) = True Then + Me.TBGI_REGEX_DOCTYPETableAdapter.Fill(Me.MyDataset.TBGI_REGEX_DOCTYPE) + End If + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Exclamation, "Error in Deleting Regex:") + End Try + + End Sub End Class diff --git a/Global_Indexer/frmIndex.designer.vb b/Global_Indexer/frmIndex.designer.vb index a92bf85..33372c4 100644 --- a/Global_Indexer/frmIndex.designer.vb +++ b/Global_Indexer/frmIndex.designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmIndex Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class frmIndex 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmIndex)) @@ -276,11 +276,14 @@ Partial Class frmIndex ' 'pnlPDF ' + Me.pnlPDF.Controls.Add(Me.PdfViewer1) Me.pnlPDF.Controls.Add(Me.StatusStrip2) Me.pnlPDF.Controls.Add(Me.RibbonControl1) resources.ApplyResources(Me.pnlPDF, "pnlPDF") Me.pnlPDF.Name = "pnlPDF" + ' + ' 'PdfViewer1 ' @@ -510,6 +513,7 @@ Partial Class frmIndex Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBGI_CONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter = Nothing + Me.TableAdapterManager.TBGI_REGEX_DOCTYPETableAdapter = Nothing Me.TableAdapterManager.TBHOTKEY_PATTERNS_REWORKTableAdapter = Nothing Me.TableAdapterManager.TBHOTKEY_PATTERNSTableAdapter = Nothing Me.TableAdapterManager.TBHOTKEY_PROFILETableAdapter = Nothing @@ -597,7 +601,7 @@ Partial Class frmIndex End Sub Friend WithEvents btnOK As System.Windows.Forms.Button - + Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents cmbDokumentart As System.Windows.Forms.ComboBox Friend WithEvents VWINDEX_MANBindingSource As System.Windows.Forms.BindingSource @@ -672,7 +676,5 @@ Partial Class frmIndex Friend WithEvents grpbxMailBody As System.Windows.Forms.GroupBox Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents CheckBox1 As System.Windows.Forms.CheckBox - - End Class diff --git a/Global_Indexer/frmIndex.resx b/Global_Indexer/frmIndex.resx index 5f97781..176052a 100644 --- a/Global_Indexer/frmIndex.resx +++ b/Global_Indexer/frmIndex.resx @@ -229,7 +229,7 @@ 1 - 17, 212 + 774, 56 Magenta @@ -613,7 +613,7 @@ 0 - 1477, 173 + 657, 56 120, 17 @@ -748,10 +748,10 @@ pnlPDF - 0 + 1 - 1212, 173 + 392, 56 Segoe UI Semibold, 9pt, style=Bold, Italic @@ -793,7 +793,7 @@ pnlPDF - 1 + 2 0, 0 @@ -811,7 +811,7 @@ pnlPDF - 2 + 3 67, 25 @@ -937,7 +937,7 @@ 244, 56 - 1329, 173 + 509, 56 True diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb index 9c5fd28..1f180fc 100644 --- a/Global_Indexer/frmIndex.vb +++ b/Global_Indexer/frmIndex.vb @@ -1107,7 +1107,7 @@ Public Class frmIndex Dim err As Boolean = False Dim folder_Created As Boolean = False - Dim Zielordner As String + Dim oRAWZielordner As String Dim extension As String = System.IO.Path.GetExtension(CURRENT_WORKFILE) Dim DT As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID) sql_history_INSERT_INTO = "INSERT INTO TBGI_HISTORY (FILENAME_ORIGINAL,FILENAME_NEW" @@ -1116,36 +1116,36 @@ Public Class frmIndex CURR_DOKART_WD_DIRECT = DT.Rows(0).Item("WINDREAM_DIRECT") CURR_DOKART_OBJECTTYPE = DT.Rows(0).Item("OBJEKTTYP") CURR_WORKFILE_EXTENSION = extension - Zielordner = DT.Rows(0).Item("ZIEL_PFAD") + oRAWZielordner = DT.Rows(0).Item("ZIEL_PFAD") '#### ' Regulären Ausdruck zum Auslesen der Indexe definieren Dim preg As String = "\[%{1}[a-zA-Z0-9ß\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" 'schonmal den gesamten Pfad laden - Dim DATEINAME As String = Zielordner & "\" & DT.Rows(0).Item("NAMENKONVENTION") - NewFileString = DATEINAME + Dim oNamenkonvention As String = DT.Rows(0).Item("NAMENKONVENTION") & CURR_WORKFILE_EXTENSION 'oRAWZielordner & "\" & DT.Rows(0).Item("NAMENKONVENTION") + NewFileString = oNamenkonvention ' einen Regulären Ausdruck laden Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg) ' die Vorkommen im SQL-String auslesen - Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(DATEINAME) + Dim oMatchelements As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(oNamenkonvention) '#### - If elemente.Count = 0 Then + If oMatchelements.Count = 0 Then ClassLogger.Add(" >> No RegularExpression Fileds on Nameconvention!", False) End If ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen - For Each element As System.Text.RegularExpressions.Match In elemente - Select Case element.Value.Substring(2, 1).ToUpper + For Each oElement As System.Text.RegularExpressions.Match In oMatchelements + Select Case oElement.Value.Substring(2, 1).ToUpper 'Manueller Indexwert Case "M" If LogErrorsOnly = False Then ClassLogger.Add(" >>Manueller Index wird geprüft...", False) - Dim Indexname = element.Value.Substring(3, element.Value.Length - 4) + Dim Indexname = oElement.Value.Substring(3, oElement.Value.Length - 4) Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & CURRENT_DOKART_ID & " AND UPPER(NAME) = UPPER('" & Indexname & "')", MyConnectionString, True) Dim value As String = GetManIndex_Value(Indexname, "FILE", optional_index) If value <> String.Empty Then Dim firstVectorValue = value.Split(ClassConstants.VECTORSEPARATOR).First() - DATEINAME = DATEINAME.Replace(element.Value, firstVectorValue) - NewFileString = DATEINAME + oNamenkonvention = oNamenkonvention.Replace(oElement.Value, firstVectorValue) + NewFileString = oNamenkonvention sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString AnzahlIndexe += 1 sql_history_Index_Values = sql_history_Index_Values & ", '" & value.Replace("'", "''") & "'" @@ -1154,25 +1154,26 @@ Public Class frmIndex If optional_index = True Then Dim result As MsgBoxResult - If USER_LANGUAGE = "de-DE" Then - result = MessageBox.Show("Achtung der optionale Index ist leer, wird aber für die Benennung der Datei benutzt." & vbNewLine & "Wollen Sie stattdessen den Originaldateinamen verwenden?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) - Else - result = MessageBox.Show("Attention: optional index is empty, but is being used in renaming the file." & vbNewLine & "Do you want to use the original filename instead?", "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) - End If + 'If USER_LANGUAGE = "de-DE" Then + ' result = MessageBox.Show("Achtung der optionale Index ist leer, wird aber für die Benennung der Datei benutzt." & vbNewLine & "Wollen Sie stattdessen den Originaldateinamen verwenden?", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + 'Else + ' result = MessageBox.Show("Attention: optional index is empty, but is being used in renaming the file." & vbNewLine & "Do you want to use the original filename instead?", "Confirmation needed:", MessageBoxButtons.YesNo, MessageBoxIcon.Question) + 'End If - If result = MsgBoxResult.Yes Then - DATEINAME = DATEINAME.Replace(element.Value, System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE)) - NewFileString = DATEINAME - sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString - AnzahlIndexe += 1 - sql_history_Index_Values = sql_history_Index_Values & ", '" & System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE).Replace("'", "''") & "'" - Else - DATEINAME = DATEINAME.Replace(element.Value, value) - NewFileString = DATEINAME - sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString - AnzahlIndexe += 1 - sql_history_Index_Values = sql_history_Index_Values & ", '" & value.Replace("'", "''") & "'" - End If + 'If result = MsgBoxResult.Yes Then + ' oNamenkonvention = oNamenkonvention.Replace(oElement.Value, System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE)) + ' NewFileString = oNamenkonvention + ' sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString + ' AnzahlIndexe += 1 + ' sql_history_Index_Values = sql_history_Index_Values & ", '" & System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE).Replace("'", "''") & "'" + 'Else + oNamenkonvention = oNamenkonvention.Replace("_" & oElement.Value, value) + oNamenkonvention = oNamenkonvention.Replace("-" & oElement.Value, value) + NewFileString = oNamenkonvention + sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString + AnzahlIndexe += 1 + sql_history_Index_Values = sql_history_Index_Values & ", '" & value.Replace("'", "''") & "'" + ' End If Else ClassLogger.Add(" >> Der Indexvalue für Index '" & Indexname & "' ist String.Empty", False) @@ -1181,14 +1182,14 @@ Public Class frmIndex End If Case "A" - Dim value As String = GetAutoIndex_Value(element.Value.Substring(3, element.Value.Length - 4)) + Dim value As String = GetAutoIndex_Value(oElement.Value.Substring(3, oElement.Value.Length - 4)) If value <> String.Empty Then If value = "EMPTY_OI" Then - DATEINAME = DATEINAME.Replace(element.Value, "") - NewFileString = DATEINAME + oNamenkonvention = oNamenkonvention.Replace(oElement.Value, "") + NewFileString = oNamenkonvention Else - DATEINAME = DATEINAME.Replace(element.Value, value) - NewFileString = DATEINAME + oNamenkonvention = oNamenkonvention.Replace(oElement.Value, value) + NewFileString = oNamenkonvention sql_history_INSERT_INTO = sql_history_INSERT_INTO & ", INDEX" & AnzahlIndexe.ToString AnzahlIndexe += 1 sql_history_Index_Values = sql_history_Index_Values & ", '" & value.Replace("'", "''") & "'" @@ -1206,7 +1207,7 @@ Public Class frmIndex If _day.Length = 1 Then _day = "0" & _day End If - Dim type = element.Value '.ToUpper.Replace("[v%", "") + Dim type = oElement.Value '.ToUpper.Replace("[v%", "") type = type.Replace("[%v_", "") type = type.Replace("[%v", "") type = type.Replace("]", "") @@ -1228,32 +1229,32 @@ Public Class frmIndex Case "DDMMYYYY" datetemp = _day & _Month & My.Computer.Clock.LocalTime.Year Case "OFilename" - DATEINAME = DATEINAME.Replace(element.Value, System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE)) + oNamenkonvention = oNamenkonvention.Replace(oElement.Value, System.IO.Path.GetFileNameWithoutExtension(CURRENT_WORKFILE)) Case "Username".ToUpper - DATEINAME = DATEINAME.Replace(element.Value, Environment.UserName) + oNamenkonvention = oNamenkonvention.Replace(oElement.Value, Environment.UserName) Case "Usercode".ToUpper - DATEINAME = DATEINAME.Replace(element.Value, USER_SHORT_NAME) + oNamenkonvention = oNamenkonvention.Replace(oElement.Value, USER_SHORT_NAME) Case "" End Select If datetemp <> "" Then - DATEINAME = DATEINAME.Replace(element.Value, datetemp) + oNamenkonvention = oNamenkonvention.Replace(oElement.Value, datetemp) End If - NewFileString = DATEINAME + NewFileString = oNamenkonvention Case "[%Version]".ToUpper Try Dim version As Integer = 1 - Dim Stammname As String = DATEINAME.Replace(element.Value, "") - Dim _neuername As String = DATEINAME.Replace(element.Value, "") + Dim Stammname As String = oRAWZielordner & "\" & oNamenkonvention.Replace(oElement.Value, "") + Dim _neuername As String = oRAWZielordner & "\" & oNamenkonvention.Replace(oElement.Value, "") Stammname = _neuername.Replace(VERSION_DELIMITER, "") _neuername = _neuername.Replace(VERSION_DELIMITER, "") 'Dim MoveFilename As String = DATEINAME.Replace(element.Value, "") 'Überprüfen ob File existiert - If File.Exists(_neuername & extension) = False Then + If File.Exists(_neuername) = False Then NewFileString = _neuername Else - Do While File.Exists(_neuername & extension) + Do While File.Exists(_neuername) version = version + 1 - _neuername = Stammname & VERSION_DELIMITER & version + _neuername = Stammname.Replace(extension, "") & VERSION_DELIMITER & version & extension NewFileString = _neuername Loop End If @@ -1263,11 +1264,14 @@ Public Class frmIndex err = True End Try Case Else - ClassLogger.Add(" - Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper) - MsgBox("Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper, MsgBoxStyle.Exclamation, "Unexpected error in Name generieren:") + ClassLogger.Add(" - Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & oElement.Value.ToUpper) + MsgBox("Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & oElement.Value.ToUpper, MsgBoxStyle.Exclamation, "Unexpected error in Name generieren:") End Select Next + + CURRENT_NEWFILENAME = ClassFilehandle.CleanFilename(NewFileString, "") + CURRENT_NEWFILENAME = oRAWZielordner & "\" & CURRENT_NEWFILENAME If CURRENT_NEWFILENAME.EndsWith("_") Then CURRENT_NEWFILENAME = CURRENT_NEWFILENAME.Substring(0, CURRENT_NEWFILENAME.Length - 1) @@ -1278,7 +1282,7 @@ Public Class frmIndex If CURRENT_NEWFILENAME.Contains("__") Then CURRENT_NEWFILENAME = CURRENT_NEWFILENAME.Replace("__", "_") End If - CURRENT_NEWFILENAME &= extension + 'CURRENT_NEWFILENAME &= extension Dim sollfilename = System.IO.Path.GetFileName(CURRENT_NEWFILENAME) If sollfilename.StartsWith("_") Then sollfilename = sollfilename.Substring(1) @@ -1840,17 +1844,17 @@ Public Class frmIndex End Function Function Move_Rename_Only(Quelle As String, _NewFilename As String, extension As String, _versionTz As String) 'Überprüfen ob File existiert - If File.Exists(_NewFilename & extension) = False Then - CURRENT_NEWFILENAME = _NewFilename & extension + If File.Exists(_NewFilename) = False Then + CURRENT_NEWFILENAME = _NewFilename Else 'Versionieren Dim version As Integer = 1 Dim Stammname As String = _NewFilename Dim neuername As String = _NewFilename - Do While File.Exists(neuername & extension) + Do While File.Exists(neuername) version = version + 1 - neuername = Stammname & _versionTz & version - CURRENT_NEWFILENAME = neuername & extension + neuername = Stammname.Replace(extension, "") & _versionTz & version & extension + CURRENT_NEWFILENAME = neuername Loop End If 'Die Datei wird nun verschoben @@ -1861,7 +1865,7 @@ Public Class frmIndex Dim tempCur_WF = CURRENT_WORKFILE.Replace("'", "''") Dim tempCur_New_FN = CURRENT_NEWFILENAME.Replace("'", "''") Insert_String = sql_history_INSERT_INTO & ",ADDED_WHO,ADDED_WHERE) VALUES ('" & tempCur_WF & "','" & tempCur_New_FN & "'" & sql_history_Index_Values & ",'" & Environment.UserDomainName & "\" & Environment.UserName & "','" & Environment.MachineName & "')" - If ClassDatabase.Execute_Scalar(Insert_String, MyConnectionString) = True Then + If ClassDatabase.Execute_non_Query(Insert_String) = True Then If CURRENT_MESSAGEID <> "" Then Dim max As String = "SELECT MAX(GUID) FROM TBGI_HISTORY" Dim GUID = ClassDatabase.Execute_Scalar(max, MyConnectionString, True) @@ -1946,6 +1950,7 @@ Public Class frmIndex CURRENT_ISATTACHMENT = False DropType = ClassDatabase.Execute_Scalar("SELECT HANDLE_TYPE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID, MyConnectionString, True) chkdelete_origin.Visible = False + 'DocumentViewer1.Init(LOGCONFIG, "21182889975216572111813147150675976632") CURRENT_DROPTYPE = DropType.Replace("|", "") If DropType = "|DROPFROMFSYSTEM|" Then chkdelete_origin.Visible = True @@ -2054,12 +2059,32 @@ Public Class frmIndex Me.Cursor = Cursors.Default Refresh_Dokart() Me.pnlIndex.Controls.Clear() + chkdelete_origin.Checked = CONFIG.Config.DeleteOriginalFile + CURR_DELETE_ORIGIN = chkdelete_origin.Checked + formloaded = True If My.Settings.DA_Vorauswahlaktiv = True Then If CURRENT_LASTDOKART <> "" Then cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(CURRENT_LASTDOKART) End If End If + Try + If DTTBGI_REGEX_DOCTYPE.Rows.Count > 0 Then + For Each oRoW As DataRow In DTTBGI_REGEX_DOCTYPE.Rows + Dim oOnlyFilename = Path.GetFileName(CURRENT_WORKFILE) + If Regex.IsMatch(oOnlyFilename, oRoW.Item("Regex")) Then + ClassLogger.Add($"There is a match on REGEX_DOCTYPE: {oRoW.Item("DOCTYPE")}") + cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(oRoW.Item("DOCTYPE")) + Exit For + End If + Next + End If + Catch ex As Exception + ClassLogger.Add(" - Unexpected error DTTBGI_REGEX_DOCTYPE - ErrorMessage: " & vbNewLine & ex.Message) + End Try + Me.TopMost = True + Me.BringToFront() + End Sub Sub Refresh_Dokart() Try @@ -2559,11 +2584,14 @@ Public Class frmIndex Me.pnlPDF.Visible = False CURRENT_HTML_DOC = "" Dim workfile As String = CURRENT_WORKFILE.ToLower + 'DocumentViewer1.LoadFile(CURRENT_WORKFILE) + If Not workfile.EndsWith("msg") Then CURRENT_HTML_DOC = "" If workfile.EndsWith("pdf") Then Me.SplitContainer1.Panel2Collapsed = False PdfViewer1.LoadDocument(CURRENT_WORKFILE) + PdfViewer1.ZoomMode = DevExpress.XtraPdfViewer.PdfZoomMode.FitToWidth pnlPDF.Dock = DockStyle.Fill SplitContainer1.SplitterDistance = My.Settings.SplitterDistance_Viewer Me.pnlPDF.Visible = True @@ -2771,8 +2799,8 @@ Public Class frmIndex CURRENT_LASTDOKART = cmbDokumentart.Text ClassLogger.Add(" >> Datei '" & CURRENT_NEWFILENAME & "' erfolgreich erzeugt.", False) - Dim upd As String = "UPDATE TBGI_FILES_USER SET WORKED = 1 WHERE GUID = " & CURRENT_WORKFILE_GUID - ClassDatabase.Execute_non_Query(upd, True) + Dim oDEL As String = "DELETE FROM TBGI_FILES_USER WHERE GUID = " & CURRENT_WORKFILE_GUID + ClassDatabase.Execute_non_Query(oDEL, True) Return True End If @@ -2888,9 +2916,17 @@ Public Class frmIndex Private Function Move_File2_Target() Dim err As Boolean = False Try + Dim sql As String = "SELECT FOLDER_FOR_INDEX FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID + Dim Folder_for_index = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) + If Not IsDBNull(Folder_for_index) Then + If Folder_for_index <> String.Empty Then + CreateFolderForIndex(Folder_for_index) + End If + End If + If CBool(CURR_DOKART_WD_DIRECT) = False Then 'Datei verschieben - err = Move_Rename_Only(CURRENT_WORKFILE, NewFileString, CURR_WORKFILE_EXTENSION, VERSION_DELIMITER) + err = Move_Rename_Only(CURRENT_WORKFILE, CURRENT_NEWFILENAME, CURR_WORKFILE_EXTENSION, VERSION_DELIMITER) Else If CURRENT_NEWFILENAME.Contains("//") Then CURRENT_NEWFILENAME = CURRENT_NEWFILENAME.Replace("//", "/") @@ -2900,13 +2936,8 @@ Public Class frmIndex End If Dim exp2WD As Boolean = False 'Variable Folder - Dim sql As String = "SELECT FOLDER_FOR_INDEX FROM TBDD_DOKUMENTART WHERE GUID = " & CURRENT_DOKART_ID - Dim Folder_for_index = ClassDatabase.Execute_Scalar(sql, MyConnectionString, True) - If Not IsDBNull(Folder_for_index) Then - If Folder_for_index <> String.Empty Then - CreateFolderForIndex(Folder_for_index) - End If - End If + + If DropType = "|DROPFROMFSYSTEM|" Or DropType = "|OUTLOOK_ATTACHMENT|" Or DropType = "|ATTMNTEXTRACTED|" Or DropType = "|FW_SIMPLEINDEXER|" Then exp2WD = SINGLEFILE_2_WINDREAM(CURR_DOKART_OBJECTTYPE) @@ -3010,16 +3041,16 @@ Public Class frmIndex End Try End Sub - Private Function CreateFolderForIndex(folderindex As String) + Private Function CreateFolderForIndex(myDynamicFolder As String) Try - Dim RootFolder As String = Path.GetDirectoryName(CURRENT_NEWFILENAME) + Dim ORootFolder As String = Path.GetDirectoryName(CURRENT_NEWFILENAME) '###### Dim p_reg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" ' einen Regulären Ausdruck laden Dim regularExpression As Regex = New Regex(p_reg) ' die Vorkommen im Folder-String auslesen - Dim elemente As MatchCollection = regularExpression.Matches(folderindex) + Dim elemente As MatchCollection = regularExpression.Matches(myDynamicFolder) '#### ' alle Vorkommen innerhalb des Ordnerstrings durchlaufen For Each element As Match In elemente @@ -3037,8 +3068,10 @@ Public Class frmIndex If IsDate(ManIndex_Value) Then ManIndex_Value = CDate(ManIndex_Value).ToString("yyyyMMdd") End If - folderindex = folderindex.Replace(element.ToString, ManIndex_Value) - If LogErrorsOnly = False Then ClassLogger.Add(" >> FolderPattern: '" & folderindex & "'", False) + ManIndex_Value = ClassFilehandle.CleanFilename(ManIndex_Value, "") + myDynamicFolder = myDynamicFolder.Replace(element.ToString, ManIndex_Value) + + If LogErrorsOnly = False Then ClassLogger.Add(" >> FolderPattern: '" & myDynamicFolder & "'", False) Else If optional_index = True Then @@ -3054,18 +3087,19 @@ Public Class frmIndex Dim AutoIndex_Value As String = GetAutoIndex_Value(AutoIndexname) If LogErrorsOnly = False Then ClassLogger.Add(" >> Ergebnis/Wert für neuen Ordner: '" & AutoIndexname & "'", False) If Not AutoIndex_Value = String.Empty Then + AutoIndex_Value = ClassFilehandle.CleanFilename(AutoIndex_Value, "") If AutoIndex_Value = "EMPTY_OI" Then - folderindex = folderindex.Replace(element.ToString, "") + myDynamicFolder = myDynamicFolder.Replace(element.ToString, "") Else - folderindex = folderindex.Replace(element.ToString, AutoIndex_Value) - If LogErrorsOnly = False Then ClassLogger.Add(" >> FolderPattern: '" & folderindex & "'", False) + myDynamicFolder = myDynamicFolder.Replace(element.ToString, AutoIndex_Value) + If LogErrorsOnly = False Then ClassLogger.Add(" >> FolderPattern: '" & myDynamicFolder & "'", False) End If Else ClassLogger.Add(" - Achtung Ausnahme in 'CrFolderForIndex': der Index ist leer!", True) End If Case "V" - Dim folder_temp As String + Dim oElementTemp As String Dim _Month As String = My.Computer.Clock.LocalTime.Month If _Month.Length = 1 Then _Month = "0" & _Month @@ -3080,16 +3114,16 @@ Public Class frmIndex End If Select Case type Case "YYYY/MM/DD" - folder_temp = My.Computer.Clock.LocalTime.Year & "\" & _Month & "\" & _day + oElementTemp = My.Computer.Clock.LocalTime.Year & "\" & _Month & "\" & _day Case "YYYY/MM" - folder_temp = My.Computer.Clock.LocalTime.Year & "\" & _Month + oElementTemp = My.Computer.Clock.LocalTime.Year & "\" & _Month Case "YYYY" - folder_temp = My.Computer.Clock.LocalTime.Year + oElementTemp = My.Computer.Clock.LocalTime.Year Case "YYYY-MM" - folder_temp = My.Computer.Clock.LocalTime.Year & "-" & _Month + oElementTemp = My.Computer.Clock.LocalTime.Year & "-" & _Month End Select - folderindex = folderindex.Replace(element.ToString, folder_temp) - If LogErrorsOnly = False Then ClassLogger.Add(" >> FolderPatter nach V-Element: '" & folderindex & "'", False) + myDynamicFolder = myDynamicFolder.Replace(element.ToString, oElementTemp) + If LogErrorsOnly = False Then ClassLogger.Add(" >> FolderPatter nach V-Element: '" & myDynamicFolder & "'", False) Case Else ClassLogger.Add(" - Achtung - in der Namenkonvention wurde ein Element gefunden welches nicht zugeordnet werden kann!" & vbNewLine & "Elementname: " & element.Value.ToUpper) @@ -3104,35 +3138,35 @@ Public Class frmIndex If LogErrorsOnly = False Then ClassLogger.Add(" >> Den Root-Folder zusammenfügen>> ", False) - Dim fullpath As String = RootFolder & "\" & folderindex & "\" - fullpath = fullpath.Replace("\\", "\") + Dim oNewFullpath As String = ORootFolder & "\" & myDynamicFolder & "\" + oNewFullpath = oNewFullpath.Replace("\\", "\") - fullpath = Path.Combine(RootFolder, folderindex) + oNewFullpath = Path.Combine(ORootFolder, myDynamicFolder) - If LogErrorsOnly = False Then ClassLogger.Add(" >> Fullpath (mit evtl. Sonderzeichen (SZ)) '" & fullpath & "'", False) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Fullpath (mit evtl. Sonderzeichen (SZ)) '" & oNewFullpath & "'", False) Dim invalidPathChars() As Char = Path.GetInvalidPathChars() For Each sonderChar As Char In invalidPathChars 'Sonderzeichen ausser Whitespace entfernen If Char.IsWhiteSpace(sonderChar) = False Then - If fullpath.Contains(sonderChar) Then - fullpath = fullpath.Replace(sonderChar, "") + If oNewFullpath.Contains(sonderChar) Then + oNewFullpath = oNewFullpath.Replace(sonderChar, "") End If End If Next sonderChar - If LogErrorsOnly = False Then ClassLogger.Add(" >> Fullpath (ohne SZ) '" & fullpath & "'", False) - If Directory.Exists(fullpath) = False Then + If LogErrorsOnly = False Then ClassLogger.Add(" >> Fullpath (ohne SZ) '" & oNewFullpath & "'", False) + If Directory.Exists(oNewFullpath) = False Then Try - Directory.CreateDirectory(fullpath) - If LogErrorsOnly = False Then ClassLogger.Add(" >> Folder '" & fullpath & "' wurde angelegt", False) + Directory.CreateDirectory(oNewFullpath) + If LogErrorsOnly = False Then ClassLogger.Add(" >> Folder '" & oNewFullpath & "' wurde angelegt", False) Catch ex As Exception - ClassLogger.Add(" >> Error in CreateFolderforIndex-Method - Root Folder '" & fullpath & "' could not be created. " & ex.Message, True) - MsgBox("Attention: Root Folder '" & fullpath & "' could not be created." & vbNewLine & ex.Message, MsgBoxStyle.Critical) + ClassLogger.Add(" >> Error in CreateFolderforIndex-Method - Root Folder '" & oNewFullpath & "' could not be created. " & ex.Message, True) + MsgBox("Attention: Root Folder '" & oNewFullpath & "' could not be created." & vbNewLine & ex.Message, MsgBoxStyle.Critical) Return False End Try End If - CURRENT_NEWFILENAME = Path.Combine(fullpath, Path.GetFileName(CURRENT_NEWFILENAME)) + CURRENT_NEWFILENAME = Path.Combine(oNewFullpath, Path.GetFileName(CURRENT_NEWFILENAME)) Return True Catch ex As Exception @@ -3155,9 +3189,11 @@ Public Class frmIndex End Sub Private Sub chkdelete_origin_CheckedChanged(sender As Object, e As EventArgs) Handles chkdelete_origin.CheckedChanged - CURR_DELETE_ORIGIN = chkdelete_origin.Checked - CONFIG.Config.DeleteOriginalFile = chkdelete_origin.Checked - CONFIG.Save() + If formloaded = True Then + CURR_DELETE_ORIGIN = chkdelete_origin.Checked + CONFIG.Config.DeleteOriginalFile = chkdelete_origin.Checked + CONFIG.Save() + End If 'SaveConfigValue("Delete_OriginFile", CURR_DELETE_ORIGIN) End Sub diff --git a/Global_Indexer/frmIndexFileList.Designer.vb b/Global_Indexer/frmIndexFileList.Designer.vb index 21253fe..de79b82 100644 --- a/Global_Indexer/frmIndexFileList.Designer.vb +++ b/Global_Indexer/frmIndexFileList.Designer.vb @@ -25,6 +25,7 @@ Partial Class frmIndexFileList Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmIndexFileList)) Me.Panel1 = New System.Windows.Forms.Panel() + Me.Label2 = New System.Windows.Forms.Label() Me.Label1 = New System.Windows.Forms.Label() Me.CheckedListBoxControl1 = New DevExpress.XtraEditors.CheckedListBoxControl() Me.Button1 = New System.Windows.Forms.Button() @@ -36,37 +37,25 @@ Partial Class frmIndexFileList Me.btnCancel = New System.Windows.Forms.Button() Me.btnstartIndex = New System.Windows.Forms.Button() Me.Panel1.SuspendLayout() - CType(Me.CheckedListBoxControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBGI_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.MyDataset1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Panel1 ' - resources.ApplyResources(Me.Panel1, "Panel1") + Me.Panel1.Controls.Add(Me.Label2) Me.Panel1.Controls.Add(Me.Label1) + resources.ApplyResources(Me.Panel1, "Panel1") Me.Panel1.Name = "Panel1" ' + 'Label2 + ' + resources.ApplyResources(Me.Label2, "Label2") + Me.Label2.Name = "Label2" + ' 'Label1 ' resources.ApplyResources(Me.Label1, "Label1") Me.Label1.Name = "Label1" ' - 'CheckedListBoxControl1 - ' - resources.ApplyResources(Me.CheckedListBoxControl1, "CheckedListBoxControl1") - Me.CheckedListBoxControl1.Appearance.Font = CType(resources.GetObject("CheckedListBoxControl1.Appearance.Font"), System.Drawing.Font) - Me.CheckedListBoxControl1.Appearance.FontSizeDelta = CType(resources.GetObject("CheckedListBoxControl1.Appearance.FontSizeDelta"), Integer) - Me.CheckedListBoxControl1.Appearance.FontStyleDelta = CType(resources.GetObject("CheckedListBoxControl1.Appearance.FontStyleDelta"), System.Drawing.FontStyle) - Me.CheckedListBoxControl1.Appearance.GradientMode = CType(resources.GetObject("CheckedListBoxControl1.Appearance.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode) - Me.CheckedListBoxControl1.Appearance.Image = CType(resources.GetObject("CheckedListBoxControl1.Appearance.Image"), System.Drawing.Image) - Me.CheckedListBoxControl1.Appearance.Options.UseFont = True - Me.CheckedListBoxControl1.CheckOnClick = True - Me.CheckedListBoxControl1.Cursor = System.Windows.Forms.Cursors.Default - Me.CheckedListBoxControl1.Name = "CheckedListBoxControl1" - Me.CheckedListBoxControl1.SelectionMode = System.Windows.Forms.SelectionMode.None - Me.CheckedListBoxControl1.ShowFocusRect = False - ' 'Button1 ' resources.ApplyResources(Me.Button1, "Button1") @@ -74,16 +63,6 @@ Partial Class frmIndexFileList Me.Button1.TabStop = False Me.Button1.UseVisualStyleBackColor = True ' - 'TBGI_FILES_USERBindingSource - ' - Me.TBGI_FILES_USERBindingSource.DataMember = "TBGI_FILES_USER" - Me.TBGI_FILES_USERBindingSource.DataSource = Me.MyDataset1 - ' - 'MyDataset1 - ' - Me.MyDataset1.DataSetName = "MyDataset" - Me.MyDataset1.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' 'TBGI_FILES_USERTableAdapter ' Me.TBGI_FILES_USERTableAdapter.ClearBeforeFill = True @@ -96,10 +75,10 @@ Partial Class frmIndexFileList Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Nothing Me.TableAdapterManager.TBDD_GROUPS_USERTableAdapter = Nothing + Me.TableAdapterManager.TBDD_GROUPSTableAdapter = Nothing Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Nothing Me.TableAdapterManager.TBDD_INDEX_MAN_POSTPROCESSINGTableAdapter = Nothing Me.TableAdapterManager.TBDD_INDEX_MANTableAdapter = Nothing - Me.TableAdapterManager.TBDD_GROUPSTableAdapter = Nothing Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing Me.TableAdapterManager.TBGI_CONFIGURATIONTableAdapter = Nothing Me.TableAdapterManager.TBGI_OBJECTTYPE_EMAIL_INDEXTableAdapter = Nothing @@ -120,7 +99,6 @@ Partial Class frmIndexFileList 'btnCancel ' resources.ApplyResources(Me.btnCancel, "btnCancel") - Me.btnCancel.Image = Global.Global_Indexer.My.Resources.Resources.cancel Me.btnCancel.Name = "btnCancel" Me.btnCancel.TabStop = False Me.btnCancel.UseVisualStyleBackColor = True @@ -128,7 +106,6 @@ Partial Class frmIndexFileList 'btnstartIndex ' resources.ApplyResources(Me.btnstartIndex, "btnstartIndex") - Me.btnstartIndex.Image = Global.Global_Indexer.My.Resources.Resources.Go Me.btnstartIndex.Name = "btnstartIndex" Me.btnstartIndex.UseVisualStyleBackColor = True ' @@ -149,9 +126,6 @@ Partial Class frmIndexFileList Me.TopMost = True Me.Panel1.ResumeLayout(False) Me.Panel1.PerformLayout() - CType(Me.CheckedListBoxControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBGI_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.MyDataset1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub @@ -166,4 +140,5 @@ Partial Class frmIndexFileList Friend WithEvents Button1 As System.Windows.Forms.Button Friend WithEvents Button2 As System.Windows.Forms.Button Friend WithEvents btnCancel As System.Windows.Forms.Button + Friend WithEvents Label2 As Label End Class diff --git a/Global_Indexer/frmIndexFileList.en-US.resx b/Global_Indexer/frmIndexFileList.en-US.resx index 5016513..5b25e7d 100644 --- a/Global_Indexer/frmIndexFileList.en-US.resx +++ b/Global_Indexer/frmIndexFileList.en-US.resx @@ -205,9 +205,6 @@ You can prevent indexing the selected files. AADAAAAAgAAAAAAAAAAAAAAAAAAAAAABAAAAAwAAAAcAAEL/AAD//wAA - - NoControl - Files to index: diff --git a/Global_Indexer/frmIndexFileList.resx b/Global_Indexer/frmIndexFileList.resx index 5cd4609..592f879 100644 --- a/Global_Indexer/frmIndexFileList.resx +++ b/Global_Indexer/frmIndexFileList.resx @@ -117,190 +117,273 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 0 + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 1 + + + + Top + - - 648, 294 + + 0, 0 - - $this + + 655, 57 - - btnCancel + + + 0 + + + Panel1 System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Button1 + + $this - - 115, 23 + + 5 - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True - - frmIndexFileList + + Segoe UI, 9.75pt, style=Bold - - - 0 + + NoControl - - 7 + + 3, 31 - - 6, 232 + + 522, 17 - - Alle unselektieren + + 1 - - TBGI_FILES_USERBindingSource + + Sie haben nun Möglichkeit die Indexierung für ausgewählte Dateien zu verhindern. - + + Label2 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + 0 True + + Segoe UI, 9.75pt + + + 3, 9 + + + 326, 17 + + + 0 + + + Folgende Dateien werden zur Indexierung angeboten! + + + Label1 + + + System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Panel1 + + + 1 + + + CheckedListBoxControl1 + + + DevExpress.XtraEditors.CheckedListBoxControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 3 + + + Bottom, Left + + + 6, 292 + + + 115, 23 + + + 1 + + + Alle auswählen + + + Button1 + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + 2 + + 357, 17 + + + 574, 17 + + + Bottom, Left + + + 6, 319 + + + 115, 23 + + + 6 + + + Alle unselektieren + Button2 System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Label1 - - - - Top, Bottom, Left, Right - - - $this - - - Alle auswählen - - - 491, 232 - - - 4 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - MyDataset1 - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 3 - - - 7, 15 - - - Bottom, Right - - - Top - - - 5 - - - TBGI_FILES_USERTableAdapter - - - Horizontal - - - TableAdapterManager - - - 0, 0 - - - 6, 50 - - - $this - - - Panel1 - - - Segoe UI, 9pt - - - 145, 36 - - - Folgende Dateien werden zur Indexierung angeboten! -Sie haben nun Möglichkeit die Indexierung für ausgewählte Dateien zu verhindern. - - - 0 - - - Panel1 - - - 6, 259 - - - MiddleLeft - - - 399, 232 - - - Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - - MiddleRight - - - 86, 36 - - - System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - $this - - 3 - 1 - - 0 - - - Regular - - - 3, 9 - - - Global_Indexer.MyDataset, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + + Bottom, Right MiddleLeft + + 406, 292 + + + 86, 36 + + + 7 + + + Abbruch + + + MiddleRight + + + btnCancel + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + + + Bottom, Right + + + Segoe UI, 9pt, style=Bold + + + MiddleLeft + + + 498, 292 + + + 145, 36 + + + 3 + + + Starte Indexierung + + + MiddleRight + + + btnstartIndex + + + System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + True + + + 7, 15 + + + 655, 354 + + + Segoe UI, 9pt + AAABAAMAEBAQAAEABAAoAQAANgAAABAQAAABAAgAaAUAAF4BAAAQEAAAAQAgAGgEAADGBgAAKAAAABAA @@ -353,88 +436,37 @@ Sie haben nun Möglichkeit die Indexierung für ausgewählte Dateien zu verhinde AADAAAAAgAAAAAAAAAAAAAAAAAAAAAABAAAAAwAAAAcAAEL/AAD//wAA - - 648, 44 - - - - - - 0 - - - Starte Indexierung - - - 0 - Zu indexierende Dateien: - - 6 + + TBGI_FILES_USERBindingSource - - CheckedListBoxControl1 + + System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 440, 30 + + MyDataset1 - - 630, 176 + + Global_Indexer.MyDataset, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - btnstartIndex - - - Segoe UI, 9pt, style=Bold - - - MiddleRight + + TBGI_FILES_USERTableAdapter Global_Indexer.MyDatasetTableAdapters.TBGI_FILES_USERTableAdapter, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - Abbruch + + TableAdapterManager - - 115, 23 + + Global_Indexer.MyDatasetTableAdapters.TableAdapterManager, MyDataset.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - - 1 - - - Segoe UI, 8.25pt + + frmIndexFileList System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this - - - $this - - - DevExpress.XtraEditors.CheckedListBoxControl, DevExpress.XtraEditors.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - 357, 17 - - - 574, 17 - - - en-US - - - True - - - 17, 17 - - - 134, 17 - \ No newline at end of file diff --git a/Global_Indexer/frmStart.Designer.vb b/Global_Indexer/frmStart.Designer.vb index 8520f83..287e8d9 100644 --- a/Global_Indexer/frmStart.Designer.vb +++ b/Global_Indexer/frmStart.Designer.vb @@ -54,8 +54,6 @@ Partial Class frmStart Me.btnChoosefiles = New System.Windows.Forms.Button() Me.MenuStrip1.SuspendLayout() Me.StatusStrip1.SuspendLayout() - CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TBHOTKEY_USER_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'MenuStrip1 @@ -81,7 +79,6 @@ Partial Class frmStart ' 'GlobalIndexerEinstellungenToolStripMenuItem ' - Me.GlobalIndexerEinstellungenToolStripMenuItem.Image = Global.Global_Indexer.My.Resources.Resources.Einstellungen6 Me.GlobalIndexerEinstellungenToolStripMenuItem.Name = "GlobalIndexerEinstellungenToolStripMenuItem" resources.ApplyResources(Me.GlobalIndexerEinstellungenToolStripMenuItem, "GlobalIndexerEinstellungenToolStripMenuItem") ' @@ -187,16 +184,6 @@ Partial Class frmStart Me.LabelVersion.Name = "LabelVersion" Me.LabelVersion.TextAlignment = System.Drawing.StringAlignment.Near ' - 'MyDataset - ' - Me.MyDataset.DataSetName = "MyDataset" - Me.MyDataset.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema - ' - 'TBHOTKEY_USER_PROFILEBindingSource - ' - Me.TBHOTKEY_USER_PROFILEBindingSource.DataMember = "TBHOTKEY_USER_PROFILE" - Me.TBHOTKEY_USER_PROFILEBindingSource.DataSource = Me.MyDataset - ' 'TBHOTKEY_USER_PROFILETableAdapter ' Me.TBHOTKEY_USER_PROFILETableAdapter.ClearBeforeFill = True @@ -239,6 +226,7 @@ Partial Class frmStart Me.Controls.Add(Me.LabelControl1) Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.MenuStrip1) + Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle Me.MaximizeBox = False Me.Name = "frmStart" Me.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide @@ -247,8 +235,6 @@ Partial Class frmStart Me.MenuStrip1.PerformLayout() Me.StatusStrip1.ResumeLayout(False) Me.StatusStrip1.PerformLayout() - CType(Me.MyDataset, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TBHOTKEY_USER_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() diff --git a/Global_Indexer/frmStart.resx b/Global_Indexer/frmStart.resx index 523174f..d49dc30 100644 --- a/Global_Indexer/frmStart.resx +++ b/Global_Indexer/frmStart.resx @@ -581,12 +581,6 @@ auf dieses Fenster oder... 17, 56 - - 249, 17 - - - 359, 17 - 632, 17 diff --git a/Global_Indexer/frmStart.vb b/Global_Indexer/frmStart.vb index 2fae317..06e3e9a 100644 --- a/Global_Indexer/frmStart.vb +++ b/Global_Indexer/frmStart.vb @@ -272,7 +272,7 @@ Public Class frmStart CURRENT_WORKFILE_GUID = Filerow.Item(0) CURRENT_WORKFILE = Filerow.Item("FILENAME2WORK") If LogErrorsOnly = False Then ClassLogger.Add(">> CURRENT_WORKFILE: " & CURRENT_WORKFILE, False) - If File.Exists(CURRENT_WORKFILE) = True Then + If File.Exists(CURRENT_WORKFILE) = True And DTACTUAL_FILES.Rows.Count > 0 Then Open_IndexDialog() End If @@ -284,13 +284,31 @@ Public Class frmStart End Try Me.TopMost = True End Sub + Sub MyBackgroundThread() + + Dim frmCollection = System.Windows.Forms.Application.OpenForms + Do While frmCollection.OfType(Of frmIndex).Any + + Loop + End Sub Sub Open_IndexDialog() - Me.Hide() - frmIndex.ShowDialog() - Me.Visible = True - Me.TopMost = True - Me.BringToFront() + Try + Me.Hide() + Me.TopMost = False + frmIndex.ShowDialog() + 'Dim thread As New Thread(AddressOf MyBackgroundThread) + 'thread.Start() + 'Do While thread.IsAlive + + 'Loop + Me.Visible = True + Me.TopMost = True + Me.BringToFront() + Catch ex As Exception + MsgBox(ex.Message, MsgBoxStyle.Critical) + End Try + End Sub Private Sub frmStart_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing