wipo-gbd-transformation 1.1.89__py3-none-any.whl → 1.1.90__py3-none-any.whl

gbdtransformation/brands/phtm/__init__.py

@@ -5,5 +5,10 @@ source = 'national'
 # PH/4/1981/00000115
 # PH/M/0001/01573483 
 # A/M/0001/01421820 B/M/0001/01364251 
-appnum_mask = [ 'PH/\\d/\\d*/(\\d*)', 'PH/M/\\d*/(\\d*)', 'A/M/\\d*/(\\d*)', 'B/M/\\d*/(\\d*)' ]
-regnum_mask = [ 'PH/\\d/\\d*/(\\d*)', 'PH/M/\\d*/(\\d*)', 'A/M/\\d*/(\\d*)', 'B/M/\\d*/(\\d*)' ]
+
+# PH4198100000115
+# PHM000101573483 
+# AM000101421820 BM000101364251 
+
+appnum_mask = [ 'PH\\d\\d{4}(\\d*)', 'PHM\\d{4}(\\d*)', 'AM\\d{4}(\\d*)', 'BM\\d{4}(\\d*)' ]
+regnum_mask = [ 'PH\\d\\d{4}(\\d*)', 'PHM\\d{4}(\\d*)', 'AM\\d{4}(\\d*)', 'BM\\d{4}(\\d*)' ]

gbdtransformation/brands/phtm/filters.py

@@ -10,10 +10,10 @@ ignore_namespace = [
    'http://www.wipo.int/standards/XMLSchema/trademarks',
    'http://www.wipo.int/standards/XMLSchema/wo-trademarks']
 
+"""
 def get_appdate(appdate, appnum):
     return appnum.split('/')[-2].zfill(4)
 
-"""
 def clean_application_number(number):
     # PH/4/1981/00000115 -> 00000115
     if number.startswith("PH/"):
@@ -29,11 +29,6 @@ def get_registration_nb(trademark, tmstatus):
     if not tmstatus in ['Expired', 'Registered']:
         return None
 
-    # 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)
 

gbdtransformation/brands/phtm/template.yml

@@ -28,7 +28,7 @@ designatedCountries:
 applicationLanguageCode: {{ trademark.ApplicationLanguageCode }}
 
 {% set tmstatus = trademark | translate_status %}
-{% set appdate = trademark.ApplicationDate | get_appdate(trademark.ApplicationNumber) %}
+{% set appdate = trademark.ApplicationDate %}
 
 
 gbdStatus: {{ tmstatus }}

{wipo_gbd_transformation-1.1.89.dist-info → wipo_gbd_transformation-1.1.90.dist-info}/METADATA

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

{wipo_gbd_transformation-1.1.89.dist-info → wipo_gbd_transformation-1.1.90.dist-info}/RECORD

@@ -324,12 +324,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=ubPa3l6csI9kH0SD3cc7vI2eV7oaH_lpD3ZgbZP50Oc,363
-gbdtransformation/brands/phtm/filters.py,sha256=NmNBnGVzJroC6h9VmZwZhLnvW61Hre6gRIulgaJXWHE,6324
+gbdtransformation/brands/phtm/__init__.py,sha256=o7NHkydTzaWCSoGgheZKSfnpJycq9Eu8ZhvAHs6CtXg,427
+gbdtransformation/brands/phtm/filters.py,sha256=AImUAIOkD1aM97q5Bh1hNw_fyzC8cDY13nA45rcR894,6141
 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=cfxCxD4yCJgvFJjgfgKuv4sJ--NYEUdYLJZAKZd899Q,7653
+gbdtransformation/brands/phtm/template.yml,sha256=fGIpMJoLyWIzRanpt0hoxkWp66lep0JapCeK03UH1_I,7610
 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
@@ -589,9 +589,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.89.dist-info/licenses/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.89.dist-info/METADATA,sha256=p-rjaKLI63q3KRZFxVOxn2TDKZHPsap96YTATlB3W3Q,804
-wipo_gbd_transformation-1.1.89.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
-wipo_gbd_transformation-1.1.89.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
-wipo_gbd_transformation-1.1.89.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.89.dist-info/RECORD,,
+wipo_gbd_transformation-1.1.90.dist-info/licenses/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
+wipo_gbd_transformation-1.1.90.dist-info/METADATA,sha256=3NeGjEHA8I-yCT9V_56Zlkl5kwP7pf9pcu4WZONiDR8,804
+wipo_gbd_transformation-1.1.90.dist-info/WHEEL,sha256=lTU6B6eIfYoiQJTZNc-fyaR6BpL6ehTzU3xGYxn2n8k,91
+wipo_gbd_transformation-1.1.90.dist-info/entry_points.txt,sha256=NFLtlP3mPHUi-hEoUcz4CXa7vcpP8bbwd18HS4arbEk,223
+wipo_gbd_transformation-1.1.90.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
+wipo_gbd_transformation-1.1.90.dist-info/RECORD,,