wipo-gbd-transformation 1.1.77__py3-none-any.whl → 1.1.79__py3-none-any.whl

gbdtransformation/brands/hrtm/filters.py

@@ -7,7 +7,16 @@ ignore_namespace = [
 
 def  get_entity_addr(addr):
     if not addr: return None
-    return "%s %s %s" % (addr.AddressStreet, addr.AddressCity, addr.AddressPostcode)
+    result = ""
+    if addr.AddressStreet:
+        result+= addr.AddressStreet
+    if addr.AddressCity:
+        result+= " " + addr.AddressCity
+    if addr.AddressState:
+        result+= " " + addr.AddressState
+    if addr.AddressPostcode:
+        result+= " " + addr.AddressPostcode
+    return result.strip()
 
 def create_full_name(name): 
     result = ""

gbdtransformation/brands/hrtm/template.yml

@@ -21,6 +21,8 @@ applicationLanguageCode: {{ TradeMark.ApplicationLanguageCode }}
 officeStatus: {{ TradeMark.MarkCurrentStatusCode }}
 statusDate: {{ TradeMark.MarkCurrentStatusDate | convertdate('%Y-%m-%d') }}
 
+expiryDate: {{ TradeMark.ExpiryDate | convertdate('%Y-%m-%d') }}
+
 markDisclaimerDetails:
   {% call(desc) match('MarkDisclaimerDetails.MarkDisclaimer', TradeMark) %}
   - text: {{ desc }}
@@ -193,4 +195,9 @@ representatives:
   {% endif %}
   {% endcall %}
 
+# here goes extra information that is office specific and that is pertinent for us to retain.
+extra:
+  oppositionPeriodStartDate: {{ TradeMark.OppositionPeriodStartDate | convertdate('%Y-%m-%d') }}
+  oppositionPeriodEndDate: {{ TradeMark.OppositionPeriodEndDate | convertdate('%Y-%m-%d') }}
+
 {% endif %}

gbdtransformation/brands/notm/filters.py

@@ -151,4 +151,16 @@ def translate_licence_status(status):
     if status.lower() == 'valid': return 'Valid'
 
     return 'Other'
-    #raise Exception('licence status "%s" is not mapped.' % status)
+    #raise Exception('licence status "%s" is not mapped.' % status)
+
+def clean_vienna_class(the_class):
+    if the_class == None:
+        return None
+    if len(the_class) == 0:
+        return None
+    # remove trailing dot
+    if the_class.endswith("."):
+        the_class = the_class[:-1]
+    if len(the_class) == 0:
+        return None
+    return the_class

gbdtransformation/brands/notm/template.yml

@@ -94,7 +94,7 @@ markImageDetails:
       code:
       {% call(viennaClass) match('viennaClassificationBag', markImage.markImageClassification.figurativeElementClassificationBag) %}
       {% call(viennaValue) match('viennaClassification', viennaClass) %}
-        - {{ viennaValue.viennaCategory }}
+        - {{ viennaValue.viennaCategory | clean_vienna_class }}
       {% endcall %}
       {% endcall %}
     {% endif %}

{wipo_gbd_transformation-1.1.77.dist-info → wipo_gbd_transformation-1.1.79.dist-info}/METADATA

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

{wipo_gbd_transformation-1.1.77.dist-info → wipo_gbd_transformation-1.1.79.dist-info}/RECORD

@@ -150,9 +150,9 @@ gbdtransformation/brands/gstm/filters.py,sha256=QGOXTX5HsoOoxfY9a31adtujzOS7C0KQ
 gbdtransformation/brands/gstm/template.gs.yml,sha256=tQOXTIpmurgytddfqyWvKuCx-7K6ZxALMGXLn0mjg0s,1711
 gbdtransformation/brands/gstm/template.yml,sha256=INQBe908BttDal83tMEXkpAOTasJ0vo5Myl_kFuatR8,1000
 gbdtransformation/brands/hrtm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib-IVMR5kCVMTY,86
-gbdtransformation/brands/hrtm/filters.py,sha256=9aoEjSxpD8d8S3UG9F9vfk9yMOX5q6HdnVwBWwsZzw0,4115
+gbdtransformation/brands/hrtm/filters.py,sha256=jFQvK41R17Rdl5xBzGXmK-M0u0EVp81AhrfJSicMrkY,4340
 gbdtransformation/brands/hrtm/schema,sha256=7jQ-PC0VTx5NZ79Qf8xAZEX8sqFSUtjPwsvVYV8XZAs,1376
-gbdtransformation/brands/hrtm/template.yml,sha256=9vOPTN4h6ytSoUhQ0m40bRfFbBqUXi8ZbcEU4Dw9k-c,9185
+gbdtransformation/brands/hrtm/template.yml,sha256=pMwur5_WPSWtQQb6-nhu9MjtF47sxvvaA36a2VDLsEY,9543
 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
@@ -297,8 +297,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=hFVIsTFyO41QGS98JqVlg0J16A0mg9Hw5rH48kW7pYc,5518
-gbdtransformation/brands/notm/template.yml,sha256=SE9mcE3VxgOErmJPssTXkLeKuDRrajVMYG_Zvdef9sM,10135
+gbdtransformation/brands/notm/filters.py,sha256=KNc0PXlUgKm3SRhKGn0SUHJ_Zg2YvIvfQZnP8qoARzc,5811
+gbdtransformation/brands/notm/template.yml,sha256=iNPRI1DSe7LKzt-jFHNcd2DBeo-0yGd-xr1nZK9pYL0,10156
 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
@@ -585,9 +585,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.77.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.77.dist-info/METADATA,sha256=UcDXShGJZ47hV1I4RKR52q6FvHP1wE2wc-tdS8diHNI,577
-wipo_gbd_transformation-1.1.77.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wipo_gbd_transformation-1.1.77.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
-wipo_gbd_transformation-1.1.77.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.77.dist-info/RECORD,,
+wipo_gbd_transformation-1.1.79.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
+wipo_gbd_transformation-1.1.79.dist-info/METADATA,sha256=M538k3cZRwBsMXVlKEKGUZJ6AZ8pUKao5BRFboF7DAk,577
+wipo_gbd_transformation-1.1.79.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+wipo_gbd_transformation-1.1.79.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
+wipo_gbd_transformation-1.1.79.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
+wipo_gbd_transformation-1.1.79.dist-info/RECORD,,