wipo-gbd-transformation 1.1.84__py3-none-any.whl → 1.1.85__py3-none-any.whl

gbdtransformation/brands/ustm/filters.py

@@ -176,16 +176,31 @@ def get_applicants(owners, status):
                 if(owner.get('add%s' % i)):
                     adrlines.append(owner['add%s' % i].replace(';', ''))
 
+            address_str = ', '.join(adrlines)
+            address_str = address_str.replace(",,", ",")
+            if address_str.endswith(","):
+                address_str = address_str[:-1]
+
+            if len(address_str.strip()) == 0:
+                address_str = None
+
             city = []
+            city_str = None
+            postCode_str = None
             if owner.postCode:
                 city.append(owner.postCode)
+                postCode_str = owner.postCode
             if owner.city:
                 city.append(owner.city)
+                city_str = owner.city
 
             if len(city):
                 adrlines.append(' '.join(city))
+
+            state_str = None
             if owner.state:
                 adrlines.append(owner.state)
+                state_str = owner.state
 
             address = '; '.join(adrlines)
 
@@ -197,7 +212,11 @@ def get_applicants(owners, status):
                 'kind': 'Natural Person' if owner.entType == '01' else 'Legal Entity',
                 'name': owner.partyName,
                 'address': address,
-                'country': country
+                'country': country,
+                'city': city_str,
+                'postCode': postCode_str,
+                'addressLines': address_str,
+                'state': state_str
             })
 
     return applicants

gbdtransformation/brands/ustm/template.yml

@@ -137,15 +137,40 @@ publications:
 {% set applicants = file.owners.owner | get_applicants(status['gbd']) %}
 applicants:
   {% for applicant in applicants %}
-  - kind: {{ applicant.kind }}
+  - identifier:
+    kind: {{ applicant.kind }}
     fullName:
       - languageCode: en
         text: {{ applicant.name }}
+    firstName:
+      - languageCode:
+        text:
+    lastName:
+      - languageCode:
+        text:
+    middleName:
+      - languageCode:
+        text:
+    organizationName:
+      - languageCode:
+        text:
     fullAddress:
       - languageCode: en
         text: {{ applicant.address }}
+    detailedAddress:
+      - languageCode: en
+        text: {{ applicant.addressLines }}
+        cityName: {{ applicant.city }}
+        geographicRegionName: {{ applicant.state }}
+        postalCode: {{ applicant.postCode }}
+        countryCode: {{ applicant.country }}
+    contact:
+      phone: 
+      fax: 
+      email: 
+      url:
     countryCode: {{ applicant.country }}
-    {% endfor %}
+  {% endfor %}
 
 representatives:
   {% if file.head.attName %}

{wipo_gbd_transformation-1.1.84.dist-info → wipo_gbd_transformation-1.1.85.dist-info}/METADATA

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

{wipo_gbd_transformation-1.1.84.dist-info → wipo_gbd_transformation-1.1.85.dist-info}/RECORD

@@ -408,9 +408,9 @@ gbdtransformation/brands/uatm/filters.py,sha256=Er8L7T5If-2s_oDZIhgIpUKBTHR9gN1Z
 gbdtransformation/brands/uatm/schema,sha256=xyi3dhfyhzwFzeNA4vl5CZ_3FGNm6kcePHQt4Nd_qWM,4318
 gbdtransformation/brands/uatm/template.yml,sha256=7E7Q9HUg8aFdiwzpYYqB0LIWbkG_zkRh8mGVpk7fL6k,5974
 gbdtransformation/brands/ustm/__init__.py,sha256=nAKYGg8pFwhesOakhSSbHADYx422ODF73hEIjbswwOw,9731
-gbdtransformation/brands/ustm/filters.py,sha256=_-Fk0jN3es5yr8AtRjYUXZ9ZTqmKMaJZrTAwQsPiJGw,5978
+gbdtransformation/brands/ustm/filters.py,sha256=G6M2DHBnQUnBBK6gDYUXcTJ-dAe3AKILayaOXkFXfbA,6624
 gbdtransformation/brands/ustm/schema,sha256=7vcbDMFy76nAxZ5dRjssbOhHNFOqVIlVldrNssBB1Mc,133581
-gbdtransformation/brands/ustm/template.yml,sha256=btWlXhetvAFnng9IFMi264ZgXur2KRl_7er1GYGFt-8,5033
+gbdtransformation/brands/ustm/template.yml,sha256=0stb2cq5WpWeeRwFO7o3cd1yq1KlQQiNI__ORcYPmt8,5592
 gbdtransformation/brands/uytm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib-IVMR5kCVMTY,86
 gbdtransformation/brands/uytm/filters.py,sha256=i7SBMVTF70OERVdsS3Dfv19S3-9kyxE-y4aYA59YxA4,1976
 gbdtransformation/brands/uytm/schema,sha256=uMd1E_XRVQ_wHVrGq5fqFH6Fyg8cWx2DTQbVvH8tmmA,3730
@@ -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.84.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.84.dist-info/METADATA,sha256=v0jD6sQSUrdlPctbdJPhaAyCEMHj5yAAVkWY3CwYKjM,577
-wipo_gbd_transformation-1.1.84.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wipo_gbd_transformation-1.1.84.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
-wipo_gbd_transformation-1.1.84.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.84.dist-info/RECORD,,
+wipo_gbd_transformation-1.1.85.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
+wipo_gbd_transformation-1.1.85.dist-info/METADATA,sha256=kFsgOB9r1aCuM4Gz5hzWG3h7a6OlmX2cNuB0nZ67NYc,577
+wipo_gbd_transformation-1.1.85.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+wipo_gbd_transformation-1.1.85.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
+wipo_gbd_transformation-1.1.85.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
+wipo_gbd_transformation-1.1.85.dist-info/RECORD,,