Skip to content

Commit f68617b

Browse files
committed
Support schema.org/author notation
as in common-workflow-language/user_guide
1 parent fc22555 commit f68617b

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

src/main/java/org/commonwl/view/cwl/RDFService.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -310,19 +310,19 @@ public ResultSet getAuthors(String path, String fileUri) {
310310
"SELECT ?email ?name ?orcid\n" +
311311
"WHERE {\n" +
312312
" GRAPH ?graphName {" +
313-
" ?file s:creator ?creator .\n" +
313+
" ?file s:author|s:contributor|s:creator ?author .\n" +
314314
" {\n" +
315315
" ?creator rdf:type s:Person .\n" +
316-
" OPTIONAL { ?creator s:email ?email }\n" +
317-
" OPTIONAL { ?creator s:name ?name }\n" +
318-
" OPTIONAL { ?creator s:sameAs ?orcid }\n" +
316+
" OPTIONAL { ?author s:email ?email }\n" +
317+
" OPTIONAL { ?author s:name ?name }\n" +
318+
" OPTIONAL { ?author s:id|s:sameAs ?orcid }\n" +
319319
" } UNION {\n" +
320-
" ?creator rdf:type s:Organization .\n" +
321-
" ?creator s:department* ?dept .\n" +
320+
" ?author rdf:type s:Organization .\n" +
321+
" ?author s:department* ?dept .\n" +
322322
" ?dept s:member ?member\n" +
323323
" OPTIONAL { ?member s:email ?email }\n" +
324324
" OPTIONAL { ?member s:name ?name }\n" +
325-
" OPTIONAL { ?member s:sameAs ?orcid }\n" +
325+
" OPTIONAL { ?member s:id|s:sameAs ?orcid }\n" +
326326
" }\n" +
327327
" FILTER(regex(str(?orcid), \"^https?://orcid.org/\" ))\n" +
328328
" FILTER(regex(str(?file), ?wfFilter, \"i\" ))\n" +

src/main/resources/templates/about.html

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,15 @@ <h2>Use of Subworkflows</h2>
136136
<h2>Attribution</h2>
137137
<p class="recommendation">Include attribution information in your workflow and tool descriptions</p>
138138
<p class="recommendation_more">
139-
For example, to attribute a person as the creator of a workflow or tool with name, email and
139+
For example, to attribute a person as the author of a workflow or tool with name, email and
140140
ORCID information, include the following statements at the top level:<br />
141141
<pre>
142142
$namespaces: { s: "http://schema.org/" }
143-
s:creator:
143+
s:author:
144144
- class: s:Person
145145
s:name: Mark Robinson
146146
s:email: mailto:[email protected]
147-
s:sameAs:
148-
- id: http://orcid.org/0000-0002-8184-7507
147+
s:id: http://orcid.org/0000-0002-8184-7507
149148
</pre>
150149
For attributing organisations, see <a href="https://github.com/Barski-lab/ga4gh_challenge/blob/9de2f0c29ae09e31a434d6c5c969a5e3b2dbf535/biowardrobe_chipseq_se.cwl#L387">this workflow</a>
151150
as an example
@@ -155,7 +154,7 @@ <h2>Attribution</h2>
155154
be uniquely identified from other researchers</p>
156155
<p class="use">CWLViewer parses attribution information for inclusion in the Research Object Manifest from
157156
both the Git commit logs and from the CWL descriptions themselves when expressed in the
158-
<a href="http://schema.org/creator">http://schema.org/creator</a> format as above</p>
157+
<a href="http://schema.org/author">http://schema.org/author</a> format as above</p>
159158

160159
<h2>Licensing</h2>
161160
<p class="recommendation">Include a <a href="https://opensource.org/licenses">OSI approved open source license</a>

0 commit comments

Comments
 (0)