wipo-gbd-transformation 1.1.53__py3-none-any.whl → 1.1.55__py3-none-any.whl

gbdtransformation/designs/woid/template.yml

@@ -108,6 +108,61 @@ applicants:
         entitlementDomiciled: {{ holder.Entitlement.EntitlementDomiciled.EntitlementDomiciledCode }}
   {% endcall %}
 
+applicantsNormalized:
+  {% call(holder) match('HolderNormalized', HagueExpressTransaction.HagueCurrent.HagueRegistration.HolderBag) %}
+    - identifier:
+
+      {% set ns = namespace(kind='organization') %}
+      {% call(name) match('Name', holder.Contact) %}
+        {% if name.PersonName %}
+          {% set ns.kind = 'person' %}
+        {% endif %}
+      {% endcall %}
+      kind: {{ ns.kind }}
+
+      {% call(name) match('Name', holder.Contact) %}
+      {% if name.PersonName %}
+      firstName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.FirstName) }}
+          text: {{ name.PersonName.PersonStructuredName.FirstName }}
+      lastName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.LastName) }}
+          text: {{ name.PersonName.PersonStructuredName.LastName }}
+      middleName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.MiddleName) }}
+          text: {{ name.PersonName.PersonStructuredName.MiddleName }}
+      {% endif %}
+
+      {% if name.OrganizationName %}
+      orgName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
+          text: {{ name.OrganizationName.OrganizationStandardName }}
+      {% endif %}
+      {% endcall %}
+
+      fullAddress:
+      {% call(postalAddress) match('PostalAddress', holder.Contact.PostalAddressBag) %}
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
+          #text: {{ postalAddress.PostalStructuredAddress | format_complete_address }}
+          addressLine: {{ postalAddress.PostalStructuredAddress.AddressLineText }}
+          cityName: {{ postalAddress.PostalStructuredAddress.CityName }}
+          geographicRegionName: {{ postalAddress.PostalStructuredAddress.GeographicRegionName }}
+          postalCode: {{ postalAddress.PostalStructuredAddress.PostalCode }}
+          postalBox: {{ postalAddress.PostalStructuredAddress.PostalBox }}
+          countryCode: {{ postalAddress.PostalStructuredAddress.CountryCode }}
+      {% endcall %}
+
+      processingTool:
+        name: {{ holder.Contact._type }}
+        version: {{ holder.Contact._subtype }}
+        processingDate: {{ holder.Contact._when }}
+
+      entitlement:
+        entitlementNationalityCode: {{ holder.Entitlement.EntitlementNationalityCode }}
+        entitlementEstablishment: {{ holder.Entitlement.EntitlementEstablishment.EntitlementEstablishmentCode }}
+        entitlementDomiciled: {{ holder.Entitlement.EntitlementDomiciled.EntitlementDomiciledCode }}
+  {% endcall %}
+
 representatives:
   {% call(representative) match('Representative', HagueExpressTransaction.HagueCurrent.HagueRegistration.RepresentativeBag) %}
     - identifier:
@@ -145,6 +200,56 @@ representatives:
       {% endcall %}
   {% endcall %}
 
