From 00433beb65e513283dbd1b05d4232fa2c8e0de69 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 6 May 2011 16:48:51 +0000 Subject: Make writer methods directly compatible with reader callbacks. Connect writer directly to reader in serdi. git-svn-id: http://svn.drobilla.net/serd/trunk@164 490d8e77-9747-427b-9fa3-0b8f29cee8a0 --- src/writer.c | 53 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 23 deletions(-) (limited to 'src/writer.c') diff --git a/src/writer.c b/src/writer.c index 122cde01..4e4ee2eb 100644 --- a/src/writer.c +++ b/src/writer.c @@ -426,21 +426,25 @@ serd_writer_new(SerdSyntax syntax, SERD_API SerdStatus -serd_writer_set_base_uri(SerdWriter* writer, - const SerdURI* uri) +serd_writer_set_base_uri(SerdWriter* writer, + const SerdNode* uri) { - writer->base_uri = *uri; - if (writer->syntax != SERD_NTRIPLES) { - if (writer->context.graph.buf || writer->context.subject.buf) { - writer->sink(" .\n\n", 4, writer->stream); - reset_context(writer); + if (!serd_env_set_base_uri(writer->env, uri)) { + serd_env_get_base_uri(writer->env, &writer->base_uri); + + if (writer->syntax != SERD_NTRIPLES) { + if (writer->context.graph.buf || writer->context.subject.buf) { + writer->sink(" .\n\n", 4, writer->stream); + reset_context(writer); + } + writer->sink("@base <", 7, writer->stream); + writer->sink(uri->buf, uri->n_bytes - 1, writer->stream); + writer->sink("> .\n", 4, writer->stream); } - writer->sink("@base <", 7, writer->stream); - serd_uri_serialise(uri, writer->sink, writer->stream); - writer->sink("> .\n", 4, writer->stream); + reset_context(writer); + return SERD_SUCCESS; } - reset_context(writer); - return SERD_SUCCESS; + return SERD_ERR_UNKNOWN; } SERD_API @@ -449,19 +453,22 @@ serd_writer_set_prefix(SerdWriter* writer, const SerdNode* name, const SerdNode* uri) { - if (writer->syntax != SERD_NTRIPLES) { - if (writer->context.graph.buf || writer->context.subject.buf) { - writer->sink(" .\n\n", 4, writer->stream); - reset_context(writer); + if (!serd_env_set_prefix(writer->env, name, uri)) { + if (writer->syntax != SERD_NTRIPLES) { + if (writer->context.graph.buf || writer->context.subject.buf) { + writer->sink(" .\n\n", 4, writer->stream); + reset_context(writer); + } + writer->sink("@prefix ", 8, writer->stream); + writer->sink(name->buf, name->n_bytes - 1, writer->stream); + writer->sink(": <", 3, writer->stream); + write_text(writer, WRITE_URI, uri->buf, uri->n_bytes - 1, '>'); + writer->sink("> .\n", 4, writer->stream); } - writer->sink("@prefix ", 8, writer->stream); - writer->sink(name->buf, name->n_bytes - 1, writer->stream); - writer->sink(": <", 3, writer->stream); - write_text(writer, WRITE_URI, uri->buf, uri->n_bytes - 1, '>'); - writer->sink("> .\n", 4, writer->stream); + reset_context(writer); + return SERD_SUCCESS; } - reset_context(writer); - return SERD_SUCCESS; + return SERD_ERR_UNKNOWN; } SERD_API -- cgit v1.2.1