AppCustom/MultiTool
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Consolidate parameter format and logic

Browse Source
This commit is contained in:
Jonathan Jenne
2022-06-20 15:00:49 +02:00
parent b3140c48c5
commit adad5501f3
4 changed files with 58 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
MultiTool.Common/Templates/Template.vb
View File

@@ -93,8 +93,8 @@ Namespace Templates
Dim oParam1 As String = Utils.NotNull(Parameter1, String.Empty)
Dim oParam2 As String = Utils.NotNull(Parameter2, String.Empty)
Dim oParamValue1 = TryGetParameter(oParam1, pName)
Dim oParamValue2 = TryGetParameter(oParam2, pName)
Dim oParamValue1 = Parameters.TryGet(oParam1, pName)
Dim oParamValue2 = Parameters.TryGet(oParam2, pName)
If oParamValue1 IsNot Nothing AndAlso oParamValue1.Item1 = pName Then
Return oParamValue1.Item2
@@ -107,22 +107,6 @@ Namespace Templates
Return Nothing
End Function
Private Function TryGetParameter(pParameterString As String, pName As String) As Tuple(Of String, String)
If pParameterString <> String.Empty Then
For Each oParameter In pParameterString.Split(",")
Dim oSplit = oParameter.Split("=").ToList()
If oSplit.Count = 2 AndAlso oSplit.First = pName Then
Return New Tuple(Of String, String)(oSplit.First, oSplit.Last)
End If
Next
Return Nothing
Else
Return Nothing
End If
End Function
''' <summary>
''' Table from XSD
''' </summary>