svn commit: r1242850 - in /incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader: RDFReaderRIOT.java WebReader2.java

[an...@apache.org]

Author: andy
Date: Fri Feb 10 16:53:44 2012
New Revision: 1242850

URL: http://svn.apache.org/viewvc?rev=1242850&view=rev
Log: (empty)

Modified:
    incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/RDFReaderRIOT.java
    incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/WebReader2.java

Modified: incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/RDFReaderRIOT.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/RDFReaderRIOT.java?rev=1242850&r1=1242849&r2=1242850&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/RDFReaderRIOT.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/RDFReaderRIOT.java Fri Feb 10 16:53:44 2012
@@ -36,11 +36,16 @@ public class RDFReaderRIOT implements RD
 {
     // See also JenaReaderBase, JenaReaderRiot
 
-    private final String base ; // This will be per 
+    private final String base ; // This will be per reader instance.
     Context context = new Context() ;
     
     RDFErrorHandler errorHandler = new RDFDefaultErrorHandler();
     
+    public RDFReaderRIOT()
+    {
+        base = "org.apache.jena.lang.generic" ;
+    }
+    
     public RDFReaderRIOT(String lang)
     {
         base = "org.apache.jena.lang."+lang.toLowerCase(Locale.US) ;

Modified: incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/WebReader2.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/WebReader2.java?rev=1242850&r1=1242849&r2=1242850&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/WebReader2.java (original)
+++ incubator/jena/Scratch/AFS/Dev/trunk/src/main/java/riot/reader/WebReader2.java Fri Feb 10 16:53:44 2012
@@ -26,6 +26,7 @@ import org.openjena.riot.ContentType ;
 import org.openjena.riot.Lang ;
 import org.openjena.riot.RiotException ;
 import org.openjena.riot.RiotLoader ;
+import org.openjena.riot.SysRIOT ;
 import org.openjena.riot.WebContent ;
 import org.openjena.riot.lang.SinkTriplesToGraph ;
 import org.slf4j.Logger ;
@@ -37,7 +38,7 @@ import com.hp.hpl.jena.graph.Graph ;
 import com.hp.hpl.jena.graph.Triple ;
 import com.hp.hpl.jena.rdf.model.Model ;
 import com.hp.hpl.jena.rdf.model.ModelFactory ;
-import com.hp.hpl.jena.rdf.model.RDFReader ;
+import com.hp.hpl.jena.rdf.model.impl.RDFReaderFImpl ;
 import com.hp.hpl.jena.sparql.util.Context ;
 
 /** General purpose reader framework.
@@ -84,11 +85,25 @@ public class WebReader2
 //        
 //        System.exit(0) ;
         
+        SysRIOT.wireIntoJena() ;
+        // Wirein generic 
+        String readerRDF = RDFReaderRIOT.class.getName() ;
+        RDFReaderFImpl.setBaseReaderClassName("RDF/XML", readerRDF) ;           // And default
+        RDFReaderFImpl.setBaseReaderClassName("RDF/XML-ABBREV", readerRDF) ;
+
+        RDFReaderFImpl.setBaseReaderClassName("N-TRIPLES", readerRDF) ;
+        RDFReaderFImpl.setBaseReaderClassName("N-TRIPLE",   readerRDF) ;
+        RDFReaderFImpl.setBaseReaderClassName("N3",     readerRDF) ;
+        RDFReaderFImpl.setBaseReaderClassName("TURTLE", readerRDF) ;
+        RDFReaderFImpl.setBaseReaderClassName("Turtle", readerRDF) ;
+        RDFReaderFImpl.setBaseReaderClassName("TTL",    readerRDF) ;
+        RDFReaderFImpl.setBaseReaderClassName("RDF/JSON", readerRDF) ;
+        
+        
         Log.enable(WebReader2.class) ;
         Model m = ModelFactory.createDefaultModel() ;
-        RDFReader r = new RDFReaderRIOT("generic") ;
-        r.read(m, "http://localhost:3030/ds/data?default") ;
-        
+        m.read("file:D.ttl") ;
+        System.out.println("triples = "+m.size()) ;
         System.out.println("DONE") ;
         System.exit(0) ;