You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2014/07/19 10:07:47 UTC
svn commit: r1611857 -
/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java
Author: andy
Date: Sat Jul 19 08:07:46 2014
New Revision: 1611857
URL: http://svn.apache.org/r1611857
Log:
Support blank node for graph name.
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java?rev=1611857&r1=1611856&r2=1611857&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/JenaRDF2JSONLD.java Sat Jul 19 08:07:46 2014
@@ -21,7 +21,7 @@ package org.apache.jena.riot.out;
import java.util.Iterator ;
import org.apache.jena.atlas.logging.Log ;
-import org.apache.jena.riot.out.NodeToLabel ;
+import org.apache.jena.riot.RiotException ;
import org.apache.jena.riot.system.SyntaxLabels ;
import com.github.jsonldjava.core.JsonLdError ;
@@ -51,8 +51,14 @@ class JenaRDF2JSONLD implements com.gith
Node o = q.getObject() ;
Node g = q.getGraph() ;
- String gq = (g == null || Quad.isDefaultGraph(g) ) ? null : g.getURI() ;
- String sq = resourceString(s) ;
+ String gq = blankNodeOrIRIString(g) ;
+ if ( gq == null )
+ throw new RiotException("Graph node is not a URI or a blank node") ;
+
+ String sq = blankNodeOrIRIString(s) ;
+ if ( sq == null )
+ throw new RiotException("Subject node is not a URI or a blank node") ;
+
String pq = p.getURI() ;
if ( o.isLiteral() )
{
@@ -71,7 +77,7 @@ class JenaRDF2JSONLD implements com.gith
}
else
{
- String oq = resourceString(o) ;
+ String oq = blankNodeOrIRIString(o) ;
result.addQuad(sq, pq, oq, gq) ;
}
}
@@ -81,11 +87,16 @@ class JenaRDF2JSONLD implements com.gith
return result ;
}
- private String resourceString(Node x)
+ private String blankNodeOrIRIString(Node x)
+
{
if ( x.isURI() ) return x.getURI() ;
if ( x.isBlank() )
return labels.get(null, x) ;
+ if ( x.isLiteral() ) {
+
+ }
+
return null ;
}
}