You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2014/12/01 17:03:58 UTC
[14/19] jena git commit: JENA-816 : Suppress datatype xsd:string when
out for RDF 1.1
JENA-816 : Suppress datatype xsd:string when out for RDF 1.1
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a32cc904
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a32cc904
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a32cc904
Branch: refs/heads/hadoop-rdf
Commit: a32cc904bf9b7cee6081bdbaf4b953b15f62f956
Parents: a1c50ac
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Nov 30 14:29:33 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Nov 30 14:29:33 2014 +0000
----------------------------------------------------------------------
.../jena/sparql/resultset/JSONOutputResultSet.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a32cc904/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONOutputResultSet.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONOutputResultSet.java b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONOutputResultSet.java
index a7296d6..5ba2579 100644
--- a/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONOutputResultSet.java
+++ b/jena-arq/src/main/java/com/hp/hpl/jena/sparql/resultset/JSONOutputResultSet.java
@@ -35,6 +35,7 @@ import com.hp.hpl.jena.query.ResultSet ;
import com.hp.hpl.jena.rdf.model.Literal ;
import com.hp.hpl.jena.rdf.model.RDFNode ;
import com.hp.hpl.jena.rdf.model.Resource ;
+import com.hp.hpl.jena.rdf.model.impl.Util ;
/**
* A JSON writer for SPARQL Result Sets. Uses Jena Atlas JSON support.
@@ -189,15 +190,7 @@ public class JSONOutputResultSet implements ResultSetProcessor
String datatype = literal.getDatatypeURI() ;
String lang = literal.getLanguage() ;
- if ( datatype != null )
- {
- out.print(quoteName(kDatatype)+": "+quote(datatype)+" , ") ;
- if ( multiLineValues ) out.println() ;
-
- out.print(quoteName(kType)+": "+quote(kTypedLiteral)+" , ") ;
- if ( multiLineValues ) out.println() ;
- }
- else
+ if ( Util.isSimpleString(literal) || Util.isLangString(literal) )
{
out.print(quoteName(kType)+": "+quote(kLiteral)+" , ") ;
if ( multiLineValues ) out.println() ;
@@ -207,6 +200,12 @@ public class JSONOutputResultSet implements ResultSetProcessor
out.print(quoteName(kXmlLang)+": "+quote(lang)+" , ") ;
if ( multiLineValues ) out.println() ;
}
+ } else {
+ out.print(quoteName(kDatatype)+": "+quote(datatype)+" , ") ;
+ if ( multiLineValues ) out.println() ;
+
+ out.print(quoteName(kType)+": "+quote(kTypedLiteral)+" , ") ;
+ if ( multiLineValues ) out.println() ;
}
out.print(quoteName(kValue)+": "+quote(literal.getLexicalForm())) ;