Updated Branches: refs/heads/master 0f067f1f9 -> 78754675a
add changes since beta2 Project: http://git-wip-us.apache.org/repos/asf/any23/repo Commit: http://git-wip-us.apache.org/repos/asf/any23/commit/8f825099 Tree: http://git-wip-us.apache.org/repos/asf/any23/tree/8f825099 Diff: http://git-wip-us.apache.org/repos/asf/any23/diff/8f825099 Branch: refs/heads/master Commit: 8f825099c738899b65b2e700f2e3b8135a460db2 Parents: 79ac93f Author: Peter Ansell <[email protected]> Authored: Fri Apr 19 13:31:50 2013 +1000 Committer: Peter Ansell <[email protected]> Committed: Wed Jun 26 10:06:32 2013 +1000 ---------------------------------------------------------------------- .../any23/rdf/Any23ValueFactoryWrapper.java | 5 ----- .../apache/any23/io/nquads/NQuadsParser.java | 7 ++++--- .../apache/any23/io/nquads/NQuadsWriter.java | 20 +++++++++++++++++++- pom.xml | 4 ++-- 4 files changed, 25 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/any23/blob/8f825099/core/src/main/java/org/apache/any23/rdf/Any23ValueFactoryWrapper.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/any23/rdf/Any23ValueFactoryWrapper.java b/core/src/main/java/org/apache/any23/rdf/Any23ValueFactoryWrapper.java index 4db8629..d601d68 100644 --- a/core/src/main/java/org/apache/any23/rdf/Any23ValueFactoryWrapper.java +++ b/core/src/main/java/org/apache/any23/rdf/Any23ValueFactoryWrapper.java @@ -149,11 +149,6 @@ public class Any23ValueFactoryWrapper implements ValueFactory { return wrappedFactory.createLiteral(date); } - @Override - public Literal createLiteral(Object object) { - return wrappedFactory.createLiteral(object); - } - public Statement createStatement(Resource sub, URI pre, Value obj) { if (sub == null || pre == null || obj == null) { return null; http://git-wip-us.apache.org/repos/asf/any23/blob/8f825099/nquads/src/main/java/org/apache/any23/io/nquads/NQuadsParser.java ---------------------------------------------------------------------- diff --git a/nquads/src/main/java/org/apache/any23/io/nquads/NQuadsParser.java b/nquads/src/main/java/org/apache/any23/io/nquads/NQuadsParser.java index ba484ba..485d5cb 100644 --- a/nquads/src/main/java/org/apache/any23/io/nquads/NQuadsParser.java +++ b/nquads/src/main/java/org/apache/any23/io/nquads/NQuadsParser.java @@ -29,6 +29,7 @@ import org.openrdf.rio.RDFFormat; import org.openrdf.rio.RDFHandler; import org.openrdf.rio.RDFHandlerException; import org.openrdf.rio.RDFParseException; +import org.openrdf.rio.helpers.NTriplesParserSettings; import org.openrdf.rio.helpers.RDFParserBase; import org.openrdf.rio.ntriples.NTriplesUtil; @@ -170,7 +171,7 @@ public class NQuadsParser extends RDFParserBase { try { return (char) Integer.parseInt(unicodeCharStr, 16); } catch (NumberFormatException nfe) { - reportError("Error while converting unicode char '\\u" + unicodeCharStr + "'", row, col); + reportError("Error while converting unicode char '\\u" + unicodeCharStr + "'", row, col, NTriplesParserSettings.IGNORE_NTRIPLES_INVALID_LINES); throw new IllegalStateException(); } } @@ -280,7 +281,7 @@ public class NQuadsParser extends RDFParserBase { throw new RDFParseException(e, row, col); } else { // Remove rest of broken line and report error. consumeBrokenLine(br); - reportError(e.getMessage(), row, col); + reportError(e.getMessage(), row, col, NTriplesParserSettings.IGNORE_NTRIPLES_INVALID_LINES); return true; } } @@ -636,7 +637,7 @@ public class NQuadsParser extends RDFParserBase { try { literalType = new URIImpl(lt.value); } catch (Exception e) { - reportError( String.format("Error while parsing literal type '%s'", lt.value), row, col ); + reportError( String.format("Error while parsing literal type '%s'", lt.value), row, col , NTriplesParserSettings.IGNORE_NTRIPLES_INVALID_LINES); } return createLiteral( validateAndNormalizeLiteral(value, literalType), http://git-wip-us.apache.org/repos/asf/any23/blob/8f825099/nquads/src/main/java/org/apache/any23/io/nquads/NQuadsWriter.java ---------------------------------------------------------------------- diff --git a/nquads/src/main/java/org/apache/any23/io/nquads/NQuadsWriter.java b/nquads/src/main/java/org/apache/any23/io/nquads/NQuadsWriter.java index 6f7abaf..6da59d4 100644 --- a/nquads/src/main/java/org/apache/any23/io/nquads/NQuadsWriter.java +++ b/nquads/src/main/java/org/apache/any23/io/nquads/NQuadsWriter.java @@ -26,14 +26,21 @@ import org.openrdf.model.Value; import org.openrdf.rio.RDFFormat; import org.openrdf.rio.RDFHandlerException; import org.openrdf.rio.RDFWriter; +import org.openrdf.rio.RioSetting; +import org.openrdf.rio.WriterConfig; +import org.openrdf.rio.helpers.NTriplesParserSettings; +import org.openrdf.rio.helpers.RDFWriterBase; import org.openrdf.rio.ntriples.NTriplesUtil; import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.Writer; +import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; +import java.util.Set; /** * <i>N-Quads</i> implementation of an {@link org.openrdf.rio.RDFWriter}. @@ -41,7 +48,7 @@ import java.util.Map; * * @author Michele Mostarda ([email protected]) */ -public class NQuadsWriter implements RDFWriter { +public class NQuadsWriter extends RDFWriterBase implements RDFWriter { /** * The table maintaining namespaces. @@ -58,6 +65,8 @@ public class NQuadsWriter implements RDFWriter { */ private boolean started = false; + private WriterConfig writerConfig; + public NQuadsWriter(OutputStream os) { this( new OutputStreamWriter(os) ); } @@ -270,4 +279,13 @@ public class NQuadsWriter implements RDFWriter { } } + @Override + public Collection<RioSetting<?>> getSupportedSettings() { + Set<RioSetting<?>> results = new HashSet<RioSetting<?>>(super.getSupportedSettings()); + + results.add(NTriplesParserSettings.IGNORE_NTRIPLES_INVALID_LINES); + + return results; + } + } http://git-wip-us.apache.org/repos/asf/any23/blob/8f825099/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 12ea7d2..70dc27e 100644 --- a/pom.xml +++ b/pom.xml @@ -226,8 +226,8 @@ <maven.build.timestamp.format>yyyy-MM-dd HH:mm:ssZ</maven.build.timestamp.format> <implementation.build>${scmBranch}@r${buildNumber}</implementation.build> <implementation.build.tstamp>${implementation.build}; ${maven.build.timestamp}</implementation.build.tstamp> - <slf4j.logger.version>1.7.2</slf4j.logger.version> - <sesame.version>2.7.0-beta2-SNAPSHOT</sesame.version> + <slf4j.logger.version>1.7.5</slf4j.logger.version> + <sesame.version>2.7.0</sesame.version> <latest.stable.released>0.7.0-incubating</latest.stable.released> <!-- Maven Plugin Versions -->
