wipo-gbd-transformation 1.1.68__py3-none-any.whl → 1.1.70__py3-none-any.whl

gbdtransformation/brands/phtm/__init__.py

@@ -1,3 +1,7 @@
 # instruction to render the output to JSON format
 render = 'JSON'
 source = 'national'
+
+# PH/4/1981/00000115
+appnum_mask = 'PH/\\d/\\d*/(\\d*)'
+regnum_mask = 'PH/\\d/\\d*/(\\d*)'

gbdtransformation/brands/phtm/filters.py

@@ -13,12 +13,15 @@ ignore_namespace = [
 def get_appdate(appdate, appnum):
     return appnum.split('/')[-2].zfill(4)
 
+"""
 def clean_application_number(number):
-    # PH/4/1981/00000115 -> 4/1981/00000115
+    # PH/4/1981/00000115 -> 00000115
     if number.startswith("PH/"):
         number = number.replace("PH/", "")
     return number
 
+"""
+
 def get_registration_nb(trademark, tmstatus):
     if trademark.RegistrationNumber:
         return trademark.RegistrationNumber
@@ -26,9 +29,10 @@ def get_registration_nb(trademark, tmstatus):
     if not tmstatus in ['Expired', 'Registered']:
         return None
 
-    # 4/1981/00000115 
-    appnum = clean_application_number(trademark.ApplicationNumber)
-    return appnum
+    # a way to deduce the registration number
+    appnum_parts = trademark.ApplicationNumber.split('/')
+    regnum = '%s/%s' % (appnum_parts[-2], appnum_parts[-1])
+    return regnum
 
 def get_expiry_date(trademark, tmstatus):
     return ipas.get_expiry_date(trademark, tmstatus)
@@ -155,3 +159,15 @@ def get_ir_refnum(appnum):
 
 def get_goods_services(goods_services):
     return ipas.get_goods_services(goods_services)
+
+def get_file_name(img):
+    if img == None:
+        return None
+    result = ""
+    if img.MarkImageFilename:
+        result += img.MarkImageFilename
+    if img.MarkImageFileFormat:
+        result += "." + img.MarkImageFileFormat.lower()
+    if len(result) == 0:
+        return None
+    return result

gbdtransformation/brands/phtm/template.yml

@@ -38,8 +38,8 @@ publicationDate: {{ (trademark.PublicationDetails.Publication | last).Publicatio
 
 markFeature: {{ trademark | translate_feature }}
 
-st13: {{ trademark.ApplicationNumber | clean_application_number | st13(trademark.RegistrationOfficeCode, type=type, appdate=appdate) }}
-applicationNumber: {{ trademark.ApplicationNumber | clean_application_number }}
+st13: {{ trademark.ApplicationNumber | st13(trademark.RegistrationOfficeCode, type=type, appdate=appdate) }}
+applicationNumber: {{ trademark.ApplicationNumber }}
 applicationDate: {{ trademark.ApplicationDate }}
 registrationNumber: {{ trademark | get_registration_nb(tmstatus) | remove_trailing('-') }}
 registrationDate: {{ trademark | get_registration_date(tmstatus) }}
@@ -52,8 +52,10 @@ terminationDate: {{ trademark.MarkCurrentStatusDate }}
 
 markDisclaimerDetails:
   {% call(disclaimer) match('MarkDisclaimerDetails.MarkDisclaimer', trademark) %}
+  {% if disclaimer.__value != 'N/A' and disclaimer.__value != 'NONE' and disclaimer.__value != 'None' %}
   - text: {{ disclaimer.__value }}
     languageCode: {{ disclaimer.__value | guess_language(disclaimer._languageCode, default=trademark.ApplicationLanguageCode) }}
+  {% endif %}
   {% endcall %}
 
 wordMarkSpecification:
@@ -68,16 +70,18 @@ wordMarkSpecification:
     {% endfor %}
   markTranslation:
     {% call(trans) match('MarkTranslation', wordSpec) %}
+    {% if trans != 'N/A' and trans != 'NONE' and trans != 'None' %}
     - text: {{ trans }}
       languageCode: {{ trans | guess_language(trans._languageCode, trademark.ApplicationLanguageCode) }}
+    {% endif %}
     {% endcall %}
   {% endcall %}
 
 markImageDetails:
   {% call(img) match('MarkImageDetails.MarkImage', trademark) %}
-    - name: {{ trademark.ApplicationNumber }}
+    - name: {{ img | get_file_name }}
       {% call(cclaim) match('MarkImageColourClaimedText', img) %}
-      {% if not cclaim.__value  == 'N/A' %}
+      {% if cclaim.__value  != 'N/A' and cclaim.__value  != 'NONE' and cclaim.__value  != 'None' %}
       colourIndicator: {{ cclaim.__value | remove_trailing('-') | get_true_or_false }}
       colourClaimed:
         - text: {{ cclaim.__value | remove_trailing('-') }}

{wipo_gbd_transformation-1.1.68.dist-info → wipo_gbd_transformation-1.1.70.dist-info}/METADATA

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

{wipo_gbd_transformation-1.1.68.dist-info → wipo_gbd_transformation-1.1.70.dist-info}/RECORD

@@ -319,12 +319,12 @@ gbdtransformation/brands/pgtm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRF
 gbdtransformation/brands/pgtm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/brands/pgtm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 gbdtransformation/brands/pgtm/tests/pgtm.xml,sha256=fAzAz2VtqOFV_2QImDbNxDvuTr-Ue3e5tGx8h-Lnnvg,6533
-gbdtransformation/brands/phtm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib-IVMR5kCVMTY,86
-gbdtransformation/brands/phtm/filters.py,sha256=01woZNZUCCBEuX2NMS3S0oUZ-BZUwiBrU-YjP5I0CpE,5885
+gbdtransformation/brands/phtm/__init__.py,sha256=7OMzcAdPCpMwW9XVZFWbQdeYc-8exeatkcCDCfbKEB0,178
+gbdtransformation/brands/phtm/filters.py,sha256=dG_0UfD5JPwOhQew4j5EljfF4t-kE2jb3hw5FkVy-rg,6262
 gbdtransformation/brands/phtm/schema,sha256=Nb5tI5MUrzn19c8GpLFuJhpiLn0Fa9XPza10eNHeesI,2877
 gbdtransformation/brands/phtm/schema.classic,sha256=3JOKHUfK0jSo0NBlDmeGFAKqfYdMJOrIPBIoNUMrVFI,808
 gbdtransformation/brands/phtm/template.classic.yml,sha256=U5th90SpXjspWTPuimqftd8vZfJ3tT90mIud5n7Zv8w,2820
-gbdtransformation/brands/phtm/template.yml,sha256=Tvr7L7--PodWQ_SxK-s5VElSIQaCE8yMeYptl6K4lbE,7456
+gbdtransformation/brands/phtm/template.yml,sha256=cfxCxD4yCJgvFJjgfgKuv4sJ--NYEUdYLJZAKZd899Q,7653
 gbdtransformation/brands/qatm/__init__.py,sha256=NBdOewZ1F_3eErahjyR-up8bjz1FSxwEiPSJfDw6GxY,79
 gbdtransformation/brands/qatm/filters.py,sha256=lMPVBX2ProdUtg5LcuQAmlInoGCo1-JZemHrvE1lNvw,2330
 gbdtransformation/brands/qatm/schema,sha256=AP0MxQyD0hY4APRh8nxitlxMqJYJB4AaaTJ8y20-XBA,3283
@@ -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.68.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.68.dist-info/METADATA,sha256=AADeJ835Tr7JRCIcKIFV51fUHgtlMR5VdeaEZjwZaFo,577
-wipo_gbd_transformation-1.1.68.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-wipo_gbd_transformation-1.1.68.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
-wipo_gbd_transformation-1.1.68.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.68.dist-info/RECORD,,
+wipo_gbd_transformation-1.1.70.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
+wipo_gbd_transformation-1.1.70.dist-info/METADATA,sha256=VMAfRZu4yiuO5qmPEzcUoM9r3ptJhkisBQLDnWxtKZQ,577
+wipo_gbd_transformation-1.1.70.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+wipo_gbd_transformation-1.1.70.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
+wipo_gbd_transformation-1.1.70.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
+wipo_gbd_transformation-1.1.70.dist-info/RECORD,,