Skip to content

Commit 6f0250b

Browse files
committed
Update RDFS namespace
Workaround for common-workflow-language/cwltool#427
1 parent 2dc657a commit 6f0250b

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

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

+3-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@ public Workflow parseWorkflowWithCwltool(Workflow basicModel,
260260
if (!rdfService.graphExists(url)) {
261261
String rdf = cwlTool.getRDF(localPath);
262262
rdf = rdf.replace("file://" + workTree.toAbsolutePath().toString(),
263-
"https://w3id.org/cwl/v/git" + latestCommit + "/");
263+
"https://w3id.org/cwl/v/git/" + latestCommit);
264+
// Workaround for common-workflow-language/cwltool#427
265+
rdf = rdf.replace("<rdfs:>", "<http://www.w3.org/2000/01/rdf-schema#>");
264266

265267
// Create a workflow model from RDF representation
266268
Model model = ModelFactory.createDefaultModel();

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class RDFService {
3838
"PREFIX sld: <https://w3id.org/cwl/salad#>\n" +
3939
"PREFIX Workflow: <https://w3id.org/cwl/cwl#Workflow/>\n" +
4040
"PREFIX DockerRequirement: <https://w3id.org/cwl/cwl#DockerRequirement/>\n" +
41-
"PREFIX rdfs: <rdfs:>\n" +
41+
"PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n" +
4242
"PREFIX s: <http://schema.org/>";
4343

4444
private String rdfService;
@@ -142,7 +142,7 @@ public ResultSet getLabelAndDoc(String path, String workflowURI) {
142142

143143
/**
144144
* Get the label for an ontology URL
145-
* TODO: can be merged with getLabelAndDoc when cwltool namespace bug is resolved
145+
* TODO: can be merged with getLabelAndDoc when common-workflow-language/cwltool#427 is resolved
146146
* @param ontologyURI The format URI for the ontology
147147
* @return Result set with label and doc strings
148148
*/

0 commit comments

Comments
 (0)