wipo-gbd-transformation 1.1.56__py3-none-any.whl → 1.1.58__py3-none-any.whl

gbdtransformation/brands/chtm/filters.py

@@ -158,4 +158,4 @@ def local_guess_language(content):
     if language:
         return language.iso_code_639_1.name.lower()
     else:
-        return None
+        return "en"

gbdtransformation/brands/chtm/template.yml

@@ -34,7 +34,6 @@ wordMarkSpecification:
   markVerbalElement:
     {% set verbalElement = trademark.MarkRepresentation.MarkReproduction.WordMarkSpecification.MarkSignificantVerbalElementText | clean_verbal_element %}
     - text: {{ verbalElement }}
-      languageCode: 
 
 markImageDetails:
   {% call(img) match('MarkImage', trademark.MarkRepresentation.MarkImageBag) %}
@@ -66,9 +65,10 @@ goodsServicesClassification:
   version: {{ ASK_THE_OFFICE }}
   class: 
      {% call(ClassDescription) match('ClassDescription', trademark.GoodsServicesBag.GoodsServices.ClassDescriptionBag) %}
-    - code: {{ ClassDescription.ClassNumber }}
-      terms: {{ ClassDescription.GoodsServicesDescriptionText }}
-      languageCode: {{ ClassDescription.GoodsServicesDescriptionText | local_guess_language() }}
+    - code: {{ ClassDescription.ClassNumber| int }}
+      terms:
+        {{ ClassDescription.GoodsServicesDescriptionText | local_guess_language() }}:
+        - {{ ClassDescription.GoodsServicesDescriptionText }}
      {% endcall %}
 
 priorities:

gbdtransformation/brands/notm/filters.py

@@ -23,24 +23,39 @@ def translate_status(status):
                   'Finally shelved',
                   'Ceased',
                   'Ceased/cancelled',
-                  'Withdrawn']:
+                  'Withdrawn',
+                  'Rejected']:
         return 'Ended'
 
-    #return 'Unknown'
-    raise Exception('Status "%s" unmapped' % status)
+    return 'Unknown'
+    #raise Exception('Status "%s" unmapped' % status)
 
 def translate_feature(feature):
     """translation of mark feature"""
     if not feature: return 'Undefined'
     feature = feature.upper()
     if feature == 'COMBINED/FIGURATIVE MARK': return 'Combined'
+    if feature == 'FIGURATIVE MARK': return 'Figurative'
     if feature == 'WORD MARK': return 'Word'
     if feature == '3D-MARK': return "Three dimensional"
+    if feature == '3D MARK': return "Three dimensional"
+    if feature == 'SOUND MARK': return 'Sound'
+    if feature == 'COLOR MARK': return 'Colour'
+    if feature == 'MOTION MARK': return 'Motion'
+    if feature == 'MULTIMEDIA MARK': return 'Multimedia'
+    if feature == 'POSITION MARK': return 'Position'
+    if feature == 'PATTERN MARK': return 'Pattern'
+    if feature == 'HOLOGRAM MARK': return 'Hologram'
+    if feature == 'TRACER MARK': return 'Tracer'
+    if feature == 'OLFACTORY MARK': return 'Olfactory'
+    if feature == 'OLFACTIVE MARK': return 'Olfactory'
+    if feature == 'STYLIZED CHARACTERS': return 'Stylized characters'
+    if feature == 'STYLIZED CHARACTERS MARK': return 'Stylized characters'
 
-    #return 'Unknown'
+    return 'Unknown'
 
     # raise Exception to recognize unmapped values
-    raise Exception('Feature "%s" unmapped' % feature)
+    #raise Exception('Feature "%s" unmapped' % feature)
 
 def get_local_text(node):
     if "$" in node:
@@ -95,4 +110,4 @@ def local_guess_language(content):
             lang = "no"
         return lang
     else:
-        return None
+        return "en"

gbdtransformation/brands/notm/template.yml

@@ -13,8 +13,6 @@ registrationNumber: {{ trademark.trademarkTypeChoice1.registrationNumber }}
 registrationDate: {{ trademark.registrationDate }}
 
 expiryDate: {{ trademark.expiryDate }}
-# rarely passed
-terminationDate:
 
 {% set status = trademark.markCurrentStatusCode | translate_status %}
 gbdStatus: {{ status }}
@@ -37,12 +35,6 @@ kind:
   - Individual
   # (Individual|Collective|Certificate|Defensive|Other|Membership)
 
-publicationDate: #
-
-applicationLanguageCode:
-# rarely passed
-secondLanguageCode:
-
 markDisclaimerDetails:
   {% call(markDisclaimerText) match('markDisclaimerText', trademark.markDisclaimerBag) %}
   - languageCode: 
@@ -67,7 +59,7 @@ wordMarkSpecification:
 
 markImageDetails:
   {% call(markImage) match('markImage', trademark.markRepresentation.markReproduction.markImageBag) %}
-  - name:  {{ markImage.fileName }}
+  - name: {{ markImage.fileName }}
     colourIndicator: {{ markImage.colourModeCategory }}
     colourClaimed:
       - languageCode:
@@ -77,11 +69,6 @@ markImageDetails:
       - languageCode:
         text: {{ markDescriptionText | get_local_text() }}
       {% endcall %}
-    classification:
-      kind: 
-      version:  
-      code:
-        - 
   {% endcall %}
 
 markSoundDetails:

{wipo_gbd_transformation-1.1.56.dist-info → wipo_gbd_transformation-1.1.58.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wipo-gbd-transformation
-Version: 1.1.56
+Version: 1.1.58
 Summary: GBD XML ETL package
 Home-page: https://github.com/GBD-Wipo/xmlE
 Author: WIPO GDB team

{wipo_gbd_transformation-1.1.56.dist-info → wipo_gbd_transformation-1.1.58.dist-info}/RECORD

@@ -70,9 +70,9 @@ gbdtransformation/brands/catm/filters.py,sha256=iZOJFFpmXySl08VWkLDF3cMqFxW3ZGcl
 gbdtransformation/brands/catm/schema,sha256=Xace88lwiEefhHkk6Zg12dzVF237nMy06HMISEXaTwk,34762
 gbdtransformation/brands/catm/template.yml,sha256=AwAv3VPRY2VmoyTyPZCwKdRJSmYdVUTRpJj4Zv3uqrM,9861
 gbdtransformation/brands/chtm/__init__.py,sha256=HPYmDCQ41vkuoXSA94CRtqN_pEKDaUhbpXLOBqlaumQ,130
-gbdtransformation/brands/chtm/filters.py,sha256=nYtLWz-1b_DVyVO46AbtdGCzuXwKjJ7aEiZxItQ4o-c,5317
+gbdtransformation/brands/chtm/filters.py,sha256=kSMlYumpaLg53MdPAF5L7bM3ZiNsRfd0BgkPLgDDzQQ,5317
 gbdtransformation/brands/chtm/schema,sha256=f3lVto7Y6O9W7dmhR-4lShQMTVL3tl6bGbw1DZLXuxU,2071
-gbdtransformation/brands/chtm/template.yml,sha256=Desw_6ECzW_tXZCKHCZfyu-DdMeVrCl4vQgXXYBHU-A,4397
+gbdtransformation/brands/chtm/template.yml,sha256=qQadx7c5XXmhAVOi9ao_zcKggTwWNr-LMUVtHGSzqN8,4380
 gbdtransformation/brands/cltm/__init__.py,sha256=yqzC7OagUR0RLui3pHPWo5WxLyksznHcpI-NEEgnlYE,36
 gbdtransformation/brands/cltm/filters.py,sha256=tmcDE85IAHVuV7GX-EddvNqDktDxYkCCeZIC-RPlbck,2417
 gbdtransformation/brands/cltm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRFeqaJt6Q,3242
@@ -288,8 +288,8 @@ gbdtransformation/brands/natm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRF
 gbdtransformation/brands/natm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/brands/natm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/brands/notm/__init__.py,sha256=YRZPymjJv7V5vqjphBN1UOHZ3RL1oeYYqaOI6AKInl0,88
-gbdtransformation/brands/notm/filters.py,sha256=Iahq56k5uQD0rZJiwIbPA6Q13M5MNdEGmh8SXPZavUY,2933
-gbdtransformation/brands/notm/template.yml,sha256=71Nk8ViYW8Oa3C9_F2sbugIT6bUytRkRZrEzQ-x6ZnA,5279
+gbdtransformation/brands/notm/filters.py,sha256=1f1vF9kKTlMQ9K_Qh7Hk6OQ964WGWQ8BadNOu-61sIo,3738
+gbdtransformation/brands/notm/template.yml,sha256=UmJ35fKzAHQSYrECsJtXRXTE2egXM69oXcu0Ya5fqWA,5090
 gbdtransformation/brands/nztm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib-IVMR5kCVMTY,86
 gbdtransformation/brands/nztm/filters.py,sha256=dAjrg03Yq37H10oAM8rnAMNa71lZHuG1uMwHi25kIvA,4211
 gbdtransformation/brands/nztm/schema,sha256=tpcyNMtmiBQQ0FsxKKTASRSo4nbrw0j0_b1nhELyAzE,6355
@@ -579,10 +579,10 @@ gbdtransformation/utilities/st66.xsd,sha256=co8aFN3a5TpudllRttWmfLeiZu8ulNipfeXm
 schemas/ShazamConfig.py,sha256=D67os5B11C41h_WZ7kk54Ss0Kk7tHh8W0d_1c_aX-lY,1191
 schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 schemas/schema_extractor.py,sha256=3-ImtnI777f6b3VA0A_w-NoXdlGz5VZMzK6MnPdQQAY,10294
-wipo_gbd_transformation-1.1.56.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.56.dist-info/METADATA,sha256=-GsZkwzqAtr15pV7LlkbNrADlvlquHLOkExZqpL2YGg,577
-wipo_gbd_transformation-1.1.56.dist-info/SOURCES_Stefans-Mac-Studio.local_Sep-18-063455-2024_Conflict.txt,sha256=NeGxpq7lHSg1kaKoQE1hRDhEL5c39TAp008ptbN08NU,29740
-wipo_gbd_transformation-1.1.56.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wipo_gbd_transformation-1.1.56.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
-wipo_gbd_transformation-1.1.56.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.56.dist-info/RECORD,,
+wipo_gbd_transformation-1.1.58.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
+wipo_gbd_transformation-1.1.58.dist-info/METADATA,sha256=H7dTnIGdWSeM0Np1FMc7zRSg6E_6uDpwxWxQ_62x7E8,577
+wipo_gbd_transformation-1.1.58.dist-info/SOURCES_Stefans-Mac-Studio.local_Sep-18-063455-2024_Conflict.txt,sha256=NeGxpq7lHSg1kaKoQE1hRDhEL5c39TAp008ptbN08NU,29740
+wipo_gbd_transformation-1.1.58.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+wipo_gbd_transformation-1.1.58.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
+wipo_gbd_transformation-1.1.58.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
+wipo_gbd_transformation-1.1.58.dist-info/RECORD,,