+representativesNormalized:
+  {% call(representative) match('RepresentativeNormalized', HagueExpressTransaction.HagueCurrent.HagueRegistration.RepresentativeBag) %}
+    - identifier:
+
+      {% set ns = namespace(kind='organization') %}
+      {% call(name) match('Name', representative.Contact) %}
+        {% if name.PersonName %}
+          {% set ns.kind = 'person' %}
+        {% endif %}
+      {% endcall %}
+      kind: {{ ns.kind }}
+
+      {% call(name) match('Name', representative.Contact) %}
+      {% if name.PersonName %}
+      firstName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.FirstName) }}
+          text: {{ name.PersonName.PersonStructuredName.FirstName }}
+      lastName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.LastName) }}
+          text: {{ name.PersonName.PersonStructuredName.LastName }}
+      middleName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.MiddleName) }}
+          text: {{ name.PersonName.PersonStructuredName.MiddleName }}
+      {% endif %}
+
+      {% if name.OrganizationName %}
+      orgName:
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
+          text: {{ name.OrganizationName.OrganizationStandardName }}
+      {% endif %}
+      {% endcall %}
+
+      fullAddress:
+      {% call(postalAddress) match('PostalAddress', representative.Contact.PostalAddressBag) %}
+        - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
+          #text: {{ postalAddress.PostalStructuredAddress | format_complete_address }}
+          addressLine: {{ postalAddress.PostalStructuredAddress.AddressLineText }}
+          cityName: {{ postalAddress.PostalStructuredAddress.CityName }}
+          geographicRegionName: {{ postalAddress.PostalStructuredAddress.GeographicRegionName }}
+          postalCode: {{ postalAddress.PostalStructuredAddress.PostalCode }}
+          postalBox: {{ postalAddress.PostalStructuredAddress.PostalBox }}
+          countryCode: {{ postalAddress.PostalStructuredAddress.CountryCode }}
+      {% endcall %}
+
+      processingTool:
+        name: {{ representative.Contact._type }}
+        version: {{ representative.Contact._subtype }}
+        processingDate: {{ representative.Contact._when }}
+  {% endcall %}
+
 designClaim:
 # updated for supporting Hague data
 {% if HagueExpressTransaction.HagueCurrent.HagueRegistration.DesignClaimBag.DesignClaim.DesignClaimTextBag %}
@@ -264,6 +369,56 @@ designs:
           {% endcall %}
       {% endcall %}
 
+    designerNormalized:
+      {% call(designer) match('DesignerNormalized', design.DesignerBag) %}
+      - identifier:
+
+        {% set ns = namespace(kind='organization') %}
+        {% call(name) match('Name', designer.Contact) %}
+          {% if name.PersonName %}
+            {% set ns.kind = 'person' %}
+          {% endif %}
+        {% endcall %}
+        kind: {{ ns.kind }}
+
+        {% call(name) match('Name', designer.Contact) %}
+        {% if name.PersonName %}
+        firstName:
+          - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.FirstName) }}
+            text: {{ name.PersonName.PersonStructuredName.FirstName }}
+        lastName:
+          - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.LastName) }}
+            text: {{ name.PersonName.PersonStructuredName.LastName }}
+        middleName:
+          - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode | should_display_language(name.PersonName.PersonStructuredName.MiddleName) }}
+            text: {{ name.PersonName.PersonStructuredName.MiddleName }}
+        {% endif %}
+          
+        {% if name.OrganizationName %}
+        orgName:
+          - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
+            text: {{ name.OrganizationName.OrganizationStandardName }}
+        {% endif %}
+        {% endcall %}
+
+        fullAddress:
+        {% call(postalAddress) match('PostalAddress', designer.Contact.PostalAddressBag) %}
+          - languageCode: {{ HagueExpressTransaction.HagueCurrent.HagueRegistration.FilingLanguageCode }}
+            #text: {{ postalAddress.PostalStructuredAddress | format_complete_address }}
+            addressLine: {{ postalAddress.PostalStructuredAddress.AddressLineText }}
+            cityName: {{ postalAddress.PostalStructuredAddress.CityName }}
+            geographicRegionName: {{ postalAddress.PostalStructuredAddress.GeographicRegionName }}
+            postalCode: {{ postalAddress.PostalStructuredAddress.PostalCode }}
+            postalBox: {{ postalAddress.PostalStructuredAddress.PostalBox }}
+            countryCode: {{ postalAddress.PostalStructuredAddress.CountryCode }}
+        {% endcall %}
+
+        processingTool:
+          name: {{ designer.Contact._type }}
+          version: {{ designer.Contact._subtype }}
+          processingDate: {{ designer.Contact._when }}
+      {% endcall %}
+    
     productIndicationClasses:
       kind: "Locarno"
       version: {{ design.LocarnoClassificationBag.LocarnoClassificationEdition }}
