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

gbdtransformation/brands/emtm/filters.py

@@ -70,7 +70,8 @@ def translate_feature(feature):
     if feature.capitalize() in std_features:
         return feature.capitalize()
 
-    raise Exception('Feature "%s" unmapped' % feature)
+    return 'Unknown'
+    #raise Exception('Feature "%s" unmapped' % feature)
 
 
 def get_registration_nb(trademark, tmstatus):
@@ -106,4 +107,5 @@ def translate_status(trademark):
     if status == 'Registered': return 'Registered'
     if status == 'Registration expired': return 'Expired'
 
-    raise Exception('Status "%s" not mapped.' % status)
+    return 'Unknown'
+    #raise Exception('Status "%s" not mapped.' % status)

gbdtransformation/brands/emtm/template.yml

@@ -7,6 +7,7 @@
 
 {% set _space = " " %}
 {% set status = TradeMark | translate_status %}
+{% set st13 = TradeMark.ApplicationNumber | st13('EM') %}
 
 st13: {{ TradeMark.ApplicationNumber | st13('EM') }}
 gbdStatus: {{ status }}
@@ -108,49 +109,22 @@ appeals:
     date: {{ apeal.AppealEventDate }}
   {% endcall %}
 applicants:
-  {% call(applicant) match('ApplicantDetails.Applicant', TradeMark) %}
+  {% call(applicant) match('ApplicantDetails.ApplicantKey', TradeMark) %}
   {% if not applicant._operationCode == 'Delete' %}
-  - identifier: {{ applicant.ApplicantIdentifier }}
-    kind: {{ applicant.ApplicantLegalEntity }}
-    fullName:
-      - languageCode: {{ TradeMark.ApplicationLanguageCode }}
-        text: {{ applicant.ApplicantAddressBook.FormattedNameAddress.Name.FormattedName.OrganizationName }}
-    fullAddress:
-      - languageCode: {{ TradeMark.ApplicationLanguageCode }}
-        text: {{ applicant.ApplicantAddressBook.FormattedNameAddress.Address.FormattedAddress | format_address }}
-    contact:
-      phone: {{ applicant.ApplicantAddressBook.ContactInformationDetails.Phone }}
-      fax: {{ applicant.ApplicantAddressBook.ContactInformationDetails.Fax }}
-      email: {{ applicant.ApplicantAddressBook.ContactInformationDetails.Email }}
-      url: {{ applicant.ApplicantAddressBook.ContactInformationDetails.URL }}
-    countryCode: {{ applicant.ApplicantAddressBook.FormattedNameAddress.Address.AddressCountryCode }}
+  - {{ applicant.Identifier | get_entity_from_db(TradeMark.RegistrationOfficeCode, 'APP', st13) | field_name}}
   {% endif %}
   {% endcall %}
 
 representatives:
-  {% call(representative) match('RepresentativeDetails.Representative', TradeMark) %}
+  {% call(rep) match('RepresentativeDetails.RepresentativeKey', TradeMark) %}
   {% if not representative._operationCode == 'Delete' %}
-  - identifier: {{ representative.RepresentativeIdentifier }}
-    kind: {{representative.RepresentativeLegalEntity | append(' (') | append(representative.RepresentativeTypeCode) | append(')')}}
-    {% call(fna) match('RepresentativeAddressBook.FormattedNameAddress', representative)%}
-    fullName:
-      - languageCode: {{ TradeMark.ApplicationLanguageCode }}
-        text: {{ fna.Name.FormattedName | format_name }}
-    fullAddress:
-      - languageCode: {{ TradeMark.ApplicationLanguageCode }}
-        text: {{ fna.Address.FormattedAddress | format_address }}
-    contact:
-      phone: {{ representative.RepresentativeAddressBook.ContactInformationDetails.Phone }}
-      fax: {{ representative.RepresentativeAddressBook.ContactInformationDetails.Fax }}
-      email: {{ representative.RepresentativeAddressBook.ContactInformationDetails.Email }}
-      url: {{ representative.RepresentativeAddressBook.ContactInformationDetails.URL }}
-    countryCode: {{ fna.Address.AddressCountryCode }}
-    {% endcall %}
+  - {{ rep.Identifier | get_entity_from_db(TradeMark.RegistrationOfficeCode, 'REP', st13) | field_name}}
   {% endif %}
   {% endcall %}
+
 correspondence:
