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 2013/05/03 00:10:27 UTC
svn commit: r1478588 - in
/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot: IO_Jena.java
adapters/RDFReaderRIOT_ARP.java
Author: andy
Date: Thu May 2 22:10:27 2013
New Revision: 1478588
URL: http://svn.apache.org/r1478588
Log:
Partial for JENA-448
Resolve all files names to get file: URLS for reading RDF/XML.
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java?rev=1478588&r1=1478587&r2=1478588&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/IO_Jena.java Thu May 2 22:10:27 2013
@@ -34,9 +34,12 @@ public class IO_Jena
public static void wireIntoJena()
{
- if ( coreFileManager == null )
- coreFileManager = FileManager.get() ;
- FileManager.setGlobalFileManager(AdapterFileManager.get()) ;
+ if ( false )
+ {
+ if ( coreFileManager == null )
+ coreFileManager = FileManager.get() ;
+ FileManager.setGlobalFileManager(AdapterFileManager.get()) ;
+ }
IO_JenaReaders.wireIntoJena() ;
IO_JenaWriters.wireIntoJena() ;
}
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java?rev=1478588&r1=1478587&r2=1478588&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/adapters/RDFReaderRIOT_ARP.java Thu May 2 22:10:27 2013
@@ -69,10 +69,16 @@ public class RDFReaderRIOT_ARP implement
if ( scheme != null )
{
- if ( scheme.equals("file") || (isWindows && scheme.length() == 1) )
- return IRILib.filenameToIRI(url) ;
+ // Skip any scheme that is not file: and not a windows drive letter.
+ if ( ! scheme.equals("file") && ! isWindowsDrive(scheme) )
+ return url ;
}
- return url ;
+ return IRILib.filenameToIRI(url) ;
+ }
+
+ private static boolean isWindowsDrive(String scheme)
+ {
+ return (isWindows && scheme.length() == 1) ;
}
@Override