v1.3.1.0 - Correct ADDED_WHO

app/DpmaXmlParser/Main.vb

@@ -19,22 +19,22 @@ Module Main
 
     Private patents As New List(Of Patent)
     Private propsMarks = New List(Of String) From {
-        "RegistrationOfficeCode",
-        "RegistrationDate",
-        "RegistrationNumber",
-        "MarkCurrentStatusCode",
-        "MarkVerbalElementText",
-        "MarkFeature",
-        "ApplicationDate",
-        "Applicant",
-        "Representative",
-        "PublicationDate",
-        "ExpiryDate",
-        "TerminationDate",
-        "OppositionPeriodStartDate",
-        "OppositionPeriodEndDate",
-        "Classification",
-        "ClassificationLong"
+        "RegistrationOfficeCode", ' Aktenzeichen
+        "RegistrationDate", ' Anmeldetag
+        "RegistrationNumber", ' Registernummer
+        "MarkCurrentStatusCode", ' Aktenzustand
+        "MarkVerbalElementText", ' Wiedergabe der Marke
+        "MarkFeature", ' Markenform
+        "ApplicationDate", ' Anmeldetag
+        "Applicant", ' Inhaber
+        "Representative", ' Vertreter
+        "PublicationDate", 'Tag der Veröffentlichung
+        "ExpiryDate", 'Schutzendedatum
+        "TerminationDate", 'Wirkungsdatum Löschung
+        "OppositionPeriodStartDate", 'Wiederspruchsfrist Anfang
+        "OppositionPeriodEndDate", 'Wiederspruchsfrist Ende
+        "Classification", 'Klasse(n) Nizza
+        "ClassificationLong" 'Klasse(n) Nizza vollständig
     }
 
     Private propsPatents = New List(Of String) From {
@@ -43,11 +43,11 @@ Module Main
         "Status", ' Status
         "Title", ' Titel
         "ICM", 'IPC-Klasse
-        "ApplicationDate",
-        "PublicationDate",
-        "Inventors",
-        "Applicants",
-        "Abstract"
+        "ApplicationDate", ' Anmeldetag
+        "PublicationDate", ' Offenlegungstag
+        "Inventors", ' Erfinder
+        "Applicants", ' Inhaber
+        "Abstract" ' Zusammenfassung
     }
 
     Public DataDir As String = "Data"
@@ -207,7 +207,7 @@ Module Main
                     End If
                 Next
 
-                logger.Info($"{addedMarks} Marks added, {updatedMarks} updated, {failedMarks} failed.")
+                logger.Info($"{addedMarks} Marks added, {updatedMarks} updated, {failedMarks} failed." & vbCrLf)
             End If
 
             If config.searchType.Contains("P") Then
@@ -298,11 +298,10 @@ Module Main
                     End If
                 Next
 
-                logger.Info($"{addedPatents} Marks added, {updatedPatents} updated, {failedPatents} failed.")
+                logger.Info($"{addedPatents} Marks added, {updatedPatents} updated, {failedPatents} failed." & vbCrLf)
             End If
 
             logger.Debug("=================== IMPORT END ===================")
-            ReadLine()
         Catch ex As Exception
             logger.Error("==================================================")
             logger.Error("=================== ERROR ========================")

app/DpmaXmlParser/My Project/AssemblyInfo.vb

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

app/DpmaXmlParser/Patent.vb

@@ -144,6 +144,8 @@ Public Class Patent
             Return _abstract
         End Get
         Set(value As String)
+            ' Änderung 01.08.17 - Problem bei Maskierung von Hochkomma    
+            '_abstract = value.Replace("'", "`")
             _abstract = value.Replace("'", "''")
         End Set
     End Property

app/SetupWiX/SetupWiX.wixproj

@@ -35,12 +35,22 @@
     </WixExtension>
   </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
-  <!--
-	To modify your build process, add your task inside one of the targets below and uncomment it.
-	Other similar extension points exist, see Wix.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
+  <Target Name="BeforeBuild">
+    <!-- Get the programs assembly version from the .exe file -->
+    <GetAssemblyIdentity AssemblyFiles="..\DpmaXmlParser\bin\$(Configuration)\DpmaXmlParser.exe">
+      <Output TaskParameter="Assemblies" ItemName="AsmInfo" />
+    </GetAssemblyIdentity>
+    <!-- Store the assembly version number in ProductVersion preprocessor variable -->
+    <CreateProperty Value="$(DefineConstants);ProductVersion=%(AsmInfo.Version)">
+      <Output TaskParameter="Value" PropertyName="DefineConstants" />
+    </CreateProperty>
+    <!-- Name the .msi file after the solution platform and assembly version e.g TestService-x86-1.4.0.0.msi -->
+    <CreateProperty Value="$(SolutionName)-$(Platform)-%(AsmInfo.Version)">
+      <Output TaskParameter="Value" PropertyName="TargetName" />
+    </CreateProperty>
+    <!-- Name the .wixpdb file after the solution platform and assembly version e.g TestService-x86-1.4.0.0.msi -->
+    <CreateProperty Value="$(TargetName)$(TargetPdbExt)">
+      <Output TaskParameter="Value" PropertyName="TargetPdbName" />
+    </CreateProperty>
+  </Target>
 </Project>