-  {% call(rep) match('xxxCorrespondenceAddress', TradeMark) %}
-    {{ rep.CorrespondenceAddressIdentifier}}
+  {% call(rep) match('CorrespondenceAddress', TradeMark) %}
+    {{ rep.CorrespondenceAddressIdentifier | get_entity_from_db('EM', rep.CorrespondenceAddressParty, st13) | field_name}}
   {% endcall %}
 
 {% endif %}

gbdtransformation/brands/hrtm/__init__.py

@@ -0,0 +1,3 @@
+# instruction to render the output to JSON format
+render = 'JSON'
+source = 'national'

gbdtransformation/brands/hrtm/filters.py

@@ -0,0 +1,109 @@
+# namespaces defined in XML and to be ignored in procecssing
+ignore_namespace = [
+    'http://tmview.europa.eu/trademark/data',
+    'http://www.oami.europa.eu/TM-Search'
+]
+
+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'
+
+# -------------------------------------------------------------
+# data translation helpers:
+# translate values from office interpretation to gbd equivalent
+# -------------------------------------------------------------
+def translate_kind(kind):
+    if not kind: return ['Individual']
+
+    if kind == 'Individual': return ['Individual']
+    if kind == 'Collective': return ['Collective']
+
+    raise Exception('kind "%s" is not mapped.' % kind)
+
+def translate_status(status):
+    if not status: return 'Ended'
+
+    if status == 'Registered': return 'Registered'
+
+    if status in ['Application published',
+                  'Application filed',
+                  'Application opposed',
+                  'Filed']:
+        return 'Pending'
+
+    raise Exception('Status "%s" unmapped' % status)
+
+def get_termination(value, gbd_status):
+    if gbd_status == 'Ended':
+        return value
+    return None
+
+def translate_feature(feature):
+    """translation of mark feature"""
+
+    # needed information from office
+    # if office cannot provide information, then agree on a way to guess (uatm)
+    if not feature: return 'Undefined'
+    feature = feature.upper()
+    if feature == 'COMBINED': return 'Combined'
+    if feature == 'WORD': return 'Word'
+    if feature == 'STYLIZED_CHARACTERS': return 'Stylized characters'
+    if feature == 'FIGURATIVE': return 'Figurative'
+    if feature == 'SOUND': return 'Sound'
+    if feature == ' 3 d': return 'Three dimensional'
+    if feature == '3-d': return 'Three dimensional'
+    if feature == '_3_D': return 'Three dimensional'
+    if feature == '3-D': return 'Three dimensional'
+    return feature.lower().capitalize()
+    # raise Exception to recognize unmapped values
+    raise Exception('Feature "%s" unmapped' % feature)
+
+def get_registration_nb(trademark, tmstatus):
+    if "RegistrationNumber" in trademark and trademark.RegistrationNumber:
+        return trademark.RegistrationNumber
+
+    # default registration number to application number
+    # in case none is provided
+    if tmstatus in ['Registered', 'Expired']:
+        return trademark.ApplicationNumber
+
+# -----------------------
+# filtering empty tags
+# -----------------------
+def get_goods_services(goods_services):
+    nc_gs = {} # classified
+    if not goods_services:
+        goods_services = []
+
+    if not isinstance(goods_services, list):
+        goods_services = [goods_services]
+
+    for goods_service in goods_services:
+        code = goods_service.ClassNumber
+        if code and not code == '0':
+            nc_gs[code] = {}
+            desc = goods_service.GoodsServicesDescription
+
+            if hasattr(desc, '__value'):
+                terms = desc.__value
+            else:
+                terms = desc
+
+            if terms:
+                nc_gs[code]['terms'] = terms
+            else:
+                continue
+
+            if hasattr(desc, '_languageCode'):
+                lang = desc._languageCode
+                nc_gs[code]['lang'] = lang.lower()
+
+    return nc_gs

gbdtransformation/brands/hrtm/schema

