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/11/23 19:38:08 UTC
[1/2] jena git commit: JENA-1637: Default hint language for the
by-lang parse commands.
Repository: jena
Updated Branches:
refs/heads/master ba4d28f49 -> 5a0843d7e
JENA-1637: Default hint language for the by-lang parse commands.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2f655c0e
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2f655c0e
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2f655c0e
Branch: refs/heads/master
Commit: 2f655c0e3ba110478a8bd0050f40362dcb11db41
Parents: 35c1c36
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 23 13:47:51 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 23 13:47:51 2018 +0000
----------------------------------------------------------------------
.../src/main/java/riotcmd/CmdLangParse.java | 14 ++++---
jena-cmds/src/main/java/riotcmd/nquads.java | 3 +-
jena-cmds/src/main/java/riotcmd/ntriples.java | 3 +-
jena-cmds/src/main/java/riotcmd/rdfxml.java | 3 +-
jena-cmds/src/main/java/riotcmd/riot.java | 43 +++++++-------------
jena-cmds/src/main/java/riotcmd/trig.java | 3 +-
jena-cmds/src/main/java/riotcmd/turtle.java | 3 +-
7 files changed, 28 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2f655c0e/jena-cmds/src/main/java/riotcmd/CmdLangParse.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/riotcmd/CmdLangParse.java b/jena-cmds/src/main/java/riotcmd/CmdLangParse.java
index c14f220..3c46faa 100644
--- a/jena-cmds/src/main/java/riotcmd/CmdLangParse.java
+++ b/jena-cmds/src/main/java/riotcmd/CmdLangParse.java
@@ -36,7 +36,6 @@ import org.apache.jena.Jena ;
import org.apache.jena.atlas.io.IO ;
import org.apache.jena.atlas.lib.InternalErrorException ;
import org.apache.jena.atlas.lib.Pair ;
-import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.query.ARQ ;
import org.apache.jena.riot.* ;
import org.apache.jena.riot.lang.LabelToNode ;
@@ -222,9 +221,12 @@ public abstract class CmdLangParse extends CmdGeneral
// Always use the command line specified syntax.
builder.forceLang(modLangParse.getLang());
else {
- // Otherwise, use the command selected langauge, with N-Quads as the ultimate fallback.
- Lang lang = selectLang(null, null, RDFLanguages.NQUADS) ;
- builder.lang(RDFLanguages.NQUADS);
+ // Otherwise, use the command selected language, with N-Quads as the ultimate fallback.
+ Lang lang = dftLang() ;
+ if ( lang == null )
+ lang = Lang.NQUADS;
+ // Fall back lang if RIOT can't guess it.
+ builder.lang(lang);
}
// Set the source.
@@ -240,7 +242,9 @@ public abstract class CmdLangParse extends CmdGeneral
return parseRIOT(builder, filename);
}
- protected abstract Lang selectLang(String filename, ContentType contentType, Lang dftLang) ;
+ // Return the default (fall-back) language used if no other choice is made.
+ // Contrast with --syntax=.. which forces the language.
+ protected abstract Lang dftLang() ;
protected ParseRecord parseRIOT(RDFParserBuilder builder, /*Info for the ProcessOutcome*/ String filename) {
boolean checking = true ;
http://git-wip-us.apache.org/repos/asf/jena/blob/2f655c0e/jena-cmds/src/main/java/riotcmd/nquads.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/riotcmd/nquads.java b/jena-cmds/src/main/java/riotcmd/nquads.java
index d76cf96..07c0b8f 100644
--- a/jena-cmds/src/main/java/riotcmd/nquads.java
+++ b/jena-cmds/src/main/java/riotcmd/nquads.java
@@ -19,7 +19,6 @@
package riotcmd;
import org.apache.jena.atlas.lib.Lib ;
-import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFLanguages ;
@@ -43,6 +42,6 @@ public class nquads extends CmdLangParse
}
@Override
- protected Lang selectLang(String filename , ContentType contentType , Lang lang )
+ protected Lang dftLang( )
{ return RDFLanguages.NQUADS ; }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/2f655c0e/jena-cmds/src/main/java/riotcmd/ntriples.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/riotcmd/ntriples.java b/jena-cmds/src/main/java/riotcmd/ntriples.java
index dd20e82..f5587d6 100644
--- a/jena-cmds/src/main/java/riotcmd/ntriples.java
+++ b/jena-cmds/src/main/java/riotcmd/ntriples.java
@@ -19,7 +19,6 @@
package riotcmd;
import org.apache.jena.atlas.lib.Lib ;
-import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFLanguages ;
@@ -43,6 +42,6 @@ public class ntriples extends CmdLangParse
}
@Override
- protected Lang selectLang(String filename , ContentType contentType , Lang lang )
+ protected Lang dftLang( )
{ return RDFLanguages.NTRIPLES ; }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/2f655c0e/jena-cmds/src/main/java/riotcmd/rdfxml.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/riotcmd/rdfxml.java b/jena-cmds/src/main/java/riotcmd/rdfxml.java
index d4346da..a246ed3 100644
--- a/jena-cmds/src/main/java/riotcmd/rdfxml.java
+++ b/jena-cmds/src/main/java/riotcmd/rdfxml.java
@@ -19,7 +19,6 @@
package riotcmd;
import org.apache.jena.atlas.lib.Lib ;
-import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFLanguages ;
@@ -43,6 +42,6 @@ public class rdfxml extends CmdLangParse
}
@Override
- protected Lang selectLang(String filename , ContentType contentType , Lang lang )
+ protected Lang dftLang( )
{ return RDFLanguages.RDFXML ; }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/2f655c0e/jena-cmds/src/main/java/riotcmd/riot.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/riotcmd/riot.java b/jena-cmds/src/main/java/riotcmd/riot.java
index d332d17..16702b5 100644
--- a/jena-cmds/src/main/java/riotcmd/riot.java
+++ b/jena-cmds/src/main/java/riotcmd/riot.java
@@ -18,44 +18,29 @@
package riotcmd;
-import org.apache.jena.atlas.lib.Lib ;
-import org.apache.jena.atlas.web.ContentType ;
-import org.apache.jena.riot.Lang ;
-import org.apache.jena.riot.RDFLanguages ;
-import org.apache.jena.riot.WebContent ;
+import org.apache.jena.atlas.lib.Lib;
+import org.apache.jena.riot.Lang;
/**
- * Guess the syntax from the filename.
+ * Guess the syntax from the filename.
*/
-public class riot extends CmdLangParse
-{
- public static void main(String... argv)
- {
- new riot(argv).mainRun() ;
- }
+public class riot extends CmdLangParse {
+ public static void main(String...argv) {
+ new riot(argv).mainRun();
+ }
- protected riot(String[] argv)
- {
- super(argv) ;
+ protected riot(String[] argv) {
+ super(argv);
}
-
+
@Override
- protected Lang selectLang(String filename, ContentType contentType, Lang dftLang)
+ protected Lang dftLang()
{
- if ( contentType != null && ! WebContent.matchContentType(WebContent.ctTextPlain, contentType) )
- return RDFLanguages.contentTypeToLang(contentType) ;
-
- if ( filename != null ) {
- Lang lang = RDFLanguages.filenameToLang(filename) ;
- if ( lang != null )
- return lang;
- }
- return dftLang;
+ return Lang.NQUADS;
}
@Override
- protected String getCommandName()
- {
- return Lib.classShortName(riot.class) ;
+ protected String getCommandName() {
+ return Lib.classShortName(riot.class);
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/2f655c0e/jena-cmds/src/main/java/riotcmd/trig.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/riotcmd/trig.java b/jena-cmds/src/main/java/riotcmd/trig.java
index 08a24df..5c0b3c6 100644
--- a/jena-cmds/src/main/java/riotcmd/trig.java
+++ b/jena-cmds/src/main/java/riotcmd/trig.java
@@ -19,7 +19,6 @@
package riotcmd;
import org.apache.jena.atlas.lib.Lib ;
-import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFLanguages ;
@@ -43,6 +42,6 @@ public class trig extends CmdLangParse
}
@Override
- protected Lang selectLang(String filename , ContentType contentType , Lang lang )
+ protected Lang dftLang( )
{ return RDFLanguages.TRIG ; }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/2f655c0e/jena-cmds/src/main/java/riotcmd/turtle.java
----------------------------------------------------------------------
diff --git a/jena-cmds/src/main/java/riotcmd/turtle.java b/jena-cmds/src/main/java/riotcmd/turtle.java
index 776803b..3a4c5ce 100644
--- a/jena-cmds/src/main/java/riotcmd/turtle.java
+++ b/jena-cmds/src/main/java/riotcmd/turtle.java
@@ -19,7 +19,6 @@
package riotcmd;
import org.apache.jena.atlas.lib.Lib ;
-import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.riot.Lang ;
import org.apache.jena.riot.RDFLanguages ;
@@ -43,6 +42,6 @@ public class turtle extends CmdLangParse
}
@Override
- protected Lang selectLang(String filename , ContentType contentType , Lang dftLang )
+ protected Lang dftLang( )
{ return RDFLanguages.TURTLE ; }
}
[2/2] jena git commit: JENA-1637: Merge commit 'refs/pull/497/head'
of https://github.com/apache/jena
Posted by an...@apache.org.
JENA-1637: Merge commit 'refs/pull/497/head' of https://github.com/apache/jena
This closes #497.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/5a0843d7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/5a0843d7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/5a0843d7
Branch: refs/heads/master
Commit: 5a0843d7e2cb49f3b59dcff747f3c254208d65c0
Parents: ba4d28f 2f655c0
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Nov 23 19:30:59 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Nov 23 19:30:59 2018 +0000
----------------------------------------------------------------------
.../src/main/java/riotcmd/CmdLangParse.java | 14 ++++---
jena-cmds/src/main/java/riotcmd/nquads.java | 3 +-
jena-cmds/src/main/java/riotcmd/ntriples.java | 3 +-
jena-cmds/src/main/java/riotcmd/rdfxml.java | 3 +-
jena-cmds/src/main/java/riotcmd/riot.java | 43 +++++++-------------
jena-cmds/src/main/java/riotcmd/trig.java | 3 +-
jena-cmds/src/main/java/riotcmd/turtle.java | 3 +-
7 files changed, 28 insertions(+), 44 deletions(-)
----------------------------------------------------------------------