librdf.h   librdf.h 
skipping to change at line 83 skipping to change at line 83
#define REDLAND_DEPRECATED #define REDLAND_DEPRECATED
#endif #endif
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
#define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) \ #define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) \
__attribute__((__format__(__printf__, string_index, first_to_check_index) )) __attribute__((__format__(__printf__, string_index, first_to_check_index) ))
#else #else
#define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index) #define REDLAND_PRINTF_FORMAT(string_index, first_to_check_index)
#endif #endif
/* Use raptor_uris in place of librdf_uris for raptor2 */
#ifdef RAPTOR_V2_AVAILABLE
#define LIBRDF_USE_RAPTOR_URI 1
#define LIBRDF_USE_RAPTOR_TERM 1
#define LIBRDF_USE_RAPTOR_STATEMENT 1
#else
#undef LIBRDF_USE_RAPTOR_URI
#undef LIBRDF_USE_RAPTOR_TERM
#undef LIBRDF_USE_RAPTOR_STATEMENT
#endif
/* Public typedefs (references to private structures) */ /* Public typedefs (references to private structures) */
/** /**
* librdf_world: * librdf_world:
* *
* Redland world class. * Redland world class.
*/ */
typedef struct librdf_world_s librdf_world; typedef struct librdf_world_s librdf_world;
/** /**
skipping to change at line 125 skipping to change at line 136
* *
* Redland digest factory class. * Redland digest factory class.
*/ */
typedef struct librdf_digest_factory_s librdf_digest_factory; typedef struct librdf_digest_factory_s librdf_digest_factory;
/** /**
* librdf_uri: * librdf_uri:
* *
* Redland URI class. * Redland URI class.
*/ */
#ifdef LIBRDF_USE_RAPTOR_URI
typedef struct raptor_uri_s librdf_uri;
#else
typedef struct librdf_uri_s librdf_uri; typedef struct librdf_uri_s librdf_uri;
#endif
/** /**
* librdf_list: * librdf_list:
* *
* Redland list class. * Redland list class.
*/ */
typedef struct librdf_list_s librdf_list; typedef struct librdf_list_s librdf_list;
/** /**
* librdf_iterator: * librdf_iterator:
* *
* Redland iterator class. * Redland iterator class.
*/ */
typedef struct librdf_iterator_s librdf_iterator; typedef struct librdf_iterator_s librdf_iterator;
/** /**
* librdf_node: * librdf_node:
* *
* Redland node class. * Redland node class.
*/ */
#ifdef LIBRDF_USE_RAPTOR_TERM
typedef raptor_term librdf_node;
#else
typedef struct librdf_node_s librdf_node; typedef struct librdf_node_s librdf_node;
#endif
/** /**
* librdf_statement: * librdf_statement:
* *
* Redland statement class. * Redland statement class.
*/ */
#ifdef LIBRDF_USE_RAPTOR_STATEMENT
typedef raptor_statement librdf_statement;
#else
typedef struct librdf_statement_s librdf_statement; typedef struct librdf_statement_s librdf_statement;
#endif
/** /**
* librdf_model: * librdf_model:
* *
* Redland model class. * Redland model class.
*/ */
typedef struct librdf_model_s librdf_model; typedef struct librdf_model_s librdf_model;
/** /**
* librdf_model_factory: * librdf_model_factory:
 End of changes. 7 change blocks. 
0 lines changed or deleted 23 lines changed or added


 rdf_hash.h   rdf_hash.h 
skipping to change at line 72 skipping to change at line 72
long librdf_hash_get_as_long(librdf_hash* hash, const char *key); long librdf_hash_get_as_long(librdf_hash* hash, const char *key);
/* retrieve one value for key and delete from hash all other values */ /* retrieve one value for key and delete from hash all other values */
REDLAND_API REDLAND_API
char* librdf_hash_get_del(librdf_hash* hash, const char *key); char* librdf_hash_get_del(librdf_hash* hash, const char *key);
/* insert a key/value pair */ /* insert a key/value pair */
REDLAND_API REDLAND_API
int librdf_hash_put_strings(librdf_hash* hash, const char *key, const char *value); int librdf_hash_put_strings(librdf_hash* hash, const char *key, const char *value);
/* make a hash from a string */
REDLAND_API
int librdf_hash_from_string(librdf_hash* hash, const char *string);
/* make a string from a hash */
REDLAND_API
char* librdf_hash_to_string(librdf_hash* hash, const char *filter[]);
REDLAND_API REDLAND_API
void librdf_hash_print(librdf_hash* hash, FILE *fh); void librdf_hash_print(librdf_hash* hash, FILE *fh);
REDLAND_API REDLAND_API
void librdf_hash_print_keys(librdf_hash* hash, FILE *fh); void librdf_hash_print_keys(librdf_hash* hash, FILE *fh);
REDLAND_API REDLAND_API
void librdf_hash_print_values(librdf_hash* hash, const char *key_string, FI LE *fh); void librdf_hash_print_values(librdf_hash* hash, const char *key_string, FI LE *fh);
REDLAND_API REDLAND_API
unsigned char* librdf_hash_interpret_template(const unsigned char* template _string, librdf_hash* dictionary, const unsigned char* prefix, const unsig ned char* suffix); unsigned char* librdf_hash_interpret_template(const unsigned char* template _string, librdf_hash* dictionary, const unsigned char* prefix, const unsig ned char* suffix);
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 rdf_init.h   rdf_init.h 
skipping to change at line 47 skipping to change at line 47
librdf_world* librdf_new_world(void); librdf_world* librdf_new_world(void);
REDLAND_API REDLAND_API
void librdf_free_world(librdf_world *world); void librdf_free_world(librdf_world *world);
REDLAND_API REDLAND_API
void librdf_world_open(librdf_world *world); void librdf_world_open(librdf_world *world);
REDLAND_API REDLAND_API
void librdf_world_init_mutex(librdf_world *world); void librdf_world_init_mutex(librdf_world *world);
REDLAND_API REDLAND_API
void librdf_world_set_rasqal(librdf_world* world, rasqal_world* rasqal_worl
d_ptr);
REDLAND_API
rasqal_world* librdf_world_get_rasqal(librdf_world* world);
REDLAND_API
void librdf_world_set_error(librdf_world* world, void *user_data, librdf_lo g_level_func error_handler); void librdf_world_set_error(librdf_world* world, void *user_data, librdf_lo g_level_func error_handler);
REDLAND_API REDLAND_API
void librdf_world_set_warning(librdf_world* world, void *user_data, librdf_ log_level_func warning_handler); void librdf_world_set_warning(librdf_world* world, void *user_data, librdf_ log_level_func warning_handler);
REDLAND_API REDLAND_API
void librdf_world_set_logger(librdf_world* world, void *user_data, librdf_l og_func log_handler); void librdf_world_set_logger(librdf_world* world, void *user_data, librdf_l og_func log_handler);
REDLAND_API REDLAND_API
void librdf_world_set_digest(librdf_world* world, const char *name); void librdf_world_set_digest(librdf_world* world, const char *name);
/** /**
 End of changes. 1 change blocks. 
0 lines changed or deleted 7 lines changed or added


 rdf_log.h   rdf_log.h 
skipping to change at line 77 skipping to change at line 77
* @LIBRDF_FROM_PARSER: Parser * @LIBRDF_FROM_PARSER: Parser
* @LIBRDF_FROM_QUERY: Query * @LIBRDF_FROM_QUERY: Query
* @LIBRDF_FROM_SERIALIZER: Serializer * @LIBRDF_FROM_SERIALIZER: Serializer
* @LIBRDF_FROM_STATEMENT: Statement * @LIBRDF_FROM_STATEMENT: Statement
* @LIBRDF_FROM_STORAGE: Storage * @LIBRDF_FROM_STORAGE: Storage
* @LIBRDF_FROM_STREAM: Stream * @LIBRDF_FROM_STREAM: Stream
* @LIBRDF_FROM_URI: URI * @LIBRDF_FROM_URI: URI
* @LIBRDF_FROM_UTF8: UTF8 * @LIBRDF_FROM_UTF8: UTF8
* @LIBRDF_FROM_MEMORY: Memory * @LIBRDF_FROM_MEMORY: Memory
* @LIBRDF_FROM_NONE: Associated with no part. * @LIBRDF_FROM_NONE: Associated with no part.
* @LIBRDF_FROM_RAPTOR: Raptor library (parser or serializer; raptor2 and l ater).
* @LIBRDF_FROM_LAST: Internal, never returned. * @LIBRDF_FROM_LAST: Internal, never returned.
* *
* Indicates the part of the system that generated the log message. * Indicates the part of the system that generated the log message.
*/ */
typedef enum { typedef enum {
LIBRDF_FROM_NONE = 0, LIBRDF_FROM_NONE = 0,
LIBRDF_FROM_CONCEPTS, LIBRDF_FROM_CONCEPTS,
LIBRDF_FROM_DIGEST, LIBRDF_FROM_DIGEST,
LIBRDF_FROM_FILES, LIBRDF_FROM_FILES,
LIBRDF_FROM_HASH, LIBRDF_FROM_HASH,
skipping to change at line 101 skipping to change at line 102
LIBRDF_FROM_NODE, LIBRDF_FROM_NODE,
LIBRDF_FROM_PARSER, LIBRDF_FROM_PARSER,
LIBRDF_FROM_QUERY, LIBRDF_FROM_QUERY,
LIBRDF_FROM_SERIALIZER, LIBRDF_FROM_SERIALIZER,
LIBRDF_FROM_STATEMENT, LIBRDF_FROM_STATEMENT,
LIBRDF_FROM_STORAGE, LIBRDF_FROM_STORAGE,
LIBRDF_FROM_STREAM, LIBRDF_FROM_STREAM,
LIBRDF_FROM_URI, LIBRDF_FROM_URI,
LIBRDF_FROM_UTF8, LIBRDF_FROM_UTF8,
LIBRDF_FROM_MEMORY, LIBRDF_FROM_MEMORY,
LIBRDF_FROM_LAST=LIBRDF_FROM_MEMORY LIBRDF_FROM_RAPTOR,
LIBRDF_FROM_LAST=LIBRDF_FROM_RAPTOR
} librdf_log_facility; } librdf_log_facility;
/** /**
* librdf_log_message: * librdf_log_message:
* *
* Structure for storing parts of a log message generated by Redland. * Structure for storing parts of a log message generated by Redland.
*/ */
typedef struct typedef struct
{ {
int code; /* The error code */ int code; /* The error code */
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 rdf_model.h   rdf_model.h 
skipping to change at line 142 skipping to change at line 142
librdf_iterator* librdf_model_get_arcs_in(librdf_model *model, librdf_node *node); librdf_iterator* librdf_model_get_arcs_in(librdf_model *model, librdf_node *node);
REDLAND_API REDLAND_API
librdf_iterator* librdf_model_get_arcs_out(librdf_model *model, librdf_node *node); librdf_iterator* librdf_model_get_arcs_out(librdf_model *model, librdf_node *node);
/* submodels */ /* submodels */
REDLAND_API REDLAND_API
int librdf_model_add_submodel(librdf_model* model, librdf_model* sub_model) ; int librdf_model_add_submodel(librdf_model* model, librdf_model* sub_model) ;
REDLAND_API REDLAND_API
int librdf_model_remove_submodel(librdf_model* model, librdf_model* sub_mod el); int librdf_model_remove_submodel(librdf_model* model, librdf_model* sub_mod el);
REDLAND_API REDLAND_API REDLAND_DEPRECATED
void librdf_model_print(librdf_model *model, FILE *fh); void librdf_model_print(librdf_model *model, FILE *fh);
REDLAND_API
int librdf_model_write(librdf_model *model, raptor_iostream* iostr);
/* statement contexts */ /* statement contexts */
REDLAND_API REDLAND_API
int librdf_model_context_add_statement(librdf_model* model, librdf_node* co ntext, librdf_statement* statement); int librdf_model_context_add_statement(librdf_model* model, librdf_node* co ntext, librdf_statement* statement);
REDLAND_API REDLAND_API
int librdf_model_context_add_statements(librdf_model* model, librdf_node* c ontext, librdf_stream* stream); int librdf_model_context_add_statements(librdf_model* model, librdf_node* c ontext, librdf_stream* stream);
REDLAND_API REDLAND_API
int librdf_model_context_remove_statement(librdf_model* model, librdf_node* context, librdf_statement* statement); int librdf_model_context_remove_statement(librdf_model* model, librdf_node* context, librdf_statement* statement);
REDLAND_API REDLAND_API
int librdf_model_context_remove_statements(librdf_model* model, librdf_node * context); int librdf_model_context_remove_statements(librdf_model* model, librdf_node * context);
REDLAND_API REDLAND_API
librdf_stream* librdf_model_context_as_stream(librdf_model* model, librdf_n ode* context); librdf_stream* librdf_model_context_as_stream(librdf_model* model, librdf_n ode* context);
REDLAND_API REDLAND_DEPRECATED REDLAND_API REDLAND_DEPRECATED
librdf_stream* librdf_model_context_serialize(librdf_model* model, librdf_n ode* context); librdf_stream* librdf_model_context_serialize(librdf_model* model, librdf_n ode* context);
REDLAND_API REDLAND_API
int librdf_model_contains_context(librdf_model* model, librdf_node* context ); int librdf_model_contains_context(librdf_model* model, librdf_node* context );
REDLAND_API
int librdf_model_supports_contexts(librdf_model* model);
/* query language */ /* query language */
REDLAND_API REDLAND_API
librdf_query_results* librdf_model_query_execute(librdf_model* model, librd f_query* query); librdf_query_results* librdf_model_query_execute(librdf_model* model, librd f_query* query);
REDLAND_API REDLAND_API
int librdf_model_sync(librdf_model* model); int librdf_model_sync(librdf_model* model);
REDLAND_API REDLAND_API
librdf_storage* librdf_model_get_storage(librdf_model *model); librdf_storage* librdf_model_get_storage(librdf_model *model);
 End of changes. 3 change blocks. 
1 lines changed or deleted 5 lines changed or added


 rdf_node.h   rdf_node.h 
skipping to change at line 62 skipping to change at line 62
* XML space * XML space
* @LIBRDF_NODE_TYPE_BLANK: blank node has an identifier string. * @LIBRDF_NODE_TYPE_BLANK: blank node has an identifier string.
* @LIBRDF_NODE_TYPE_LAST: Internal * @LIBRDF_NODE_TYPE_LAST: Internal
* *
* Type of a redland node. * Type of a redland node.
* *
* Better to check this with functions librdf_node_is_resource(), * Better to check this with functions librdf_node_is_resource(),
* librdf_node_is_literal() or librdf_node_is_blank(). * librdf_node_is_literal() or librdf_node_is_blank().
* *
*/ */
#ifdef LIBRDF_USE_RAPTOR_TERM
typedef enum {
LIBRDF_NODE_TYPE_UNKNOWN = RAPTOR_TERM_TYPE_UNKNOWN,
LIBRDF_NODE_TYPE_RESOURCE = RAPTOR_TERM_TYPE_URI,
LIBRDF_NODE_TYPE_LITERAL = RAPTOR_TERM_TYPE_LITERAL,
LIBRDF_NODE_TYPE_BLANK = RAPTOR_TERM_TYPE_BLANK,
LIBRDF_NODE_TYPE_LAST = LIBRDF_NODE_TYPE_BLANK
} librdf_node_type;
#else
typedef enum { typedef enum {
LIBRDF_NODE_TYPE_UNKNOWN = 0, /* To catch uninitialised nodes */ LIBRDF_NODE_TYPE_UNKNOWN = 0, /* To catch uninitialised nodes */
LIBRDF_NODE_TYPE_RESOURCE = 1, /* rdf:Resource (& rdf:Property) - has a URI */ LIBRDF_NODE_TYPE_RESOURCE = 1, /* rdf:Resource (& rdf:Property) - has a URI */
LIBRDF_NODE_TYPE_LITERAL = 2, /* rdf:Literal - has an XML string, lang uage, XML space */ LIBRDF_NODE_TYPE_LITERAL = 2, /* rdf:Literal - has an XML string, lang uage, XML space */
/* node type 3 is unused at present. Do not renumber this list. */ /* node type 3 is unused at present. Do not renumber this list. */
LIBRDF_NODE_TYPE_BLANK = 4, /* blank node has an identifier string * / LIBRDF_NODE_TYPE_BLANK = 4, /* blank node has an identifier string * /
LIBRDF_NODE_TYPE_LAST = LIBRDF_NODE_TYPE_BLANK LIBRDF_NODE_TYPE_LAST = LIBRDF_NODE_TYPE_BLANK
} librdf_node_type; } librdf_node_type;
#endif
#ifdef LIBRDF_INTERNAL #ifdef LIBRDF_INTERNAL
#include <rdf_node_internal.h> #include <rdf_node_internal.h>
#endif #endif
/* Create a new Node. */ /* Create a new Node. */
REDLAND_API REDLAND_API
librdf_node* librdf_new_node(librdf_world* world); librdf_node* librdf_new_node(librdf_world* world);
/* Create a new resource Node from URI string. */ /* Create a new resource Node from URI string. */
REDLAND_API REDLAND_API
librdf_node* librdf_new_node_from_uri_string(librdf_world* world, const uns igned char *uri_string); librdf_node* librdf_new_node_from_uri_string(librdf_world* world, const uns igned char *uri_string);
REDLAND_API
librdf_node* librdf_new_node_from_counted_uri_string(librdf_world* world, c
onst unsigned char *uri_string, size_t len);
/* Create a new resource Node from URI object. */ /* Create a new resource Node from URI object. */
REDLAND_API REDLAND_API
librdf_node* librdf_new_node_from_uri(librdf_world* world, librdf_uri *uri) ; librdf_node* librdf_new_node_from_uri(librdf_world* world, librdf_uri *uri) ;
/* Create a new resource Node from URI object with a local_name */ /* Create a new resource Node from URI object with a local_name */
REDLAND_API REDLAND_API
librdf_node* librdf_new_node_from_uri_local_name(librdf_world* world, librd f_uri *uri, const unsigned char *local_name); librdf_node* librdf_new_node_from_uri_local_name(librdf_world* world, librd f_uri *uri, const unsigned char *local_name);
/* Create a new resource Node from URI string renormalised to a new base */ /* Create a new resource Node from URI string renormalised to a new base */
skipping to change at line 109 skipping to change at line 121
/* Create a new Node from a typed literal string / language. */ /* Create a new Node from a typed literal string / language. */
REDLAND_API REDLAND_API
librdf_node* librdf_new_node_from_typed_literal(librdf_world *world, const unsigned char *value, const char *xml_language, librdf_uri* datatype_uri); librdf_node* librdf_new_node_from_typed_literal(librdf_world *world, const unsigned char *value, const char *xml_language, librdf_uri* datatype_uri);
REDLAND_API REDLAND_API
librdf_node* librdf_new_node_from_typed_counted_literal(librdf_world *world , const unsigned char *value, size_t value_len, const char *xml_language, s ize_t xml_language_len, librdf_uri* datatype_uri); librdf_node* librdf_new_node_from_typed_counted_literal(librdf_world *world , const unsigned char *value, size_t value_len, const char *xml_language, s ize_t xml_language_len, librdf_uri* datatype_uri);
/* Create a new Node from blank node identifier. */ /* Create a new Node from blank node identifier. */
REDLAND_API REDLAND_API
librdf_node* librdf_new_node_from_blank_identifier(librdf_world* world, con st unsigned char *identifier); librdf_node* librdf_new_node_from_blank_identifier(librdf_world* world, con st unsigned char *identifier);
REDLAND_API
librdf_node* librdf_new_node_from_counted_blank_identifier(librdf_world* wo
rld, const unsigned char *identifier, size_t identifier_len);
/* Create a new Node from an existing Node - CLONE */ /* Create a new Node from an existing Node - CLONE */
REDLAND_API REDLAND_API
librdf_node* librdf_new_node_from_node(librdf_node *node); librdf_node* librdf_new_node_from_node(librdf_node *node);
/* destructor */ /* destructor */
REDLAND_API REDLAND_API
void librdf_free_node(librdf_node* node); void librdf_free_node(librdf_node* node);
/* functions / methods */ /* functions / methods */
skipping to change at line 145 skipping to change at line 159
int librdf_node_get_literal_value_is_wf_xml(librdf_node* node); int librdf_node_get_literal_value_is_wf_xml(librdf_node* node);
REDLAND_API REDLAND_API
librdf_uri* librdf_node_get_literal_value_datatype_uri(librdf_node* node); librdf_uri* librdf_node_get_literal_value_datatype_uri(librdf_node* node);
REDLAND_API REDLAND_API
int librdf_node_get_li_ordinal(librdf_node* node); int librdf_node_get_li_ordinal(librdf_node* node);
REDLAND_API REDLAND_API
unsigned char *librdf_node_get_blank_identifier(librdf_node* node); unsigned char *librdf_node_get_blank_identifier(librdf_node* node);
REDLAND_API REDLAND_API
unsigned char *librdf_node_get_counted_blank_identifier(librdf_node* node,
size_t* len_p);
REDLAND_API
int librdf_node_is_resource(librdf_node* node); int librdf_node_is_resource(librdf_node* node);
REDLAND_API REDLAND_API
int librdf_node_is_literal(librdf_node* node); int librdf_node_is_literal(librdf_node* node);
REDLAND_API REDLAND_API
int librdf_node_is_blank(librdf_node* node); int librdf_node_is_blank(librdf_node* node);
/* serialise / deserialise */ /* serialise / deserialise */
REDLAND_API REDLAND_API
size_t librdf_node_encode(librdf_node* node, unsigned char *buffer, size_t length); size_t librdf_node_encode(librdf_node* node, unsigned char *buffer, size_t length);
REDLAND_API REDLAND_API
librdf_node* librdf_node_decode(librdf_world *world, size_t* size_p, unsign ed char *buffer, size_t length); librdf_node* librdf_node_decode(librdf_world *world, size_t* size_p, unsign ed char *buffer, size_t length);
/* convert to a string */ /* convert to a string */
REDLAND_API REDLAND_API
unsigned char *librdf_node_to_string(librdf_node* node); unsigned char *librdf_node_to_string(librdf_node* node);
REDLAND_API REDLAND_API REDLAND_DEPRECATED
unsigned char* librdf_node_to_counted_string(librdf_node* node, size_t* len _p); unsigned char* librdf_node_to_counted_string(librdf_node* node, size_t* len _p);
/* pretty print it */ /* pretty print it */
REDLAND_API REDLAND_API
int librdf_node_write(librdf_node* node, raptor_iostream *iostr);
REDLAND_API
void librdf_node_print(librdf_node* node, FILE *fh); void librdf_node_print(librdf_node* node, FILE *fh);
/* utility functions */ /* utility functions */
REDLAND_API REDLAND_API
int librdf_node_equals(librdf_node* first_node, librdf_node* second_node); int librdf_node_equals(librdf_node* first_node, librdf_node* second_node);
/* create an iterator for a static array of nodes */ /* create an iterator for a static array of nodes */
REDLAND_API REDLAND_API REDLAND_DEPRECATED
librdf_iterator* librdf_node_static_iterator_create(librdf_node** nodes, in t size); librdf_iterator* librdf_node_static_iterator_create(librdf_node** nodes, in t size);
REDLAND_API
librdf_iterator* librdf_node_new_static_node_iterator(librdf_world* world,
librdf_node** nodes, int size);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 9 change blocks. 
2 lines changed or deleted 26 lines changed or added


 rdf_query.h   rdf_query.h 
skipping to change at line 39 skipping to change at line 39
#include <rdf_query_internal.h> #include <rdf_query_internal.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* class methods */ /* class methods */
REDLAND_API REDLAND_API
void librdf_query_register_factory(librdf_world *world, const char *name, c onst unsigned char *uri_string, void (*factory) (librdf_query_factory*)); void librdf_query_register_factory(librdf_world *world, const char *name, c onst unsigned char *uri_string, void (*factory) (librdf_query_factory*));
REDLAND_API
int librdf_query_languages_enumerate(librdf_world* world, const unsigned in
t counter, const char **name, const unsigned char **uri_string);
/* constructor */ /* constructor */
REDLAND_API REDLAND_API
librdf_query* librdf_new_query(librdf_world* world, const char *name, librd f_uri* uri, const unsigned char *query_string, librdf_uri* base_uri); librdf_query* librdf_new_query(librdf_world* world, const char *name, librd f_uri* uri, const unsigned char *query_string, librdf_uri* base_uri);
REDLAND_API REDLAND_API
librdf_query* librdf_new_query_from_query (librdf_query* old_query); librdf_query* librdf_new_query_from_query (librdf_query* old_query);
REDLAND_API REDLAND_API
librdf_query* librdf_new_query_from_factory(librdf_world* world, librdf_que ry_factory* factory, const char *name, librdf_uri* uri, const unsigned char * query_string, librdf_uri* base_uri); librdf_query* librdf_new_query_from_factory(librdf_world* world, librdf_que ry_factory* factory, const char *name, librdf_uri* uri, const unsigned char * query_string, librdf_uri* base_uri);
/* destructor */ /* destructor */
skipping to change at line 84 skipping to change at line 86
REDLAND_API REDLAND_API
int librdf_query_results_get_bindings(librdf_query_results* query_results, const char ***names, librdf_node **values); int librdf_query_results_get_bindings(librdf_query_results* query_results, const char ***names, librdf_node **values);
REDLAND_API REDLAND_API
librdf_node* librdf_query_results_get_binding_value(librdf_query_results* q uery_results, int offset); librdf_node* librdf_query_results_get_binding_value(librdf_query_results* q uery_results, int offset);
REDLAND_API REDLAND_API
const char* librdf_query_results_get_binding_name(librdf_query_results* que ry_results, int offset); const char* librdf_query_results_get_binding_name(librdf_query_results* que ry_results, int offset);
REDLAND_API REDLAND_API
librdf_node* librdf_query_results_get_binding_value_by_name(librdf_query_re sults* query_results, const char *name); librdf_node* librdf_query_results_get_binding_value_by_name(librdf_query_re sults* query_results, const char *name);
REDLAND_API REDLAND_API
int librdf_query_results_get_bindings_count(librdf_query_results* query_res ults); int librdf_query_results_get_bindings_count(librdf_query_results* query_res ults);
REDLAND_API REDLAND_API REDLAND_DEPRECATED
unsigned char* librdf_query_results_to_counted_string(librdf_query_results *query_results, librdf_uri *format_uri, librdf_uri *base_uri, size_t *lengt h_p); unsigned char* librdf_query_results_to_counted_string(librdf_query_results *query_results, librdf_uri *format_uri, librdf_uri *base_uri, size_t *lengt h_p);
REDLAND_API REDLAND_API
unsigned char* librdf_query_results_to_counted_string2(librdf_query_results
*query_results, const char *name, const char *mime_type, librdf_uri *forma
t_uri, librdf_uri *base_uri, size_t *length_p);
REDLAND_API REDLAND_DEPRECATED
unsigned char* librdf_query_results_to_string(librdf_query_results *query_r esults, librdf_uri *format_uri, librdf_uri *base_uri); unsigned char* librdf_query_results_to_string(librdf_query_results *query_r esults, librdf_uri *format_uri, librdf_uri *base_uri);
REDLAND_API REDLAND_API
unsigned char* librdf_query_results_to_string2(librdf_query_results *query_
results, const char *name, const char *mime_type, librdf_uri *format_uri, l
ibrdf_uri *base_uri);
REDLAND_API REDLAND_DEPRECATED
int librdf_query_results_to_file_handle(librdf_query_results *query_results , FILE *handle, librdf_uri *format_uri, librdf_uri *base_uri); int librdf_query_results_to_file_handle(librdf_query_results *query_results , FILE *handle, librdf_uri *format_uri, librdf_uri *base_uri);
REDLAND_API REDLAND_API
int librdf_query_results_to_file_handle2(librdf_query_results *query_result
s, FILE *handle, const char *name, const char *mime_type, librdf_uri *forma
t_uri, librdf_uri *base_uri);
REDLAND_API REDLAND_DEPRECATED
int librdf_query_results_to_file(librdf_query_results *query_results, const char *name, librdf_uri *format_uri, librdf_uri *base_uri); int librdf_query_results_to_file(librdf_query_results *query_results, const char *name, librdf_uri *format_uri, librdf_uri *base_uri);
REDLAND_API
int librdf_query_results_to_file2(librdf_query_results *query_results, cons
t char *name, const char *mime_type, librdf_uri *format_uri, librdf_uri *ba
se_uri);
REDLAND_API REDLAND_API
void librdf_free_query_results(librdf_query_results* query_results); void librdf_free_query_results(librdf_query_results* query_results);
REDLAND_API REDLAND_API
int librdf_query_results_is_bindings(librdf_query_results *query_results); int librdf_query_results_is_bindings(librdf_query_results *query_results);
REDLAND_API REDLAND_API
int librdf_query_results_is_boolean(librdf_query_results *query_results); int librdf_query_results_is_boolean(librdf_query_results *query_results);
REDLAND_API REDLAND_API
int librdf_query_results_is_graph(librdf_query_results *query_results); int librdf_query_results_is_graph(librdf_query_results *query_results);
REDLAND_API REDLAND_API
int librdf_query_results_is_syntax(librdf_query_results* query_results); int librdf_query_results_is_syntax(librdf_query_results* query_results);
REDLAND_API REDLAND_API
int librdf_query_results_get_boolean(librdf_query_results *query_results); int librdf_query_results_get_boolean(librdf_query_results *query_results);
/* query results formatter class */ /* query results formatter class */
REDLAND_API REDLAND_API
librdf_query_results_formatter* librdf_new_query_results_formatter2(librdf_
query_results* query_results, const char *name, const char* mime_type, libr
df_uri* uri);
REDLAND_API REDLAND_DEPRECATED
librdf_query_results_formatter* librdf_new_query_results_formatter(librdf_q uery_results* query_results, const char *name, librdf_uri* uri); librdf_query_results_formatter* librdf_new_query_results_formatter(librdf_q uery_results* query_results, const char *name, librdf_uri* uri);
REDLAND_API REDLAND_API REDLAND_DEPRECATED
librdf_query_results_formatter* librdf_new_query_results_formatter_by_mime_ type(librdf_query_results* query_results, const char *mime_type); librdf_query_results_formatter* librdf_new_query_results_formatter_by_mime_ type(librdf_query_results* query_results, const char *mime_type);
REDLAND_API REDLAND_API
void librdf_free_query_results_formatter(librdf_query_results_formatter* fo rmatter); void librdf_free_query_results_formatter(librdf_query_results_formatter* fo rmatter);
REDLAND_API REDLAND_API
int librdf_query_results_formatter_write(raptor_iostream *iostr, librdf_que ry_results_formatter* formatter, librdf_query_results* results, librdf_uri *base_uri); int librdf_query_results_formatter_write(raptor_iostream *iostr, librdf_que ry_results_formatter* formatter, librdf_query_results* query_results, librd f_uri *base_uri);
REDLAND_API REDLAND_API
int librdf_query_results_formats_check(librdf_world* world, const char *nam e, librdf_uri* uri, const char *mime_type); int librdf_query_results_formats_check(librdf_world* world, const char *nam e, librdf_uri* uri, const char *mime_type);
REDLAND_API REDLAND_API
int librdf_query_results_formats_enumerate(librdf_world* world, const unsig ned int counter, const char **name, const char **label, const unsigned char **uri_string, const char **mime_type); int librdf_query_results_formats_enumerate(librdf_world* world, const unsig ned int counter, const char **name, const char **label, const unsigned char **uri_string, const char **mime_type);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
 End of changes. 9 change blocks. 
3 lines changed or deleted 26 lines changed or added


 rdf_raptor.h   rdf_raptor.h 
skipping to change at line 35 skipping to change at line 35
#define LIBRDF_RAPTOR_H #define LIBRDF_RAPTOR_H
#ifdef LIBRDF_INTERNAL #ifdef LIBRDF_INTERNAL
#include <rdf_raptor_internal.h> #include <rdf_raptor_internal.h>
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
#ifndef RAPTOR_WORLD_DECLARED
#define RAPTOR_WORLD_DECLARED 1
/* Declare raptor_world type unless it is declared in raptor.h */
typedef struct raptor_world_s raptor_world;
#endif
#ifdef RAPTOR_V2_AVAILABLE
REDLAND_API REDLAND_API
void librdf_world_set_raptor(librdf_world* world, raptor_world* raptor_worl d_ptr); void librdf_world_set_raptor(librdf_world* world, raptor_world* raptor_worl d_ptr);
REDLAND_API REDLAND_API
raptor_world* librdf_world_get_raptor(librdf_world* world); raptor_world* librdf_world_get_raptor(librdf_world* world);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 2 change blocks. 
8 lines changed or deleted 0 lines changed or added


 rdf_statement.h   rdf_statement.h 
skipping to change at line 47 skipping to change at line 47
* librdf_statement_part: * librdf_statement_part:
* @LIBRDF_STATEMENT_SUBJECT: Subject of a statement. * @LIBRDF_STATEMENT_SUBJECT: Subject of a statement.
* @LIBRDF_STATEMENT_PREDICATE: Predicate of a statement. * @LIBRDF_STATEMENT_PREDICATE: Predicate of a statement.
* @LIBRDF_STATEMENT_OBJECT: Object of a statement. * @LIBRDF_STATEMENT_OBJECT: Object of a statement.
* @LIBRDF_STATEMENT_ALL: All parts of a statement. * @LIBRDF_STATEMENT_ALL: All parts of a statement.
* *
* Flags that are or-ed to indicate statement parts. * Flags that are or-ed to indicate statement parts.
* *
* Used in fields arguments to methods such as the public * Used in fields arguments to methods such as the public
* librdf_statement_encode_parts() librdf_statement_decode_parts() * librdf_statement_encode_parts() librdf_statement_decode_parts()
* librdf_new_stream_from_node_iterator() and the internal * librdf_new_stream_from_node_iterator().
* librdf_storage_node_stream_to_node_create()
*/ */
typedef enum { typedef enum {
LIBRDF_STATEMENT_SUBJECT = 1 << 0, LIBRDF_STATEMENT_SUBJECT = 1 << 0,
LIBRDF_STATEMENT_PREDICATE = 1 << 1, LIBRDF_STATEMENT_PREDICATE = 1 << 1,
LIBRDF_STATEMENT_OBJECT = 1 << 2, LIBRDF_STATEMENT_OBJECT = 1 << 2,
/* must be a combination of all of the above */ /* must be a combination of all of the above */
LIBRDF_STATEMENT_ALL = (LIBRDF_STATEMENT_SUBJECT| LIBRDF_STATEMENT_ALL = (LIBRDF_STATEMENT_SUBJECT|
LIBRDF_STATEMENT_PREDICATE| LIBRDF_STATEMENT_PREDICATE|
LIBRDF_STATEMENT_OBJECT) LIBRDF_STATEMENT_OBJECT)
skipping to change at line 108 skipping to change at line 107
REDLAND_API REDLAND_API
librdf_node* librdf_statement_get_object(librdf_statement *statement); librdf_node* librdf_statement_get_object(librdf_statement *statement);
REDLAND_API REDLAND_API
void librdf_statement_set_object(librdf_statement *statement, librdf_node * node); void librdf_statement_set_object(librdf_statement *statement, librdf_node * node);
/* if statement has all fields */ /* if statement has all fields */
REDLAND_API REDLAND_API
int librdf_statement_is_complete(librdf_statement *statement); int librdf_statement_is_complete(librdf_statement *statement);
/* convert to a string */ /* convert to a string */
REDLAND_API REDLAND_API REDLAND_DEPRECATED
unsigned char *librdf_statement_to_string(librdf_statement *statement); unsigned char *librdf_statement_to_string(librdf_statement *statement);
/* print it prettily */ /* print it prettily */
REDLAND_API REDLAND_API
int librdf_statement_write(librdf_statement *statement, raptor_iostream *io
str);
REDLAND_API
void librdf_statement_print(librdf_statement *statement, FILE *fh); void librdf_statement_print(librdf_statement *statement, FILE *fh);
/* compare two statements */ /* compare two statements */
REDLAND_API REDLAND_API
int librdf_statement_equals(librdf_statement* statement1, librdf_statement* statement2); int librdf_statement_equals(librdf_statement* statement1, librdf_statement* statement2);
/* match statement against one with partial content */ /* match statement against one with partial content */
REDLAND_API REDLAND_API
int librdf_statement_match(librdf_statement* statement, librdf_statement* p artial_statement); int librdf_statement_match(librdf_statement* statement, librdf_statement* p artial_statement);
/* serialising/deserialising */ /* serialising/deserialising */
REDLAND_API REDLAND_API REDLAND_DEPRECATED
size_t librdf_statement_encode(librdf_statement* statement, unsigned char * buffer, size_t length); size_t librdf_statement_encode(librdf_statement* statement, unsigned char * buffer, size_t length);
REDLAND_API REDLAND_API
size_t librdf_statement_encode2(librdf_world* world, librdf_statement* stat
ement, unsigned char *buffer, size_t length);
REDLAND_API REDLAND_DEPRECATED
size_t librdf_statement_encode_parts(librdf_statement* statement, librdf_no de* context_node, unsigned char *buffer, size_t length, librdf_statement_pa rt fields); size_t librdf_statement_encode_parts(librdf_statement* statement, librdf_no de* context_node, unsigned char *buffer, size_t length, librdf_statement_pa rt fields);
REDLAND_API REDLAND_API
size_t librdf_statement_encode_parts2(librdf_world* world, librdf_statement
* statement, librdf_node* context_node, unsigned char *buffer, size_t lengt
h, librdf_statement_part fields);
REDLAND_API REDLAND_DEPRECATED
size_t librdf_statement_decode(librdf_statement* statement, unsigned char * buffer, size_t length); size_t librdf_statement_decode(librdf_statement* statement, unsigned char * buffer, size_t length);
REDLAND_API REDLAND_API
size_t librdf_statement_decode2(librdf_world* world, librdf_statement* stat
ement, librdf_node** context_node, unsigned char *buffer, size_t length);
REDLAND_API REDLAND_DEPRECATED
size_t librdf_statement_decode_parts(librdf_statement* statement, librdf_no de** context_node, unsigned char *buffer, size_t length); size_t librdf_statement_decode_parts(librdf_statement* statement, librdf_no de** context_node, unsigned char *buffer, size_t length);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 7 change blocks. 
4 lines changed or deleted 16 lines changed or added


 rdf_storage_module.h   rdf_storage_module.h 
skipping to change at line 41 skipping to change at line 41
* librdf_storage_instance: * librdf_storage_instance:
* *
* Opaque storage module instance handle. * Opaque storage module instance handle.
* *
* For use with a storage module and the librdf_storage_get_instance() * For use with a storage module and the librdf_storage_get_instance()
* and librdf_storage_set_instance() functions. The instance handle * and librdf_storage_set_instance() functions. The instance handle
* should be set in the #librdf_storage_factory init factory method. * should be set in the #librdf_storage_factory init factory method.
*/ */
typedef void* librdf_storage_instance; typedef void* librdf_storage_instance;
/**
* LIBRDF_STORAGE_MIN_INTERFACE_VERSION:
*
* Oldest support librdf storage module interface version.
*
*/
#define LIBRDF_STORAGE_MIN_INTERFACE_VERSION 1 #define LIBRDF_STORAGE_MIN_INTERFACE_VERSION 1
/**
* LIBRDF_STORAGE_MAX_INTERFACE_VERSION:
*
* Newest supported librdf storage module interface version.
*
*/
#define LIBRDF_STORAGE_MAX_INTERFACE_VERSION 1 #define LIBRDF_STORAGE_MAX_INTERFACE_VERSION 1
/**
* LIBRDF_STORAGE_INTERFACE_VERSION:
*
* Default librdf storage module interface version.
*
*/
#define LIBRDF_STORAGE_INTERFACE_VERSION LIBRDF_STORAGE_MAX_INTERFACE_VERSI ON #define LIBRDF_STORAGE_INTERFACE_VERSION LIBRDF_STORAGE_MAX_INTERFACE_VERSI ON
/** /**
* librdf_storage_factory: * librdf_storage_factory:
* @version: Interface version. Only version 1 is defined. * @version: Interface version. Only version 1 is defined.
* @name: Name (ID) of this storage, e.g. "megastore" * @name: Name (ID) of this storage, e.g. "megastore"
* @label: Label of this storage, e.g. "Megastore Storage" * @label: Label of this storage, e.g. "Megastore Storage"
* @init: Create a new storage. * @init: Create a new storage.
* This method should create the required instance data and store it with * This method should create the required instance data and store it with
* librdf_storage_set_instance() so it can be used in other methods. * librdf_storage_set_instance() so it can be used in other methods.
skipping to change at line 216 skipping to change at line 235
int (*transaction_start_with_handle)(librdf_storage* storage, void* handl e); int (*transaction_start_with_handle)(librdf_storage* storage, void* handl e);
/* Commit a transaction */ /* Commit a transaction */
int (*transaction_commit)(librdf_storage* storage); int (*transaction_commit)(librdf_storage* storage);
/* Rollback a transaction */ /* Rollback a transaction */
int (*transaction_rollback)(librdf_storage* storage); int (*transaction_rollback)(librdf_storage* storage);
/* Get opaque data handle passed to transaction_start_with_handle */ /* Get opaque data handle passed to transaction_start_with_handle */
void* (*transaction_get_handle)(librdf_storage* storage); void* (*transaction_get_handle)(librdf_storage* storage);
/** Storage engine supports querying - OPTIONAL */
int (*supports_query)(librdf_storage* storage, librdf_query *query);
/** Storage engine returns query results - OPTIONAL */
librdf_query_results* (*query_execute)(librdf_storage* storage, librdf_qu
ery *query);
}; };
/** /**
* librdf_storage_module_register_function: * librdf_storage_module_register_function:
* @world: world object * @world: world object
* *
* Registration function for storage * Registration function for storage
* *
* A storage module must define and export a function named of this * A storage module must define and export a function named of this
* type with function name "librdf_storage_module_register_factory". * type with function name "librdf_storage_module_register_factory".
 End of changes. 4 change blocks. 
0 lines changed or deleted 26 lines changed or added


 rdf_stream.h   rdf_stream.h 
skipping to change at line 98 skipping to change at line 98
REDLAND_API REDLAND_API
int librdf_stream_next(librdf_stream* stream); int librdf_stream_next(librdf_stream* stream);
REDLAND_API REDLAND_API
librdf_statement* librdf_stream_get_object(librdf_stream* stream); librdf_statement* librdf_stream_get_object(librdf_stream* stream);
REDLAND_API REDLAND_API
void* librdf_stream_get_context(librdf_stream* stream); void* librdf_stream_get_context(librdf_stream* stream);
REDLAND_API REDLAND_API
int librdf_stream_add_map(librdf_stream* stream, librdf_stream_map_handler map_function, librdf_stream_map_free_context_handler free_context, void *ma p_context); int librdf_stream_add_map(librdf_stream* stream, librdf_stream_map_handler map_function, librdf_stream_map_free_context_handler free_context, void *ma p_context);
REDLAND_API REDLAND_API REDLAND_DEPRECATED
void librdf_stream_print(librdf_stream *stream, FILE *fh); void librdf_stream_print(librdf_stream *stream, FILE *fh);
REDLAND_API
int librdf_stream_write(librdf_stream *stream, raptor_iostream *iostr);
REDLAND_API REDLAND_API
librdf_stream* librdf_new_empty_stream(librdf_world *world); librdf_stream* librdf_new_empty_stream(librdf_world *world);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif #endif
 End of changes. 2 change blocks. 
1 lines changed or deleted 3 lines changed or added


 rdf_uri.h   rdf_uri.h 
skipping to change at line 50 skipping to change at line 50
* *
* Callback function for librdf_parser_set_uri_filter() * Callback function for librdf_parser_set_uri_filter()
* *
* Return value: non-0 to filter the URI * Return value: non-0 to filter the URI
*/ */
typedef int (*librdf_uri_filter_func)(void *user_data, librdf_uri* uri); typedef int (*librdf_uri_filter_func)(void *user_data, librdf_uri* uri);
/* constructors */ /* constructors */
REDLAND_API REDLAND_API
librdf_uri* librdf_new_uri (librdf_world *world, const unsigned char *uri_s tring); librdf_uri* librdf_new_uri (librdf_world *world, const unsigned char *uri_s tring);
REDLAND_API
librdf_uri* librdf_new_uri2 (librdf_world *world, const unsigned char *uri_
string, size_t length);
/* Create a new URI from an existing URI - CLONE */ /* Create a new URI from an existing URI - CLONE */
REDLAND_API REDLAND_API
librdf_uri* librdf_new_uri_from_uri (librdf_uri* old_uri); librdf_uri* librdf_new_uri_from_uri (librdf_uri* old_uri);
/* Create a new URI from an existing URI and local name */ /* Create a new URI from an existing URI and local name */
REDLAND_API REDLAND_API
librdf_uri* librdf_new_uri_from_uri_local_name (librdf_uri* old_uri, const unsigned char *local_name); librdf_uri* librdf_new_uri_from_uri_local_name (librdf_uri* old_uri, const unsigned char *local_name);
/* destructor */ /* destructor */
REDLAND_API REDLAND_API
void librdf_free_uri(librdf_uri *uri); void librdf_free_uri(librdf_uri *uri);
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/