diff --git a/app/BrainpoolXmlParser/Parser.vb b/app/BrainpoolXmlParser/Parser.vb index 57981f4..bf0353e 100644 --- a/app/BrainpoolXmlParser/Parser.vb +++ b/app/BrainpoolXmlParser/Parser.vb @@ -1,5 +1,5 @@ Imports System.Xml -Imports System.Net + Imports System.IO Public Class Parser @@ -57,7 +57,7 @@ Public Class Parser Case "MarkFeature" mark.MarkFeature = r.ReadInnerXml() Case "MarkVerbalElementText" - mark.MarkVerbalElementText = r.ReadInnerXml() 'WebUtility.HtmlDecode(r.ReadInnerXml()) + mark.MarkVerbalElementText = r.ReadInnerXml() Case "MarkCurrentStatusCode" mark.MarkCurrentStatusCode = r.ReadInnerXml() Case "RegistrationOfficeCode" @@ -68,10 +68,6 @@ Public Class Parser mark.Representative = r.ReadInnerXml() Case "Classification" mark.Classification = r.ReadInnerXml() - Case "OppositionPeriodStartDate" - mark.OppositionPeriodStartDate = r.ReadInnerXml() - Case "OppositionPeriodEndDate" - mark.OppositionPeriodEndDate = r.ReadInnerXml() End Select End If End If @@ -122,12 +118,41 @@ Public Class Parser Case "PublicationDetails" r.ReadToFollowing("PublicationDate") mark.PublicationDate = r.ReadInnerXml() + Case "OppositionPeriodStartDate" + mark.OppositionPeriodStartDate = r.ReadInnerXml() + Case "OppositionPeriodEndDate" + mark.OppositionPeriodEndDate = r.ReadInnerXml() + Case "MarkImage" + ReadImageDetails(r.ReadSubtree(), mark) End Select End If End If End While End Sub + Private Sub ReadImageDetails(r As XmlReader, ByRef mark As Mark) + Dim image As New ImageDetail() + + While r.Read() + If r.IsStartElement() Then + If r.NodeType = XmlNodeType.Element Then + Select Case r.Name + Case "MarkImageBinary" + image.BinaryImage = r.ReadInnerXml() + Case "Height" + image.Height = r.ReadInnerXml() + Case "Width" + image.Width = r.ReadInnerXml() + Case "MarkImageFileFormat" + image.Format = r.ReadInnerXml() + End Select + End If + End If + End While + + mark.Image = image + End Sub + Private Sub ReadGoodsDetails(r As XmlReader, ByRef mark As Mark) While r.Read() If r.IsStartElement() Then