@@ -0,0 +1,43 @@
+/Transaction
+__/TradeMarkTransactionBody
+____/TransactionContentDetails
+______/TransactionCode
+______/TransactionData
+________/TradeMarkDetails
+__________/TradeMark
+____________/ApplicantDetails
+______________/Applicant
+________________/ApplicantAddressBook
+__________________/FormattedNameAddress
+____________________/Name
+______________________/FreeFormatName
+________________________/FreeFormatNameDetails
+__________________________/FreeFormatNameLine
+________________/ApplicantURI
+____________/ApplicationDate
+____________/ApplicationNumber
+____________/GoodsServicesDetails
+______________/GoodsServices
+________________/ClassDescriptionDetails
+__________________/ClassDescription
+____________________/ClassNumber
+____________/MarkCurrentStatusCode
+____________/MarkFeature
+____________/MarkImageDetails
+______________/MarkImage
+________________/MarkImageCategory
+__________________/CategoryCodeDetails
+____________________/CategoryCode
+________________/MarkImageURI
+____________/OppositionPeriodEndDate
+____________/OppositionPeriodStartDate
+____________/RegistrationOfficeCode
+____________/TradeMarkURI
+____________/WordMarkSpecification
+______________/MarkVerbalElementText
+__________/TradeMark[@operationCode=Insert]
+______/TransactionIdentifier
+__/TransactionHeader
+____/SenderDetails
+______/RequestProducerDateTime
+______/TM-Search TM-Search-TradeMarkList-V1-8.xsd]

gbdtransformation/brands/hrtm/template.yml

