Pass environment to sord write methods for CURIE abbreviation.

git-svn-id: http://svn.drobilla.net/sord/trunk@108 3d64ff67-21c5-427c-a301-fe4f08042e5a

2 files changed, 11 insertions, 5 deletions

diff --git a/sord/sord.h b/sord/sord.h
index 68c0289..8174f55 100644
--- a/sord/sord.h
+++ b/sord/sord.h
@@ -435,6 +435,7 @@ sord_quad_match(const SordQuad x, const SordQuad y);
 SORD_API
 bool
 sord_read_file(SordModel*     model,
+               SerdEnv*       env,
                const uint8_t* uri,
                SordNode*      graph,
                const uint8_t* blank_prefix);
@@ -445,6 +446,7 @@ sord_read_file(SordModel*     model,
 SORD_API
 bool
 sord_read_file_handle(SordModel*     model,
+                      SerdEnv*       env,
                       FILE*          fd,
                       const uint8_t* base_uri,
                       SordNode*      graph,
@@ -456,6 +458,7 @@ sord_read_file_handle(SordModel*     model,
 SORD_API
 bool
 sord_read_string(SordModel*     model,
+                 SerdEnv*       env,
                  const uint8_t* str,
                  const uint8_t* base_uri);
 
diff --git a/sord/sordmm.hpp b/sord/sordmm.hpp
index d37d6e5..854e647 100644
--- a/sord/sordmm.hpp
+++ b/sord/sordmm.hpp
@@ -390,9 +390,10 @@ public:
 
 	inline const Node& base_uri() const { return _base; }
 
-	inline void load_file(const std::string& uri);
+	inline void load_file(SerdEnv* env, const std::string& uri);
 
-	inline void load_string(const char*        str,
+	inline void load_string(SerdEnv*           env,
+	                        const char*        str,
 	                        size_t             len,
 	                        const std::string& base_uri,
 	                        const std::string  lang = "turtle");
@@ -432,12 +433,14 @@ Model::Model(World& world, const std::string& base_uri)
 }
 
 inline void
-Model::load_string(const char*        str,
+Model::load_string(SerdEnv*           env,
+                   const char*        str,
                    size_t             len,
                    const std::string& base_uri,
                    const std::string  lang)
 {
 	sord_read_string(_c_obj,
+	                 env,
 	                 (const uint8_t*)str,
 	                 (const uint8_t*)base_uri.c_str());
 }
@@ -448,10 +451,10 @@ inline Model::~Model()
 }
 
 inline void
-Model::load_file(const std::string& data_uri)
+Model::load_file(SerdEnv* env, const std::string& data_uri)
 {
 	// FIXME: blank prefix
-	sord_read_file(_c_obj, (const uint8_t*)data_uri.c_str(), NULL,
+	sord_read_file(_c_obj, env, (const uint8_t*)data_uri.c_str(), NULL,
 	               (const uint8_t*)"b");
 }