rasqal.h   rasqal.h 
skipping to change at line 38 skipping to change at line 38
extern "C" { extern "C" {
#endif #endif
/** /**
* RASQAL_VERSION: * RASQAL_VERSION:
* *
* Rasqal library version number * Rasqal library version number
* *
* Format: major * 10000 + minor * 100 + release * Format: major * 10000 + minor * 100 + release
*/ */
#define RASQAL_VERSION 932 #define RASQAL_VERSION 933
/** /**
* RASQAL_VERSION_STRING: * RASQAL_VERSION_STRING:
* *
* Rasqal library version string * Rasqal library version string
*/ */
#define RASQAL_VERSION_STRING "0.9.32" #define RASQAL_VERSION_STRING "0.9.33"
/** /**
* RASQAL_VERSION_MAJOR: * RASQAL_VERSION_MAJOR:
* *
* Rasqal library major version * Rasqal library major version
*/ */
#define RASQAL_VERSION_MAJOR 0 #define RASQAL_VERSION_MAJOR 0
/** /**
* RASQAL_VERSION_MINOR: * RASQAL_VERSION_MINOR:
* *
* Rasqal library minor version * Rasqal library minor version
*/ */
#define RASQAL_VERSION_MINOR 9 #define RASQAL_VERSION_MINOR 9
/** /**
* RASQAL_VERSION_RELEASE: * RASQAL_VERSION_RELEASE:
* *
* Rasqal library release * Rasqal library release
*/ */
#define RASQAL_VERSION_RELEASE 32 #define RASQAL_VERSION_RELEASE 33
/** /**
* RASQAL_API: * RASQAL_API:
* *
* Macro for wrapping API function call declarations. * Macro for wrapping API function call declarations.
* *
*/ */
#ifndef RASQAL_API #ifndef RASQAL_API
# ifdef WIN32 # ifdef WIN32
# ifdef __GNUC__ # ifdef __GNUC__
skipping to change at line 349 skipping to change at line 349
* @RASQAL_DATA_GRAPH_BACKGROUND: Graphs with a source only. * @RASQAL_DATA_GRAPH_BACKGROUND: Graphs with a source only.
* *
* Flags for the type of #rasqal_data_graph. * Flags for the type of #rasqal_data_graph.
* *
* These are used by rasqal_new_data_graph_from_uri() and * These are used by rasqal_new_data_graph_from_uri() and
* rasqal_new_data_graph_from_iostream(). See #rasqal_data_graph. * rasqal_new_data_graph_from_iostream(). See #rasqal_data_graph.
*/ */
typedef enum { typedef enum {
RASQAL_DATA_GRAPH_NONE = 0, RASQAL_DATA_GRAPH_NONE = 0,
RASQAL_DATA_GRAPH_NAMED = 1, RASQAL_DATA_GRAPH_NAMED = 1,
RASQAL_DATA_GRAPH_BACKGROUND = 2, RASQAL_DATA_GRAPH_BACKGROUND = 2
} rasqal_data_graph_flags; } rasqal_data_graph_flags;
/** /**
* rasqal_data_graph: * rasqal_data_graph:
* @world: rasqal_world object * @world: rasqal_world object
* @uri: source URI * @uri: source URI
* @name_uri: name of graph for %RASQAL_DATA_GRAPH_NAMED * @name_uri: name of graph for %RASQAL_DATA_GRAPH_NAMED
* @flags: %RASQAL_DATA_GRAPH_NAMED or %RASQAL_DATA_GRAPH_BACKGROUND * @flags: %RASQAL_DATA_GRAPH_NAMED or %RASQAL_DATA_GRAPH_BACKGROUND
* @format_type: MIME Type of data format at @uri (or NULL) * @format_type: MIME Type of data format at @uri (or NULL)
* @format_name: Raptor parser Name of data format at @uri (or NULL) * @format_name: Raptor parser Name of data format at @uri (or NULL)
skipping to change at line 378 skipping to change at line 378
* iostream and using @base_uri as a base uri. Otherwise the graph * iostream and using @base_uri as a base uri. Otherwise the graph
* can be constructed from the graph at URI @uri. * can be constructed from the graph at URI @uri.
* *
* In either case the @name_uri is the graph name as long as @flags * In either case the @name_uri is the graph name as long as @flags
* is %RASQAL_DATA_GRAPH_NAMED * is %RASQAL_DATA_GRAPH_NAMED
*/ */
typedef struct { typedef struct {
rasqal_world* world; rasqal_world* world;
raptor_uri* uri; raptor_uri* uri;
raptor_uri* name_uri; raptor_uri* name_uri;
int flags; unsigned int flags;
char* format_type; char* format_type;
char* format_name; char* format_name;
raptor_uri* format_uri; raptor_uri* format_uri;
raptor_iostream* iostr; raptor_iostream* iostr;
raptor_uri* base_uri; raptor_uri* base_uri;
int usage; int usage;
} rasqal_data_graph; } rasqal_data_graph;
/** /**
* rasqal_literal_type: * rasqal_literal_type:
skipping to change at line 832 skipping to change at line 832
* @op: expression operation * @op: expression operation
* @arg1: first argument * @arg1: first argument
* @arg2: second argument * @arg2: second argument
* @arg3: third argument (for #RASQAL_EXPR_REGEX ) * @arg3: third argument (for #RASQAL_EXPR_REGEX )
* @literal: literal argument * @literal: literal argument
* @value: UTF-8 value * @value: UTF-8 value
* @name: name for extension function qname(args...) and cast-to-uri * @name: name for extension function qname(args...) and cast-to-uri
* @args: args for extension function qname(args...), cast-to-uri and COALE SCE * @args: args for extension function qname(args...), cast-to-uri and COALE SCE
* @params: args for extension function parameters (SPARQL 1.1) (Rasqal 0.9 .20+) * @params: args for extension function parameters (SPARQL 1.1) (Rasqal 0.9 .20+)
* @flags: bitflags from #rasqal_expression_flags for expressions (Rasqal 0 .9.20+) * @flags: bitflags from #rasqal_expression_flags for expressions (Rasqal 0 .9.20+)
* @arg4: fourth argument (for #RASQAL_EXPR_REPLACE )
* *
* Expression with arguments * Expression with arguments
* *
*/ */
struct rasqal_expression_s { struct rasqal_expression_s {
rasqal_world* world; rasqal_world* world;
int usage; int usage;
rasqal_op op; rasqal_op op;
skipping to change at line 1317 skipping to change at line 1318
RASQAL_API RASQAL_API
int rasqal_graph_pattern_variable_bound_in(rasqal_graph_pattern *gp, rasqal _variable *v); int rasqal_graph_pattern_variable_bound_in(rasqal_graph_pattern *gp, rasqal _variable *v);
RASQAL_API RASQAL_API
rasqal_literal* rasqal_graph_pattern_get_origin(rasqal_graph_pattern* graph _pattern); rasqal_literal* rasqal_graph_pattern_get_origin(rasqal_graph_pattern* graph _pattern);
RASQAL_API RASQAL_API
rasqal_variable* rasqal_graph_pattern_get_variable(rasqal_graph_pattern* gr aph_pattern); rasqal_variable* rasqal_graph_pattern_get_variable(rasqal_graph_pattern* gr aph_pattern);
RASQAL_API RASQAL_API
rasqal_literal* rasqal_graph_pattern_get_service(rasqal_graph_pattern* grap h_pattern); rasqal_literal* rasqal_graph_pattern_get_service(rasqal_graph_pattern* grap h_pattern);
RASQAL_API RASQAL_API
raptor_sequence* rasqal_graph_pattern_get_flattened_triples(rasqal_query* q uery, rasqal_graph_pattern* graph_pattern); raptor_sequence* rasqal_graph_pattern_get_flattened_triples(rasqal_query* q uery, rasqal_graph_pattern* graph_pattern);
RASQAL_API
raptor_sequence* rasqal_graph_pattern_get_triples(rasqal_query* query, rasq
al_graph_pattern* graph_pattern);
/* Utility methods */ /* Utility methods */
RASQAL_API RASQAL_API
const char* rasqal_query_verb_as_string(rasqal_query_verb verb); const char* rasqal_query_verb_as_string(rasqal_query_verb verb);
RASQAL_API RASQAL_API
int rasqal_query_print(rasqal_query* query, FILE* fh); int rasqal_query_print(rasqal_query* query, FILE* fh);
/* Query */ /* Query */
RASQAL_API RASQAL_API
int rasqal_query_prepare(rasqal_query* query, const unsigned char *query_st ring, raptor_uri *base_uri); int rasqal_query_prepare(rasqal_query* query, const unsigned char *query_st ring, raptor_uri *base_uri);
skipping to change at line 1348 skipping to change at line 1351
rasqal_variable* rasqal_query_get_bindings_variable(rasqal_query* query, in t idx); rasqal_variable* rasqal_query_get_bindings_variable(rasqal_query* query, in t idx);
RASQAL_API RASQAL_API
raptor_sequence* rasqal_query_get_bindings_rows_sequence(rasqal_query* quer y); raptor_sequence* rasqal_query_get_bindings_rows_sequence(rasqal_query* quer y);
RASQAL_API RASQAL_API
rasqal_row* rasqal_query_get_bindings_row(rasqal_query* query, int idx); rasqal_row* rasqal_query_get_bindings_row(rasqal_query* query, int idx);
RASQAL_API RASQAL_API
rasqal_query_results_type rasqal_query_get_result_type(rasqal_query* query) ; rasqal_query_results_type rasqal_query_get_result_type(rasqal_query* query) ;
/* query results */ /* query results */
RASQAL_API RASQAL_API
rasqal_query_results* rasqal_new_query_results2(rasqal_world* world, rasqal
_query* query, rasqal_query_results_type type);
RASQAL_API RASQAL_DEPRECATED
rasqal_query_results* rasqal_new_query_results(rasqal_world* world, rasqal_ query* query, rasqal_query_results_type type, rasqal_variables_table* vars_ table); rasqal_query_results* rasqal_new_query_results(rasqal_world* world, rasqal_ query* query, rasqal_query_results_type type, rasqal_variables_table* vars_ table);
RASQAL_API RASQAL_API
rasqal_query_results* rasqal_new_query_results_from_string(rasqal_world* wo
rld, rasqal_query_results_type type, raptor_uri* base_uri, const char* stri
ng, size_t string_len);
RASQAL_API
void rasqal_free_query_results(rasqal_query_results *query_results); void rasqal_free_query_results(rasqal_query_results *query_results);
RASQAL_API RASQAL_API
rasqal_query* rasqal_query_results_get_query(rasqal_query_results* query_re sults); rasqal_query* rasqal_query_results_get_query(rasqal_query_results* query_re sults);
/* Bindings result format */ /* Bindings result format */
RASQAL_API RASQAL_API
rasqal_query_results_type rasqal_query_results_get_type(rasqal_query_result s* query_results); rasqal_query_results_type rasqal_query_results_get_type(rasqal_query_result s* query_results);
RASQAL_API RASQAL_API
const char* rasqal_query_results_type_label(rasqal_query_results_type type) ; const char* rasqal_query_results_type_label(rasqal_query_results_type type) ;
skipping to change at line 1423 skipping to change at line 1430
* @RASQAL_QUERY_RESULTS_FORMAT_FLAG_WRITER: format can be written. * @RASQAL_QUERY_RESULTS_FORMAT_FLAG_WRITER: format can be written.
* *
* Bitflags for rasqal_query_results_formats_check() to find formats with f eatures. * Bitflags for rasqal_query_results_formats_check() to find formats with f eatures.
*/ */
typedef enum { typedef enum {
RASQAL_QUERY_RESULTS_FORMAT_FLAG_READER = 1, RASQAL_QUERY_RESULTS_FORMAT_FLAG_READER = 1,
RASQAL_QUERY_RESULTS_FORMAT_FLAG_WRITER = 2 RASQAL_QUERY_RESULTS_FORMAT_FLAG_WRITER = 2
} rasqal_query_results_format_flags; } rasqal_query_results_format_flags;
RASQAL_API RASQAL_API
int rasqal_query_results_formats_check2(rasqal_world* world, const char *na
me, raptor_uri* uri, const char *mime_type, int flags);
RASQAL_API RASQAL_API RASQAL_DEPRECATED
int rasqal_query_results_formats_check(rasqal_world* world, const char *nam e, raptor_uri* uri, const char *mime_type, int flags); int rasqal_query_results_formats_check(rasqal_world* world, const char *nam e, raptor_uri* uri, const char *mime_type, int flags);
RASQAL_API RASQAL_API
rasqal_query_results_formatter* rasqal_new_query_results_formatter(rasqal_w orld* world, const char *name, const char *mime_type, raptor_uri* format_ur i); rasqal_query_results_formatter* rasqal_new_query_results_formatter(rasqal_w orld* world, const char *name, const char *mime_type, raptor_uri* format_ur i);
RASQAL_API RASQAL_API
rasqal_query_results_formatter* rasqal_new_query_results_formatter_for_cont ent(rasqal_world* world, raptor_uri *uri, const char *mime_type, const unsi gned char *buffer, size_t len, const unsigned char *identifier); rasqal_query_results_formatter* rasqal_new_query_results_formatter_for_cont ent(rasqal_world* world, raptor_uri *uri, const char *mime_type, const unsi gned char *buffer, size_t len, const unsigned char *identifier);
RASQAL_API RASQAL_API
void rasqal_free_query_results_formatter(rasqal_query_results_formatter* fo rmatter); void rasqal_free_query_results_formatter(rasqal_query_results_formatter* fo rmatter);
RASQAL_API RASQAL_API
int rasqal_query_results_formatter_write(raptor_iostream *iostr, rasqal_que ry_results_formatter* formatter, rasqal_query_results* results, raptor_uri *base_uri); int rasqal_query_results_formatter_write(raptor_iostream *iostr, rasqal_que ry_results_formatter* formatter, rasqal_query_results* results, raptor_uri *base_uri);
RASQAL_API RASQAL_API
int rasqal_query_results_formatter_read(rasqal_world* world, raptor_iostrea m *iostr, rasqal_query_results_formatter* formatter, rasqal_query_results* results, raptor_uri *base_uri); int rasqal_query_results_formatter_read(rasqal_world* world, raptor_iostrea m *iostr, rasqal_query_results_formatter* formatter, rasqal_query_results* results, raptor_uri *base_uri);
RASQAL_API RASQAL_API
int rasqal_query_iostream_write_escaped_counted_string(rasqal_query* query, raptor_iostream* iostr, const unsigned char* string, size_t len); int rasqal_query_iostream_write_escaped_counted_string(rasqal_query* query, raptor_iostream* iostr, const unsigned char* string, size_t len);
RASQAL_API RASQAL_API
unsigned char* rasqal_query_escape_counted_string(rasqal_query* query, cons t unsigned char *string, size_t len, size_t* output_len_p); unsigned char* rasqal_query_escape_counted_string(rasqal_query* query, cons t unsigned char *string, size_t len, size_t* output_len_p);
/* Data graph class */ /* Data graph class */
RASQAL_API RASQAL_API
rasqal_data_graph* rasqal_new_data_graph_from_uri(rasqal_world* world, rapt or_uri* uri, raptor_uri* name_uri, int flags, const char* format_type, cons t char* format_name, raptor_uri* format_uri); rasqal_data_graph* rasqal_new_data_graph_from_uri(rasqal_world* world, rapt or_uri* uri, raptor_uri* name_uri, unsigned int flags, const char* format_t ype, const char* format_name, raptor_uri* format_uri);
RASQAL_API RASQAL_API
rasqal_data_graph* rasqal_new_data_graph_from_iostream(rasqal_world* world, raptor_iostream* iostr, raptor_uri* base_uri, raptor_uri* name_uri, unsign ed int flags, const char* format_type, const char* format_name, raptor_uri* format_uri); rasqal_data_graph* rasqal_new_data_graph_from_iostream(rasqal_world* world, raptor_iostream* iostr, raptor_uri* base_uri, raptor_uri* name_uri, unsign ed int flags, const char* format_type, const char* format_name, raptor_uri* format_uri);
RASQAL_API RASQAL_API
rasqal_data_graph* rasqal_new_data_graph_from_data_graph(rasqal_data_graph* dg); rasqal_data_graph* rasqal_new_data_graph_from_data_graph(rasqal_data_graph* dg);
RASQAL_API RASQAL_API
void rasqal_free_data_graph(rasqal_data_graph* dg); void rasqal_free_data_graph(rasqal_data_graph* dg);
RASQAL_API RASQAL_API
int rasqal_data_graph_print(rasqal_data_graph* dg, FILE* fh); int rasqal_data_graph_print(rasqal_data_graph* dg, FILE* fh);
/** /**
skipping to change at line 1525 skipping to change at line 1534
rasqal_expression* rasqal_new_function_expression(rasqal_world* world, rapt or_uri* name, raptor_sequence* args, raptor_sequence* params, unsigned int flags); rasqal_expression* rasqal_new_function_expression(rasqal_world* world, rapt or_uri* name, raptor_sequence* args, raptor_sequence* params, unsigned int flags);
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_aggregate_function_expression(rasqal_world* w orld, rasqal_op op, rasqal_expression* arg1, raptor_sequence* params, unsig ned int flags); rasqal_expression* rasqal_new_aggregate_function_expression(rasqal_world* w orld, rasqal_op op, rasqal_expression* arg1, raptor_sequence* params, unsig ned int flags);
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_cast_expression(rasqal_world* world, raptor_u ri* name, rasqal_expression *value); rasqal_expression* rasqal_new_cast_expression(rasqal_world* world, raptor_u ri* name, rasqal_expression *value);
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_expr_seq_expression(rasqal_world* world, rasq al_op op, raptor_sequence* args); rasqal_expression* rasqal_new_expr_seq_expression(rasqal_world* world, rasq al_op op, raptor_sequence* args);
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_set_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg1, raptor_sequence* args); rasqal_expression* rasqal_new_set_expression(rasqal_world* world, rasqal_op op, rasqal_expression* arg1, raptor_sequence* args);
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_group_concat_expression(rasqal_world* world, int flags, raptor_sequence* args, rasqal_literal* separator); rasqal_expression* rasqal_new_group_concat_expression(rasqal_world* world, unsigned int flags, raptor_sequence* args, rasqal_literal* separator);
RASQAL_API RASQAL_API
rasqal_expression* rasqal_new_expression_from_expression(rasqal_expression* e); rasqal_expression* rasqal_new_expression_from_expression(rasqal_expression* e);
RASQAL_API RASQAL_API
void rasqal_free_expression(rasqal_expression* e); void rasqal_free_expression(rasqal_expression* e);
RASQAL_API RASQAL_API
void rasqal_expression_print_op(rasqal_expression* e, FILE* fh); void rasqal_expression_print_op(rasqal_expression* e, FILE* fh);
RASQAL_API RASQAL_API
int rasqal_expression_print(rasqal_expression* e, FILE* fh); int rasqal_expression_print(rasqal_expression* e, FILE* fh);
RASQAL_API RASQAL_DEPRECATED RASQAL_API RASQAL_DEPRECATED
skipping to change at line 1633 skipping to change at line 1642
RASQAL_API RASQAL_API
int rasqal_literal_compare(rasqal_literal* l1, rasqal_literal* l2, int flag s, int *error_p); int rasqal_literal_compare(rasqal_literal* l1, rasqal_literal* l2, int flag s, int *error_p);
RASQAL_API RASQAL_API
int rasqal_literal_equals(rasqal_literal* l1, rasqal_literal* l2); int rasqal_literal_equals(rasqal_literal* l1, rasqal_literal* l2);
RASQAL_API RASQAL_API
int rasqal_literal_same_term(rasqal_literal* l1, rasqal_literal* l2); int rasqal_literal_same_term(rasqal_literal* l1, rasqal_literal* l2);
RASQAL_API RASQAL_API
rasqal_literal_type rasqal_literal_get_rdf_term_type(rasqal_literal* l); rasqal_literal_type rasqal_literal_get_rdf_term_type(rasqal_literal* l);
RASQAL_API RASQAL_API
rasqal_literal_type rasqal_literal_get_type(rasqal_literal* l);
RASQAL_API
char* rasqal_literal_get_language(rasqal_literal* l);
RASQAL_API
int rasqal_literal_is_rdf_literal(rasqal_literal* l); int rasqal_literal_is_rdf_literal(rasqal_literal* l);
RASQAL_API RASQAL_API
rasqal_prefix* rasqal_new_prefix(rasqal_world* world, const unsigned char* prefix, raptor_uri* uri); rasqal_prefix* rasqal_new_prefix(rasqal_world* world, const unsigned char* prefix, raptor_uri* uri);
RASQAL_API RASQAL_API
void rasqal_free_prefix(rasqal_prefix* p); void rasqal_free_prefix(rasqal_prefix* p);
RASQAL_API RASQAL_API
int rasqal_prefix_print(rasqal_prefix* p, FILE* fh); int rasqal_prefix_print(rasqal_prefix* p, FILE* fh);
/* Row class */ /* Row class */
skipping to change at line 1679 skipping to change at line 1692
RASQAL_API RASQAL_API
int rasqal_variable_print(rasqal_variable* v, FILE* fh); int rasqal_variable_print(rasqal_variable* v, FILE* fh);
RASQAL_API RASQAL_API
void rasqal_variable_set_value(rasqal_variable* v, rasqal_literal* l); void rasqal_variable_set_value(rasqal_variable* v, rasqal_literal* l);
/* Variables Table */ /* Variables Table */
RASQAL_API RASQAL_API
rasqal_variables_table* rasqal_new_variables_table(rasqal_world* world); rasqal_variables_table* rasqal_new_variables_table(rasqal_world* world);
RASQAL_API RASQAL_API
void rasqal_free_variables_table(rasqal_variables_table* vt); void rasqal_free_variables_table(rasqal_variables_table* vt);
RASQAL_API RASQAL_API RASQAL_DEPRECATED
rasqal_variable* rasqal_variables_table_add(rasqal_variables_table* vt, ras qal_variable_type type, const unsigned char *name, rasqal_literal *value); rasqal_variable* rasqal_variables_table_add(rasqal_variables_table* vt, ras qal_variable_type type, const unsigned char *name, rasqal_literal *value);
RASQAL_API RASQAL_API
rasqal_variable* rasqal_variables_table_add2(rasqal_variables_table* vt, ra
sqal_variable_type type, const unsigned char *name, size_t name_len, rasqal
_literal *value);
RASQAL_API
int rasqal_variables_table_add_variable(rasqal_variables_table* vt, rasqal_ variable* variable); int rasqal_variables_table_add_variable(rasqal_variables_table* vt, rasqal_ variable* variable);
RASQAL_API RASQAL_API
rasqal_variable* rasqal_variables_table_get_by_name(rasqal_variables_table* vt, rasqal_variable_type type, const unsigned char *name); rasqal_variable* rasqal_variables_table_get_by_name(rasqal_variables_table* vt, rasqal_variable_type type, const unsigned char *name);
RASQAL_API RASQAL_API
int rasqal_variables_table_contains(rasqal_variables_table* vt, rasqal_vari able_type type, const unsigned char *name); int rasqal_variables_table_contains(rasqal_variables_table* vt, rasqal_vari able_type type, const unsigned char *name);
/* memory functions */ /* memory functions */
RASQAL_API RASQAL_API
void rasqal_free_memory(void *ptr); void rasqal_free_memory(void *ptr);
RASQAL_API RASQAL_API
skipping to change at line 1968 skipping to change at line 1983
* *
* Lowest accepted @rasqal_triples_source_factory API version * Lowest accepted @rasqal_triples_source_factory API version
*/ */
#define RASQAL_TRIPLES_SOURCE_FACTORY_MIN_VERSION 1 #define RASQAL_TRIPLES_SOURCE_FACTORY_MIN_VERSION 1
/** /**
* RASQAL_TRIPLES_SOURCE_FACTORY_MAX_VERSION: * RASQAL_TRIPLES_SOURCE_FACTORY_MAX_VERSION:
* *
* Highest accepted @rasqal_triples_source_factory API version * Highest accepted @rasqal_triples_source_factory API version
*/ */
#define RASQAL_TRIPLES_SOURCE_FACTORY_MAX_VERSION 2 #define RASQAL_TRIPLES_SOURCE_FACTORY_MAX_VERSION 3
/** /**
* rasqal_triples_error_handler: * rasqal_triples_error_handler:
* @query: query object * @query: query object
* @locator: error locator (or NULL) * @locator: error locator (or NULL)
* @message: error message * @message: error message
* *
* Triples source factory error handler callback. * Triples source factory error handler callback.
*/ */
typedef void (*rasqal_triples_error_handler)(rasqal_query* query, raptor_lo cator* locator, const char* message); typedef void (*rasqal_triples_error_handler)(rasqal_query* query, raptor_lo cator* locator, const char* message);
/** /**
* rasqal_triples_error_handler2:
* @world: world object
* @locator: error locator (or NULL)
* @message: error message
*
* Triples source factory error handler callback.
*/
typedef void (*rasqal_triples_error_handler2)(rasqal_world* world, raptor_l
ocator* locator, const char* message);
/**
* rasqal_triples_source_factory: * rasqal_triples_source_factory:
* @version: API factory version from 1 to 2 * @version: API factory version from 1 to 3
* @user_data: User data for triples_source_factory. * @user_data: User data for triples_source_factory.
* @user_data_size: Size of @user_data for new_triples_source. * @user_data_size: Size of @user_data for new_triples_source.
* @new_triples_source: Create a new triples source - returns non-zero on f ailure < 0 is a 'no rdf data error', > 0 is an unspecified error. Err or messages are generated by rasqal internally. (V1) * @new_triples_source: Create a new triples source - returns non-zero on f ailure < 0 is a 'no rdf data error', > 0 is an unspecified error. Err or messages are generated by rasqal internally. (V1)
* @init_triples_source: Initialise a new triples source V2 for a particula r source URI/base URI and syntax. Returns non-zero on failure with errors r eported via the handler callback by the implementation. (V2) * @init_triples_source: Initialise a new triples source V2 for a particula r source URI/base URI and syntax. Returns non-zero on failure with errors r eported via the handler callback by the implementation. (V2)
* @init_triples_source2: Initialise a new triples source V3 for a particul ar source URI/base URI and syntax and given data graphs. Returns non-zero o n failure with errors reported via the handler callback by the implementati on. If bit 0 of flags is 1, enforce RAPTOR_FEATURE_NO_NET (V3)
* *
* A factory that initialises #rasqal_triples_source structures to * A factory that initialises #rasqal_triples_source structures to
* returning matches to a triple pattern across the dataset formed * returning matches to a triple pattern across the dataset formed
* from the data graphs recorded in the @query object. * from the data graphs recorded in the @query object.
*/ */
typedef struct { typedef struct {
int version; int version;
void *user_data; void *user_data;
size_t user_data_size; size_t user_data_size;
/* API v1 */ /* API v1 */
int (*new_triples_source)(rasqal_query* query, void *factory_user_data, v oid *user_data, rasqal_triples_source* rts); int (*new_triples_source)(rasqal_query* query, void *factory_user_data, v oid *user_data, rasqal_triples_source* rts);
/* API v2 onwards */ /* API v2 onwards */
int (*init_triples_source)(rasqal_query* query, void *factory_user_data, void *user_data, rasqal_triples_source* rts, rasqal_triples_error_handler h andler); int (*init_triples_source)(rasqal_query* query, void *factory_user_data, void *user_data, rasqal_triples_source* rts, rasqal_triples_error_handler h andler);
/* API v3 onwards */
int (*init_triples_source2)(rasqal_world* world, raptor_sequence* data_gr
aphs, void *factory_user_data, void *user_data, rasqal_triples_source *rts,
rasqal_triples_error_handler2 handler, unsigned int flags);
} rasqal_triples_source_factory; } rasqal_triples_source_factory;
/** /**
* rasqal_triples_source_factory_register_fn: * rasqal_triples_source_factory_register_fn:
* @factory: factory to register * @factory: factory to register
* *
* Register a factory for generating triples sources #rasqal_triples_source * Register a factory for generating triples sources #rasqal_triples_source
* *
* Return value: non-0 on failure * Return value: non-0 on failure
*/ */
skipping to change at line 2046 skipping to change at line 2074
*/ */
/** /**
* RASQAL_LITERAL_UDT_DEFINED * RASQAL_LITERAL_UDT_DEFINED
* *
* Internal * Internal
*/ */
/** /**
* rasqal_expression_s: * rasqal_expression_s:
* @world: Internal
* @usage: Internal * @usage: Internal
* @op: Internal * @op: Internal
* @arg1: Internal * @arg1: Internal
* @arg2: Internal * @arg2: Internal
* @arg3: Internal * @arg3: Internal
* @literal: Internal * @literal: Internal
* @value: Internal * @value: Internal
* @name: Internal * @name: Internal
* @args: Internal * @args: Internal
* @params: Internal * @params: Internal
* @flags: Internal * @flags: Internal
* @arg4: Internal
* *
* Internal - see #rasqal_expression. * Internal - see #rasqal_expression.
* *
*/ */
/** /**
* bind_match: * bind_match:
* @rtm: triples match context * @rtm: triples match context
* @user_data: user data * @user_data: user data
* @bindings: variable binding for parts of triple (s, p, o, g) * @bindings: variable binding for parts of triple (s, p, o, g)
 End of changes. 22 change blocks. 
10 lines changed or deleted 50 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/