wipo-gbd-transformation 1.1.78__py3-none-any.whl → 1.1.80__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 = ""
@@ -128,3 +137,22 @@ def clean_app_reg_number(app_num):
     if not app_num[:1].isdigit():
         app_num = app_num[1:]
     return app_num
+
+def get_publication_date(publications):
+    # in the publication information, in case:
+    # PublicationSection == "Registration"
+    # the associated PublicationDate is the publicationDate
+    if publications == None:
+        return None
+    if isinstance(publications, list):
+        for publication in publications:
+            if 'PublicationSection' in publication and publication['PublicationSection'] == 'Registration':
+                if 'PublicationDate' in publication:
+                    return publication['PublicationDate']
+    else:
+        if "Publication" in publications:
+            publication = publications["Publication"]
+            if 'PublicationSection' in publication and publication['PublicationSection'] == 'Registration':
+                if 'PublicationDate' in publication:
+                    return publication['PublicationDate']
+    return None

gbdtransformation/brands/hrtm/template.yml

@@ -21,6 +21,10 @@ applicationLanguageCode: {{ TradeMark.ApplicationLanguageCode }}
 officeStatus: {{ TradeMark.MarkCurrentStatusCode }}
 statusDate: {{ TradeMark.MarkCurrentStatusDate | convertdate('%Y-%m-%d') }}
 
+publicationDate: {{ TradeMark.PublicationDetails | get_publication_date | convertdate('%Y-%m-%d')}}
+
+expiryDate: {{ TradeMark.ExpiryDate | convertdate('%Y-%m-%d') }}
+
 markDisclaimerDetails:
   {% call(desc) match('MarkDisclaimerDetails.MarkDisclaimer', TradeMark) %}
   - text: {{ desc }}
@@ -193,4 +197,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 %}

{wipo_gbd_transformation-1.1.78.dist-info → wipo_gbd_transformation-1.1.80.dist-info}/METADATA

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

{wipo_gbd_transformation-1.1.78.dist-info → wipo_gbd_transformation-1.1.80.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=QYkXkWS4F-Hvs1JgMUBDD69pe6OBCdft04dOGH8O5Rk,5220
 gbdtransformation/brands/hrtm/schema,sha256=7jQ-PC0VTx5NZ79Qf8xAZEX8sqFSUtjPwsvVYV8XZAs,1376
-gbdtransformation/brands/hrtm/template.yml,sha256=9vOPTN4h6ytSoUhQ0m40bRfFbBqUXi8ZbcEU4Dw9k-c,9185
+gbdtransformation/brands/hrtm/template.yml,sha256=dzgqIyM9tKHEiVJswxbw2eWyDo4nNRnN2Aj8awKsg9U,9644
 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
@@ -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.78.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.78.dist-info/METADATA,sha256=Wp9ill2T_9x9nSybXeWrIk4OUZP-z96JkI_E13Fgpns,577
-wipo_gbd_transformation-1.1.78.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wipo_gbd_transformation-1.1.78.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
-wipo_gbd_transformation-1.1.78.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.78.dist-info/RECORD,,
+wipo_gbd_transformation-1.1.80.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
+wipo_gbd_transformation-1.1.80.dist-info/METADATA,sha256=tP8Dr_GU9q6qN5vSQjK_uctibxLasvZTiUrmTJjxQO8,577
+wipo_gbd_transformation-1.1.80.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+wipo_gbd_transformation-1.1.80.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
+wipo_gbd_transformation-1.1.80.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
+wipo_gbd_transformation-1.1.80.dist-info/RECORD,,