AppStd/FileFlow
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Automatic Profile by Regex

Browse Source
This commit is contained in:
Jonathan Jenne 2021-04-09 16:38:02 +02:00
parent a8531bc454
commit 0f9ad5659b
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
Global_Indexer/frmIndex.vb
View File

@ -1581,29 +1581,28 @@ Public Class frmIndex
'cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(CURRENT_LASTDOKART)
End If
Else
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
End If
_Logger.Debug("There is a match on REGEX_DOCTYPE: [{0}]", oRoW.Item("DOCTYPE"))
_Logger.Debug("Regex: [{0}], FileName: [{1}]", oRoW.Item("Regex"), oOnlyFilename)
'cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(oRoW.Item("DOCTYPE"))
If ComboboxDoctype.SelectedItem Is Nothing And 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
Dim oFoundDocType = ComboboxDoctype.Properties.Items.
Cast(Of DocType)().
Where(Function(dt) dt.Name = CURRENT_LASTDOKART).
FirstOrDefault()
_Logger.Debug("There is a match on REGEX_DOCTYPE: [{0}]", oRoW.Item("DOCTYPE"))
_Logger.Debug("Regex: [{0}], FileName: [{1}]", oRoW.Item("Regex"), oOnlyFilename)
'cmbDokumentart.SelectedIndex = cmbDokumentart.FindStringExact(oRoW.Item("DOCTYPE"))
If oFoundDocType IsNot Nothing Then
ComboboxDoctype.SelectedItem = oFoundDocType
End If
Dim oFoundDocType = ComboboxDoctype.Properties.Items.
Cast(Of DocType)().
Where(Function(dt) dt.Guid = oRoW.Item("DOCTYPE_ID")).
FirstOrDefault()
If oFoundDocType IsNot Nothing Then
ComboboxDoctype.SelectedItem = oFoundDocType
Exit For
End If
Next
End If
End If
Next
End If
Catch ex As Exception
ShowErrorMessage(ex, "Form Shown")
@ -1626,10 +1625,8 @@ Public Class frmIndex
For Each oRow As DataRow In oDoctypes.Rows
ComboboxDoctype.Properties.Items.Add(New DocType With {
.Guid = oRow.Item("DOCTYPE_ID"),
.Name = oRow.Item("DOCTYPE")
})
Dim oDocType = New DocType With {.Guid = oRow.Item("DOCTYPE_ID"), .Name = oRow.Item("DOCTYPE")}
ComboboxDoctype.Properties.Items.Add(oDocType)
Next
ComboboxDoctype.SelectedIndex = -1