wipo-gbd-transformation 1.1.53__py3-none-any.whl → 1.1.54__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of wipo-gbd-transformation might be problematic. Click here for more details.
- gbdtransformation/brands/catm/filters.py +2 -1
- gbdtransformation/brands/catm/template.yml +9 -5
- gbdtransformation/brands/vctm/__init__.py +5 -0
- gbdtransformation/brands/vctm/filters.py +75 -0
- gbdtransformation/brands/vctm/schema +87 -0
- gbdtransformation/brands/vctm/template.yml +1 -0
- gbdtransformation/brands/vctm/tests/__init__.py +0 -0
- gbdtransformation/designs/woid/filters.py +16 -0
- gbdtransformation/designs/woid/template.yml +166 -1
- gbdtransformation/designs/xxid/template.yml +118 -2
- {wipo_gbd_transformation-1.1.53.dist-info → wipo_gbd_transformation-1.1.54.dist-info}/METADATA +1 -1
- {wipo_gbd_transformation-1.1.53.dist-info → wipo_gbd_transformation-1.1.54.dist-info}/RECORD +17 -11
- wipo_gbd_transformation-1.1.54.dist-info/SOURCES_Stefans-Mac-Studio.local_Sep-18-063455-2024_Conflict.txt +690 -0
- {wipo_gbd_transformation-1.1.53.dist-info → wipo_gbd_transformation-1.1.54.dist-info}/LICENSE.md +0 -0
- {wipo_gbd_transformation-1.1.53.dist-info → wipo_gbd_transformation-1.1.54.dist-info}/WHEEL +0 -0
- {wipo_gbd_transformation-1.1.53.dist-info → wipo_gbd_transformation-1.1.54.dist-info}/entry_points.txt +0 -0
- {wipo_gbd_transformation-1.1.53.dist-info → wipo_gbd_transformation-1.1.54.dist-info}/top_level.txt +0 -0
|
@@ -193,8 +193,9 @@ def translate_feature(feature):
|
|
|
193
193
|
if feature == 'Olfactory': return 'Olfactory'
|
|
194
194
|
if feature == 'Hologram': return 'Hologram'
|
|
195
195
|
if feature == 'Other': return 'Other'
|
|
196
|
+
if feature == 'Design': return 'Combined'
|
|
196
197
|
|
|
197
|
-
|
|
198
|
+
return 'Unknown'
|
|
198
199
|
|
|
199
200
|
def get_mark_names(word_mark_spec):
|
|
200
201
|
verbal = word_mark_spec.MarkVerbalElementText
|
|
@@ -52,17 +52,21 @@ markDescriptionDetails:
|
|
|
52
52
|
text: {{ description.__value }}
|
|
53
53
|
{% endcall %}
|
|
54
54
|
|
|
55
|
-
|
|
55
|
+
|
|
56
56
|
wordMarkSpecification:
|
|
57
|
-
{%
|
|
57
|
+
{% call(wspec) match('IndexHeadingBag.IndexHeading', trademark) %}
|
|
58
58
|
markVerbalElement:
|
|
59
|
-
- languageCode: {{
|
|
60
|
-
text: {{
|
|
59
|
+
- languageCode: {{ wspec.IndexHeadingText | guess_language(trademark.ApplicationLanguageCode) }}
|
|
60
|
+
text: {{ wspec.IndexHeadingText }}
|
|
61
|
+
{% endcall %}
|
|
62
|
+
{% call(wspec) match('MarkRepresentation.MarkReproduction.WordMarkSpecification', trademark) %}
|
|
63
|
+
{% set (verbal, signif) = wspec | get_mark_names %}
|
|
61
64
|
markSignificantVerbalElement:
|
|
62
65
|
- languageCode: {{ signif | guess_language(trademark.ApplicationLanguageCode) }}
|
|
63
66
|
text: {{ signif }}
|
|
64
67
|
markTransliteration: {{ wspec.MarkTransliteration }}
|
|
65
|
-
{% endcall %}
|
|
68
|
+
{% endcall %}
|
|
69
|
+
|
|
66
70
|
|
|
67
71
|
markImageDetails:
|
|
68
72
|
{% call(img) match('MarkRepresentation.MarkReproduction.MarkImageBag.MarkImage', trademark) %}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import gbdtransformation.brands.ipas.filters as ipas
|
|
2
|
+
import gbdtransformation.common.filters as commons
|
|
3
|
+
|
|
4
|
+
ignore_namespace = [
|
|
5
|
+
'http://www.wipo.int/standards/XMLSchema/trademarks',
|
|
6
|
+
'http://www.wipo.int/standards/XMLSchema/wo-trademarks']
|
|
7
|
+
|
|
8
|
+
def get_appdate(appdate, appnum):
|
|
9
|
+
return appnum.split('/')[-2]
|
|
10
|
+
|
|
11
|
+
#return ipas.get_appdate(appdate, appnum)
|
|
12
|
+
|
|
13
|
+
def translate_type(header):
|
|
14
|
+
code = header.TransactionCode
|
|
15
|
+
if code == 'Trademark': return 'TRADEMARK'
|
|
16
|
+
|
|
17
|
+
raise Exception('Type "%s" is not mapped.' % code)
|
|
18
|
+
|
|
19
|
+
def translate_kind(trademark, header):
|
|
20
|
+
subcode = header.TransactionSubCode
|
|
21
|
+
if subcode == 'Trademarks': return ['Individual']
|
|
22
|
+
# it is None for all
|
|
23
|
+
# kind = trademark.KindMark
|
|
24
|
+
|
|
25
|
+
raise Exception('Kind "%s" not mapped.' % subcode)
|
|
26
|
+
|
|
27
|
+
def translate_status(trademark):
|
|
28
|
+
status = trademark.MarkCurrentStatusCode
|
|
29
|
+
"""
|
|
30
|
+
if status == 'Converted': return 'Registered'
|
|
31
|
+
"""
|
|
32
|
+
return ipas.translate_status(status)
|
|
33
|
+
|
|
34
|
+
def translate_feature(trademark):
|
|
35
|
+
feature = trademark.MarkFeature
|
|
36
|
+
if not feature: return 'Undefined'
|
|
37
|
+
|
|
38
|
+
return ipas.translate_feature(feature)
|
|
39
|
+
|
|
40
|
+
def translate_event(event):
|
|
41
|
+
if not event: return 'Unknown'
|
|
42
|
+
|
|
43
|
+
return ipas.translate_event(event)
|
|
44
|
+
|
|
45
|
+
# ---------------------------------------
|
|
46
|
+
# # language code is not accurate for markVerbalElement
|
|
47
|
+
# def guess_language(text, lang, default):
|
|
48
|
+
# if commons.is_latin(text):
|
|
49
|
+
# return 'en'
|
|
50
|
+
# else:
|
|
51
|
+
# return commons.guess_language(text, lang, default)
|
|
52
|
+
|
|
53
|
+
def verbal_lang_map(markVerbalElements, applang=None):
|
|
54
|
+
return ipas.verbal_lang_map(markVerbalElements, applang=applang)
|
|
55
|
+
|
|
56
|
+
def get_registration_nb(trademark, tmstatus):
|
|
57
|
+
if trademark.RegistrationNumber:
|
|
58
|
+
return trademark.RegistrationNumber
|
|
59
|
+
|
|
60
|
+
return None
|
|
61
|
+
|
|
62
|
+
def get_expiry_date(trademark, tmstatus):
|
|
63
|
+
return ipas.get_expiry_date(trademark, tmstatus)
|
|
64
|
+
|
|
65
|
+
def get_registration_date(trademark, tmstatus):
|
|
66
|
+
return ipas.get_registration_date(trademark, tmstatus)
|
|
67
|
+
|
|
68
|
+
def is_international(header):
|
|
69
|
+
return False
|
|
70
|
+
|
|
71
|
+
def get_ir_refnum(appnum):
|
|
72
|
+
return
|
|
73
|
+
|
|
74
|
+
def get_goods_services(goods_services):
|
|
75
|
+
return ipas.get_goods_services(goods_services)
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
/Transaction
|
|
2
|
+
__/TradeMarkTransactionBody
|
|
3
|
+
____/TransactionContentDetails
|
|
4
|
+
______/TransactionCode
|
|
5
|
+
______/TransactionData
|
|
6
|
+
________/TradeMarkApplication
|
|
7
|
+
__________/TradeMarkDetails
|
|
8
|
+
____________/TradeMark
|
|
9
|
+
______________/ApplicantDetails
|
|
10
|
+
________________/Applicant
|
|
11
|
+
__________________/ApplicantAddressBook
|
|
12
|
+
____________________/FormattedNameAddress
|
|
13
|
+
______________________/Address
|
|
14
|
+
________________________/AddressCountryCode
|
|
15
|
+
________________________/FreeFormatAddress
|
|
16
|
+
__________________________/FreeFormatAddressLine
|
|
17
|
+
______________________/Name
|
|
18
|
+
________________________/FreeFormatName
|
|
19
|
+
__________________________/FreeFormatNameDetails
|
|
20
|
+
____________________________/FreeFormatNameLine
|
|
21
|
+
____________________________/FreeFormatNameLine[@languageCode=en]
|
|
22
|
+
______________/ApplicationDate
|
|
23
|
+
______________/ApplicationLanguageCode
|
|
24
|
+
______________/ApplicationNumber
|
|
25
|
+
______________/ExpiryDate
|
|
26
|
+
______________/GoodsServicesDetails
|
|
27
|
+
________________/GoodsServices
|
|
28
|
+
__________________/ClassDescriptionDetails
|
|
29
|
+
____________________/ClassDescription
|
|
30
|
+
______________________/ClassNumber
|
|
31
|
+
______________________/GoodsServicesDescription
|
|
32
|
+
______________________/GoodsServicesDescription[@languageCode=en]
|
|
33
|
+
______________/KindMark
|
|
34
|
+
______________/MarkCurrentStatusCode
|
|
35
|
+
______________/MarkCurrentStatusDate
|
|
36
|
+
______________/MarkDisclaimerDetails
|
|
37
|
+
________________/MarkDisclaimer
|
|
38
|
+
________________/MarkDisclaimer[@languageCode=en]
|
|
39
|
+
______________/MarkEventDetails
|
|
40
|
+
________________/MarkEvent
|
|
41
|
+
__________________/MarkEventCode
|
|
42
|
+
__________________/MarkEventDate
|
|
43
|
+
__________________/OfficeSpecificMarkEventCode
|
|
44
|
+
__________________/OfficeSpecificMarkEventDescription
|
|
45
|
+
__________________/OfficeSpecificMarkEventDescription[@languageCode=en]
|
|
46
|
+
______________/MarkFeature
|
|
47
|
+
______________/MarkImageDetails
|
|
48
|
+
________________/MarkImage
|
|
49
|
+
__________________/MarkImageCategory
|
|
50
|
+
____________________/CategoryCodeDetails
|
|
51
|
+
______________________/CategoryCode
|
|
52
|
+
____________________/CategoryKind
|
|
53
|
+
____________________/CategoryVersion
|
|
54
|
+
__________________/MarkImageColourClaimedText
|
|
55
|
+
__________________/MarkImageColourClaimedText[@languageCode=en]
|
|
56
|
+
__________________/MarkImageFileFormat
|
|
57
|
+
__________________/MarkImageFilename
|
|
58
|
+
______________/PriorityDetails
|
|
59
|
+
________________/Priority
|
|
60
|
+
__________________/PriorityCountryCode
|
|
61
|
+
__________________/PriorityDate
|
|
62
|
+
__________________/PriorityNumber
|
|
63
|
+
______________/PublicationDetails
|
|
64
|
+
________________/Publication
|
|
65
|
+
__________________/PublicationDate
|
|
66
|
+
__________________/PublicationIdentifier
|
|
67
|
+
______________/RegistrationDate
|
|
68
|
+
______________/RegistrationNumber
|
|
69
|
+
______________/RegistrationOfficeCode
|
|
70
|
+
______________/RepresentativeDetails
|
|
71
|
+
________________/Representative
|
|
72
|
+
__________________/RepresentativeAddressBook
|
|
73
|
+
____________________/FormattedNameAddress
|
|
74
|
+
______________________/Address
|
|
75
|
+
________________________/AddressCountryCode
|
|
76
|
+
________________________/FreeFormatAddress
|
|
77
|
+
__________________________/FreeFormatAddressLine
|
|
78
|
+
______________________/Name
|
|
79
|
+
________________________/FreeFormatName
|
|
80
|
+
__________________________/FreeFormatNameDetails
|
|
81
|
+
____________________________/FreeFormatNameLine
|
|
82
|
+
____________________________/FreeFormatNameLine[@languageCode=en]
|
|
83
|
+
______________/WordMarkSpecification
|
|
84
|
+
________________/MarkVerbalElementText
|
|
85
|
+
________________/MarkVerbalElementText[@languageCode=en]
|
|
86
|
+
______/TransactionIdentifier
|
|
87
|
+
______/TransactionSubCode
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{% include "ipas/template.yml" %}
|
|
File without changes
|
|
@@ -3,6 +3,7 @@ from gbdtransformation.designs import kinds as std_kinds
|
|
|
3
3
|
from gbdtransformation.designs import status as std_status
|
|
4
4
|
from gbdtransformation.designs.filters import st13
|
|
5
5
|
from datetime import datetime, date
|
|
6
|
+
import json
|
|
6
7
|
|
|
7
8
|
# namespaces defined in XML and to be ignored in procecssing
|
|
8
9
|
ignore_namespace = [ "http://www.wipo.int/standards/XMLSchema/ST96/Design",
|
|
@@ -344,4 +345,19 @@ def isApplicableToCountry(countryCode, hagueHistoryEvent):
|
|
|
344
345
|
return True
|
|
345
346
|
return False
|
|
346
347
|
|
|
348
|
+
"""
|
|
349
|
+
Functions dedicated to Hague transaction history
|
|
350
|
+
"""
|
|
347
351
|
|
|
352
|
+
transaction_header_elements = [ "HagueBulletinNumber", "PublicationDate" ]
|
|
353
|
+
|
|
354
|
+
def get_event_type(history):
|
|
355
|
+
for child in history:
|
|
356
|
+
if child.startswith("_"):
|
|
357
|
+
continue
|
|
358
|
+
if child not in transaction_header_elements:
|
|
359
|
+
return child
|
|
360
|
+
return None
|
|
361
|
+
|
|
362
|
+
def serialize(history):
|
|
363
|
+
return json.loads(history.toJSON())
|
|
@@ -108,6 +108,61 @@ applicants:
|
|
|
108
108
|
entitlementDomiciled: {{ holder.Entitlement.EntitlementDomiciled.EntitlementDomiciledCode }}
|
|
109
109
|
{% endcall %}
|
|
110
110
|
|
|
111
|
+
applicantsNormalized:
|
|
112
|
+
{% call(holder) match('HolderNormalized', HagueExpressTransaction.HagueCurrent.HagueRegistration.HolderBag) %}
|
|
113
|
+
- identifier:
|
|
114
|
+
|
|
115
|
+
{% set ns = namespace(kind='organization') %}
|
|
116
|
+
{% call(name) match('Name', holder.Contact) %}
|
|
117
|
+
{% if name.PersonName %}
|
|
118
|
+
{% set ns.kind = 'person' %}
|
|
119
|
+
{% endif %}
|
|
120
|
+
{% endcall %}
|
|
121
|
+
kind: {{ ns.kind }}
|
|
122
|
+
|
|
123
|
+
{% call(name) match('Name', holder.Contact) %}
|
|
124
|
+
{% if name.PersonName %}
|
|
125
|
+
firstName:
|
|
126
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.FirstName) }}
|
|
127
|
+
text: {{ name.PersonName.PersonStructuredName.FirstName }}
|
|
128
|
+
lastName:
|
|
129
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.LastName) }}
|
|
130
|
+
text: {{ name.PersonName.PersonStructuredName.LastName }}
|
|
131
|
+
middleName:
|
|
132
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.MiddleName) }}
|
|
133
|
+
text: {{ name.PersonName.PersonStructuredName.MiddleName }}
|
|
134
|
+
{% endif %}
|
|
135
|
+
|
|
136
|
+
{% if name.OrganizationName %}
|
|
137
|
+
orgName:
|
|
138
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
|
|
139
|
+
text: {{ name.OrganizationName.OrganizationStandardName }}
|
|
140
|
+
{% endif %}
|
|
141
|
+
{% endcall %}
|
|
142
|
+
|
|
143
|
+
fullAddress:
|
|
144
|
+
{% call(postalAddress) match('PostalAddress', holder.Contact.PostalAddressBag) %}
|
|
145
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
|
|
146
|
+
#text: {{ postalAddress.PostalStructuredAddress | format_complete_address }}
|
|
147
|
+
addressLine: {{ postalAddress.PostalStructuredAddress.AddressLineText }}
|
|
148
|
+
cityName: {{ postalAddress.PostalStructuredAddress.CityName }}
|
|
149
|
+
geographicRegionName: {{ postalAddress.PostalStructuredAddress.GeographicRegionName }}
|
|
150
|
+
postalCode: {{ postalAddress.PostalStructuredAddress.PostalCode }}
|
|
151
|
+
postalBox: {{ postalAddress.PostalStructuredAddress.PostalBox }}
|
|
152
|
+
countryCode: {{ postalAddress.PostalStructuredAddress.CountryCode }}
|
|
153
|
+
{% endcall %}
|
|
154
|
+
|
|
155
|
+
processingTool:
|
|
156
|
+
name: {{ holder.Contact._type }}
|
|
157
|
+
version: {{ holder.Contact._subtype }}
|
|
158
|
+
processingDate: {{ holder.Contact._when }}
|
|
159
|
+
|
|
160
|
+
entitlement:
|
|
161
|
+
entitlementNationalityCode: {{ holder.Entitlement.EntitlementNationalityCode }}
|
|
162
|
+
entitlementEstablishment: {{ holder.Entitlement.EntitlementEstablishment.EntitlementEstablishmentCode }}
|
|
163
|
+
entitlementDomiciled: {{ holder.Entitlement.EntitlementDomiciled.EntitlementDomiciledCode }}
|
|
164
|
+
{% endcall %}
|
|
165
|
+
|
|
111
166
|
representatives:
|
|
112
167
|
{% call(representative) match('Representative', HagueExpressTransaction.HagueCurrent.HagueRegistration.RepresentativeBag) %}
|
|
113
168
|
- identifier:
|
|
@@ -145,6 +200,56 @@ representatives:
|
|
|
145
200
|
{% endcall %}
|
|
146
201
|
{% endcall %}
|
|
147
202
|
|
|
203
|
+
representativesNormalized:
|
|
204
|
+
{% call(representative) match('RepresentativeNormalized', HagueExpressTransaction.HagueCurrent.HagueRegistration.RepresentativeBag) %}
|
|
205
|
+
- identifier:
|
|
206
|
+
|
|
207
|
+
{% set ns = namespace(kind='organization') %}
|
|
208
|
+
{% call(name) match('Name', representative.Contact) %}
|
|
209
|
+
{% if name.PersonName %}
|
|
210
|
+
{% set ns.kind = 'person' %}
|
|
211
|
+
{% endif %}
|
|
212
|
+
{% endcall %}
|
|
213
|
+
kind: {{ ns.kind }}
|
|
214
|
+
|
|
215
|
+
{% call(name) match('Name', representative.Contact) %}
|
|
216
|
+
{% if name.PersonName %}
|
|
217
|
+
firstName:
|
|
218
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.FirstName) }}
|
|
219
|
+
text: {{ name.PersonName.PersonStructuredName.FirstName }}
|
|
220
|
+
lastName:
|
|
221
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.LastName) }}
|
|
222
|
+
text: {{ name.PersonName.PersonStructuredName.LastName }}
|
|
223
|
+
middleName:
|
|
224
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.MiddleName) }}
|
|
225
|
+
text: {{ name.PersonName.PersonStructuredName.MiddleName }}
|
|
226
|
+
{% endif %}
|
|
227
|
+
|
|
228
|
+
{% if name.OrganizationName %}
|
|
229
|
+
orgName:
|
|
230
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
|
|
231
|
+
text: {{ name.OrganizationName.OrganizationStandardName }}
|
|
232
|
+
{% endif %}
|
|
233
|
+
{% endcall %}
|
|
234
|
+
|
|
235
|
+
fullAddress:
|
|
236
|
+
{% call(postalAddress) match('PostalAddress', representative.Contact.PostalAddressBag) %}
|
|
237
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
|
|
238
|
+
#text: {{ postalAddress.PostalStructuredAddress | format_complete_address }}
|
|
239
|
+
addressLine: {{ postalAddress.PostalStructuredAddress.AddressLineText }}
|
|
240
|
+
cityName: {{ postalAddress.PostalStructuredAddress.CityName }}
|
|
241
|
+
geographicRegionName: {{ postalAddress.PostalStructuredAddress.GeographicRegionName }}
|
|
242
|
+
postalCode: {{ postalAddress.PostalStructuredAddress.PostalCode }}
|
|
243
|
+
postalBox: {{ postalAddress.PostalStructuredAddress.PostalBox }}
|
|
244
|
+
countryCode: {{ postalAddress.PostalStructuredAddress.CountryCode }}
|
|
245
|
+
{% endcall %}
|
|
246
|
+
|
|
247
|
+
processingTool:
|
|
248
|
+
name: {{ representative.Contact._type }}
|
|
249
|
+
version: {{ representative.Contact._subtype }}
|
|
250
|
+
processingDate: {{ representative.Contact._when }}
|
|
251
|
+
{% endcall %}
|
|
252
|
+
|
|
148
253
|
designClaim:
|
|
149
254
|
# updated for supporting Hague data
|
|
150
255
|
{% if HagueExpressTransaction.HagueCurrent.HagueRegistration.DesignClaimBag.DesignClaim.DesignClaimTextBag %}
|
|
@@ -264,6 +369,56 @@ designs:
|
|
|
264
369
|
{% endcall %}
|
|
265
370
|
{% endcall %}
|
|
266
371
|
|
|
372
|
+
designerNormalized:
|
|
373
|
+
{% call(designer) match('DesignerNormalized', design.DesignerBag) %}
|
|
374
|
+
- identifier:
|
|
375
|
+
|
|
376
|
+
{% set ns = namespace(kind='organization') %}
|
|
377
|
+
{% call(name) match('Name', designer.Contact) %}
|
|
378
|
+
{% if name.PersonName %}
|
|
379
|
+
{% set ns.kind = 'person' %}
|
|
380
|
+
{% endif %}
|
|
381
|
+
{% endcall %}
|
|
382
|
+
kind: {{ ns.kind }}
|
|
383
|
+
|
|
384
|
+
{% call(name) match('Name', designer.Contact) %}
|
|
385
|
+
{% if name.PersonName %}
|
|
386
|
+
firstName:
|
|
387
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.FirstName) }}
|
|
388
|
+
text: {{ name.PersonName.PersonStructuredName.FirstName }}
|
|
389
|
+
lastName:
|
|
390
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.LastName) }}
|
|
391
|
+
text: {{ name.PersonName.PersonStructuredName.LastName }}
|
|
392
|
+
middleName:
|
|
393
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.MiddleName) }}
|
|
394
|
+
text: {{ name.PersonName.PersonStructuredName.MiddleName }}
|
|
395
|
+
{% endif %}
|
|
396
|
+
|
|
397
|
+
{% if name.OrganizationName %}
|
|
398
|
+
orgName:
|
|
399
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
|
|
400
|
+
text: {{ name.OrganizationName.OrganizationStandardName }}
|
|
401
|
+
{% endif %}
|
|
402
|
+
{% endcall %}
|
|
403
|
+
|
|
404
|
+
fullAddress:
|
|
405
|
+
{% call(postalAddress) match('PostalAddress', designer.Contact.PostalAddressBag) %}
|
|
406
|
+
- languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
|
|
407
|
+
#text: {{ postalAddress.PostalStructuredAddress | format_complete_address }}
|
|
408
|
+
addressLine: {{ postalAddress.PostalStructuredAddress.AddressLineText }}
|
|
409
|
+
cityName: {{ postalAddress.PostalStructuredAddress.CityName }}
|
|
410
|
+
geographicRegionName: {{ postalAddress.PostalStructuredAddress.GeographicRegionName }}
|
|
411
|
+
postalCode: {{ postalAddress.PostalStructuredAddress.PostalCode }}
|
|
412
|
+
postalBox: {{ postalAddress.PostalStructuredAddress.PostalBox }}
|
|
413
|
+
countryCode: {{ postalAddress.PostalStructuredAddress.CountryCode }}
|
|
414
|
+
{% endcall %}
|
|
415
|
+
|
|
416
|
+
processingTool:
|
|
417
|
+
name: {{ designer.Contact._type }}
|
|
418
|
+
version: {{ designer.Contact._subtype }}
|
|
419
|
+
processingDate: {{ designer.Contact._when }}
|
|
420
|
+
{% endcall %}
|
|
421
|
+
|
|
267
422
|
productIndicationClasses:
|
|
268
423
|
kind: "Locarno"
|
|
269
424
|
version: {{ design.LocarnoClassificationBag.LocarnoClassificationEdition }}
|
|
@@ -348,4 +503,14 @@ extra:
|
|
|
348
503
|
{% endcall %}
|
|
349
504
|
|
|
350
505
|
{% endcall %}
|
|
351
|
-
|
|
506
|
+
|
|
507
|
+
history:
|
|
508
|
+
{% call(history) match('HagueHistory', HagueExpressTransaction) %}
|
|
509
|
+
|
|
510
|
+
- sequenceNumber: {{ history._sequenceNumber }}
|
|
511
|
+
hagueBulletinNumber: {{ history.HagueBulletinNumber }}
|
|
512
|
+
publicationDate: {{ history.PublicationDate }}
|
|
513
|
+
eventType: {{ history | get_event_type() }}
|
|
514
|
+
content: {{ history | serialize() }}
|
|
515
|
+
|
|
516
|
+
{% endcall %}
|
|
@@ -12,7 +12,7 @@ designatedCountries:
|
|
|
12
12
|
|
|
13
13
|
# some collections indicate that the application
|
|
14
14
|
# originates from international filing and provide IR number
|
|
15
|
-
|
|
15
|
+
reference:
|
|
16
16
|
application:
|
|
17
17
|
- number:
|
|
18
18
|
date:
|
|
@@ -54,7 +54,6 @@ applicationLanguageCode:
|
|
|
54
54
|
# rarely passed
|
|
55
55
|
secondLanguageCode:
|
|
56
56
|
|
|
57
|
-
|
|
58
57
|
applicants:
|
|
59
58
|
- identifier:
|
|
60
59
|
kind:
|
|
@@ -78,6 +77,39 @@ applicants:
|
|
|
78
77
|
countryCode:
|
|
79
78
|
postalCode:
|
|
80
79
|
countryCode: # sometimes, country name is provided instead
|
|
80
|
+
entitlement:
|
|
81
|
+
entitlementNationalityCode:
|
|
82
|
+
entitlementEstablishment:
|
|
83
|
+
entitlementDomiciled:
|
|
84
|
+
|
|
85
|
+
applicantsNormalized:
|
|
86
|
+
- identifier:
|
|
87
|
+
kind:
|
|
88
|
+
orgName:
|
|
89
|
+
- languageCode:
|
|
90
|
+
text:
|
|
91
|
+
firstName:
|
|
92
|
+
- languageCode:
|
|
93
|
+
text:
|
|
94
|
+
lastName:
|
|
95
|
+
- languageCode:
|
|
96
|
+
text:
|
|
97
|
+
middleName:
|
|
98
|
+
- languageCode:
|
|
99
|
+
text:
|
|
100
|
+
fullAddress:
|
|
101
|
+
- languageCode:
|
|
102
|
+
addressLine:
|
|
103
|
+
cityName:
|
|
104
|
+
geographicRegionName:
|
|
105
|
+
countryCode:
|
|
106
|
+
country:
|
|
107
|
+
postalCode:
|
|
108
|
+
postalBox:
|
|
109
|
+
processingTool:
|
|
110
|
+
name:
|
|
111
|
+
version:
|
|
112
|
+
processingDate:
|
|
81
113
|
|
|
82
114
|
representatives:
|
|
83
115
|
- identifier:
|
|
@@ -103,6 +135,34 @@ representatives:
|
|
|
103
135
|
postalCode:
|
|
104
136
|
countryCode: # sometimes, country name is provided instead
|
|
105
137
|
|
|
138
|
+
representativesNormalized:
|
|
139
|
+
- identifier:
|
|
140
|
+
kind:
|
|
141
|
+
orgName:
|
|
142
|
+
- languageCode:
|
|
143
|
+
text:
|
|
144
|
+
firstName:
|
|
145
|
+
- languageCode:
|
|
146
|
+
text:
|
|
147
|
+
lastName:
|
|
148
|
+
- languageCode:
|
|
149
|
+
text:
|
|
150
|
+
middleName:
|
|
151
|
+
- languageCode:
|
|
152
|
+
text:
|
|
153
|
+
fullAddress:
|
|
154
|
+
- languageCode:
|
|
155
|
+
addressLine:
|
|
156
|
+
cityName:
|
|
157
|
+
geographicRegionName:
|
|
158
|
+
countryCode:
|
|
159
|
+
country:
|
|
160
|
+
postalCode:
|
|
161
|
+
postalBox:
|
|
162
|
+
processingTool:
|
|
163
|
+
name:
|
|
164
|
+
version:
|
|
165
|
+
processingDate:
|
|
106
166
|
|
|
107
167
|
correspondence:
|
|
108
168
|
fullName:
|
|
@@ -126,6 +186,33 @@ correspondence:
|
|
|
126
186
|
postalCode:
|
|
127
187
|
countryCode: # sometimes, country name is provided instead
|
|
128
188
|
|
|
189
|
+
correspondenceNormalized:
|
|
190
|
+
kind:
|
|
191
|
+
orgName:
|
|
192
|
+
- languageCode:
|
|
193
|
+
text:
|
|
194
|
+
firstName:
|
|
195
|
+
- languageCode:
|
|
196
|
+
text:
|
|
197
|
+
lastName:
|
|
198
|
+
- languageCode:
|
|
199
|
+
text:
|
|
200
|
+
middleName:
|
|
201
|
+
- languageCode:
|
|
202
|
+
text:
|
|
203
|
+
fullAddress:
|
|
204
|
+
- languageCode:
|
|
205
|
+
addressLine:
|
|
206
|
+
cityName:
|
|
207
|
+
geographicRegionName:
|
|
208
|
+
countryCode:
|
|
209
|
+
country:
|
|
210
|
+
postalCode:
|
|
211
|
+
postalBox:
|
|
212
|
+
processingTool:
|
|
213
|
+
name:
|
|
214
|
+
version:
|
|
215
|
+
processingDate:
|
|
129
216
|
|
|
130
217
|
designClaim:
|
|
131
218
|
claims:
|
|
@@ -193,6 +280,35 @@ designs:
|
|
|
193
280
|
postalCode:
|
|
194
281
|
countryCode: # sometimes, country name is provided instead
|
|
195
282
|
|
|
283
|
+
designerNormalized:
|
|
284
|
+
- identifier:
|
|
285
|
+
kind:
|
|
286
|
+
orgName:
|
|
287
|
+
- languageCode:
|
|
288
|
+
text:
|
|
289
|
+
firstName:
|
|
290
|
+
- languageCode:
|
|
291
|
+
text:
|
|
292
|
+
lastName:
|
|
293
|
+
- languageCode:
|
|
294
|
+
text:
|
|
295
|
+
middleName:
|
|
296
|
+
- languageCode:
|
|
297
|
+
text:
|
|
298
|
+
fullAddress:
|
|
299
|
+
- languageCode:
|
|
300
|
+
addressLine:
|
|
301
|
+
cityName:
|
|
302
|
+
geographicRegionName:
|
|
303
|
+
countryCode:
|
|
304
|
+
country:
|
|
305
|
+
postalCode:
|
|
306
|
+
postalBox:
|
|
307
|
+
processingTool:
|
|
308
|
+
name:
|
|
309
|
+
version:
|
|
310
|
+
processingDate:
|
|
311
|
+
|
|
196
312
|
productIndicationClasses:
|
|
197
313
|
- kind: Locarno/US/CA/Etc
|
|
198
314
|
version: #mostly
|
{wipo_gbd_transformation-1.1.53.dist-info → wipo_gbd_transformation-1.1.54.dist-info}/RECORD
RENAMED
|
@@ -64,9 +64,9 @@ gbdtransformation/brands/bztm/schema,sha256=AP0MxQyD0hY4APRh8nxitlxMqJYJB4AaaTJ8
|
|
|
64
64
|
gbdtransformation/brands/bztm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
|
|
65
65
|
gbdtransformation/brands/bztm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
66
66
|
gbdtransformation/brands/catm/__init__.py,sha256=pMtR-N5slJD0QHJU36_dbeWyqoqn4Q0eaMOmfO4Ed_o,270
|
|
67
|
-
gbdtransformation/brands/catm/filters.py,sha256=
|
|
67
|
+
gbdtransformation/brands/catm/filters.py,sha256=iZOJFFpmXySl08VWkLDF3cMqFxW3ZGclTIXfG20HW-A,8216
|
|
68
68
|
gbdtransformation/brands/catm/schema,sha256=Xace88lwiEefhHkk6Zg12dzVF237nMy06HMISEXaTwk,34762
|
|
69
|
-
gbdtransformation/brands/catm/template.yml,sha256=
|
|
69
|
+
gbdtransformation/brands/catm/template.yml,sha256=AwAv3VPRY2VmoyTyPZCwKdRJSmYdVUTRpJj4Zv3uqrM,9861
|
|
70
70
|
gbdtransformation/brands/chtm/__init__.py,sha256=HPYmDCQ41vkuoXSA94CRtqN_pEKDaUhbpXLOBqlaumQ,130
|
|
71
71
|
gbdtransformation/brands/chtm/filters.py,sha256=920M3dD2ag6RmotTQJwrGaxnsuI5VvTwsdZsYwDxcVI,5174
|
|
72
72
|
gbdtransformation/brands/chtm/schema,sha256=PWp5xUNXHbOt3U2zQKelVOKIbH0OYqNmwzkcB3QucuE,1385
|
|
@@ -399,6 +399,11 @@ gbdtransformation/brands/uytm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib
|
|
|
399
399
|
gbdtransformation/brands/uytm/filters.py,sha256=i7SBMVTF70OERVdsS3Dfv19S3-9kyxE-y4aYA59YxA4,1976
|
|
400
400
|
gbdtransformation/brands/uytm/schema,sha256=uMd1E_XRVQ_wHVrGq5fqFH6Fyg8cWx2DTQbVvH8tmmA,3730
|
|
401
401
|
gbdtransformation/brands/uytm/template.yml,sha256=fLZVKwC0j6fAxv-kpngeSnGOZMiK-T_wWdxFmd4L7pc,5497
|
|
402
|
+
gbdtransformation/brands/vctm/__init__.py,sha256=EHssGg8NHP_ywIgUYk2fxpNtalIlSdpzuCOhUfbJuA8,86
|
|
403
|
+
gbdtransformation/brands/vctm/filters.py,sha256=sjw2IhCg0CYh0zeci5dL7VY8A2us8dHpigIi6JNCTYY,2138
|
|
404
|
+
gbdtransformation/brands/vctm/schema,sha256=AP0MxQyD0hY4APRh8nxitlxMqJYJB4AaaTJ8y20-XBA,3283
|
|
405
|
+
gbdtransformation/brands/vctm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
|
|
406
|
+
gbdtransformation/brands/vctm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
402
407
|
gbdtransformation/brands/vntm/__init__.py,sha256=po50MWZ7H_x6jhT_C83-HvsjAE0J8IQpubzvXwTqmgI,225
|
|
403
408
|
gbdtransformation/brands/vntm/filters.py,sha256=R6qF0UGIHL3njBEXH5P_GI9I8Fyg1__HhTAvRwu92rw,2441
|
|
404
409
|
gbdtransformation/brands/vntm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRFeqaJt6Q,3242
|
|
@@ -548,13 +553,13 @@ gbdtransformation/designs/vnid/filters.py,sha256=HlZJp1Zb1zU37tZO-xBe0Kt-TlCT0nl
|
|
|
548
553
|
gbdtransformation/designs/vnid/schema,sha256=HxkKmaih8mUTYZst9aIbEgv_uXhqS6PQp3C4S7utz18,3830
|
|
549
554
|
gbdtransformation/designs/vnid/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
|
|
550
555
|
gbdtransformation/designs/woid/__init__.py,sha256=Cdy9Ki01mAvufymKb9QSLwfFggaoerOenq6BxhPu500,66
|
|
551
|
-
gbdtransformation/designs/woid/filters.py,sha256=
|
|
556
|
+
gbdtransformation/designs/woid/filters.py,sha256=0TAuOxP9Gj4Vds7zgRZ8X-lu9dndXDDTjnktbrI14Pg,16986
|
|
552
557
|
gbdtransformation/designs/woid/schema,sha256=DoJKgqrbOIPrrSJ7WcJM6aQpDqG34yD0MT7bsxauNpM,19967
|
|
553
|
-
gbdtransformation/designs/woid/template.yml,sha256=
|
|
558
|
+
gbdtransformation/designs/woid/template.yml,sha256=td3Y7vfssL569Anr4Sz1y11ejOZmbRbC_-xw2ON7Vk4,27778
|
|
554
559
|
gbdtransformation/designs/xxid/__init__.py,sha256=Cdy9Ki01mAvufymKb9QSLwfFggaoerOenq6BxhPu500,66
|
|
555
560
|
gbdtransformation/designs/xxid/filters.py,sha256=YCaQ6yH2LINwCQvbPHDhnORQyWglbswLlSOY6ur3KXQ,1874
|
|
556
561
|
gbdtransformation/designs/xxid/schema,sha256=KaFhfG6P5SE787wkAuME6hhpcg7vLnSb9x1rW_0EL3M,163
|
|
557
|
-
gbdtransformation/designs/xxid/template.yml,sha256=
|
|
562
|
+
gbdtransformation/designs/xxid/template.yml,sha256=m1V4DZqfFwGuMNDLDlCsiw_YjBVlGruga6AzVvzH6HA,6934
|
|
558
563
|
gbdtransformation/utilities/ISOCountryCodeType-V2006.xsd,sha256=T-QCdih6hFG7Tj_YlL7R0OyEmdAh1_NUDK_sMhVy4CI,41465
|
|
559
564
|
gbdtransformation/utilities/ISOCurrencyCodeType-V2001.xsd,sha256=FC0I3EPmeLfXeRGV25i7t5G8KXLHnX5m-pKHOYWNmSw,28868
|
|
560
565
|
gbdtransformation/utilities/ISOLanguageCodeType-V2002.xsd,sha256=ouRSwAnkVtjGLwZ50LXOW3V21lIWVlPw3yr9CcsVPRU,22147
|
|
@@ -567,9 +572,10 @@ gbdtransformation/utilities/st66.xsd,sha256=co8aFN3a5TpudllRttWmfLeiZu8ulNipfeXm
|
|
|
567
572
|
schemas/ShazamConfig.py,sha256=D67os5B11C41h_WZ7kk54Ss0Kk7tHh8W0d_1c_aX-lY,1191
|
|
568
573
|
schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
|
|
569
574
|
schemas/schema_extractor.py,sha256=3-ImtnI777f6b3VA0A_w-NoXdlGz5VZMzK6MnPdQQAY,10294
|
|
570
|
-
wipo_gbd_transformation-1.1.
|
|
571
|
-
wipo_gbd_transformation-1.1.
|
|
572
|
-
wipo_gbd_transformation-1.1.
|
|
573
|
-
wipo_gbd_transformation-1.1.
|
|
574
|
-
wipo_gbd_transformation-1.1.
|
|
575
|
-
wipo_gbd_transformation-1.1.
|
|
575
|
+
wipo_gbd_transformation-1.1.54.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
|
|
576
|
+
wipo_gbd_transformation-1.1.54.dist-info/METADATA,sha256=PDsvsGpyapstphx6eWJ2Z32J2_SxtfRMe_IM0ClRg1U,517
|
|
577
|
+
wipo_gbd_transformation-1.1.54.dist-info/SOURCES_Stefans-Mac-Studio.local_Sep-18-063455-2024_Conflict.txt,sha256=NeGxpq7lHSg1kaKoQE1hRDhEL5c39TAp008ptbN08NU,29740
|
|
578
|
+
wipo_gbd_transformation-1.1.54.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
|
|
579
|
+
wipo_gbd_transformation-1.1.54.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
|
|
580
|
+
wipo_gbd_transformation-1.1.54.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
|
|
581
|
+
wipo_gbd_transformation-1.1.54.dist-info/RECORD,,
|