@@ -0,0 +1,144 @@
+{% from 'navigation.tmpl' import match %}
+
+{% set TradeMark = Transaction.TradeMarkTransactionBody.TransactionContentDetails.TransactionData.TradeMarkDetails.TradeMark %}
+{% set status = TradeMark.MarkCurrentStatusCode | translate_status %}
+
+st13: {{ TradeMark.ApplicationNumber | st13('HR', appdate=TradeMark.ApplicationDate) }}
+gbdStatus: {{ status }}
+registrationOfficeCode: {{ TradeMark.RegistrationOfficeCode }}
+type: TRADEMARK
+
+{% if not status == 'Delete' %}
+kind: {{ TradeMark.KindMark | translate_kind }}
+markFeature: {{ TradeMark.MarkFeature | translate_feature }}
+designatedCountries:
+  - {{ TradeMark.RegistrationOfficeCode }}
+applicationNumber: {{ TradeMark.ApplicationNumber }}
+applicationDate: {{ TradeMark.ApplicationDate | convertdate('%Y-%m-%d') }}
+registrationNumber: {{ TradeMark | get_registration_nb(TradeMark.MarkCurrentStatusCode) }}
+registrationDate: {{ TradeMark.RegistrationDate }}
+applicationLanguageCode: {{ TradeMark.ApplicationLanguageCode }}
+officeStatus: {{ TradeMark.MarkCurrentStatusCode }}
+statusDate: {{ TradeMark.MarkCurrentStatusDate | convertdate('%Y-%m-%d') }}
+
+markDisclaimerDetails:
+  {% call(desc) match('MarkDisclaimerDetails.MarkDisclaimer', TradeMark) %}
+  - text: {{ desc }}
+    languageCode: {{ desc | guess_language(TradeMark.ApplicationLanguageCode) }}
+  {% endcall %}
+
+markDescriptionDetails:
+  {% call(desc) match('MarkDisclaimerDetails.MarkDisclaimer', TradeMark) %}
+  - text: {{ desc }}
+    languageCode: {{ desc | guess_language(TradeMark.ApplicationLanguageCode) }}
+  {% endcall %}
+
+wordMarkSpecification:
+  markVerbalElement:
+    {% call(desc) match('WordMarkSpecification.MarkVerbalElementText', TradeMark) %}
+    - text: {{ desc }}
+      languageCode: {{ desc | guess_language(TradeMark.ApplicationLanguageCode) }}
+    {% endcall %}
+
+markImageDetails:
+  {% call(img) match('MarkImageDetails.MarkImage', TradeMark) %}
+  - name: {{ img.MarkImageURI }}
+    colourIndicator: {{ img.MarkImageColourClaimedText | get_true_or_false }}
+    colourClaimed:
+      {% call(desc) match('MarkImageColourClaimedText', img) %}
+      - text: {{ desc }}
+        languageCode: {{ desc | guess_language(TradeMark.ApplicationLanguageCode) }}
+      {% endcall %}
+    classification:
+      kind: Vienna
+      code:
+      {% call(code) match('MarkImageCategory.CategoryCodeDetails.CategoryCode', img) %}
+      - {{ code }}
+      {% endcall %}
+  {% endcall %}
+
+markSoundDetails:
+  {% call(sound) match('MarkSoundDetails.MarkSound', TradeMark) %}
+  - filename: {{ sound.MarkSoundFilename }}
+    fileformat: {{ sound.MarkSoundFileFormat }}
+  {% endcall %}
+
+markVideoDetails:
+  {% call(video) match('MarkVideoDetails.MarkVideo', TradeMark) %}
+  - filename: {{ video.MarkVideoFilename }}
+    fileformat: {{ video.MarkVideoFileFormat }}
+  {% endcall %}
+
+{% set nc_gs = TradeMark.GoodsServicesDetails.GoodsServices.ClassDescriptionDetails.ClassDescription | get_goods_services %}
+{% if (nc_gs.keys() | length) > 0 %}
+goodsServicesClassification:
+  kind: Nice
+  version: {{ ASK_THE_OFFICE }}
+  class:
+    {% for nc in nc_gs.keys() %}
+    - code: {{ nc | int }}
+      {% if nc_gs[nc]['terms'] %}
+      terms:
+        {{ nc_gs[nc]['terms'] | guess_language(nc_gs[nc]['lang'], TradeMark.ApplicationLanguageCode) | field_name}}:
+        {% for gsline in nc_gs[nc]['terms'] | remove_trailing('.', '-') | split_terms %}
+          - {{ gsline | lower }}
+        {% endfor %}
+      {% endif %}
+    {% endfor %}
+{% endif %}
+
+priorities:
+  {% call(priority) match('PriorityDetails.Priority', TradeMark) %}
+  - countryCode: {{ priority.PriorityCountryCode }}
+    number: {{ priority.PriorityNumber }}
+    date: {{ priority.PriorityDate }}
+  {% endcall %}
+
+publications:
+  {% call(publication) match('PublicationDetails.Publication', TradeMark) %}
+  - identifier: {{ publication.PublicationIdentifier }}
+    date: {{ publication.PublicationDate }}
+    section: {{ publication.PublicationSection }}
+  {% endcall %}
+
+applicants:
+  {% call(Applicant) match('ApplicantDetails.Applicant', TradeMark) %}
+  - identifier: {{ Applicant.ApplicantIdentifier }}
+    {% call(nameline) match('FormattedNameAddress.Name.FormattedName', Applicant.ApplicantAddressBook) %}
+    kind: {{ nameline | get_entity_kind}}
+    fullName:
+      - text: {{ nameline | get_entity_name}}
+        languageCode: hr
+      {% endcall %}
+    fullAddress:
+      {% call(adrline) match('FormattedNameAddress.Address.FormattedAddress', Applicant.ApplicantAddressBook) %}
+      - text: {{ adrline | get_entity_addr}}
+        languageCode: hr
+      {% endcall %}
+    {% call(adrline) match('FormattedNameAddress.Address', Applicant.ApplicantAddressBook) %}
+    countryCode: {{ adrline.AddressCountryCode }}
+    {% endcall %}
+  {% endcall %}
+
+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}}
+    fullName:
+      - text: {{ nameline | get_entity_name}}
+        languageCode: {{ nameline | guess_language('hr') }}
+      {% endcall %}
+    fullAddress:
+      {% call(adrline) match('FormattedNameAddress.Address.FormattedAddress', Representative.RepresentativeAddressBook) %}
+      - text: {{ adrline | get_entity_addr}}
+        languageCode: {{ adrline | guess_language('hr') }}
+      {% endcall %}
+    {% call(adrline) match('FormattedNameAddress.Address', Representative.RepresentativeAddressBook) %}
+    countryCode: {{ adrline.AddressCountryCode }}
+    {% endcall %}
+  {% endif %}
+  {% endcall %}
+
+{% endif %}

gbdtransformation/brands/xxxx/template.yml

@@ -73,7 +73,7 @@ terminationDate:
 # status as is in the document
 officeStatus:
 # status as translated to gbdFormat
-gbdStatus:  # (Ended|Expired|Pending|Registered|Unknown)
+gbdStatus:  # (Ended|Expired|Pending|Registered|Unknown|Delete)
 # can also be the date of the last event in markevents if given
 statusDate:
 
@@ -166,9 +166,32 @@ applicants:
     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: # sometimes, country name is provided instead
 
 representatives:
@@ -177,10 +200,33 @@ representatives:
     fullName:
       - languageCode:
         text:
