diff options
| author | David Robillard <d@drobilla.net> | 2012-05-08 23:51:51 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2012-05-08 23:51:51 +0000 |
| commit | 4de86fdfb643dbe7113e261998c5e159f940b7d4 (patch) | |
| tree | 0d6b86614f29b68bab7e662b779e474d2654d453 /src/serdi.c | |
| parent | b05e48f333d27e434b82587d248824b98f47bcd5 (diff) | |
| download | serd-4de86fdfb643dbe7113e261998c5e159f940b7d4.tar.gz serd-4de86fdfb643dbe7113e261998c5e159f940b7d4.tar.bz2 serd-4de86fdfb643dbe7113e261998c5e159f940b7d4.zip | |
Add incremental read interface suitable for reading from infinite streams.
git-svn-id: http://svn.drobilla.net/serd/trunk@350 490d8e77-9747-427b-9fa3-0b8f29cee8a0
Diffstat (limited to 'src/serdi.c')
| -rw-r--r-- | src/serdi.c | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/serdi.c b/src/serdi.c index 74a84992..4c482884 100644 --- a/src/serdi.c +++ b/src/serdi.c @@ -46,6 +46,7 @@ print_usage(const char* name, bool error) fprintf(os, "Use - for INPUT to read from standard input.\n\n"); 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' or `ntriples').\n"); @@ -89,6 +90,7 @@ main(int argc, char** argv) SerdSyntax input_syntax = SERD_TURTLE; SerdSyntax output_syntax = SERD_NTRIPLES; bool from_file = true; + bool bulk_read = true; bool bulk_write = false; bool full_uris = false; const uint8_t* in_name = NULL; @@ -103,6 +105,8 @@ main(int argc, char** argv) break; } else if (argv[a][1] == 'b') { 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') { @@ -206,9 +210,18 @@ main(int argc, char** argv) serd_writer_chop_blank_prefix(writer, chop_prefix); serd_reader_add_blank_prefix(reader, add_prefix); - const SerdStatus status = (from_file) - ? serd_reader_read_file_handle(reader, in_fd, in_name) - : serd_reader_read_string(reader, input); + SerdStatus status = SERD_SUCCESS; + if (!from_file) { + status = serd_reader_read_string(reader, input); + } else if (bulk_read) { + status = serd_reader_read_file_handle(reader, in_fd, in_name); + } else { + status = serd_reader_start_stream(reader, in_fd, in_name, false); + while (!status) { + status = serd_reader_read_chunk(reader); + } + serd_reader_end_stream(reader); + } serd_reader_free(reader); |