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

Fix placeholder format for manual indexes in automatic indexes

Browse Source
This commit is contained in:
Jonathan Jenne 2023-01-31 14:52:07 +01:00
parent 3995c6c9fd
commit 8f129647fb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Global_Indexer/ClassPatterns.vb
View File

@ -40,7 +40,7 @@ Public Class ClassPatterns
Public Const INT_VALUE_DOMAIN = "DOMAIN" Public Const INT_VALUE_DOMAIN = "DOMAIN"
Public Const INT_VALUE_DATE = "DATE" Public Const INT_VALUE_DATE = "DATE"
Public Const MAX_TRY_COUNT = 500 Public Const MAX_TRY_COUNT = 20
Private Shared ReadOnly regex As Regex = New Regex("{#(\w+)#([\.\w\d\s_-]+)}+") Private Shared ReadOnly regex As Regex = New Regex("{#(\w+)#([\.\w\d\s_-]+)}+")
Private Shared ReadOnly allPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_IDBA, PATTERN_USER, PATTERN_INT} Private Shared ReadOnly allPatterns As New List(Of String) From {PATTERN_WMI, PATTERN_CTRL, PATTERN_IDBA, PATTERN_USER, PATTERN_INT}
@ -260,7 +260,7 @@ Public Class ClassPatterns
oTryCounter += 1 oTryCounter += 1
End While End While
LOGGER.Debug("input after ReplaceControlValues [{input}]") LOGGER.Debug($"input after ReplaceControlValues [{input}]")
Return result Return result
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex) LOGGER.Error(ex)

5
Global_Indexer/frmAdministration.vb
View File

@ -655,13 +655,14 @@ Public Class frmAdministration
Dim oDatatable = DATABASE_ECM.GetDatatable($"SELECT * FROM TBDD_INDEX_MAN WHERE DOK_ID = {oDocTypeGuid} AND ACTIVE = 1") Dim oDatatable = DATABASE_ECM.GetDatatable($"SELECT * FROM TBDD_INDEX_MAN WHERE DOK_ID = {oDocTypeGuid} AND ACTIVE = 1")
Dim oPlaceholders = oDatatable.AsEnumerable(). Dim oPlaceholders = oDatatable.AsEnumerable().
ToDictionary(Of String, String)(Function(row) row.Item("NAME"), Function(row) row.Item("WD_INDEX")) ToDictionary(Of String, String)(Function(row) row.Item("NAME"), Function(row) row.Item("NAME"))
Dim oForm2 As New DigitalData.GUIs.Common.frmSQLEditor(LOGCONFIG, DATABASE_ECM) With { Dim oForm2 As New DigitalData.GUIs.Common.frmSQLEditor(LOGCONFIG, DATABASE_ECM) With {
.SQLCommand = oSQLCommand, .SQLCommand = oSQLCommand,
.SQLConnection = oConnection, .SQLConnection = oConnection,
.PlaceholdersManual = oPlaceholders, .PlaceholdersManual = oPlaceholders,
.PlaceholdersManualTitle = "Manueller Index" .PlaceholdersManualTitle = "Manueller Index",
.PlaceholdersAutomaticPrefix = "CTRL"
} }
Dim oResult = oForm2.ShowDialog() Dim oResult = oForm2.ShowDialog()