+    firstName:
+      - languageCode:
+        text:
+    lastName:
+      - languageCode:
+        text:
+    middleName:
+      - languageCode:
+        text:
+    organizationName:
+      - languageCode:
+        text:
     fullAddress:
       - languageCode:
         text:
-    countryCode:
+    detailedAddress:
+      - languageCode:
+        text:
+        cityName:
+        geographicRegionName:
+        postalCode:
+    contact:
+      phone: 
+      fax: 
+      email: 
+      url:
+    countryCode: # sometimes, country name is provided instead
 
 correspondence:
   fullName:

gbdtransformation/common/filters.py

@@ -28,8 +28,15 @@ def load_collection_package(type, collection):
 def get_entity_from_db(value, collection, e_type, st13):
     e_type = e_type[0:3].upper()
     key = "%s.%s.%s" % (collection.lower(), e_type, value)
+    #dynamodb = boto3.resource('dynamodb',
+    #                          endpoint_url=os.environ.get('DYNAMO_DB'))
     dynamodb = boto3.resource('dynamodb',
-                              endpoint_url=os.environ.get('DYNAMO_DB'))
+                              endpoint_url=os.environ.get('DYDB_URL'))
+    #dynamodb = boto3.resource('dynamodb', 
+    #    region_name="eu-west-1", 
+    #    aws_access_key_id='anything',
+    #    aws_secret_access_key='anything',
+    #    endpoint_url="http://localhost:8001")
     table = dynamodb.Table('gbd_pypers_entity')
     response = table.get_item(Key={
         'entity_id': key}).get('Item', {})

gbdtransformation/commons/emap/filters.py

@@ -1 +1,16 @@
-ignore_namespace = ['http://www.euipo.europa.eu/EUTM/EUTM_Download']
+ignore_namespace = ['http://www.euipo.europa.eu/EUTM/EUTM_Download']
+
+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 != name.FirstName + " " + name.LastName:
+		if name.FirstName or name.LastName:
+			result += ", "
+		result += name.OrganizationName
+	return result
+
+	

gbdtransformation/commons/emap/template.yml

@@ -10,20 +10,46 @@ applicant:
     identifier: {{ Applicant.ApplicantIdentifier }}
     kind: {{ Applicant.ApplicantLegalEntity}}
     fullName:
+      {% 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) %}
-      - text: {{ nameline }}
-        languageCode: {{ nameline | guess_language('en') }}
+      - 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('PostalAddress', Applicant.ApplicantAddressBook) %}
       - text: {{ adrline }}
         languageCode: {{ adrline | 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 }}
     contact:
       phone: {{ Applicant.ApplicantAddressBook.ContactInformationDetails.Phone }}
       fax: {{ Applicant.ApplicantAddressBook.ContactInformationDetails.Fax }}
       email: {{ Applicant.ApplicantAddressBook.ContactInformationDetails.Email }}
       url: {{ Applicant.ApplicantAddressBook.ContactInformationDetails.URL }}
-    {% call(adrline) match('FormattedNameAddress.Address', Applicant.ApplicantAddressBook) %}
-    countryCode: {{ adrline.AddressCountryCode }}
-    {% endcall %}
+    countryCode: {{ Applicant.ApplicantAddressBook.FormattedNameAddress.Address.AddressCountryCode }}
+
+ 

gbdtransformation/commons/emrp/filters.py

@@ -1 +1,14 @@
-ignore_namespace = ['http://www.euipo.europa.eu/EUTM/EUTM_Download']
+ignore_namespace = ['http://www.euipo.europa.eu/EUTM/EUTM_Download']
+
+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 != name.FirstName + " " + name.LastName:
+		if name.FirstName or name.LastName:
+			result += ", "
+		result += name.OrganizationName
+	return result

gbdtransformation/commons/emrp/template.yml

@@ -6,24 +6,48 @@
 
 {% from 'navigation.tmpl' import match %}
 
-representativ:
+representative:
     identifier: {{ Representative.RepresentativeIdentifier }}
     kind: {{ Representative.RepresentativeLegalEntity}}
     fullName:
