Add test to ensure blank node IDs don't clash with generated IDs.

Add handle destructor parameter to serd_reader_new.
Add serd_reader_get_handle.
Rename serd_reader_set_blank_prefix to serd_reader_add_blank_prefix.
Rename serd_reader_read_file to serd_reader_read_file_handle.
Add new serd_reader_read_file that takes a path/URI parameter.
Add serdi -i option to select input syntax.
Add serdi -p and -c options to add/chop a prefix to/from blank IDs.
Add optional base_uri parameter to serd_env_new.
Add serd_writer_chop_blank_prefix.
Bump version to 0.3.0.


git-svn-id: http://svn.drobilla.net/serd/trunk@183 490d8e77-9747-427b-9fa3-0b8f29cee8a0

1 files changed, 10 insertions, 7 deletions

diff --git a/wscript b/wscript
index 06c96040..16ae242a 100644
--- a/wscript
+++ b/wscript
@@ -9,7 +9,7 @@ from waflib.extras import autowaf as autowaf
 import waflib.Logs as Logs, waflib.Options as Options
 
 # Version of this package (even if built as a child)
-SERD_VERSION       = '0.2.0'
+SERD_VERSION       = '0.3.0'
 SERD_MAJOR_VERSION = '0'
 
 # Library version (UNIX style major, minor, micro)
@@ -245,18 +245,21 @@ def test(ctx):
 
     autowaf.run_tests(ctx, APPNAME, commands, 1, name='bad')
 
+    thru_tests = good_tests
+    thru_tests.remove('tests/test-id.ttl') # IDs are mapped so files won't be identical
+
     commands = []
-    for test in good_tests:
+    for test in thru_tests:
         base_uri = 'http://www.w3.org/2001/sw/DataAccess/df1/' + test
         out_filename = test + '.thru'
         commands += [
-                '%s -o turtle %s/%s \'%s\' | %s - \'%s\' > %s.thru' % (
-                        './serdi_static', srcdir, test, base_uri,
-                        './serdi_static', base_uri, test) ]
-
+            '%s -o turtle %s/%s \'%s\' | %s -i turtle - \'%s\' | sed \'s/_:docid/_:genid/g\' > %s.thru' % (
+                './serdi_static', srcdir, test, base_uri,
+                './serdi_static', base_uri, test) ]
+        
     autowaf.run_tests(ctx, APPNAME, commands, 0, name='turtle-round-trip')
     Logs.pprint('BOLD', '\nVerifying ntriples => turtle => ntriples')
-    for test in good_tests:
+    for test in thru_tests:
         out_filename = test + '.thru'
         if not os.access(out_filename, os.F_OK):
             Logs.pprint('RED', 'FAIL: %s output is missing' % test)