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

fix ThreadRunner with empty TableColumn

Browse Source
This commit is contained in:
Jonathan Jenne 2020-06-29 13:58:50 +02:00
parent da5cbb0d3a
commit 9ad959ef20
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules.Interfaces/ZUGFeRDInterface/PropertyValues.vb
View File

@ -54,6 +54,7 @@ Public Class PropertyValues
' Iterate through groups to get group scope and group items ' Iterate through groups to get group scope and group items
For Each oGroup In oGroupedProperties For Each oGroup In oGroupedProperties
Dim oGroupScope As String = oGroup.Key Dim oGroupScope As String = oGroup.Key
Dim oPropertyList As New Dictionary(Of XmlItemProperty, List(Of Object)) Dim oPropertyList As New Dictionary(Of XmlItemProperty, List(Of Object))
Dim oRowCount = 0 Dim oRowCount = 0
@ -117,7 +118,7 @@ Public Class PropertyValues
oPropertyValue = String.Empty oPropertyValue = String.Empty
End If End If
_logger.Debug("ItemSpecification [{0}] has value '{1}'", oTableColumn, oPropertyValue) _logger.Debug("ItemSpecification [{0}] has value '{1}'", oTableColumn, oPropertyValue)
oResult.ValidProperties.Add(New ValidProperty() With { oResult.ValidProperties.Add(New ValidProperty() With {
.MessageId = MessageId, .MessageId = MessageId,

2
Services.ZUGFeRDService/My Project/AssemblyInfo.vb
View File

@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.2.2.0")> <Assembly: AssemblyVersion("1.2.3.0")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

26
Services.ZUGFeRDService/ThreadRunner.vb
View File

@ -174,19 +174,21 @@ Public Class ThreadRunner
Dim oResult As DataTable = _firebird.GetDatatable(oSQL) Dim oResult As DataTable = _firebird.GetDatatable(oSQL)
For Each row As DataRow In oResult.Rows For Each row As DataRow In oResult.Rows
Dim xmlPath = row.Item("XML_PATH") Dim oXmlPath = row.Item("XML_PATH")
Dim tableName = row.Item("TABLE_NAME") Dim oTableName = row.Item("TABLE_NAME")
Dim description = row.Item("DESCRIPTION") Dim oTableColumn = row.Item("TABLE_COLUMN")
Dim isRequired = row.Item("IS_REQUIRED") Dim oDescription = row.Item("DESCRIPTION")
Dim isGrouped = row.Item("IS_GROUPED") Dim oIsRequired = row.Item("IS_REQUIRED")
Dim groupScope = row.Item("GROUP_SCOPE") Dim oIsGrouped = row.Item("IS_GROUPED")
Dim oGroupScope = row.Item("GROUP_SCOPE")
args.PropertyMap.Add(xmlPath, New XmlItemProperty() With { args.PropertyMap.Add(oXmlPath, New XmlItemProperty() With {
.Description = description, .Description = oDescription,
.TableName = tableName, .TableName = oTableName,
.IsRequired = isRequired, .TableColumn = oTableColumn,
.IsGrouped = isGrouped, .IsRequired = oIsRequired,
.GroupScope = groupScope .IsGrouped = oIsGrouped,
.GroupScope = oGroupScope
}) })
Next Next