wipo-gbd-transformation 1.1.64__py3-none-any.whl → 1.1.66__py3-none-any.whl

gbdtransformation/brands/catm/filters.py

@@ -195,16 +195,33 @@ def translate_feature(feature):
     if feature == 'Other': return 'Other'
     if feature == 'Design': return 'Combined'
 
+    raise Exception('feature "%s" is not mapped.' % feature)
     return 'Unknown'
 
+def get_mark_name_from_headings(wspec, trademark):
+    if isinstance(wspec.IndexHeading, list):
+        if len(wspec.IndexHeading) == 0:
+            heading = None
+        else:
+            heading = wspec.IndexHeading[0].IndexHeadingText
+    else:
+        heading = wspec.IndexHeading.IndexHeadingText
+    
+    if heading == None:
+        # fallback to MarkVerbalElementText
+        heading = trademark.MarkRepresentation.MarkReproduction.WordMarkSpecification.MarkVerbalElementText
+        print(heading)
+
+    return heading
+
 def get_mark_names(word_mark_spec):
     verbal = word_mark_spec.MarkVerbalElementText
     signif = word_mark_spec.MarkSignificantVerbalElementText
 
     if not signif == verbal:
-        return (verbal, signif)
+        return signif
     else:
-        return (verbal, None)
+        return verbal
 
 def parse_viena(value):
     return '%s.%s.%s' % (value.ViennaCategory.zfill(2), value.ViennaDivision.zfill(2), value.ViennaSection.zfill(2))

gbdtransformation/brands/catm/template.yml

@@ -52,21 +52,18 @@ markDescriptionDetails:
     text: {{ description.__value }}
   {% endcall %}
 
-
 wordMarkSpecification:
-  {% call(wspec) match('IndexHeadingBag.IndexHeading', trademark) %}
   markVerbalElement:
-    - languageCode: {{ wspec.IndexHeadingText | guess_language(trademark.ApplicationLanguageCode) }}
-      text: {{ wspec.IndexHeadingText }}
+  {% call(wspec) match('NationalTrademarkInformation.IndexHeadingBag', trademark) %}
+    - languageCode: {{ wspec | get_mark_name_from_headings(trademark) | guess_language(trademark.ApplicationLanguageCode) }}
+      text: {{ wspec | get_mark_name_from_headings(trademark) }}
   {% endcall %}
-  {% call(wspec) match('MarkRepresentation.MarkReproduction.WordMarkSpecification', trademark) %}
-  {% set (verbal, signif) = wspec | get_mark_names %}
   markSignificantVerbalElement:
-    - languageCode: {{ signif | guess_language(trademark.ApplicationLanguageCode) }}
-      text: {{ signif }}
+    {% call(wspec) match('MarkRepresentation.MarkReproduction.WordMarkSpecification', trademark) %}
+    - languageCode: {{ wspec | get_mark_names | guess_language(trademark.ApplicationLanguageCode) }}
+      text: {{ wspec | get_mark_names }}
+    {% endcall %}    
   markTransliteration: {{ wspec.MarkTransliteration }}
-  {% endcall %}
-
 
 markImageDetails:
   {% call(img) match('MarkRepresentation.MarkReproduction.MarkImageBag.MarkImage', trademark) %}

gbdtransformation/brands/hrtm/template.yml

@@ -13,9 +13,9 @@ kind: {{ TradeMark.KindMark | translate_kind }}
 markFeature: {{ TradeMark.MarkFeature | translate_feature }}
 designatedCountries:
   - {{ TradeMark.RegistrationOfficeCode }}
-applicationNumber: {{ TradeMark.ApplicationNumber | clean_app_reg_number }}
+applicationNumber: {{ TradeMark.ApplicationNumber }}
 applicationDate: {{ TradeMark.ApplicationDate | convertdate('%Y-%m-%d') }}
-registrationNumber: {{ TradeMark | get_registration_nb(TradeMark.MarkCurrentStatusCode) | clean_app_reg_number }}
+registrationNumber: {{ TradeMark | get_registration_nb(TradeMark.MarkCurrentStatusCode) }}
 registrationDate: {{ TradeMark.RegistrationDate }}
 applicationLanguageCode: {{ TradeMark.ApplicationLanguageCode }}
 officeStatus: {{ TradeMark.MarkCurrentStatusCode }}

