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/01/27 15:03:57 UTC
[1/2] jena git commit: JENA-1467: Remove fragment before finding
extension
Repository: jena
Updated Branches:
refs/heads/master 94eb3fc99 -> 3ac175b75
JENA-1467: Remove fragment before finding extension
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5e91510b
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5e91510b
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5e91510b
Branch: refs/heads/master
Commit: 5e91510b14c10d919fc172633ba372763cc1af74
Parents: 94eb3fc
Author: Andy Seaborne <an...@apache.org>
Authored: Tue Jan 23 15:20:03 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Tue Jan 23 15:20:03 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/riot/RDFLanguages.java | 16 ++++++++++++----
.../java/org/apache/jena/riot/TestLangRIOT.java | 5 +++++
2 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/5e91510b/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java b/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
index d8a6108..cdfb6a5 100644
--- a/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
+++ b/jena-arq/src/main/java/org/apache/jena/riot/RDFLanguages.java
@@ -398,13 +398,21 @@ public class RDFLanguages
/** Try to map a resource name to a {@link Lang}; return the given default where there is no registered mapping */
public static Lang resourceNameToLang(String resourceName, Lang dftLang) { return filenameToLang(resourceName, dftLang) ; }
- /** Try to map a file name to a {@link Lang}; return null on no registered mapping */
+ /** Try to map a URI or file name to a {@link Lang}; return null on no registered mapping. */
public static Lang filenameToLang(String filename)
{
- if ( filename == null ) return null ;
+ if ( filename == null )
+ return null;
+ // Remove any URI fragment (there can be only one # in a URI).
+ // Pragmatically, assume any # is URI related.
+ // URIs can be relative.
+ int iHash = filename.indexOf('#');
+ if ( iHash > 0 )
+ filename = filename.substring(0, iHash);
+ // Gzip compressed?
if ( filename.endsWith(".gz") )
- filename = filename.substring(0, filename.length()-3) ;
- return fileExtToLang(FileUtils.getFilenameExt(filename)) ;
+ filename = filename.substring(0, filename.length()-3);
+ return fileExtToLang(FileUtils.getFilenameExt(filename));
}
/** Try to map a file name to a {@link Lang}; return the given default where there is no registered mapping */
http://git-wip-us.apache.org/repos/asf/jena/blob/5e91510b/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java b/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java
index 18223da..e839358 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/TestLangRIOT.java
@@ -64,6 +64,11 @@ public class TestLangRIOT extends BaseTest
@Test public void guess_09() { guess("D.trig", RDFLanguages.TRIG) ; }
@Test public void guess_10() { guess("D.jsonld", RDFLanguages.JSONLD) ; }
+ // JENA-1467 : URI fragments
+ @Test public void guess_11() { guess("http://example/foo/bar.ttl#frag", RDFLanguages.TTL) ; }
+ @Test public void guess_12() { guess("bar.ttl#frag", RDFLanguages.TTL) ; }
+
+
private void test(Lang expected, String string)
{
Lang lang = RDFLanguages.nameToLang(string) ;
[2/2] jena git commit: JENA-1467: Merge commit 'refs/pull/344/head'
of github.com:apache/jena
Posted by an...@apache.org.
JENA-1467: Merge commit 'refs/pull/344/head' of github.com:apache/jena
This closes #344.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/3ac175b7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/3ac175b7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/3ac175b7
Branch: refs/heads/master
Commit: 3ac175b75b2f05768e7864177518433139f88c32
Parents: 94eb3fc 5e91510
Author: Andy Seaborne <an...@apache.org>
Authored: Sat Jan 27 14:48:53 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Sat Jan 27 14:48:53 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/riot/RDFLanguages.java | 16 ++++++++++++----
.../java/org/apache/jena/riot/TestLangRIOT.java | 5 +++++
2 files changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------