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

gbdtransformation/brands/hrtm/filters.py

@@ -7,14 +7,19 @@ ignore_namespace = [
 def  get_entity_addr(addr):
     if not addr: return None
     return "%s %s %s" % (addr.AddressStreet, addr.AddressCity, addr.AddressPostcode)
-def  get_entity_name(name):
-    if not name: return
-    if name.OrganizationName: return name.OrganizationName
-    return "%s %s" % (name.FirstName, name.LastName )
-def  get_entity_kind(name):
-    if not name: return
-    if name.OrganizationName: return 'Legal entity'
-    return 'Natural person'
+
+def create_full_name(name): 
+    result = ""
+    
+    if name.FirstName: 
+        result += name.FirstName + " "
+    if name.LastName:
+        result += name.LastName
+    if name.OrganizationName and name.OrganizationName != name.LastName and name.OrganizationName != result:
+        if name.FirstName or name.LastName:
+            result += ", "
+        result += name.OrganizationName
+    return result
 
 # -------------------------------------------------------------
 # data translation helpers:
@@ -29,7 +34,7 @@ def translate_kind(kind):
     raise Exception('kind "%s" is not mapped.' % kind)
 
 def translate_status(status):
-    if not status: return 'Ended'
+    if not status: return 'Unknown'
 
     if status == 'Registered': return 'Registered'
 
@@ -39,7 +44,14 @@ def translate_status(status):
                   'Filed']:
         return 'Pending'
 
-    raise Exception('Status "%s" unmapped' % status)
+    if status in ['Expired']:
+        return 'Expired'
+
+    if status in ['Ended']:
+        return 'Ended'
+
+    return 'Unknown'
+    #raise Exception('Status "%s" unmapped' % status)
 
 def get_termination(value, gbd_status):
     if gbd_status == 'Ended':
@@ -107,3 +119,10 @@ def get_goods_services(goods_services):
                 nc_gs[code]['lang'] = lang.lower()
 
     return nc_gs
+
+def clean_app_reg_number(app_num):
+    if app_num == None:
+        return None
+    if not app_num[:1].isdigit():
+        app_num = app_num[1:]
+    return app_num

gbdtransformation/brands/hrtm/template.yml

@@ -3,7 +3,7 @@
 {% set TradeMark = Transaction.TradeMarkTransactionBody.TransactionContentDetails.TransactionData.TradeMarkDetails.TradeMark %}
 {% set status = TradeMark.MarkCurrentStatusCode | translate_status %}
 
-st13: {{ TradeMark.ApplicationNumber | st13('HR', appdate=TradeMark.ApplicationDate) }}
+st13: {{ TradeMark.ApplicationNumber | clean_app_reg_number | st13('HR', appdate=TradeMark.ApplicationDate) }}
 gbdStatus: {{ status }}
 registrationOfficeCode: {{ TradeMark.RegistrationOfficeCode }}
 type: TRADEMARK
@@ -13,9 +13,9 @@ kind: {{ TradeMark.KindMark | translate_kind }}
 markFeature: {{ TradeMark.MarkFeature | translate_feature }}
 designatedCountries:
   - {{ TradeMark.RegistrationOfficeCode }}
-applicationNumber: {{ TradeMark.ApplicationNumber }}
+applicationNumber: {{ TradeMark.ApplicationNumber | clean_app_reg_number }}
 applicationDate: {{ TradeMark.ApplicationDate | convertdate('%Y-%m-%d') }}
-registrationNumber: {{ TradeMark | get_registration_nb(TradeMark.MarkCurrentStatusCode) }}
+registrationNumber: {{ TradeMark | get_registration_nb(TradeMark.MarkCurrentStatusCode) | clean_app_reg_number }}
 registrationDate: {{ TradeMark.RegistrationDate }}
 applicationLanguageCode: {{ TradeMark.ApplicationLanguageCode }}
 officeStatus: {{ TradeMark.MarkCurrentStatusCode }}
@@ -103,18 +103,44 @@ publications:
 
 applicants:
   {% call(Applicant) match('ApplicantDetails.Applicant', TradeMark) %}
-  - identifier: {{ Applicant.ApplicantIdentifier }}
-    {% call(nameline) match('FormattedNameAddress.Name.FormattedName', Applicant.ApplicantAddressBook) %}
-    kind: {{ nameline | get_entity_kind}}
+  - identifier: {{ Applicant.ApplicantURI }}
+    kind: {{ Applicant.ApplicantLegalEntity}}
     fullName:
