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

v1.3.1.0 - Correct ADDED_WHO

Browse Source
This commit is contained in:
Jonathan Jenne
2017-08-01 12:16:33 +02:00
parent bbc0fb6bd4
commit 1872606a5c
4 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/DpmaXmlParser/Main.vb
View File

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

2
app/DpmaXmlParser/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.3.0.0")> <Assembly: AssemblyVersion("1.3.1")>
<Assembly: AssemblyFileVersion("1.1.2.0")> <Assembly: AssemblyFileVersion("1.1.2.0")>

2
app/DpmaXmlParser/Patent.vb
View File

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

26
app/SetupWiX/SetupWiX.wixproj
View File

@@ -35,12 +35,22 @@
</WixExtension> </WixExtension>
</ItemGroup> </ItemGroup>
<Import Project="$(WixTargetsPath)" /> <Import Project="$(WixTargetsPath)" />
<!-- <Target Name="BeforeBuild">
To modify your build process, add your task inside one of the targets below and uncomment it. <!-- Get the programs assembly version from the .exe file -->
Other similar extension points exist, see Wix.targets. <GetAssemblyIdentity AssemblyFiles="..\DpmaXmlParser\bin\$(Configuration)\DpmaXmlParser.exe">
<Target Name="BeforeBuild"> <Output TaskParameter="Assemblies" ItemName="AsmInfo" />
</Target> </GetAssemblyIdentity>
<Target Name="AfterBuild"> <!-- Store the assembly version number in ProductVersion preprocessor variable -->
</Target> <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> </Project>