diff --git a/validation/validation_conf_12052023.py b/validation/validation_conf_12052023.py index 74c3a54..6c60db0 100644 --- a/validation/validation_conf_12052023.py +++ b/validation/validation_conf_12052023.py @@ -82,7 +82,8 @@ STRAIN_FIELDS = [ { FIELD: "otherCollectionNumbers", VALIDATION: [ - {TYPE: REGEXP, MATCH: "([^ ]* [^ ]*)(; [^ ]* [^ ]*)*$", ERROR_CODE: "STD63"}, + {TYPE: REGEXP, MATCH: "([^ ]* [^ ]*)(; [^ ]* [^ ]*)*$", ERROR_CODE: "STD63", + MULTIPLE: True, SEPARATOR: ';'}, #{TYPE: CROSSREF, CROSSREF_NAME: "Strains", ERROR_CODE: "STD64"}, ] }, @@ -322,7 +323,7 @@ STRAIN_FIELDS = [ { FIELD: "plasmidCollections", VALIDATION: [ - {TYPE: REGEXP, MATCH: "([a-zA-Z .'-]+)\(([a-zA-Z .'-]+) (\d+)\)(; ([a-zA-Z .'-]+)\(([a-zA-Z .'-]+) (\d+)\))*$", + {TYPE: REGEXP, MATCH: "([a-zA-Z .'-]+)\(([a-zA-Z .'-]+) (\d+)\)(;([a-zA-Z .'-]+)\(([a-zA-Z .'-]+) (\d+)\))*$", ERROR_CODE: "STD62"} ] }, @@ -357,7 +358,7 @@ STRAIN_FIELDS = [ { FIELD: "sequenceLiterature", VALIDATION: [ - {TYPE: REGEXP, MATCH: "^\d+(; \d+)*$", ERROR_CODE: "STD61"}, + {TYPE: REGEXP, MATCH: "^\d+(;?\s*\d+)*$", ERROR_CODE: "STD61"}, ] }, @@ -485,10 +486,7 @@ SHEETS_SCHEMA = { "acronym": "STD", 'id_field': 'accessionNumber', VALIDATION: {TYPE: MANDATORY, ERROR_CODE: "EFS05"}, - ROW_VALIDATION: [ - #{TYPE: NAGOYA, ERROR_CODE: "STD46"}, - {TYPE: NAGOYA1, ERROR_CODE: "STD64"} - ], + ROW_VALIDATION: [], COLUMNS: STRAIN_FIELDS, }, LITERATURE_SHEET: {