From 2a1eb142f1b5fa5ec49937738d4fba6674193965 Mon Sep 17 00:00:00 2001 From: "fabio.sinibaldi" Date: Tue, 28 Jan 2020 16:23:36 +0100 Subject: [PATCH] Fixed regexps --- .../data/publishing/gCatFeeder/collectors/dm/profile.xml | 8 ++------ .../gCatFeeder/catalogues/gCat/full-algorithm.json | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/DataMinerAlgorithmsCrawler/src/main/resources/org/gcube/data/publishing/gCatFeeder/collectors/dm/profile.xml b/DataMinerAlgorithmsCrawler/src/main/resources/org/gcube/data/publishing/gCatFeeder/collectors/dm/profile.xml index 44f5665..d32a8e3 100644 --- a/DataMinerAlgorithmsCrawler/src/main/resources/org/gcube/data/publishing/gCatFeeder/collectors/dm/profile.xml +++ b/DataMinerAlgorithmsCrawler/src/main/resources/org/gcube/data/publishing/gCatFeeder/collectors/dm/profile.xml @@ -22,9 +22,7 @@ be: family, given[, email][, ORCID]. Example: Smith, John, js@acme.org, orcid.org/0000-0002-1825-0097 - ^[a-zA-ZÀ-ÿ .'-]+, [a-zA-ZÀ-ÿ .'-]+[, - ]*([a-zA-Z0-9_!#$%’*+=?`{|}~^.-]+@[a-zA-Z0-9À-ÿ.-]+)?[, - ]*(orcid.org\/0000-000(1-[5-9]|2-[0-9]|3-[0-4])\d\d\d-\d\d\d[\dX])?$ + ^[a-zA-ZÀ-ÿ .'-]+, [a-zA-ZÀ-ÿ .'-]+[,]*([a-zA-Z0-9_!#$%’*+=?`{|}~^.-]+@[a-zA-Z0-9À-ÿ.-]+)?[,]*(orcid.org\/0000-000(1-[5-9]|2-[0-9]|3-[0-4])\d\d\d-\d\d\d[\dX])?$ @@ -37,9 +35,7 @@ be: family, given[, email][, ORCID]. Example: Smith, John, js@acme.org, orcid.org/0000-0002-1825-0097 - ^[a-zA-ZÀ-ÿ .'-]+, [a-zA-ZÀ-ÿ .'-]+[, - ]*([a-zA-Z0-9_!#$%’*+=?`{|}~^.-]+@[a-zA-Z0-9À-ÿ.-]+)?[, - ]*(orcid.org\/0000-000(1-[5-9]|2-[0-9]|3-[0-4])\d\d\d-\d\d\d[\dX])?$ + ^[a-zA-ZÀ-ÿ .'-]+, [a-zA-ZÀ-ÿ .'-]+[,]*([a-zA-Z0-9_!#$%’*+=?`{|}~^.-]+@[a-zA-Z0-9À-ÿ.-]+)?[,]*(orcid.org\/0000-000(1-[5-9]|2-[0-9]|3-[0-4])\d\d\d-\d\d\d[\dX])?$ \ No newline at end of file diff --git a/gCat-Controller/src/test/resources/org/gcube/data/publishing/gCatFeeder/catalogues/gCat/full-algorithm.json b/gCat-Controller/src/test/resources/org/gcube/data/publishing/gCatFeeder/catalogues/gCat/full-algorithm.json index 7862479..85bf340 100644 --- a/gCat-Controller/src/test/resources/org/gcube/data/publishing/gCatFeeder/catalogues/gCat/full-algorithm.json +++ b/gCat-Controller/src/test/resources/org/gcube/data/publishing/gCatFeeder/catalogues/gCat/full-algorithm.json @@ -1,6 +1,6 @@ { "profileID": "DataMiner Process", - "profile": "\n\t\n\t\tInput Parameter\n\t\tfalse\n\t\tString\n\t\tInput parameter expected for the execution of the process\n\t\n\t\n\t\tProcess Description\n\t\tfalse\n\t\tString\n\t\tInput parameter expected for the execution of the process\n\t\n\t\n\t\tOutput Parameter\n\t\tfalse\n\t\tString\n\t\tOutput parameter expected from the execution of the process\n\t\t\n\t\n\t\n\t\tProcess Author\n\t\tfalse\n\t\tString\n\t\t*\n\t\t\n\t\tThe name of the author, with email and ORCID. The format should\n\t\t\tbe: family, given[, email][, ORCID]. Example: Smith, John,\n\t\t\tjs@acme.org, orcid.org/0000-0002-1825-0097\n\t\t\n\t\t\t^[a-zA-ZÀ-ÿ .'-]+, [a-zA-ZÀ-ÿ .'-]+[,\n\t\t\t\t]*([a-zA-Z0-9_!#$%’*+=?`{|}~^.-]+@[a-zA-Z0-9À-ÿ.-]+)?[,\n\t\t\t\t]*(orcid.org\\/0000-000(1-[5-9]|2-[0-9]|3-[0-4])\\d\\d\\d-\\d\\d\\d[\\dX])?$\n\t\t\n\t\n\t\n\t\tProcess Maintainer\n\t\tfalse\n\t\tString\n\t\t*\n\t\t\n\t\tThe name of the author, with email and ORCID. The format should\n\t\t\tbe: family, given[, email][, ORCID]. Example: Smith, John,\n\t\t\tjs@acme.org, orcid.org/0000-0002-1825-0097\n\t\t\n\t\t\t^[a-zA-ZÀ-ÿ .'-]+, [a-zA-ZÀ-ÿ .'-]+[,\n\t\t\t\t]*([a-zA-Z0-9_!#$%’*+=?`{|}~^.-]+@[a-zA-Z0-9À-ÿ.-]+)?[,\n\t\t\t\t]*(orcid.org\\/0000-000(1-[5-9]|2-[0-9]|3-[0-4])\\d\\d\\d-\\d\\d\\d[\\dX])?$\n\t\t\n\t\n", + "profile": "\r\n\t\r\n\t\tInput Parameter<\/fieldName>\r\n\t\tfalse<\/mandatory>\r\n\t\tString<\/dataType>\r\n\t\tInput parameter expected for the execution of the process<\/note>\r\n\t<\/metadatafield>\t\r\n\t\r\n\t\tOutput Parameter<\/fieldName>\r\n\t\tfalse<\/mandatory>\r\n\t\tString<\/dataType>\r\n\t\tOutput parameter expected from the execution of the process\r\n\t\t<\/note>\r\n\t<\/metadatafield>\r\n\t\r\n\t\tProcess Author<\/fieldName>\r\n\t\tfalse<\/mandatory>\r\n\t\tString<\/dataType>\r\n\t\t*<\/maxOccurs>\r\n\t\t\r\n\t\tThe name of the author, with email and ORCID. The format should\r\n\t\t\tbe: family, given[, email][, ORCID]. Example: Smith, John,\r\n\t\t\tjs@acme.org, orcid.org\/0000-0002-1825-0097<\/note>\r\n\t\t\r\n\t\t\t^[a-zA-Z\u00C0-\u00FF .'-]+, [a-zA-Z\u00C0-\u00FF .'-]+[,\r\n\t\t\t\t]*([a-zA-Z0-9_!#$%\u2019*+=?`{|}~^.-]+@[a-zA-Z0-9\u00C0-\u00FF.-]+)?[,\r\n\t\t\t\t]*(orcid.org\\\/0000-000(1-[5-9]|2-[0-9]|3-[0-4])\\d\\d\\d-\\d\\d\\d[\\dX])?$<\/regularExpression>\r\n\t\t<\/validator>\r\n\t<\/metadatafield>\r\n\t\r\n\t\tProcess Maintainer<\/fieldName>\r\n\t\tfalse<\/mandatory>\r\n\t\tString<\/dataType>\r\n\t\t*<\/maxOccurs>\r\n\t\t\r\n\t\tThe name of the author, with email and ORCID. The format should\r\n\t\t\tbe: family, given[, email][, ORCID]. Example: Smith, John,\r\n\t\t\tjs@acme.org, orcid.org\/0000-0002-1825-0097<\/note>\r\n\t\t\r\n\t\t\t^[a-zA-Z\u00C0-\u00FF .'-]+, [a-zA-Z\u00C0-\u00FF .'-]+[,\r\n\t\t\t\t]*([a-zA-Z0-9_!#$%\u2019*+=?`{|}~^.-]+@[a-zA-Z0-9\u00C0-\u00FF.-]+)?[,\r\n\t\t\t\t]*(orcid.org\\\/0000-000(1-[5-9]|2-[0-9]|3-[0-4])\\d\\d\\d-\\d\\d\\d[\\dX])?$<\/regularExpression>\r\n\t\t<\/validator>\r\n\t<\/metadatafield>\r\n<\/metadataformat>", "item": { "name": "timeextraction_in_prevre",