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 2018/06/30 15:32:13 UTC
[1/2] jena git commit: JENA-1569: Output for
xsd:string in TriX.
Repository: jena
Updated Branches:
refs/heads/master 5d12d84c5 -> 84b6434da
JENA-1569: Output <plainLiteral> for xsd:string in TriX.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/32ae0e22
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/32ae0e22
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/32ae0e22
Branch: refs/heads/master
Commit: 32ae0e22855e55ff62b3aed900185cc0de16c98f
Parents: 2dbfdd2
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Jun 28 12:26:56 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Jun 28 15:22:36 2018 +0100
----------------------------------------------------------------------
.../jena/riot/writer/StreamWriterTriX.java | 23 +++++++++-----------
1 file changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/32ae0e22/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java b/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java
index 7ab2df6..5575c2a 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/writer/StreamWriterTriX.java
@@ -44,9 +44,9 @@ import org.apache.jena.sparql.core.Quad ;
*/
public class StreamWriterTriX implements StreamRDF {
/*
- * Notes on writing qname:
+ * Notes on writing qnames:
* 1/ Currently disabled in favour of the most regular XML output.
- * 2/ There is code in write(...,Node,...) to handle it currently commented out.
+ * 2/ There is code in write(...,Node,...) to handle it which is currently commented out.
* 3/ Need to write prefixes which in turn needs delaying writing the <TriX> start.
*/
@@ -63,7 +63,7 @@ public class StreamWriterTriX implements StreamRDF {
@Override public void start() {
if ( depth == 0 ) {
StreamWriterTriX.startXML(out) ;
- // Wirte using the element name from the W3C DTD.
+ // Write using the element name from the W3C DTD.
StreamWriterTriX.startTag(out, TriX.tagTriX, "xmlns", TriX.NS) ;
out.println() ;
}
@@ -180,27 +180,24 @@ public class StreamWriterTriX implements StreamRDF {
if ( node.isLiteral() ) {
// RDF 1.1
- String lang = node.getLiteralLanguage() ;
- if ( lang != null && lang.isEmpty() )
- lang = null ;
- String dt = node.getLiteralDatatypeURI() ;
- if ( lang != null ) {
- startTag(out, TriX.tagPlainLiteral, "xml:lang", lang) ;
+ if ( Util.isSimpleString(node) ) {
+ startTag(out, TriX.tagPlainLiteral) ;
writeTextNoIndent(out, node.getLiteralLexicalForm()) ;
endTag(out, TriX.tagPlainLiteral) ;
out.println() ;
return ;
}
-
- if ( dt == null ) {
- startTag(out, TriX.tagPlainLiteral) ;
+
+ if ( Util.isLangString(node) ) {
+ String lang = node.getLiteralLanguage() ;
+ startTag(out, TriX.tagPlainLiteral, "xml:lang", lang) ;
writeTextNoIndent(out, node.getLiteralLexicalForm()) ;
endTag(out, TriX.tagPlainLiteral) ;
out.println() ;
return ;
}
- // The case of ( lang == null && dt != null )
+ String dt = node.getLiteralDatatypeURI() ;
startTag(out, TriX.tagTypedLiteral, TriX.attrDatatype, dt) ;
String lex = node.getLiteralLexicalForm() ;
if ( rdfXMLLiteral.equals(dt) ) {
[2/2] jena git commit: JENA-1569: Merge commit 'refs/pull/443/head'
of https://github.com/apache/jena
Posted by an...@apache.org.
JENA-1569: Merge commit 'refs/pull/443/head' of https://github.com/apache/jena
This closes #443.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/84b6434d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/84b6434d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/84b6434d
Branch: refs/heads/master
Commit: 84b6434da7845c98125a2a84b87efd0ce97a4388
Parents: 5d12d84 32ae0e2
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jun 30 16:26:50 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jun 30 16:26:50 2018 +0100
----------------------------------------------------------------------
.../jena/riot/writer/StreamWriterTriX.java | 23 +++++++++-----------
1 file changed, 10 insertions(+), 13 deletions(-)
----------------------------------------------------------------------