{wipo_gbd_transformation-1.1.64.dist-info → wipo_gbd_transformation-1.1.66.dist-info}/METADATA

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

{wipo_gbd_transformation-1.1.64.dist-info → wipo_gbd_transformation-1.1.66.dist-info}/RECORD

@@ -65,9 +65,9 @@ gbdtransformation/brands/bztm/schema,sha256=AP0MxQyD0hY4APRh8nxitlxMqJYJB4AaaTJ8
 gbdtransformation/brands/bztm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/brands/bztm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/brands/catm/__init__.py,sha256=pMtR-N5slJD0QHJU36_dbeWyqoqn4Q0eaMOmfO4Ed_o,270
-gbdtransformation/brands/catm/filters.py,sha256=iZOJFFpmXySl08VWkLDF3cMqFxW3ZGclTIXfG20HW-A,8216
+gbdtransformation/brands/catm/filters.py,sha256=wNdCN7LUhvtNWGuVpJIGGDmhyRHQKl_CtyGSY8XivHQ,8787
 gbdtransformation/brands/catm/schema,sha256=Xace88lwiEefhHkk6Zg12dzVF237nMy06HMISEXaTwk,34762
-gbdtransformation/brands/catm/template.yml,sha256=AwAv3VPRY2VmoyTyPZCwKdRJSmYdVUTRpJj4Zv3uqrM,9861
+gbdtransformation/brands/catm/template.yml,sha256=3BQ1nHanBPz8x1T7VDmuQ7AhFcnHUrYM8FuOj7HHr7o,9909
 gbdtransformation/brands/chtm/__init__.py,sha256=HPYmDCQ41vkuoXSA94CRtqN_pEKDaUhbpXLOBqlaumQ,130
 gbdtransformation/brands/chtm/filters.py,sha256=kSMlYumpaLg53MdPAF5L7bM3ZiNsRfd0BgkPLgDDzQQ,5317
 gbdtransformation/brands/chtm/schema,sha256=f3lVto7Y6O9W7dmhR-4lShQMTVL3tl6bGbw1DZLXuxU,2071
@@ -151,7 +151,7 @@ gbdtransformation/brands/gstm/template.yml,sha256=INQBe908BttDal83tMEXkpAOTasJ0v
 gbdtransformation/brands/hrtm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib-IVMR5kCVMTY,86
 gbdtransformation/brands/hrtm/filters.py,sha256=1fFLY-0CVp4F52i2S5jLMH96crdBF0Wnc5CsrDnuIH4,4016
 gbdtransformation/brands/hrtm/schema,sha256=7jQ-PC0VTx5NZ79Qf8xAZEX8sqFSUtjPwsvVYV8XZAs,1376
-gbdtransformation/brands/hrtm/template.yml,sha256=16oZNGzipRrZuEqhXky9zKZPEfnPL4a95Sw4XPUpges,9231
+gbdtransformation/brands/hrtm/template.yml,sha256=9vOPTN4h6ytSoUhQ0m40bRfFbBqUXi8ZbcEU4Dw9k-c,9185
 gbdtransformation/brands/idtm/__init__.py,sha256=MBVFGkMlqAi-s2ur7pCLYe2uxtjIxx9n9wo2bpESvxU,311
 gbdtransformation/brands/idtm/filters.py,sha256=HbcLmB9KTBFjLwHJdkJmM-u5wdE2JmxlqJvlSz1cTKk,3018
 gbdtransformation/brands/idtm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRFeqaJt6Q,3242
@@ -584,9 +584,9 @@ 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.64.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.64.dist-info/METADATA,sha256=6AOBk-nJ2rfrZMD6_Y10nZ4SwVv6W93IDBtatElKbDI,577
-wipo_gbd_transformation-1.1.64.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wipo_gbd_transformation-1.1.64.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
-wipo_gbd_transformation-1.1.64.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.64.dist-info/RECORD,,
+wipo_gbd_transformation-1.1.66.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
+wipo_gbd_transformation-1.1.66.dist-info/METADATA,sha256=xVcWJkjbN6RnAwq-XP8zdbeGVYyYlEYAfd8E7BNj0Uc,577
+wipo_gbd_transformation-1.1.66.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+wipo_gbd_transformation-1.1.66.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
+wipo_gbd_transformation-1.1.66.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
+wipo_gbd_transformation-1.1.66.dist-info/RECORD,,