gCubeSystem
/
gFeed
13
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed regexps

This commit is contained in:
Fabio Sinibaldi 2020-01-28 16:23:36 +01:00
parent 762d92a8ce
commit 2a1eb142f1
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DataMinerAlgorithmsCrawler/src/main/resources/org/gcube/data/publishing/gCatFeeder/collectors/dm/profile.xml
View File

@ -22,9 +22,7 @@
be: family, given[, email][, ORCID]. Example: Smith, John,
js@acme.org, orcid.org/0000-0002-1825-0097</note>
<validator>
<regularExpression>^[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])?$</regularExpression>
<regularExpression>^[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])?$</regularExpression>
</validator>
</metadatafield>
<metadatafield categoryref="DataMiner Process">
@ -37,9 +35,7 @@
be: family, given[, email][, ORCID]. Example: Smith, John,
js@acme.org, orcid.org/0000-0002-1825-0097</note>
<validator>
<regularExpression>^[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])?$</regularExpression>
<regularExpression>^[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])?$</regularExpression>
</validator>
</metadatafield>
</metadataformat>

2
gCat-Controller/src/test/resources/org/gcube/data/publishing/gCatFeeder/catalogues/gCat/full-algorithm.json
View File

@ -1,6 +1,6 @@
{
"profileID": "DataMiner Process",
"profile": "<metadataformat type=\"DataMiner Process\">\n\t<metadatafield>\n\t\t<fieldName>Input Parameter</fieldName>\n\t\t<mandatory>false</mandatory>\n\t\t<dataType>String</dataType>\n\t\t<note>Input parameter expected for the execution of the process</note>\n\t</metadatafield>\n\t<metadatafield>\n\t\t<fieldName>Process Description</fieldName>\n\t\t<mandatory>false</mandatory>\n\t\t<dataType>String</dataType>\n\t\t<note>Input parameter expected for the execution of the process</note>\n\t</metadatafield>\n\t<metadatafield>\n\t\t<fieldName>Output Parameter</fieldName>\n\t\t<mandatory>false</mandatory>\n\t\t<dataType>String</dataType>\n\t\t<note>Output parameter expected from the execution of the process\n\t\t</note>\n\t</metadatafield>\n\t<metadatafield>\n\t\t<fieldName>Process Author</fieldName>\n\t\t<mandatory>false</mandatory>\n\t\t<dataType>String</dataType>\n\t\t<maxOccurs>*</maxOccurs>\n\t\t<defaultValue />\n\t\t<note>The 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</note>\n\t\t<validator>\n\t\t\t<regularExpression>^[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])?$</regularExpression>\n\t\t</validator>\n\t</metadatafield>\n\t<metadatafield>\n\t\t<fieldName>Process Maintainer</fieldName>\n\t\t<mandatory>false</mandatory>\n\t\t<dataType>String</dataType>\n\t\t<maxOccurs>*</maxOccurs>\n\t\t<defaultValue />\n\t\t<note>The 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</note>\n\t\t<validator>\n\t\t\t<regularExpression>^[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])?$</regularExpression>\n\t\t</validator>\n\t</metadatafield>\n</metadataformat>",
"profile": "<metadataformat type=\"DataMiner Process\">\r\n\t<metadatafield categoryref=\"DataMiner Process\">\r\n\t\t<fieldName>Input Parameter<\/fieldName>\r\n\t\t<mandatory>false<\/mandatory>\r\n\t\t<dataType>String<\/dataType>\r\n\t\t<note>Input parameter expected for the execution of the process<\/note>\r\n\t<\/metadatafield>\t\r\n\t<metadatafield categoryref=\"DataMiner Process\">\r\n\t\t<fieldName>Output Parameter<\/fieldName>\r\n\t\t<mandatory>false<\/mandatory>\r\n\t\t<dataType>String<\/dataType>\r\n\t\t<note>Output parameter expected from the execution of the process\r\n\t\t<\/note>\r\n\t<\/metadatafield>\r\n\t<metadatafield categoryref=\"DataMiner Process\">\r\n\t\t<fieldName>Process Author<\/fieldName>\r\n\t\t<mandatory>false<\/mandatory>\r\n\t\t<dataType>String<\/dataType>\r\n\t\t<maxOccurs>*<\/maxOccurs>\r\n\t\t<defaultValue \/>\r\n\t\t<note>The 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<validator>\r\n\t\t\t<regularExpression>^[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<metadatafield categoryref=\"DataMiner Process\">\r\n\t\t<fieldName>Process Maintainer<\/fieldName>\r\n\t\t<mandatory>false<\/mandatory>\r\n\t\t<dataType>String<\/dataType>\r\n\t\t<maxOccurs>*<\/maxOccurs>\r\n\t\t<defaultValue \/>\r\n\t\t<note>The 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<validator>\r\n\t\t\t<regularExpression>^[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",