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 2012/08/16 22:18:01 UTC
svn commit: r1374034 - in /jena/Experimental/riot-reader/src:
main/java/dev/PROJECT_RiotReader.java main/java/riot_reader/WebReader2.java
test/java/riot_reader/fm2/TestLocators.java
Author: andy
Date: Thu Aug 16 20:18:01 2012
New Revision: 1374034
URL: http://svn.apache.org/viewvc?rev=1374034&view=rev
Log: (empty)
Modified:
jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java
jena/Experimental/riot-reader/src/main/java/riot_reader/WebReader2.java
jena/Experimental/riot-reader/src/test/java/riot_reader/fm2/TestLocators.java
Modified: jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java?rev=1374034&r1=1374033&r2=1374034&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java (original)
+++ jena/Experimental/riot-reader/src/main/java/dev/PROJECT_RiotReader.java Thu Aug 16 20:18:01 2012
@@ -20,35 +20,37 @@ package dev;
public class PROJECT_RiotReader
{
- // ready to integrate
+ // Tests:
- // packaging:
- // Datasets ... so in ARQ.
-
- // Issue is RDFREader mode..read integration.
+ // Sort out directories.
+ // testing/FileManager
+ // testing/RIOT/FileManager
+
+ // Poteially split into:
// WebReaderModel (no context)
// WebReaderDataset (no context)
-
- // c.h.h.j.reader (understands Model and Dataset)
- // o.oj.riot => o.a.j.riot
- // c.h.h.j.u for FileManager et al.
-
+
+ // Location:
+ // c.h.h.j.reader (understands Model and Dataset)
+ // o.oj.riot => o.a.j.riot
+ // c.h.h.j.u for FileManager et al.
// c.h.h.j.util.FileManager
// with compatibility for FileManager
- // Step 1 :
- // Type stream , FileManager
- // Step 2 : reader
-
// ****
// Testing (ready)
// 6 errors need changes to ModelCom to fix.
- // read_base_1 - ModelCom.read(url, base, lang) does : InputStream is = new URL( url ) .openStream() (no conneg)
- // ==> WebReader2.read)
- // read_input_1 - lang not passed on ModelCom: { readerFactory.getReader(lang) .read(this, reader, base); }
+ // read_base_1 - ModelCom.read(url, base, lang) does :
+ // InputStream is = new URL( url ) .openStream() (no conneg)
+ // ==> WebReader2.read(this, url, base, lang/mapped)
+ // read_input_1 - lang not passed on ModelCom:
+ // code is { readerFactory.getReader(lang) .read(this, reader, base); }
+ // needs to be WebReader2.read(this, reader, base, lang/mapped)
+ //
// read_input_2 - same
- // read_30 - looses hint lang (could fix with per-lang readers but just use WebReader2.read)
+ // read_30 - looses hint lang
+ // (could fix with per-lang reader factories in the wiring up)
// read_31 - looses hint lang (ditto)
// read_32 - looses hint lang (ditto)
@@ -65,8 +67,8 @@ public class PROJECT_RiotReader
// Remove: RDFReaderF etc.
// tests
- // File extension and HTTP
- // 303's
+ // Is HTTP and 303's sufficiently covered?
+ // tests files on jena.apache.org, gated by can contact jena.apache.org/
// Lang/Lang2 :: Use of Lang as an enum in switch statements.
Modified: jena/Experimental/riot-reader/src/main/java/riot_reader/WebReader2.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/main/java/riot_reader/WebReader2.java?rev=1374034&r1=1374033&r2=1374034&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/main/java/riot_reader/WebReader2.java (original)
+++ jena/Experimental/riot-reader/src/main/java/riot_reader/WebReader2.java Thu Aug 16 20:18:01 2012
@@ -396,7 +396,7 @@ public class WebReader2
return open(filenameOrURI, fMgr) ;
}
- private static TypedInputStream2 open(String filenameOrURI, FileManager2 fMgr)
+ public static TypedInputStream2 open(String filenameOrURI, FileManager2 fMgr)
{
TypedInputStream2 in = fMgr.open(filenameOrURI) ;
Modified: jena/Experimental/riot-reader/src/test/java/riot_reader/fm2/TestLocators.java
URL: http://svn.apache.org/viewvc/jena/Experimental/riot-reader/src/test/java/riot_reader/fm2/TestLocators.java?rev=1374034&r1=1374033&r2=1374034&view=diff
==============================================================================
--- jena/Experimental/riot-reader/src/test/java/riot_reader/fm2/TestLocators.java (original)
+++ jena/Experimental/riot-reader/src/test/java/riot_reader/fm2/TestLocators.java Thu Aug 16 20:18:01 2012
@@ -59,7 +59,7 @@ public class TestLocators extends BaseTe
LocatorFile2 loc = new LocatorFile2(dir) ;
assertFalse(loc.exists("pom.xml")) ;
- assertTrue(loc.exists("org")) ;
+ assertTrue(loc.exists("main")) ;
assertFalse(loc.exists(testingDir+"data.ttl")) ;
assertTrue(loc.exists("../pom.xml")) ;
assertFalse(loc.exists("/../"+testingDir+"data.ttl")) ;
@@ -70,7 +70,7 @@ public class TestLocators extends BaseTe
LocatorFile2 loc = new LocatorFile2() ;
TypedInputStream2 ts = loc.open(testingDir+"data.ttl") ;
assertTrue("Not equal: "+WebContent.contentTypeTurtle+" != "+ts.getMediaType(),
- WebContent.contentTypeTurtleAlt1.equalsIgnoreCase(ts.getContentType())) ;
+ WebContent.contentTypeTurtle.equalsIgnoreCase(ts.getContentType())) ;
}
// TypedStream