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

read image, fix oppositionperiod

Browse Source
This commit is contained in:
JenneJ 2015-10-19 14:36:41 +02:00
parent 754149ae86
commit 8acd1e403c
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
app/BrainpoolXmlParser/Parser.vb
View File

@ -1,5 +1,5 @@
Imports System.Xml Imports System.Xml
Imports System.Net
Imports System.IO Imports System.IO
Public Class Parser Public Class Parser
@ -57,7 +57,7 @@ Public Class Parser
Case "MarkFeature" Case "MarkFeature"
mark.MarkFeature = r.ReadInnerXml() mark.MarkFeature = r.ReadInnerXml()
Case "MarkVerbalElementText" Case "MarkVerbalElementText"
mark.MarkVerbalElementText = r.ReadInnerXml() 'WebUtility.HtmlDecode(r.ReadInnerXml()) mark.MarkVerbalElementText = r.ReadInnerXml()
Case "MarkCurrentStatusCode" Case "MarkCurrentStatusCode"
mark.MarkCurrentStatusCode = r.ReadInnerXml() mark.MarkCurrentStatusCode = r.ReadInnerXml()
Case "RegistrationOfficeCode" Case "RegistrationOfficeCode"
@ -68,10 +68,6 @@ Public Class Parser
mark.Representative = r.ReadInnerXml() mark.Representative = r.ReadInnerXml()
Case "Classification" Case "Classification"
mark.Classification = r.ReadInnerXml() mark.Classification = r.ReadInnerXml()
Case "OppositionPeriodStartDate"
mark.OppositionPeriodStartDate = r.ReadInnerXml()
Case "OppositionPeriodEndDate"
mark.OppositionPeriodEndDate = r.ReadInnerXml()
End Select End Select
End If End If
End If End If
@ -122,12 +118,41 @@ Public Class Parser
Case "PublicationDetails" Case "PublicationDetails"
r.ReadToFollowing("PublicationDate") r.ReadToFollowing("PublicationDate")
mark.PublicationDate = r.ReadInnerXml() 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 Select
End If End If
End If End If
End While End While
End Sub 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) Private Sub ReadGoodsDetails(r As XmlReader, ByRef mark As Mark)
While r.Read() While r.Read()
If r.IsStartElement() Then If r.IsStartElement() Then