From 8c71506f044243c3874f1dc7a04bdbaf8762be7d Mon Sep 17 00:00:00 2001
From: JenneJ <j.jenne@didalog.de>
Date: Tue, 20 Oct 2015 10:27:29 +0200
Subject: [PATCH] moar stuff

---
 app/BrainpoolXmlParser/BrainpoolXmlParser.vbproj | 4 ----
 app/BrainpoolXmlParser/Main.vb                   | 2 +-
 app/BrainpoolXmlParser/NLog.config               | 2 +-
 app/BrainpoolXmlParser/Parser.vb                 | 4 ++--
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/BrainpoolXmlParser/BrainpoolXmlParser.vbproj b/app/BrainpoolXmlParser/BrainpoolXmlParser.vbproj
index 149b058..3510e49 100644
--- a/app/BrainpoolXmlParser/BrainpoolXmlParser.vbproj
+++ b/app/BrainpoolXmlParser/BrainpoolXmlParser.vbproj
@@ -61,9 +61,6 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Humanizer">
-      <HintPath>..\packages\Humanizer.1.37.7\lib\portable-win+net40+sl50+wp8+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\Humanizer.dll</HintPath>
-    </Reference>
     <Reference Include="NLog">
       <HintPath>..\..\3rdparty\NLog.4.1.2\lib\net45\NLog.dll</HintPath>
     </Reference>
@@ -93,7 +90,6 @@
     <Compile Include="Config.vb" />
     <Compile Include="DB.vb" />
     <Compile Include="DPMAConnect.vb" />
-    <Compile Include="Image.vb" />
     <Compile Include="Mark.vb" />
     <Compile Include="Main.vb" />
     <Compile Include="My Project\AssemblyInfo.vb" />
diff --git a/app/BrainpoolXmlParser/Main.vb b/app/BrainpoolXmlParser/Main.vb
index dac2d6a..5879503 100644
--- a/app/BrainpoolXmlParser/Main.vb
+++ b/app/BrainpoolXmlParser/Main.vb
@@ -123,7 +123,7 @@ Module Main
                         If prop = "MarkFeature" Then
                             If value = "wort-bildmarke" Or value = "bildmarke" Then
                                 Dim imageControlId = db.GetControlId(formId, "MarkImage")
-                                Dim bimage() As Byte = Image.ToByteArray(m.Image.BinaryImage)
+                                Dim bimage() As Byte = Convert.FromBase64String(m.Image.BinaryImage)
                                 db.InsertImage(bimage, imageControlId, recordId)
                             End If
                         End If
diff --git a/app/BrainpoolXmlParser/NLog.config b/app/BrainpoolXmlParser/NLog.config
index e03c33a..f33974e 100644
--- a/app/BrainpoolXmlParser/NLog.config
+++ b/app/BrainpoolXmlParser/NLog.config
@@ -18,7 +18,7 @@
     See https://github.com/nlog/NLog/wiki/Targets for possible targets.
     See https://github.com/nlog/NLog/wiki/Layout-Renderers for the possible layout renderers.
     -->
-    <target name="logfile" xsi:type="File" fileName="${basedir}/BrainpoolXmlParser-${shortdate}.log" />
+    <target name="logfile" xsi:type="File" fileName="${basedir}/Log/BrainpoolXmlParser-${shortdate}.log" />
     <target name="console" xsi:type="Console"/>
 
     <!--
diff --git a/app/BrainpoolXmlParser/Parser.vb b/app/BrainpoolXmlParser/Parser.vb
index bf0353e..6cf3324 100644
--- a/app/BrainpoolXmlParser/Parser.vb
+++ b/app/BrainpoolXmlParser/Parser.vb
@@ -58,8 +58,6 @@ Public Class Parser
                             mark.MarkFeature = r.ReadInnerXml()
                         Case "MarkVerbalElementText"
                             mark.MarkVerbalElementText = r.ReadInnerXml()
-                        Case "MarkCurrentStatusCode"
-                            mark.MarkCurrentStatusCode = r.ReadInnerXml()
                         Case "RegistrationOfficeCode"
                             mark.RegistrationOfficeCode = r.ReadInnerXml()
                         Case "RegistrationDate"
@@ -124,6 +122,8 @@ Public Class Parser
                             mark.OppositionPeriodEndDate = r.ReadInnerXml()
                         Case "MarkImage"
                             ReadImageDetails(r.ReadSubtree(), mark)
+                        Case "MarkCurrentStatusCode"
+                            mark.MarkCurrentStatusCode = r.ReadInnerXml()
                     End Select
                 End If
             End If