Page MenuHomeSoftware Heritage
Files F9123180

D7263.id26449.diff
No OneTemporary
Actions

D7263.id26449.diff
View Options

diff --git a/swh/deposit/api/checks.py b/swh/deposit/api/checks.py
--- a/swh/deposit/api/checks.py
+++ b/swh/deposit/api/checks.py
@@ -108,7 +108,7 @@
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}
diff --git a/swh/deposit/tests/api/test_checks.py b/swh/deposit/tests/api/test_checks.py
--- a/swh/deposit/tests/api/test_checks.py
+++ b/swh/deposit/tests/api/test_checks.py
@@ -412,6 +412,7 @@
<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 @@
<title>bar</title>
<author>no one</author>
<codemeta:dateModified>2020-12-aa</codemeta:dateModified>
+ {PROVENANCE_XML}
</entry>
""",
[
@@ -442,6 +444,25 @@
},
],
),
+ (
+ 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 @@
<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 @@
<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 @@
<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 @@
<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 @@
<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 @@
<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 @@
<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 @@
<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>
""",

File Metadata

Mime Type
text/plain
Expires
Fri, Jun 20, 5:08 PM (2 w, 8 h ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3221104

Event Timeline

About · Developer information · Legal