diff --git a/authors-tools/swagger.json b/authors-tools/swagger.json index 63e9587..ca4d568 100644 --- a/authors-tools/swagger.json +++ b/authors-tools/swagger.json @@ -1,6 +1,6 @@ { "info": { - "version": "2.3.1" + "version": "2.3.6" }, "servers": [{ "url": "{scheme}://{hostname}", diff --git a/authors-tools/v1/first-name/gender.ini b/authors-tools/v1/first-name/gender.ini index 47d5dd7..e2001ca 100644 --- a/authors-tools/v1/first-name/gender.ini +++ b/authors-tools/v1/first-name/gender.ini @@ -37,8 +37,7 @@ plugin = @ezs/analytics [JSONParse] -legacy = false -separator = $ +separator = * [expand] path = env('path', 'value') diff --git a/authors-tools/v1/first-name/gender.py b/authors-tools/v1/first-name/gender.py index 9804886..c93026b 100644 --- a/authors-tools/v1/first-name/gender.py +++ b/authors-tools/v1/first-name/gender.py @@ -9,10 +9,10 @@ def detector(name,my_dict) : - name = unidecode(name.lower()) - if re.match(r"^([a-z][. '-]+){2,}[a-z]*",name) : - return "regex" + if re.match(r"^([A-Z][. '-]+){2,}[A-Z]*",name) or re.match(r"\b[A-Z]+\b\.?",name) : + return "name error" else : + name = unidecode(name.lower()) name = name.replace(".","") name = name.replace("- ","-") name = re.split("[\s-]+", name) @@ -70,11 +70,11 @@ else : return "unknown" else : - return "erreur" + return "name error" def main(): - with open('name_gender.pickle', 'rb') as handle: + with open('./v1/first-name/name_gender.pickle', 'rb') as handle: my_dict = pickle.load(handle) for line in sys.stdin: diff --git a/loterre-resolvers-conf.json b/loterre-resolvers-conf.json index f7eb4ba..287e666 100644 --- a/loterre-resolvers-conf.json +++ b/loterre-resolvers-conf.json @@ -14,11 +14,10 @@ "packages": [ "@ezs/core@2.5.2", "@ezs/basics@2.1.0", - "@ezs/basics@2.0.22", + "@ezs/analytics@2.0.22", "@ezs/storage@2.0.2" ], "files" : { - "zip": "https://gitbucket.inist.fr/tdm/web-services/archive/loterre-resolvers/loterre-resolvers@3.0.1.zip" + "zip": "https://gitbucket.inist.fr/tdm/web-services/archive/loterre-resolvers/loterre-resolvers@3.1.0.zip" } } -