diff options
| author | David Robillard <d@drobilla.net> | 2018-07-05 21:01:12 +0200 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2018-11-25 22:12:47 +0100 |
| commit | 4e7bf77fd35a76ef6b3e97e6182c58698d86421f (patch) | |
| tree | 0ed50145173d5161332104d0899ce8c994ef10b6 /src | |
| parent | f591a377441dd4ac32c389bd4ef19def580ca267 (diff) | |
| download | serd-4e7bf77fd35a76ef6b3e97e6182c58698d86421f.tar.gz serd-4e7bf77fd35a76ef6b3e97e6182c58698d86421f.tar.bz2 serd-4e7bf77fd35a76ef6b3e97e6182c58698d86421f.zip | |
Simplify writer style options
Diffstat (limited to 'src')
| -rw-r--r-- | src/serdi.c | 25 | ||||
| -rw-r--r-- | src/writer.c | 4 |
2 files changed, 4 insertions, 25 deletions
diff --git a/src/serdi.c b/src/serdi.c index 0b9f46d5..13438725 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -51,7 +51,6 @@ print_usage(const char* name, bool error) fprintf(os, " -b Fast bulk output for large serialisations.\n"); fprintf(os, " -c PREFIX Chop PREFIX from matching blank node IDs.\n"); fprintf(os, " -e Eat input one character at a time.\n"); - fprintf(os, " -f Keep full URIs in input (don't qualify).\n"); fprintf(os, " -h Display this help and exit.\n"); fprintf(os, " -i SYNTAX Input syntax: turtle/ntriples/trig/nquads.\n"); fprintf(os, " -k BYTES Parser stack size.\n"); @@ -92,7 +91,6 @@ main(int argc, char** argv) bool ascii = false; bool bulk_read = true; bool bulk_write = false; - bool full_uris = false; bool lax = false; bool quiet = false; long stack_size = 4194304; @@ -110,8 +108,6 @@ main(int argc, char** argv) bulk_write = true; } else if (argv[a][1] == 'e') { bulk_read = false; - } else if (argv[a][1] == 'f') { - full_uris = true; } else if (argv[a][1] == 'h') { return print_usage(argv[0], false); } else if (argv[a][1] == 'l') { @@ -193,25 +189,8 @@ main(int argc, char** argv) SerdWorld* world = serd_world_new(); SerdEnv* env = serd_env_new(base); - SerdStyleFlags output_style = 0; - if (output_syntax == SERD_NTRIPLES || ascii) { - output_style |= SERD_STYLE_ASCII; - } else if (output_syntax == SERD_TURTLE) { - output_style |= SERD_STYLE_ABBREVIATED; - if (!full_uris) { - output_style |= SERD_STYLE_CURIED; - } - } - - if ((input_syntax == SERD_TURTLE || input_syntax == SERD_TRIG) || - (output_style & SERD_STYLE_CURIED)) { - // Base URI may change and/or we're abbreviating URIs, so must resolve - output_style |= SERD_STYLE_RESOLVED; - } - - if (bulk_write) { - output_style |= SERD_STYLE_BULK; - } + const SerdStyleFlags output_style = ((ascii ? SERD_STYLE_ASCII : 0) | + (bulk_write ? SERD_STYLE_BULK : 0)); SerdWriter* writer = serd_writer_new(world, output_syntax, diff --git a/src/writer.c b/src/writer.c index 2a886718..274e2b20 100644 --- a/src/writer.c +++ b/src/writer.c @@ -511,7 +511,7 @@ write_uri_node(SerdWriter* const writer, return sink("a", 1, writer) == 1; } else if (supports_abbrev(writer) && !strcmp(node_str, NS_RDF "nil")) { return sink("()", 2, writer) == 2; - } else if (has_scheme && (writer->style & SERD_STYLE_CURIED) && + } else if (has_scheme && supports_abbrev(writer) && serd_env_qualify_in_place(writer->env, node, &prefix, &suffix) && is_name(suffix.buf, suffix.len)) { write_uri_from_node(writer, prefix); @@ -521,7 +521,7 @@ write_uri_node(SerdWriter* const writer, } write_sep(writer, SEP_URI_BEGIN); - if (writer->style & SERD_STYLE_RESOLVED) { + if (serd_env_get_base_uri(writer->env)) { const SerdURI* base_uri = serd_env_get_parsed_base_uri(writer->env); SerdURI uri, abs_uri; serd_uri_parse(node_str, &uri); |