raptor2.h   raptor2.h 
skipping to change at line 51 skipping to change at line 51
*/ */
#define RAPTOR_V2_AVAILABLE 1 #define RAPTOR_V2_AVAILABLE 1
/** /**
* RAPTOR_VERSION: * RAPTOR_VERSION:
* *
* Raptor library version number * Raptor library version number
* *
* Format: major * 10000 + minor * 100 + release * Format: major * 10000 + minor * 100 + release
*/ */
#define RAPTOR_VERSION 20003 #define RAPTOR_VERSION 20004
/** /**
* RAPTOR_VERSION_STRING: * RAPTOR_VERSION_STRING:
* *
* Raptor library version string * Raptor library version string
*/ */
#define RAPTOR_VERSION_STRING "2.0.3" #define RAPTOR_VERSION_STRING "2.0.4"
/** /**
* RAPTOR_VERSION_MAJOR: * RAPTOR_VERSION_MAJOR:
* *
* Raptor library major version * Raptor library major version
*/ */
#define RAPTOR_VERSION_MAJOR 2 #define RAPTOR_VERSION_MAJOR 2
/** /**
* RAPTOR_VERSION_MINOR: * RAPTOR_VERSION_MINOR:
* *
* Raptor library minor version * Raptor library minor version
*/ */
#define RAPTOR_VERSION_MINOR 0 #define RAPTOR_VERSION_MINOR 0
/** /**
* RAPTOR_VERSION_RELEASE: * RAPTOR_VERSION_RELEASE:
* *
* Raptor library release * Raptor library release
*/ */
#define RAPTOR_VERSION_RELEASE 3 #define RAPTOR_VERSION_RELEASE 4
/** /**
* RAPTOR_API: * RAPTOR_API:
* *
* Macro for wrapping API function call declarations. * Macro for wrapping API function call declarations.
* *
*/ */
#ifndef RAPTOR_API #ifndef RAPTOR_API
# ifdef WIN32 # ifdef WIN32
# ifdef __GNUC__ # ifdef __GNUC__
skipping to change at line 422 skipping to change at line 422
* for GRDDL parser. * for GRDDL parser.
* @RAPTOR_OPTION_WRITE_BASE_URI: Write @base directive for Turtle/N3. * @RAPTOR_OPTION_WRITE_BASE_URI: Write @base directive for Turtle/N3.
* @RAPTOR_OPTION_WWW_HTTP_CACHE_CONTROL: HTTP Cache-Control: header * @RAPTOR_OPTION_WWW_HTTP_CACHE_CONTROL: HTTP Cache-Control: header
* @RAPTOR_OPTION_WWW_HTTP_USER_AGENT: HTTP User-Agent: header * @RAPTOR_OPTION_WWW_HTTP_USER_AGENT: HTTP User-Agent: header
* @RAPTOR_OPTION_JSON_CALLBACK: JSON serializer callback function. * @RAPTOR_OPTION_JSON_CALLBACK: JSON serializer callback function.
* @RAPTOR_OPTION_JSON_EXTRA_DATA: JSON serializer extra top-level data * @RAPTOR_OPTION_JSON_EXTRA_DATA: JSON serializer extra top-level data
* @RAPTOR_OPTION_RSS_TRIPLES: Atom/RSS serializer writes extra RDF triples it finds (none, rdf-xml, atom-triples) * @RAPTOR_OPTION_RSS_TRIPLES: Atom/RSS serializer writes extra RDF triples it finds (none, rdf-xml, atom-triples)
* @RAPTOR_OPTION_ATOM_ENTRY_URI: Atom entry URI. If given, generate an At om Entry Document with the item having the given URI, otherwise generate an Atom Feed Document with any items found. * @RAPTOR_OPTION_ATOM_ENTRY_URI: Atom entry URI. If given, generate an At om Entry Document with the item having the given URI, otherwise generate an Atom Feed Document with any items found.
* @RAPTOR_OPTION_PREFIX_ELEMENTS: Integer. If set, generate Atom/RSS1.0 do cuments with prefixed elements, otherwise unprefixed. * @RAPTOR_OPTION_PREFIX_ELEMENTS: Integer. If set, generate Atom/RSS1.0 do cuments with prefixed elements, otherwise unprefixed.
* @RAPTOR_OPTION_STRICT: Boolean. If set, operate in strict conformance mo de. * @RAPTOR_OPTION_STRICT: Boolean. If set, operate in strict conformance mo de.
* @RAPTOR_OPTION_WWW_CERT_FILENAME: String. SSL client certificate filenam
e
* @RAPTOR_OPTION_WWW_CERT_TYPE: String. SSL client certificate type
* @RAPTOR_OPTION_WWW_CERT_PASSPHRASE: String. SSL client certificate passp
hrase
* @RAPTOR_OPTION_LAST: Internal * @RAPTOR_OPTION_LAST: Internal
* *
* Raptor parser, serializer or XML writer options. * Raptor parser, serializer or XML writer options.
*/ */
typedef enum { typedef enum {
RAPTOR_OPTION_SCANNING, RAPTOR_OPTION_SCANNING,
RAPTOR_OPTION_ALLOW_NON_NS_ATTRIBUTES, RAPTOR_OPTION_ALLOW_NON_NS_ATTRIBUTES,
RAPTOR_OPTION_ALLOW_OTHER_PARSETYPES, RAPTOR_OPTION_ALLOW_OTHER_PARSETYPES,
RAPTOR_OPTION_ALLOW_BAGID, RAPTOR_OPTION_ALLOW_BAGID,
RAPTOR_OPTION_ALLOW_RDF_TYPE_RDF_LIST, RAPTOR_OPTION_ALLOW_RDF_TYPE_RDF_LIST,
skipping to change at line 462 skipping to change at line 465
RAPTOR_OPTION_WWW_TIMEOUT, RAPTOR_OPTION_WWW_TIMEOUT,
RAPTOR_OPTION_WRITE_BASE_URI, RAPTOR_OPTION_WRITE_BASE_URI,
RAPTOR_OPTION_WWW_HTTP_CACHE_CONTROL, RAPTOR_OPTION_WWW_HTTP_CACHE_CONTROL,
RAPTOR_OPTION_WWW_HTTP_USER_AGENT, RAPTOR_OPTION_WWW_HTTP_USER_AGENT,
RAPTOR_OPTION_JSON_CALLBACK, RAPTOR_OPTION_JSON_CALLBACK,
RAPTOR_OPTION_JSON_EXTRA_DATA, RAPTOR_OPTION_JSON_EXTRA_DATA,
RAPTOR_OPTION_RSS_TRIPLES, RAPTOR_OPTION_RSS_TRIPLES,
RAPTOR_OPTION_ATOM_ENTRY_URI, RAPTOR_OPTION_ATOM_ENTRY_URI,
RAPTOR_OPTION_PREFIX_ELEMENTS, RAPTOR_OPTION_PREFIX_ELEMENTS,
RAPTOR_OPTION_STRICT, RAPTOR_OPTION_STRICT,
RAPTOR_OPTION_LAST = RAPTOR_OPTION_STRICT RAPTOR_OPTION_WWW_CERT_FILENAME,
RAPTOR_OPTION_WWW_CERT_TYPE,
RAPTOR_OPTION_WWW_CERT_PASSPHRASE,
RAPTOR_OPTION_LAST = RAPTOR_OPTION_WWW_CERT_PASSPHRASE
} raptor_option; } raptor_option;
/** /**
* raptor_term_literal_value: * raptor_term_literal_value:
* @string: literal string * @string: literal string
* @string_len: length of string * @string_len: length of string
* @datatype: datatype URI (or NULL) * @datatype: datatype URI (or NULL)
* @language: literal language (or NULL) * @language: literal language (or NULL)
* @language_len: length of language * @language_len: length of language
* *
skipping to change at line 1226 skipping to change at line 1232
#define RAPTOR_OWL_URI raptor_owl_namespace_uri #define RAPTOR_OWL_URI raptor_owl_namespace_uri
/* raptor_www */ /* raptor_www */
RAPTOR_API RAPTOR_API
raptor_www* raptor_new_www(raptor_world* world); raptor_www* raptor_new_www(raptor_world* world);
RAPTOR_API RAPTOR_API
raptor_www* raptor_new_www_with_connection(raptor_world* world, void* conne ction); raptor_www* raptor_new_www_with_connection(raptor_world* world, void* conne ction);
RAPTOR_API RAPTOR_API
void raptor_free_www(raptor_www *www); void raptor_free_www(raptor_www *www);
RAPTOR_API RAPTOR_API
int raptor_www_set_ssl_cert_options(raptor_www* www, const char* cert_filen
ame, const char* cert_type, const char* cert_passphrase);
RAPTOR_API
void raptor_www_set_user_agent(raptor_www *www, const char *user_agent); void raptor_www_set_user_agent(raptor_www *www, const char *user_agent);
RAPTOR_API RAPTOR_API
void raptor_www_set_proxy(raptor_www *www, const char *proxy); void raptor_www_set_proxy(raptor_www *www, const char *proxy);
RAPTOR_API RAPTOR_API
void raptor_www_set_http_accept(raptor_www *www, const char *value); void raptor_www_set_http_accept(raptor_www *www, const char *value);
RAPTOR_API RAPTOR_API
void raptor_www_set_write_bytes_handler(raptor_www *www, raptor_www_write_b ytes_handler handler, void *user_data); void raptor_www_set_write_bytes_handler(raptor_www *www, raptor_www_write_b ytes_handler handler, void *user_data);
RAPTOR_API RAPTOR_API
void raptor_www_set_content_type_handler(raptor_www *www, raptor_www_conten t_type_handler handler, void *user_data); void raptor_www_set_content_type_handler(raptor_www *www, raptor_www_conten t_type_handler handler, void *user_data);
RAPTOR_API RAPTOR_API
skipping to change at line 1586 skipping to change at line 1594
int raptor_uri_write(raptor_uri *uri, raptor_iostream *iostr); int raptor_uri_write(raptor_uri *uri, raptor_iostream *iostr);
RAPTOR_API RAPTOR_API
int raptor_iostream_read_bytes(void *ptr, size_t size, size_t nmemb, raptor _iostream* iostr); int raptor_iostream_read_bytes(void *ptr, size_t size, size_t nmemb, raptor _iostream* iostr);
RAPTOR_API RAPTOR_API
int raptor_iostream_read_eof(raptor_iostream *iostr); int raptor_iostream_read_eof(raptor_iostream *iostr);
/* I/O Stream utility functions */ /* I/O Stream utility functions */
RAPTOR_API RAPTOR_API
int raptor_string_ntriples_write(const unsigned char *string, size_t len, c onst char delim, raptor_iostream *iostr); int raptor_string_ntriples_write(const unsigned char *string, size_t len, c onst char delim, raptor_iostream *iostr);
RAPTOR_API RAPTOR_API
int raptor_bnodeid_ntriples_write(const unsigned char *bnodeid, size_t len,
raptor_iostream *iostr);
RAPTOR_API
int raptor_string_python_write(const unsigned char *string, size_t len, con st char delim, int flags, raptor_iostream *iostr); int raptor_string_python_write(const unsigned char *string, size_t len, con st char delim, int flags, raptor_iostream *iostr);
RAPTOR_API RAPTOR_API
int raptor_statement_ntriples_write(const raptor_statement *statement, rapt or_iostream* iostr, int write_graph_term); int raptor_statement_ntriples_write(const raptor_statement *statement, rapt or_iostream* iostr, int write_graph_term);
/* Parser and Serializer options */ /* Parser and Serializer options */
/** /**
* raptor_option_value_type: * raptor_option_value_type:
* @RAPTOR_OPTION_VALUE_TYPE_BOOL: Boolean integer value. Non-0 is true * @RAPTOR_OPTION_VALUE_TYPE_BOOL: Boolean integer value. Non-0 is true
* @RAPTOR_OPTION_VALUE_TYPE_INT: Decimal integer value * @RAPTOR_OPTION_VALUE_TYPE_INT: Decimal integer value
 End of changes. 7 change blocks. 
4 lines changed or deleted 18 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/