-      - text: {{ nameline | get_entity_name}}
-        languageCode: hr
+      {% call(nameline) match('FormattedNameAddress.Name.FormattedName', Applicant.ApplicantAddressBook) %}
+      - text: {{ nameline | create_full_name }}
+        languageCode: {{ nameline.LastName | guess_language('en') }}
+      {% endcall %}
+    firstName:
+      {% call(nameline) match('FormattedNameAddress.Name.FormattedName.FirstName', Applicant.ApplicantAddressBook) %}
+      - languageCode: {{ nameline | guess_language('en') }}
+        text: {{ nameline }}
+      {% endcall %}
+    lastName:
+      {% call(nameline) match('FormattedNameAddress.Name.FormattedName.LastName', Applicant.ApplicantAddressBook) %}
+      - languageCode: {{ nameline | guess_language('en') }}
+        text: {{ nameline }}
+      {% endcall %}
+    middleName:
+      {% call(nameline) match('FormattedNameAddress.Name.FormattedName.MiddleName', Applicant.ApplicantAddressBook) %}
+      - languageCode: {{ nameline | guess_language('en') }}
+        text: {{ nameline }}
+      {% endcall %}
+    organizationName:
+      {% call(nameline) match('FormattedNameAddress.Name.FormattedName.OrganizationName', Applicant.ApplicantAddressBook) %}
+      - languageCode: {{ nameline | guess_language('en') }}
+        text: {{ nameline }}
       {% endcall %}
     fullAddress:
       {% call(adrline) match('FormattedNameAddress.Address.FormattedAddress', Applicant.ApplicantAddressBook) %}
-      - text: {{ adrline | get_entity_addr}}
-        languageCode: hr
+      - text: {{ adrline | get_entity_addr }}
+        languageCode: {{ nameline | guess_language('en') }}
       {% endcall %}
+    detailedAddress:
+      - languageCode: {{ Applicant.ApplicantAddressBook.FormattedNameAddress.Address.FormattedAddress.AddressStreet | guess_language('en') }}
+        text: {{ Applicant.ApplicantAddressBook.FormattedNameAddress.Address.FormattedAddress.AddressStreet }}
+        cityName: {{ Applicant.ApplicantAddressBook.FormattedNameAddress.Address.FormattedAddress.AddressCity }}
+        geographicRegionName: {{ Applicant.ApplicantAddressBook.FormattedNameAddress.Address.FormattedAddress.AddressState }}
+        postalCode: {{ Applicant.ApplicantAddressBook.FormattedNameAddress.Address.FormattedAddress.AddressPostcode }}
     {% call(adrline) match('FormattedNameAddress.Address', Applicant.ApplicantAddressBook) %}
     countryCode: {{ adrline.AddressCountryCode }}
     {% endcall %}
@@ -123,18 +149,44 @@ applicants:
 representatives:
   {% call(Representative) match('RepresentativeDetails.Representative', TradeMark) %}
   {% if not Representative.RepresentativeIdentifier.endswith('-null') %}
-  - identifier: {{ Representative.RepresentativeIdentifier }}
-    {% call(nameline) match('FormattedNameAddress.Name.FormattedName', Representative.RepresentativeAddressBook) %}
-    kind: {{ nameline | get_entity_kind}}
+  - identifier: {{ Representative.RepresentativeURI }}
+    kind: {{ Representative.RepresentativeLegalEntity}}
     fullName:
-      - text: {{ nameline | get_entity_name}}
-        languageCode: {{ nameline | guess_language('hr') }}
+      {% call(nameline) match('FormattedNameAddress.Name.FormattedName', Representative.RepresentativeAddressBook) %}
+      - text: {{ nameline | create_full_name }}
+        languageCode: {{ nameline.LastName | guess_language('en') }}
       {% endcall %}
+    firstName:
+      {% call(nameline) match('FormattedNameAddress.Name.FormattedName.FirstName', Representative.RepresentativeAddressBook) %}
+      - languageCode: {{ nameline | guess_language('en') }}
+        text: {{ nameline }}
+      {% endcall %}  
+    lastName:
+      {% call(nameline) match('FormattedNameAddress.Name.FormattedName.LastName', Representative.RepresentativeAddressBook) %}
+      - languageCode: {{ nameline | guess_language('en') }}
+        text: {{ nameline }}
+      {% endcall %}    
+    middleName:
+      {% call(nameline) match('FormattedNameAddress.Name.FormattedName.MiddleName', Representative.RepresentativeAddressBook) %}
+      - languageCode: {{ nameline | guess_language('en') }}
+        text: {{ nameline }}
+      {% endcall %}  
+    organizationName:
+      {% call(nameline) match('FormattedNameAddress.Name.FormattedName.OrganizationName', Representative.RepresentativeAddressBook) %}
+      - languageCode: {{ nameline | guess_language('en') }}
+        text: {{ nameline }}
+      {% endcall %}  
     fullAddress:
       {% call(adrline) match('FormattedNameAddress.Address.FormattedAddress', Representative.RepresentativeAddressBook) %}
       - text: {{ adrline | get_entity_addr}}
-        languageCode: {{ adrline | guess_language('hr') }}
+        languageCode: {{ adrline | guess_language('en') }}
       {% endcall %}
+    detailedAddress:
+      - languageCode: {{ Representative.RepresentativeAddressBook.FormattedNameAddress.Address.FormattedAddress.AddressStreet | guess_language('en') }}
+        text: {{ Representative.RepresentativeAddressBook.FormattedNameAddress.Address.FormattedAddress.AddressStreet }}
+        cityName: {{ Representative.RepresentativeAddressBook.FormattedNameAddress.Address.FormattedAddress.AddressCity }}
+        geographicRegionName: {{ Representative.RepresentativeAddressBook.FormattedNameAddress.Address.FormattedAddress.AddressState }}
+        postalCode: {{ Representative.RepresentativeAddressBook.FormattedNameAddress.Address.FormattedAddress.AddressPostcode }}
     {% call(adrline) match('FormattedNameAddress.Address', Representative.RepresentativeAddressBook) %}
     countryCode: {{ adrline.AddressCountryCode }}
     {% endcall %}

gbdtransformation/brands/xxxx/template.yml

@@ -232,9 +232,32 @@ correspondence:
   fullName:
     - languageCode:
       text:
+  firstName:
+    - languageCode:
+      text:
+  lastName:
+    - languageCode:
+      text:
+  middleName:
+    - languageCode:
+      text:
+  organizationName:
+    - languageCode:
+      text:
   fullAddress:
     - languageCode:
       text:
+  detailedAddress:
+    - languageCode:
+      text:
+      cityName:
+      geographicRegionName:
+      postalCode:
+  contact:
+    phone: 
+    fax: 
+    email: 
+    url:
   countryCode:
 
 events:

gbdtransformation/commons/emap/filters.py

@@ -7,7 +7,7 @@ def create_full_name(name):
 		result += name.FirstName + " "
 	if name.LastName:
 		result += name.LastName
-	if name.OrganizationName and name.OrganizationName != name.LastName and name.OrganizationName != name.FirstName + " " + name.LastName:
+	if name.OrganizationName and name.OrganizationName != name.LastName and name.OrganizationName != result:
 		if name.FirstName or name.LastName:
 			result += ", "
 		result += name.OrganizationName

gbdtransformation/commons/emrp/filters.py

@@ -7,7 +7,7 @@ def create_full_name(name):
 		result += name.FirstName + " "
 	if name.LastName:
 		result += name.LastName
-	if name.OrganizationName and name.OrganizationName != name.LastName and name.OrganizationName != name.FirstName + " " + name.LastName:
+	if name.OrganizationName and name.OrganizationName != name.LastName and name.OrganizationName != result:
 		if name.FirstName or name.LastName:
 			result += ", "
 		result += name.OrganizationName

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

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

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

@@ -149,9 +149,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=4wUfjkWjltASWOEM0UirF-0TcgHMeVVc2DJKWrc7rsw,3612
+gbdtransformation/brands/hrtm/filters.py,sha256=1fFLY-0CVp4F52i2S5jLMH96crdBF0Wnc5CsrDnuIH4,4016
 gbdtransformation/brands/hrtm/schema,sha256=7jQ-PC0VTx5NZ79Qf8xAZEX8sqFSUtjPwsvVYV8XZAs,1376
-gbdtransformation/brands/hrtm/template.yml,sha256=92MBb0X1wYln7LSxWPeEDECEswzfZKT7QLudbFUDX9k,5733
+gbdtransformation/brands/hrtm/template.yml,sha256=16oZNGzipRrZuEqhXky9zKZPEfnPL4a95Sw4XPUpges,9231
 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
@@ -456,7 +456,7 @@ gbdtransformation/brands/wstm/tests/test.xml.gz,sha256=UKm7LTvKaETUtHMKurFGqkqXO
 gbdtransformation/brands/xxxx/__init__.py,sha256=fricc3VHm4BwGRFKIIqB0t-NtP3tTVRrEYee_gWpiFo,172
 gbdtransformation/brands/xxxx/filters.py,sha256=YCaQ6yH2LINwCQvbPHDhnORQyWglbswLlSOY6ur3KXQ,1874
 gbdtransformation/brands/xxxx/schema,sha256=g_oWkd7k2e5fAQR1BdNkPSsIgP3dkTyc7esWo_UOHQA,163
-gbdtransformation/brands/xxxx/template.yml,sha256=sNeTm0K7DCulgbWWgeV_5gsf9IMsyB5HDTifx6Bl4pI,5518
+gbdtransformation/brands/xxxx/template.yml,sha256=OscSZDrec-rCfK0HVbOaIPmhkykZCWcxK54Zf7iZe6o,5872
 gbdtransformation/brands/zmtm/__init__.py,sha256=Mtsi_-CaLQirHkhnletNhJ4li-pZlzEZMcKjv6mEk50,256
 gbdtransformation/brands/zmtm/filters.py,sha256=FkGfv3nPiYDUy97O7bDzPp824qoDsqX-oh2Ox01NTpA,2344
 gbdtransformation/brands/zmtm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRFeqaJt6Q,3242
@@ -482,10 +482,10 @@ gbdtransformation/common/jprp/template.yml,sha256=cgPMMyQouaGTW-AzWCNlWcMDY8S6Cb
 gbdtransformation/commons/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/commons/filters.py,sha256=_wBT4MmbFKgs2fTaom03BzAIdfW4NAn_KQHZQKe-EKc,117
 gbdtransformation/commons/emap/__init__.py,sha256=LPq1qlU4nPGFyKPsgKWZG9K2mV4vWR1OAZ1OGWH-NjU,16
-gbdtransformation/commons/emap/filters.py,sha256=FEJq2StQdWXxAieruwv2p7W0W8DYcIrmzllmX0J0tpo,456
+gbdtransformation/commons/emap/filters.py,sha256=BdYFvQBOPtHNzN6nI-kxV_uLgJoJgo9zGqht3qRcfhU,426
 gbdtransformation/commons/emap/template.yml,sha256=nSYD6hEn-8FDSprvBjMVn0IS_1stJO4gg4zqLqfmfw4,2884
 gbdtransformation/commons/emrp/__init__.py,sha256=LPq1qlU4nPGFyKPsgKWZG9K2mV4vWR1OAZ1OGWH-NjU,16
-gbdtransformation/commons/emrp/filters.py,sha256=qZalQj8Ev0Hn-Sy_RAPVOUoVG4Z2eVp08prShSRFzvc,454
+gbdtransformation/commons/emrp/filters.py,sha256=JfysDlfkWS9f285UUwFmvXRkXtScF2pvdsyhDlm1_t4,424
 gbdtransformation/commons/emrp/template.yml,sha256=bo6dfXKM-isbuZekWBvrKJ5cZ3t97oleEYSK3JoHHbQ,3076
 gbdtransformation/designs/__init__.py,sha256=0zM_Nw5d8cwxBsFq0NMxBRb21DiOUqgCb020CGJN_KY,242
 gbdtransformation/designs/filters.py,sha256=cFXAVGynjZjd5IX1CisEAfVhNLCMIZiu3xz1RUsX3zw,2584
@@ -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.62.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.62.dist-info/METADATA,sha256=_GIHoWnzVyq0aIHFSl0zC-MCaLM0SX7vG58hB6Q819o,577
-wipo_gbd_transformation-1.1.62.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wipo_gbd_transformation-1.1.62.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
-wipo_gbd_transformation-1.1.62.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.62.dist-info/RECORD,,
+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,,