From 052c934e4a1112fd0a6dcb6cb0c6fb821d778335 Mon Sep 17 00:00:00 2001 From: falkTX Date: Mon, 6 Jan 2014 22:59:41 +0000 Subject: [PATCH] Update sratom to 0.4.4 --- source/modules/lilv/Makefile | 2 +- .../lilv/{sratom-0.4.2 => sratom-0.4.4}/COPYING | 0 .../{sratom-0.4.2 => sratom-0.4.4}/sratom/sratom.h | 0 .../lilv/{sratom-0.4.2 => sratom-0.4.4}/src/sratom.c | 12 ++++++++++-- 4 files changed, 11 insertions(+), 3 deletions(-) rename source/modules/lilv/{sratom-0.4.2 => sratom-0.4.4}/COPYING (100%) rename source/modules/lilv/{sratom-0.4.2 => sratom-0.4.4}/sratom/sratom.h (100%) rename source/modules/lilv/{sratom-0.4.2 => sratom-0.4.4}/src/sratom.c (98%) diff --git a/source/modules/lilv/Makefile b/source/modules/lilv/Makefile index aca3ee2e8..bb60a8861 100644 --- a/source/modules/lilv/Makefile +++ b/source/modules/lilv/Makefile @@ -10,7 +10,7 @@ include ../../Makefile.mk SERD_VERSION = 0.18.2 SORD_VERSION = 0.12.0 -SRATOM_VERSION = 0.4.2 +SRATOM_VERSION = 0.4.4 LILV_VERSION = 0.16.0 BUILD_C_FLAGS += $(LILV_FLAGS) -Iconfig -I../../includes -w diff --git a/source/modules/lilv/sratom-0.4.2/COPYING b/source/modules/lilv/sratom-0.4.4/COPYING similarity index 100% rename from source/modules/lilv/sratom-0.4.2/COPYING rename to source/modules/lilv/sratom-0.4.4/COPYING diff --git a/source/modules/lilv/sratom-0.4.2/sratom/sratom.h b/source/modules/lilv/sratom-0.4.4/sratom/sratom.h similarity index 100% rename from source/modules/lilv/sratom-0.4.2/sratom/sratom.h rename to source/modules/lilv/sratom-0.4.4/sratom/sratom.h diff --git a/source/modules/lilv/sratom-0.4.2/src/sratom.c b/source/modules/lilv/sratom-0.4.4/src/sratom.c similarity index 98% rename from source/modules/lilv/sratom-0.4.2/src/sratom.c rename to source/modules/lilv/sratom-0.4.4/src/sratom.c index baac3e028..7c8d1c772 100644 --- a/source/modules/lilv/sratom-0.4.2/src/sratom.c +++ b/source/modules/lilv/sratom-0.4.4/src/sratom.c @@ -262,7 +262,7 @@ sratom_write(Sratom* sratom, const uint8_t* str = USTR(body); if (path_is_absolute((const char*)str)) { new_node = true; - object = serd_node_new_file_uri(str, NULL, NULL, false); + object = serd_node_new_file_uri(str, NULL, NULL, true); } else { SerdURI base_uri = SERD_URI_NULL; if (!sratom->base_uri.buf || @@ -276,7 +276,7 @@ sratom_write(Sratom* sratom, serd_uri_parse(sratom->base_uri.buf, &base_uri); } new_node = true; - SerdNode rel = serd_node_new_file_uri(str, NULL, NULL, false); + SerdNode rel = serd_node_new_file_uri(str, NULL, NULL, true); object = serd_node_new_uri_from_node(&rel, &base_uri, NULL); serd_node_free(&rel); } @@ -424,6 +424,14 @@ sratom_write(Sratom* sratom, } if (object.buf) { + SerdNode def_s = serd_node_from_string(SERD_BLANK, USTR("atom")); + SerdNode def_p = serd_node_from_string(SERD_URI, USTR(NS_RDF "value")); + if (!subject) { + subject = &def_s; + } + if (!predicate) { + predicate = &def_p; + } sratom->write_statement(sratom->handle, flags, NULL, subject, predicate, &object, &datatype, &language); }