Skip to content
Snippets Groups Projects
Commit 1fe5bf19 authored by vlorentz's avatar vlorentz
Browse files

Warn about missing <swh:metadata-provenance> even on unrelated errors

This behavior was (accidentally) removed in 74d5567b.
parent 52713785
No related branches found
Tags v2.9.2
No related merge requests found
......@@ -108,7 +108,7 @@ def check_metadata(metadata: ElementTree.Element) -> Tuple[bool, Optional[Dict]]
detail.append({"fields": [schema_element.prefixed_name], "summary": str(e)})
if detail:
return False, {"metadata": detail}
return False, {"metadata": detail + suggested_fields}
if suggested_fields: # it's fine but warn about missing suggested fields
return True, {"metadata": suggested_fields}
......
......@@ -412,6 +412,7 @@ _parameters3 = [
<author>no one</author>
<codemeta:datePublished>2020-aa-21</codemeta:datePublished>
<codemeta:dateCreated>2020-12-bb</codemeta:dateCreated>
{PROVENANCE_XML}
</entry>
""",
[
......@@ -433,6 +434,7 @@ _parameters3 = [
<title>bar</title>
<author>no one</author>
<codemeta:dateModified>2020-12-aa</codemeta:dateModified>
{PROVENANCE_XML}
</entry>
""",
[
......@@ -442,6 +444,25 @@ _parameters3 = [
},
],
),
(
f"""\
<entry {XMLNS}>
<url>some url</url>
<codemeta:name>bar</codemeta:name>
<codemeta:author>no one</codemeta:author>
</entry>
""",
[
{
"summary": ".*Reason: character data between child elements.*",
"fields": ["codemeta:author"],
},
{
"summary": "Suggested fields are missing",
"fields": ["swh:metadata-provenance"],
},
],
),
(
f"""\
<entry {XMLNS}>
......@@ -453,6 +474,9 @@ _parameters3 = [
<swh:invalid>
<swh:origin url="http://example.org" />
</swh:invalid>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
""",
......@@ -480,6 +504,9 @@ _parameters3 = [
<swh:add_to_origin>
<swh:origin url="http://example.org" />
</swh:add_to_origin>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
""",
......@@ -506,6 +533,9 @@ _parameters3 = [
<swh:create_origin>
<swh:origin url="http://example.org" />
</swh:create_origin>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
""",
......@@ -534,6 +564,9 @@ _parameters3 = [
<swh:reference>
<swh:origin url="http://example.org" />
</swh:reference>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
""",
......@@ -562,6 +595,9 @@ _parameters3 = [
<swh:reference>
<swh:origin url="http://example.org" />
</swh:reference>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
""",
......@@ -588,6 +624,9 @@ _parameters3 = [
<swh:object swhid="swh:1:dir:0000000000000000000000000000000000000000" />
<swh:origin url="http://example.org" />
</swh:reference>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
""",
......@@ -610,6 +649,9 @@ _parameters3 = [
<swh:origin url="http://example.org" />
<swh:origin url="http://example.org" />
</swh:reference>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
""",
......@@ -632,6 +674,9 @@ _parameters3 = [
<swh:origin url="http://example.org" />
<swh:object swhid="swh:1:dir:0000000000000000000000000000000000000000" />
</swh:reference>
<swh:metadata-provenance>
<schema:url>some-metadata-provenance-url</schema:url>
</swh:metadata-provenance>
</swh:deposit>
</entry>
""",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment