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 930 | #define RASQAL_VERSION 931 | |||
/** | /** | |||
* RASQAL_VERSION_STRING: | * RASQAL_VERSION_STRING: | |||
* | * | |||
* Rasqal library version string | * Rasqal library version string | |||
*/ | */ | |||
#define RASQAL_VERSION_STRING "0.9.30" | #define RASQAL_VERSION_STRING "0.9.31" | |||
/** | /** | |||
* 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 30 | #define RASQAL_VERSION_RELEASE 31 | |||
/** | /** | |||
* 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 197 | skipping to change at line 197 | |||
* Rasqal home page URL. | * Rasqal home page URL. | |||
*/ | */ | |||
RASQAL_API | RASQAL_API | |||
extern const char * const rasqal_home_url_string; | extern const char * const rasqal_home_url_string; | |||
/** | /** | |||
* RASQAL_RAPTOR_VERSION: | * RASQAL_RAPTOR_VERSION: | |||
* | * | |||
* Version of Raptor that Rasqal was configured against. | * Version of Raptor that Rasqal was configured against. | |||
*/ | */ | |||
#define RASQAL_RAPTOR_VERSION 20008 | #define RASQAL_RAPTOR_VERSION 20009 | |||
/* Public structures */ | /* Public structures */ | |||
#ifndef RASQAL_WORLD_DECLARED | #ifndef RASQAL_WORLD_DECLARED | |||
#define RASQAL_WORLD_DECLARED 1 | #define RASQAL_WORLD_DECLARED 1 | |||
/** | /** | |||
* rasqal_world: | * rasqal_world: | |||
* | * | |||
* Rasqal world class. | * Rasqal world class. | |||
*/ | */ | |||
skipping to change at line 591 | skipping to change at line 591 | |||
rasqal_variable* variable; | rasqal_variable* variable; | |||
/* decimal */ | /* decimal */ | |||
rasqal_xsd_decimal* decimal; | rasqal_xsd_decimal* decimal; | |||
/* datetime */ | /* datetime */ | |||
rasqal_xsd_datetime* datetime; | rasqal_xsd_datetime* datetime; | |||
/* date */ | /* date */ | |||
rasqal_xsd_date* date; | rasqal_xsd_date* date; | |||
} value; | } value; | |||
/* for string */ | /* for string */ | |||
const char *language; | char *language; | |||
raptor_uri *datatype; | raptor_uri *datatype; | |||
/* various flags for literal types: | /* various flags for literal types: | |||
* pattern regex flags | * pattern regex flags | |||
* string datatype of qname | * string datatype of qname | |||
* uri qname of URI not yet expanded (temporary) | * uri qname of URI not yet expanded (temporary) | |||
*/ | */ | |||
const unsigned char *flags; | const unsigned char *flags; | |||
rasqal_literal_type parent_type; | rasqal_literal_type parent_type; | |||
skipping to change at line 941 | skipping to change at line 941 | |||
RASQAL_QUERY_VERB_LAST = RASQAL_QUERY_VERB_UPDATE | RASQAL_QUERY_VERB_LAST = RASQAL_QUERY_VERB_UPDATE | |||
} rasqal_query_verb; | } rasqal_query_verb; | |||
/** | /** | |||
* rasqal_query_results_type: | * rasqal_query_results_type: | |||
* @RASQAL_QUERY_RESULTS_BINDINGS: variable binding | * @RASQAL_QUERY_RESULTS_BINDINGS: variable binding | |||
* @RASQAL_QUERY_RESULTS_BOOLEAN: a single boolean | * @RASQAL_QUERY_RESULTS_BOOLEAN: a single boolean | |||
* @RASQAL_QUERY_RESULTS_GRAPH: an RDF graph | * @RASQAL_QUERY_RESULTS_GRAPH: an RDF graph | |||
* @RASQAL_QUERY_RESULTS_SYNTAX: a syntax | * @RASQAL_QUERY_RESULTS_SYNTAX: a syntax | |||
* @RASQAL_QUERY_RESULTS_UNKNOWN: unknown type | * @RASQAL_QUERY_RESULTS_UNKNOWN: unknown type | |||
* @RASQAL_QUERY_RESULTS_LAST: internal | ||||
* | * | |||
* Query result type. | * Query result type. | |||
*/ | */ | |||
typedef enum { | typedef enum { | |||
RASQAL_QUERY_RESULTS_BINDINGS, | RASQAL_QUERY_RESULTS_BINDINGS, | |||
RASQAL_QUERY_RESULTS_BOOLEAN, | RASQAL_QUERY_RESULTS_BOOLEAN, | |||
RASQAL_QUERY_RESULTS_GRAPH, | RASQAL_QUERY_RESULTS_GRAPH, | |||
RASQAL_QUERY_RESULTS_SYNTAX, | RASQAL_QUERY_RESULTS_SYNTAX, | |||
RASQAL_QUERY_RESULTS_UNKNOWN | RASQAL_QUERY_RESULTS_UNKNOWN, | |||
RASQAL_QUERY_RESULTS_LAST = RASQAL_QUERY_RESULTS_UNKNOWN | ||||
} rasqal_query_results_type; | } rasqal_query_results_type; | |||
/** | /** | |||
* rasqal_update_type: | * rasqal_update_type: | |||
* @RASQAL_UPDATE_TYPE_CLEAR: Clear graph. | * @RASQAL_UPDATE_TYPE_CLEAR: Clear graph. | |||
* @RASQAL_UPDATE_TYPE_CREATE: Create graph. | * @RASQAL_UPDATE_TYPE_CREATE: Create graph. | |||
* @RASQAL_UPDATE_TYPE_DROP: Drop graph. | * @RASQAL_UPDATE_TYPE_DROP: Drop graph. | |||
* @RASQAL_UPDATE_TYPE_LOAD: Load graph. | * @RASQAL_UPDATE_TYPE_LOAD: Load graph. | |||
* @RASQAL_UPDATE_TYPE_UPDATE: Insert or Delete graph or triples. | * @RASQAL_UPDATE_TYPE_UPDATE: Insert or Delete graph or triples. | |||
* @RASQAL_UPDATE_TYPE_ADD: Add graph to another graph. | * @RASQAL_UPDATE_TYPE_ADD: Add graph to another graph. | |||
skipping to change at line 1066 | skipping to change at line 1068 | |||
* @RASQAL_GRAPH_PATTERN_OPERATOR_BASIC: Just triple patterns and constrain ts. | * @RASQAL_GRAPH_PATTERN_OPERATOR_BASIC: Just triple patterns and constrain ts. | |||
* @RASQAL_GRAPH_PATTERN_OPERATOR_OPTIONAL: Set of graph patterns (ANDed) a nd constraints. | * @RASQAL_GRAPH_PATTERN_OPERATOR_OPTIONAL: Set of graph patterns (ANDed) a nd constraints. | |||
* @RASQAL_GRAPH_PATTERN_OPERATOR_UNION: Set of graph patterns (UNIONed) an d constraints. | * @RASQAL_GRAPH_PATTERN_OPERATOR_UNION: Set of graph patterns (UNIONed) an d constraints. | |||
* @RASQAL_GRAPH_PATTERN_OPERATOR_GROUP: Set of graph patterns (ANDed) and constraints. | * @RASQAL_GRAPH_PATTERN_OPERATOR_GROUP: Set of graph patterns (ANDed) and constraints. | |||
* @RASQAL_GRAPH_PATTERN_OPERATOR_GRAPH: A graph term + a graph pattern and constraints. | * @RASQAL_GRAPH_PATTERN_OPERATOR_GRAPH: A graph term + a graph pattern and constraints. | |||
* @RASQAL_GRAPH_PATTERN_OPERATOR_FILTER: A filter graph pattern with an ex pression | * @RASQAL_GRAPH_PATTERN_OPERATOR_FILTER: A filter graph pattern with an ex pression | |||
* @RASQAL_GRAPH_PATTERN_OPERATOR_LET: LET ?var := Expression (LAQRS) | * @RASQAL_GRAPH_PATTERN_OPERATOR_LET: LET ?var := Expression (LAQRS) | |||
* @RASQAL_GRAPH_PATTERN_OPERATOR_SELECT: SELECT graph pattern | * @RASQAL_GRAPH_PATTERN_OPERATOR_SELECT: SELECT graph pattern | |||
* @RASQAL_GRAPH_PATTERN_OPERATOR_SERVICE: SERVICE graph pattern | * @RASQAL_GRAPH_PATTERN_OPERATOR_SERVICE: SERVICE graph pattern | |||
* @RASQAL_GRAPH_PATTERN_OPERATOR_MINUS: MINUS graph pattern | * @RASQAL_GRAPH_PATTERN_OPERATOR_MINUS: MINUS graph pattern | |||
* @RASQAL_GRAPH_PATTERN_OPERATOR_VALUES: VALUES graph pattern | ||||
* @RASQAL_GRAPH_PATTERN_OPERATOR_UNKNOWN: Internal. | * @RASQAL_GRAPH_PATTERN_OPERATOR_UNKNOWN: Internal. | |||
* @RASQAL_GRAPH_PATTERN_OPERATOR_LAST: Internal. | * @RASQAL_GRAPH_PATTERN_OPERATOR_LAST: Internal. | |||
* | * | |||
* Graph pattern operators | * Graph pattern operators | |||
*/ | */ | |||
typedef enum { | typedef enum { | |||
RASQAL_GRAPH_PATTERN_OPERATOR_UNKNOWN = 0, | RASQAL_GRAPH_PATTERN_OPERATOR_UNKNOWN = 0, | |||
RASQAL_GRAPH_PATTERN_OPERATOR_BASIC = 1, | RASQAL_GRAPH_PATTERN_OPERATOR_BASIC = 1, | |||
RASQAL_GRAPH_PATTERN_OPERATOR_OPTIONAL = 2, | RASQAL_GRAPH_PATTERN_OPERATOR_OPTIONAL = 2, | |||
RASQAL_GRAPH_PATTERN_OPERATOR_UNION = 3, | RASQAL_GRAPH_PATTERN_OPERATOR_UNION = 3, | |||
RASQAL_GRAPH_PATTERN_OPERATOR_GROUP = 4, | RASQAL_GRAPH_PATTERN_OPERATOR_GROUP = 4, | |||
RASQAL_GRAPH_PATTERN_OPERATOR_GRAPH = 5, | RASQAL_GRAPH_PATTERN_OPERATOR_GRAPH = 5, | |||
RASQAL_GRAPH_PATTERN_OPERATOR_FILTER = 6, | RASQAL_GRAPH_PATTERN_OPERATOR_FILTER = 6, | |||
RASQAL_GRAPH_PATTERN_OPERATOR_LET = 7, | RASQAL_GRAPH_PATTERN_OPERATOR_LET = 7, | |||
RASQAL_GRAPH_PATTERN_OPERATOR_SELECT = 8, | RASQAL_GRAPH_PATTERN_OPERATOR_SELECT = 8, | |||
RASQAL_GRAPH_PATTERN_OPERATOR_SERVICE = 9, | RASQAL_GRAPH_PATTERN_OPERATOR_SERVICE = 9, | |||
RASQAL_GRAPH_PATTERN_OPERATOR_MINUS = 10, | RASQAL_GRAPH_PATTERN_OPERATOR_MINUS = 10, | |||
RASQAL_GRAPH_PATTERN_OPERATOR_VALUES = 11, | ||||
RASQAL_GRAPH_PATTERN_OPERATOR_LAST = RASQAL_GRAPH_PATTERN_OPERATOR_MINUS | RASQAL_GRAPH_PATTERN_OPERATOR_LAST = RASQAL_GRAPH_PATTERN_OPERATOR_VALUES | |||
} rasqal_graph_pattern_operator; | } rasqal_graph_pattern_operator; | |||
/** | /** | |||
* rasqal_graph_pattern_visit_fn: | * rasqal_graph_pattern_visit_fn: | |||
* @query: #rasqal_query containing the graph pattern | * @query: #rasqal_query containing the graph pattern | |||
* @gp: current graph_pattern | * @gp: current graph_pattern | |||
* @user_data: user data passed in | * @user_data: user data passed in | |||
* | * | |||
* User function to visit an graph_pattern and operate on it with | * User function to visit an graph_pattern and operate on it with | |||
* rasqal_graph_pattern_visit() or rasqal_query_graph_pattern_visit() | * rasqal_graph_pattern_visit() or rasqal_query_graph_pattern_visit() | |||
skipping to change at line 1355 | skipping to change at line 1359 | |||
RASQAL_API | 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) | ||||
; | ||||
RASQAL_API | ||||
int rasqal_query_results_is_bindings(rasqal_query_results *query_results); | int rasqal_query_results_is_bindings(rasqal_query_results *query_results); | |||
RASQAL_API | RASQAL_API | |||
int rasqal_query_results_get_count(rasqal_query_results *query_results); | int rasqal_query_results_get_count(rasqal_query_results *query_results); | |||
RASQAL_API | RASQAL_API | |||
int rasqal_query_results_next(rasqal_query_results *query_results); | int rasqal_query_results_next(rasqal_query_results *query_results); | |||
RASQAL_API | RASQAL_API | |||
int rasqal_query_results_finished(rasqal_query_results *query_results); | int rasqal_query_results_finished(rasqal_query_results *query_results); | |||
RASQAL_API | RASQAL_API | |||
int rasqal_query_results_get_bindings(rasqal_query_results *query_results, const unsigned char ***names, rasqal_literal ***values); | int rasqal_query_results_get_bindings(rasqal_query_results *query_results, const unsigned char ***names, rasqal_literal ***values); | |||
RASQAL_API | RASQAL_API | |||
End of changes. 11 change blocks. | ||||
7 lines changed or deleted | 14 lines changed or added | |||