wipo-gbd-transformation 1.1.42__py3-none-any.whl → 1.1.45__py3-none-any.whl

gbdtransformation/brands/filters.py

@@ -106,7 +106,6 @@ def st13(appnum, office, type='TRADEMARK', appdate=None, roffice=None, sanitize=
     appnum = ''.join(matches.groups())
 
     prefix = st13_identifier[source.lower()][type.lower()]
-
     if sanitize:
         # remove special characters
         special_chars = re.compile(r'\W')

gbdtransformation/brands/vntm/__init__.py

@@ -3,4 +3,7 @@ source = 'national'
 
 default_lang = 'vi'
 # 4201911818
-appnum_mask =  '4-\\d{4}-(\\d*)'
+appnum_mask =  ['4-\\d{4}-(\\d*)',
+                '[A|B]-.*-\\d{4}-(\\d*)',
+                'MD-.*-\\d{4}-(\\d*)',
+                'VN-.*-\\d{4}-(\\d*)']

gbdtransformation/brands/vntm/filters.py

@@ -1,11 +1,16 @@
 import gbdtransformation.brands.ipas.filters as ipas
+from datetime import datetime
 
 ignore_namespace = [
    'http://www.wipo.int/standards/XMLSchema/trademarks',
    'http://www.wipo.int/standards/XMLSchema/wo-trademarks']
 
 def get_appdate(appdate, appnum):
-    return appnum[2:6]
+    try:
+        datetime.strptime(appdate, "%Y-%m-%d")
+        return appdate
+    except:
+        return appnum[5:9]
 
 def translate_type(header):
     code = header.TransactionCode
@@ -32,7 +37,10 @@ def translate_status(trademark):
         return ipas.translate_status('Active')
     elif value in ['Hết hạn', 'Rút đơn']:
         return ipas.translate_status("Expired")
-
+    elif value in ['Từ bỏ', 'Mất hiệu lực']:
+        return ipas.translate_status('Ended')
+    elif value in ['465']:
+        return 'Unknown'
     raise Exception('Status "%s" is not mapped.' % value)
 
 def translate_feature(trademark):

{wipo_gbd_transformation-1.1.42.dist-info → wipo_gbd_transformation-1.1.45.dist-info}/METADATA

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

{wipo_gbd_transformation-1.1.42.dist-info → wipo_gbd_transformation-1.1.45.dist-info}/RECORD

@@ -4,7 +4,7 @@ gbdtransformation/execs.py,sha256=c36fHKA61mZ5bIiwvQMenuYHF2mJnqjNGMJtVLXKA5M,23
 gbdtransformation/parser.py,sha256=m6b1J0kJEaEDc0I8HKxzzN2nsQWKFfLlQqS3nT02kb4,7074
 gbdtransformation/renders.py,sha256=RmvQgugnG2ErvDxP4I9yovW67gEZNpOd59nrzEYfQPI,4555
 gbdtransformation/brands/__init__.py,sha256=abDdinNkilR-qYg4dhVxP_e1-ZixCzVuHGxbFt710TE,1605
-gbdtransformation/brands/filters.py,sha256=uF5U_gg7Xsk1wgDrFKzThnUO5xqQ2X5WFMufeJC6xN8,3675
+gbdtransformation/brands/filters.py,sha256=2IbOBzLsfmgj8kfyEydmuB-VmpO4UMkvtnymVrxTIwc,3674
 gbdtransformation/brands/aetm/__init__.py,sha256=iRGjYvJCPaI3nnVc6ayO1g7j-fZ3yHrG1Wfb996UKMA,73
 gbdtransformation/brands/aetm/filters.py,sha256=mmhPwr6X-gC-jgc272e_9sxpNttfaUUORG7cDxgUO24,2490
 gbdtransformation/brands/aetm/schema,sha256=AP0MxQyD0hY4APRh8nxitlxMqJYJB4AaaTJ8y20-XBA,3283
@@ -389,8 +389,8 @@ gbdtransformation/brands/uytm/__init__.py,sha256=UHmbQDIPDdApISBKfO9tKOX6LgUQ_Ib
 gbdtransformation/brands/uytm/filters.py,sha256=i7SBMVTF70OERVdsS3Dfv19S3-9kyxE-y4aYA59YxA4,1976
 gbdtransformation/brands/uytm/schema,sha256=uMd1E_XRVQ_wHVrGq5fqFH6Fyg8cWx2DTQbVvH8tmmA,3730
 gbdtransformation/brands/uytm/template.yml,sha256=fLZVKwC0j6fAxv-kpngeSnGOZMiK-T_wWdxFmd4L7pc,5497
-gbdtransformation/brands/vntm/__init__.py,sha256=izLQm8Q1dG-XuVTfern9oE32O4GnZPl40BV62OeqdEI,103
-gbdtransformation/brands/vntm/filters.py,sha256=nwhKkAG4cZWxTAUVymZjHCAhVqDngKezkc-6-liOAr4,2253
+gbdtransformation/brands/vntm/__init__.py,sha256=po50MWZ7H_x6jhT_C83-HvsjAE0J8IQpubzvXwTqmgI,225
+gbdtransformation/brands/vntm/filters.py,sha256=JgOjG03WnRD_N5tL5jP5mP-YGJozRECyypsm3TvlCJo,2530
 gbdtransformation/brands/vntm/schema,sha256=TFrF4FR76cytcbtQkDWxtF74I0tCPRDIvWRFeqaJt6Q,3242
 gbdtransformation/brands/vntm/template.yml,sha256=PO7s1HDQM9ushIJuIX3z_dfWO-f62YDzBG_sYKDlnG8,34
 gbdtransformation/brands/vntm/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -481,9 +481,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.42.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
-wipo_gbd_transformation-1.1.42.dist-info/METADATA,sha256=GLVT8s1SkuPDJkjhGnvdxxkrosegBe8H05DX6gi5eCg,485
-wipo_gbd_transformation-1.1.42.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
-wipo_gbd_transformation-1.1.42.dist-info/entry_points.txt,sha256=CiiRxivMelcgA7W_4rzY1fG-AGEarhpXQUlKYzKWsOI,165
-wipo_gbd_transformation-1.1.42.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
-wipo_gbd_transformation-1.1.42.dist-info/RECORD,,
+wipo_gbd_transformation-1.1.45.dist-info/LICENSE.md,sha256=6r2dL13EwZqSt2ellLbJRFTA-6ECIDOer4YthCfkac0,35654
+wipo_gbd_transformation-1.1.45.dist-info/METADATA,sha256=O0XYNVarhjKyR14DktS9Zl841AVRoh6AxzigP0zDN10,485
+wipo_gbd_transformation-1.1.45.dist-info/WHEEL,sha256=2wepM1nk4DS4eFpYrW1TTqPcoGNfHhhO_i5m4cOimbo,92
+wipo_gbd_transformation-1.1.45.dist-info/entry_points.txt,sha256=CiiRxivMelcgA7W_4rzY1fG-AGEarhpXQUlKYzKWsOI,165
+wipo_gbd_transformation-1.1.45.dist-info/top_level.txt,sha256=oU1j-JNLga18Fd-EV6Xl9wM8zxYoNVEzb7P8MDhTPJg,26
+wipo_gbd_transformation-1.1.45.dist-info/RECORD,,