From 8f129647fb98726f4a63570d95453f59f64f0b11 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 31 Jan 2023 14:52:07 +0100 Subject: [PATCH] Fix placeholder format for manual indexes in automatic indexes --- Global_Indexer/ClassPatterns.vb | 4 ++-- Global_Indexer/frmAdministration.vb | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Global_Indexer/ClassPatterns.vb b/Global_Indexer/ClassPatterns.vb index 6528897..a8fd32e 100644 --- a/Global_Indexer/ClassPatterns.vb +++ b/Global_Indexer/ClassPatterns.vb @@ -40,7 +40,7 @@ Public Class ClassPatterns Public Const INT_VALUE_DOMAIN = "DOMAIN" 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 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 End While - LOGGER.Debug("input after ReplaceControlValues [{input}]") + LOGGER.Debug($"input after ReplaceControlValues [{input}]") Return result Catch ex As Exception LOGGER.Error(ex) diff --git a/Global_Indexer/frmAdministration.vb b/Global_Indexer/frmAdministration.vb index 727b3f3..9892e50 100644 --- a/Global_Indexer/frmAdministration.vb +++ b/Global_Indexer/frmAdministration.vb @@ -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 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 { .SQLCommand = oSQLCommand, .SQLConnection = oConnection, .PlaceholdersManual = oPlaceholders, - .PlaceholdersManualTitle = "Manueller Index" + .PlaceholdersManualTitle = "Manueller Index", + .PlaceholdersAutomaticPrefix = "CTRL" } Dim oResult = oForm2.ShowDialog()