URI Fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/commit/91a02149 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/tree/91a02149 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/diff/91a02149 Branch: refs/heads/master Commit: 91a0214944b4f234b7d8b040f6741e52aeaa86ed Parents: a805993 Author: Mark Robinson <[email protected]> Authored: Thu Feb 23 14:08:49 2017 +0000 Committer: Mark Robinson <[email protected]> Committed: Thu Feb 23 14:08:49 2017 +0000 ---------------------------------------------------------------------- .../taverna/robundle/manifest/RDFToManifest.java | 15 +++++++++++++-- .../org/apache/taverna/robundle/utils/RDFUtils.java | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/91a02149/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/RDFToManifest.java ---------------------------------------------------------------------- diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/RDFToManifest.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/RDFToManifest.java index 25b0558..b758244 100644 --- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/RDFToManifest.java +++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/manifest/RDFToManifest.java @@ -35,6 +35,7 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import java.util.UUID; +import java.util.logging.Level; import java.util.logging.Logger; import org.apache.jena.riot.Lang; @@ -435,7 +436,12 @@ public class RDFToManifest { // retrievedFrom RDFNode retrievedNode = ro.getPropertyValue(retrievedFrom); - manifest.setRetrievedFrom(retrievedNode); + try { + manifest.setRetrievedFrom(new URI(retrievedNode.asResource().getURI())); + } catch (URISyntaxException ex) { + logger.log(Level.WARNING, "Error creating URI for retrievedFrom: " + + retrievedNode.asResource().getURI(), ex); + } // retrievedBy List<Agent> retrievers = getAgents(root, ro, retrievedBy); @@ -498,7 +504,12 @@ public class RDFToManifest { // retrievedFrom RDFNode retrievedAggrNode = aggrResource.getPropertyValue(retrievedFrom); - meta.setRetrievedFrom(retrievedAggrNode); + try { + meta.setRetrievedFrom(new URI(retrievedAggrNode.asResource().getURI())); + } catch (URISyntaxException ex) { + logger.log(Level.WARNING, "Error creating URI for retrievedFrom: " + + retrievedAggrNode.asResource().getURI(), ex); + } // retrievedBy List<Agent> retrieversAggr = getAgents(root, aggrResource, retrievedBy); http://git-wip-us.apache.org/repos/asf/incubator-taverna-language/blob/91a02149/taverna-robundle/src/main/java/org/apache/taverna/robundle/utils/RDFUtils.java ---------------------------------------------------------------------- diff --git a/taverna-robundle/src/main/java/org/apache/taverna/robundle/utils/RDFUtils.java b/taverna-robundle/src/main/java/org/apache/taverna/robundle/utils/RDFUtils.java index 5230827..716a723 100644 --- a/taverna-robundle/src/main/java/org/apache/taverna/robundle/utils/RDFUtils.java +++ b/taverna-robundle/src/main/java/org/apache/taverna/robundle/utils/RDFUtils.java @@ -39,6 +39,7 @@ public class RDFUtils { if (rdfNode == null) return null; if (!rdfNode.isLiteral()) { + new Exception().printStackTrace(); logger.warning("Expected literal. not " + rdfNode); return null; }