@@ -348,4 +503,14 @@ extra:
         {% endcall %}
         
     {% endcall %}
-    
+    
+  history:
+    {% call(history) match('HagueHistory', HagueExpressTransaction) %}
+
+      - sequenceNumber: {{ history._sequenceNumber }}
+        hagueBulletinNumber: {{ history.HagueBulletinNumber }}
+        publicationDate: {{ history.PublicationDate }}
+        eventType: {{ history | get_event_type() }}
+        content: {{ history | serialize() }}
+
+    {% endcall %}

gbdtransformation/designs/xxid/template.yml

@@ -12,7 +12,7 @@ designatedCountries:
 
 # some collections indicate that the application
 # originates from international filing and provide IR number
-referece:
+reference:
   application:
     - number:
       date:
@@ -54,7 +54,6 @@ applicationLanguageCode:
 # rarely passed
 secondLanguageCode:
 
-
 applicants:
   - identifier:
     kind:
@@ -78,6 +77,39 @@ applicants:
         countryCode:
         postalCode:
     countryCode: # sometimes, country name is provided instead
+    entitlement:
+        entitlementNationalityCode: 
+        entitlementEstablishment: 
+        entitlementDomiciled:
+
+applicantsNormalized:
+  - identifier:
+    kind:
+    orgName:
+      - languageCode:
+        text:
+    firstName:
+      - languageCode:
+        text:
+    lastName:
+      - languageCode:
+        text:
+    middleName:
+      - languageCode:
+        text:
+    fullAddress:
+      - languageCode:
+        addressLine:
+        cityName:
+        geographicRegionName:
+        countryCode:
+        country:
+        postalCode:
+        postalBox: 
+    processingTool:
+      name:
+      version:
+      processingDate:
 
 representatives:
   - identifier:
@@ -103,6 +135,34 @@ representatives:
         postalCode:
     countryCode: # sometimes, country name is provided instead
 
+representativesNormalized:
+  - identifier:
+    kind:
+    orgName:
+      - languageCode:
+        text:
+    firstName:
+      - languageCode:
+        text:
+    lastName:
+      - languageCode:
+        text:
+    middleName:
+      - languageCode:
+        text:
+    fullAddress:
+      - languageCode:
+        addressLine:
+        cityName:
+        geographicRegionName:
+        countryCode:
+        country:
+        postalCode:
+        postalBox:
+    processingTool:
+      name:
+      version:
+      processingDate:
 
 correspondence:
   fullName:
@@ -126,6 +186,33 @@ correspondence:
       postalCode:
   countryCode: # sometimes, country name is provided instead
 
+correspondenceNormalized:
+  kind:
+  orgName:
+    - languageCode:
+      text:
+  firstName:
+    - languageCode:
+      text:
+  lastName:
+    - languageCode:
+      text:
+  middleName:
+    - languageCode:
+      text:
+  fullAddress:
+    - languageCode:
+      addressLine:
+      cityName:
+      geographicRegionName:
+      countryCode:
+      country:
+      postalCode:
+      postalBox:
+  processingTool:
+    name:
+    version:
+    processingDate:
 
 designClaim:
   claims:
@@ -193,6 +280,35 @@ designs:
             postalCode:
         countryCode: # sometimes, country name is provided instead
 
+    designerNormalized:
+      - identifier:
+        kind:
+        orgName:
+          - languageCode:
+            text:
+        firstName:
+          - languageCode:
+            text:
+        lastName:
+          - languageCode:
+            text:
+        middleName:
+          - languageCode:
+            text:
+        fullAddress:
+          - languageCode:
+            addressLine:
+            cityName:
+            geographicRegionName:
+            countryCode:
+            country:
+            postalCode:
+            postalBox:
+        processingTool:
+          name:
+          version:
+          processingDate:
+
     productIndicationClasses:
       - kind: Locarno/US/CA/Etc
         version:  #mostly