svn commit: r1372502 - in /jena/trunk/jena-arq/src/main/java/org/openjena/riot: WebContent.java lang/LangRDFXML.java

[an...@apache.org]

Author: andy
Date: Mon Aug 13 16:42:01 2012
New Revision: 1372502

URL: http://svn.apache.org/viewvc?rev=1372502&view=rev
Log:
Make application/n-triples the internally preferred name.
Support parsing RDF/XML from readers (if using LangRDFXML directly).

Modified:
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java
    jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFXML.java

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java?rev=1372502&r1=1372501&r2=1372502&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/WebContent.java Mon Aug 13 16:42:01 2012
@@ -42,8 +42,8 @@ public class WebContent
     
     // MIME type for N-triple is text/plain (!!!)
     public static final String contentTypeTextPlain         = "text/plain" ;
-    public static final String contentTypeNTriples          = contentTypeTextPlain ;
-    public static final String contentTypeNTriplesAlt       = "application/n-triples" ;
+    public static final String contentTypeNTriples          = "application/n-triples" ;
+    public static final String contentTypeNTriplesAlt       = contentTypeTextPlain ;
     
     public static final String contentTypeXML               = "application/xml" ;
 

Modified: jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFXML.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFXML.java?rev=1372502&r1=1372501&r2=1372502&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFXML.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/openjena/riot/lang/LangRDFXML.java Mon Aug 13 16:42:01 2012
@@ -20,6 +20,7 @@ package org.openjena.riot.lang;
 
 import java.io.IOException ;
 import java.io.InputStream ;
+import java.io.Reader ;
 
 import org.openjena.atlas.io.IO ;
 import org.openjena.atlas.lib.Sink ;
@@ -53,6 +54,7 @@ public class LangRDFXML implements LangR
     private long count = 0 ;
     
     private InputStream input = null ;
+    private Reader reader = null ;
     private String xmlBase ;
     private String filename ;
     private Sink<Triple> sink ;
@@ -73,11 +75,27 @@ public class LangRDFXML implements LangR
         return new LangRDFXML(in, xmlBase, filename, errorHandler, sink) ;
     }
     
+    @Deprecated
+    public static LangRDFXML create(Reader reader, String xmlBase, String filename, ErrorHandler errorHandler, Sink<Triple> sink)
+    {
+        return new LangRDFXML(reader, xmlBase, filename, errorHandler, sink) ;
+    }
+    
+
     public static LangRDFXML create(String xmlBase, String filename, ErrorHandler errorHandler, Sink<Triple> sink)
     {
         return create(IO.openFile(filename), xmlBase, filename, errorHandler, sink) ;
     }
     
+    private LangRDFXML(Reader reader, String xmlBase, String filename, ErrorHandler errorHandler, Sink<Triple> sink)
+    {
+        this.reader = reader ;
+        this.xmlBase = xmlBase ;
+        this.filename = filename ;
+        this.sink = sink ;
+        this.profile = RiotLib.profile(getLang(), xmlBase, errorHandler) ;
+    }
+    
     private LangRDFXML(InputStream in, String xmlBase, String filename, ErrorHandler errorHandler, Sink<Triple> sink)
     {
         this.input = in ;
@@ -102,7 +120,10 @@ public class LangRDFXML implements LangR
         arp.getHandlers().setNamespaceHandler(rslt) ;
         
         try {
-            arp.load(input, xmlBase);
+            if ( reader != null )
+                arp.load(reader, xmlBase);
+            else
+                arp.load(input, xmlBase);
         } catch (IOException e) {
             getProfile().getHandler().error(filename + ": " + ParseException.formatMessage(e), -1 , -1) ;
         } catch (SAXParseException e) {