-      {% call(nameline) match('FormattedNameAddress.Name.FormattedName.LastName', Representative.RepresentativeAddressBook) %}
-      - text: {{ nameline }}
-        languageCode: {{ nameline | guess_language('en') }}
+      {% 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('PostalAddress', Representative.RepresentativeAddressBook) %}
       - text: {{ adrline }}
         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 }}
     contact:
       phone: {{ Representative.RepresentativeAddressBook.ContactInformationDetails.Phone }}
       fax: {{ Representative.RepresentativeAddressBook.ContactInformationDetails.Fax }}
       email: {{ Representative.RepresentativeAddressBook.ContactInformationDetails.Email }}
       url: {{ Representative.RepresentativeAddressBook.ContactInformationDetails.URL }}
-    {% call(adrline) match('FormattedNameAddress.Address', Representative.RepresentativeAddressBook) %}
-    countryCode: {{ adrline.AddressCountryCode }}
-    {% endcall %}
+    countryCode: {{ Representative.RepresentativeAddressBook.FormattedNameAddress.Address.AddressCountryCode }}

gbdtransformation/commons/filters.py

@@ -0,0 +1,3 @@
+from gbdtransformation.common.filters import *
+
+ignore_namespace = ['http://www.euipo.europa.eu/EUTM/EUTM_Download']

gbdtransformation/parser.py

@@ -39,11 +39,12 @@ class Parser:
                 self.type = 'brands'
             elif template_name == 'whoinn':
                 self.type = 'brands'
-
             elif template_name.endswith('tm'):
                 self.type = 'brands'
             elif template_name.endswith('id'):
                 self.type = 'designs'
+            elif template_name == 'emap' or template_name == 'emrp':
+                self.type = 'commons'
             else:
                 self.type = 'common'
         self.render = self.get_render()

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

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

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

@@ -2,7 +2,7 @@ gbdtransformation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 gbdtransformation/execs-nico.py,sha256=UC8E6CPLS5YwhB8AC_Z9_VIxlDGjweOv7NEMMxEVte0,24514
 gbdtransformation/execs.py,sha256=h4BBz3YrEBwPRwt312iNf2tAT_AglqLbssa1faJe1PA,25450
 gbdtransformation/gbd-transform.exec.tgz,sha256=fOcqmzJRIuAhCVtbhju3kaikTDAuQF2K16lt9xllnOE,6262
-gbdtransformation/parser.py,sha256=m6b1J0kJEaEDc0I8HKxzzN2nsQWKFfLlQqS3nT02kb4,7074
+gbdtransformation/parser.py,sha256=AqJdd-soUJH5l6VN3aTAwPayoHaslFQT4zRuPKa52Q8,7180
 gbdtransformation/renders.py,sha256=RmvQgugnG2ErvDxP4I9yovW67gEZNpOd59nrzEYfQPI,4555
 gbdtransformation/brands/__init__.py,sha256=abDdinNkilR-qYg4dhVxP_e1-ZixCzVuHGxbFt710TE,1605
 gbdtransformation/brands/filters.py,sha256=2IbOBzLsfmgj8kfyEydmuB-VmpO4UMkvtnymVrxTIwc,3674
@@ -110,9 +110,9 @@ gbdtransformation/brands/egtm/schema,sha256=AP0MxQyD0hY4APRh8nxitlxMqJYJB4AaaTJ8
 gbdtransformation/brands/egtm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/brands/egtm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/brands/emtm/__init__.py,sha256=9J9MpkcIR-7PWVjbzvT-ey9F400wxdlRAQF5ZiX8FX8,91
-gbdtransformation/brands/emtm/filters.py,sha256=xHkvSRnkkpUxLzUcLGNfVbdReLcB9vhz0ybT0oCdeP0,3250
+gbdtransformation/brands/emtm/filters.py,sha256=vUAFaOGOx2l7VhIf1DcyyNfoGpJLudBP4wYm8ukCMCM,3294
 gbdtransformation/brands/emtm/schema,sha256=CCZ2HtmgidPqBs9byleAC6ksQ6jFgclmVewH3Vnex8w,9643
-gbdtransformation/brands/emtm/template.yml,sha256=xNNQTLiI7aDU5or7ByodxPVMjean2kTvkzbz3L8bWgw,7135
+gbdtransformation/brands/emtm/template.yml,sha256=L0pDlLO_xwksy_Bb_BiNSgorFAAysaPcojmJJnu4UZw,5561
 gbdtransformation/brands/estm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib-IVMR5kCVMTY,86
 gbdtransformation/brands/estm/filters.py,sha256=GzhXr2dnPmZ4l71q0a3ulNTJgdpLQI6qcQcNEK8E5Co,3553
 gbdtransformation/brands/estm/schema,sha256=y7ZeQPuHez-DbBs1wnQjkyPvQ3hQ2uX5eNdrimCnFh4,3334
@@ -148,6 +148,10 @@ gbdtransformation/brands/gstm/__init__.py,sha256=yqzC7OagUR0RLui3pHPWo5WxLyksznH
 gbdtransformation/brands/gstm/filters.py,sha256=QGOXTX5HsoOoxfY9a31adtujzOS7C0KQx0V9wYKIr2o,2291
 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/schema,sha256=7jQ-PC0VTx5NZ79Qf8xAZEX8sqFSUtjPwsvVYV8XZAs,1376
+gbdtransformation/brands/hrtm/template.yml,sha256=92MBb0X1wYln7LSxWPeEDECEswzfZKT7QLudbFUDX9k,5733
 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
@@ -452,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=asJd5FHB2g5mfneMMqIkTSR9w3w-AUROnO6YgTyaR00,4665
+gbdtransformation/brands/xxxx/template.yml,sha256=sNeTm0K7DCulgbWWgeV_5gsf9IMsyB5HDTifx6Bl4pI,5518
 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
@@ -464,7 +468,7 @@ gbdtransformation/brands/zwtm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRF
 gbdtransformation/brands/zwtm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/brands/zwtm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/common/__init__.py,sha256=D8Pro2OHR868UAos_APlN1LhUPWMyIDXmPxP81n3HTw,12644
-gbdtransformation/common/filters.py,sha256=1V02GK5d1tPmUVEiwZXzvc0eu4nSB9qItusUWGkobsw,10522
+gbdtransformation/common/filters.py,sha256=IRaUD7dCP-29VYrZ0Ea_YF2gesdKrLRDjPoHlXUb-PA,10845
 gbdtransformation/common/navigation.tmpl,sha256=EZtsUnfh8B1V2WzHZjH3ZRZ9c9WpCVpWYsxLhGg9-fw,346
 gbdtransformation/common/jpap/__init__.py,sha256=0zpD6c5XcsLqKBLRVgRUSImZrCQMgtYv9Na0lNV9CzU,16
 gbdtransformation/common/jpap/filters.py,sha256=78tglb02rkiOvGn-DipzrBpkFsmYF8pKOIan6j99QWs,2209
@@ -476,12 +480,13 @@ gbdtransformation/common/jprp/__init__.py,sha256=0zpD6c5XcsLqKBLRVgRUSImZrCQMgtY
 gbdtransformation/common/jprp/filters.py,sha256=89NR8ZgekoeGnRfhPkXjzasDfWLolsGs7rpcT_BSANc,2234
 gbdtransformation/common/jprp/template.yml,sha256=cgPMMyQouaGTW-AzWCNlWcMDY8S6CbJCd9w-SyT1uds,1459
 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=CA7FRKxuhP1QVlB7hh6uIf7EVBXr1MkJ_NKAaP7nqBo,68
-gbdtransformation/commons/emap/template.yml,sha256=acb3nyjhNFSZa89KjIwrAhcc7Em2MrgjPgkvy-nBnYo,1308
+gbdtransformation/commons/emap/filters.py,sha256=FEJq2StQdWXxAieruwv2p7W0W8DYcIrmzllmX0J0tpo,456
+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=CA7FRKxuhP1QVlB7hh6uIf7EVBXr1MkJ_NKAaP7nqBo,68
-gbdtransformation/commons/emrp/template.yml,sha256=Zor0npqNLZfY9oFs7Ts-bwbsLlUJGmZMHi1cb35MQmI,1402
+gbdtransformation/commons/emrp/filters.py,sha256=qZalQj8Ev0Hn-Sy_RAPVOUoVG4Z2eVp08prShSRFzvc,454
+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
 gbdtransformation/designs/alid/__init__.py,sha256=U1i1Qng034s7l_2No1yJKbHvUSnMWl66ZLSinKMMS7Y,95
@@ -579,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.60.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.60.dist-info/METADATA,sha256=7iqsd2Pnis4i0u0NUVK4b9cETsQaV7HB91EKdWxwCMI,577
-wipo_gbd_transformation-1.1.60.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wipo_gbd_transformation-1.1.60.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
-wipo_gbd_transformation-1.1.60.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.60.dist-info/RECORD,,
+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,,