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

EDMIService: Fix internal Placeholders

Browse Source
This commit is contained in:
Jonathan Jenne 2022-03-15 16:34:54 +01:00
parent 65ef8ccbc7
commit 1b5e724750
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules.Patterns/Modules/BaseModule.vb
View File

@ -9,7 +9,7 @@ Namespace Modules
"SELECT ", "UPDATE ", "DELETE ", "EXEC " "SELECT ", "UPDATE ", "DELETE ", "EXEC "
} }
Private Const MAX_TRY_COUNT = 500 Private Const MAX_TRY_COUNT = 100
Public Sub New(pLogConfig As LogConfig) Public Sub New(pLogConfig As LogConfig)
Logger = pLogConfig.GetLogger() Logger = pLogConfig.GetLogger()

24
Modules.Patterns/Modules/Globix/GlobixAutomatic.vb
View File

@ -28,22 +28,24 @@ Namespace Modules.Globix
While ContainsPattern(oResult, PatternIdentifier) While ContainsPattern(oResult, PatternIdentifier)
Try Try
Dim oIndexName As String = GetNextPattern(oResult, PatternIdentifier).Value Dim oIndexName As String = GetNextPattern(oResult, PatternIdentifier).Value
Logger.Info("Replacing value for Index {0}", oIndexName)
If pIndexes.ContainsKey(oIndexName) = False Then If pIndexes.ContainsKey(oIndexName) = False Then
Logger.Warn("Value for Index [{0}] does not exist and will not be used for replacing. Skipping.", oIndexName) Logger.Warn("Value for Index [{0}] does not exist and will not be used for replacing. Skipping.", oIndexName)
Else
' TODO: If Index contains multiple values, only the first value will be used as value
Dim oIndexValues As List(Of String) = pIndexes.Item(oIndexName)
Dim oFirstValue As String = oIndexValues.FirstOrDefault()
If oFirstValue Is Nothing Then
Logger.Warn("Value for Index [{0}] is empty and will not be used for replacing. Skipping.")
Return oResult
End If
oResult = ReplacePattern(oResult, PatternIdentifier, oFirstValue)
End If End If
' TODO: If Index contains multiple values, only the first value will be used as value
Dim oIndexValues As List(Of String) = pIndexes.Item(oIndexName)
Dim oFirstValue As String = oIndexValues.FirstOrDefault()
If oFirstValue Is Nothing Then
Logger.Warn("Value for Index [{0}] is empty and will not be used for replacing. Skipping.")
Return oResult
End If
oResult = ReplacePattern(oResult, PatternIdentifier, oFirstValue)
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) Logger.Error(ex)
Return oResult Return oResult

2
Modules.Patterns/Modules/Internal.vb
View File

@ -38,7 +38,7 @@ Namespace Modules
' Replace CurrentDate(s) ' Replace CurrentDate(s)
While ContainsPatternAndValue(oResult, PatternIdentifier, INT_VALUE_DATE_YYYY_MM_DD) While ContainsPatternAndValue(oResult, PatternIdentifier, INT_VALUE_DATE_YYYY_MM_DD)
Logger.Trace("Replacing Pattern [{0}]", INT_VALUE_DATE_YYYY_MM_DD) Logger.Trace("Replacing Pattern [{0}]", INT_VALUE_DATE_YYYY_MM_DD)
oResult = ReplacePattern(oResult, PatternIdentifier, oNow.ToString("yyyy/MM/dd")) oResult = ReplacePattern(oResult, PatternIdentifier, oNow.ToString("yyyy\\MM\\dd"))
IncrementCounterOrThrow(oCounter) IncrementCounterOrThrow(oCounter)
End While End While