raptor.h   raptor.h 
/* -*- Mode: c; c-basic-offset: 2 -*- /* -*- Mode: c; c-basic-offset: 2 -*-
* *
* raptor.h - Redland Parser Toolkit for RDF (Raptor) interfaces and defini tion * raptor.h - Redland Parser Toolkit for RDF (Raptor) interfaces and defini tion
* *
* $Id: raptor.h,v 1.72 2003/04/05 12:18:03 cmdjb Exp $ * $Id: raptor.h,v 1.79 2003/07/28 22:21:40 cmdjb Exp $
* *
* Copyright (C) 2000-2003 David Beckett - http://purl.org/net/dajobe/ * Copyright (C) 2000-2003 David Beckett - http://purl.org/net/dajobe/
* Institute for Learning and Research Technology - http://www.ilrt.org/ * Institute for Learning and Research Technology - http://www.ilrt.org/
* University of Bristol - http://www.bristol.ac.uk/ * University of Bristol - http://www.bristol.ac.uk/
* *
* This package is Free Software or Open Source available under the * This package is Free Software or Open Source available under the
* following licenses (these are alternatives): * following licenses (these are alternatives):
* 1. GNU Lesser General Public License (LGPL) * 1. GNU Lesser General Public License (LGPL)
* 2. GNU General Public License (GPL) * 2. GNU General Public License (GPL)
* 3. Mozilla Public License (MPL) * 3. Mozilla Public License (MPL)
skipping to change at line 55 skipping to change at line 55
#define RAPTOR_DEPRECATED #define RAPTOR_DEPRECATED
#else #else
#define RAPTOR_DEPRECATED __attribute__((deprecated)) #define RAPTOR_DEPRECATED __attribute__((deprecated))
#endif #endif
#else #else
#define RAPTOR_DEPRECATED #define RAPTOR_DEPRECATED
#endif #endif
typedef void* raptor_uri; typedef void* raptor_uri;
/* Public statics */
extern const char * const raptor_copyright_string;
extern const char * const raptor_version_string;
extern const unsigned int raptor_version_major;
extern const unsigned int raptor_version_minor;
extern const unsigned int raptor_version_release;
extern const unsigned int raptor_version_decimal;
/* Public structure */ /* Public structure */
typedef struct raptor_parser_s raptor_parser; typedef struct raptor_parser_s raptor_parser;
typedef struct raptor_www_s raptor_www; typedef struct raptor_www_s raptor_www;
typedef struct raptor_sax2_element_s raptor_sax2_element;
typedef struct raptor_xml_writer_s raptor_xml_writer;
/* OLD structure - can't deprecate a typedef */ /* OLD structure - can't deprecate a typedef */
typedef raptor_parser raptor_ntriples_parser; typedef raptor_parser raptor_ntriples_parser;
typedef enum { typedef enum {
RAPTOR_IDENTIFIER_TYPE_UNKNOWN, /* Unknown type - illegal */ RAPTOR_IDENTIFIER_TYPE_UNKNOWN, /* Unknown type - illegal */
RAPTOR_IDENTIFIER_TYPE_RESOURCE, /* Resource URI (e.g. rdf:abo ut) */ RAPTOR_IDENTIFIER_TYPE_RESOURCE, /* Resource URI (e.g. rdf:abo ut) */
RAPTOR_IDENTIFIER_TYPE_ANONYMOUS, /* _:foo N-Triples, or genera ted */ RAPTOR_IDENTIFIER_TYPE_ANONYMOUS, /* _:foo N-Triples, or genera ted */
RAPTOR_IDENTIFIER_TYPE_PREDICATE, /* Predicate URI */ RAPTOR_IDENTIFIER_TYPE_PREDICATE, /* Predicate URI */
RAPTOR_IDENTIFIER_TYPE_ORDINAL, /* rdf:li, rdf:_<n> etc. */ RAPTOR_IDENTIFIER_TYPE_ORDINAL, /* rdf:li, rdf:_<n> etc. */
RAPTOR_IDENTIFIER_TYPE_LITERAL, /* regular literal */ RAPTOR_IDENTIFIER_TYPE_LITERAL, /* regular literal */
skipping to change at line 90 skipping to change at line 101
int line; int line;
int column; int column;
int byte; int byte;
} raptor_locator; } raptor_locator;
typedef enum { typedef enum {
RAPTOR_FEATURE_SCANNING, RAPTOR_FEATURE_SCANNING,
RAPTOR_FEATURE_ASSUME_IS_RDF, RAPTOR_FEATURE_ASSUME_IS_RDF,
RAPTOR_FEATURE_ALLOW_NON_NS_ATTRIBUTES, RAPTOR_FEATURE_ALLOW_NON_NS_ATTRIBUTES,
RAPTOR_FEATURE_ALLOW_OTHER_PARSETYPES, RAPTOR_FEATURE_ALLOW_OTHER_PARSETYPES,
RAPTOR_FEATURE_ALLOW_BAGID RAPTOR_FEATURE_ALLOW_BAGID,
RAPTOR_FEATURE_ALLOW_RDF_TYPE_RDF_LIST
} raptor_feature; } raptor_feature;
typedef enum {
RAPTOR_GENID_TYPE_BNODEID,
RAPTOR_GENID_TYPE_BAGID
} raptor_genid_type;
typedef struct { typedef struct {
raptor_identifier_type type; raptor_identifier_type type;
raptor_uri *uri; raptor_uri *uri;
raptor_uri_source uri_source; raptor_uri_source uri_source;
const unsigned char *id; const unsigned char *id;
int ordinal; int ordinal;
int is_malloced; int is_malloced;
} raptor_identifier; } raptor_identifier;
/* Returned by statement_handler */ /* Returned by statement_handler */
skipping to change at line 114 skipping to change at line 131
const void *subject; const void *subject;
raptor_identifier_type subject_type; raptor_identifier_type subject_type;
const void *predicate; const void *predicate;
raptor_identifier_type predicate_type; raptor_identifier_type predicate_type;
const void *object; const void *object;
raptor_identifier_type object_type; raptor_identifier_type object_type;
raptor_uri *object_literal_datatype; raptor_uri *object_literal_datatype;
const unsigned char *object_literal_language; const unsigned char *object_literal_language;
} raptor_statement; } raptor_statement;
typedef raptor_uri* (*raptor_new_uri_func) (void *context, const char *uri_
string);
typedef raptor_uri* (*raptor_new_uri_from_uri_local_name_func) (void *conte
xt, raptor_uri *uri, const char *local_name);
typedef raptor_uri* (*raptor_new_uri_relative_to_base_func) (void *context,
raptor_uri *base_uri, const char *uri_string);
typedef raptor_uri* (*raptor_new_uri_for_rdf_concept_func) (void *context,
const char *name);
typedef void (*raptor_free_uri_func) (void *context, raptor_uri *uri);
typedef int (*raptor_uri_equals_func) (void *context, raptor_uri* uri1, rap
tor_uri* uri2);
typedef raptor_uri* (*raptor_uri_copy_func) (void *context, raptor_uri *uri
);
typedef char* (*raptor_uri_as_string_func)(void *context, raptor_uri *uri);
typedef char* (*raptor_uri_as_counted_string_func)(void *context, raptor_ur
i *uri, size_t* len_p);
typedef struct {
/* constructors */
raptor_new_uri_func new_uri;
raptor_new_uri_from_uri_local_name_func new_uri_from_uri_local_name;
raptor_new_uri_relative_to_base_func new_uri_relative_to_base;
raptor_new_uri_for_rdf_concept_func new_uri_for_rdf_concept;
/* destructor */
raptor_free_uri_func free_uri;
/* methods */
raptor_uri_equals_func uri_equals;
raptor_uri_copy_func uri_copy; /* well, copy construct
or */
raptor_uri_as_string_func uri_as_string;
raptor_uri_as_counted_string_func uri_as_counted_string;
int initialised;
} raptor_uri_handler;
typedef void (*raptor_simple_message_handler)(void *user_data, const char *
message, ...);
typedef void (*raptor_message_handler)(void *user_data, raptor_locator* loc ator, const char *message); typedef void (*raptor_message_handler)(void *user_data, raptor_locator* loc ator, const char *message);
typedef void (*raptor_statement_handler)(void *user_data, const raptor_stat ement *statement); typedef void (*raptor_statement_handler)(void *user_data, const raptor_stat ement *statement);
typedef const unsigned char* (*raptor_generate_id_handler)(void *user_data, raptor_genid_type type, const unsigned char* user_bnodeid);
typedef raptor_uri* (*raptor_container_test_handler)(raptor_uri *element_ur i); typedef raptor_uri* (*raptor_container_test_handler)(raptor_uri *element_ur i);
typedef void (*raptor_www_write_bytes_handler)(raptor_www* www, void *userd ata, const void *ptr, size_t size, size_t nmemb); typedef void (*raptor_www_write_bytes_handler)(raptor_www* www, void *userd ata, const void *ptr, size_t size, size_t nmemb);
typedef void (*raptor_www_content_type_handler)(raptor_www* www, void *user data, const char *content_type); typedef void (*raptor_www_content_type_handler)(raptor_www* www, void *user data, const char *content_type);
/* Public functions */ /* Public functions */
RAPTOR_API void raptor_init(void); RAPTOR_API void raptor_init(void);
RAPTOR_API void raptor_finish(void); RAPTOR_API void raptor_finish(void);
/* Create */ /* Create */
skipping to change at line 138 skipping to change at line 183
RAPTOR_API int raptor_start_parse(raptor_parser *rdf_parser, raptor_uri *ur i); RAPTOR_API int raptor_start_parse(raptor_parser *rdf_parser, raptor_uri *ur i);
/* Destroy */ /* Destroy */
RAPTOR_API void raptor_free_parser(raptor_parser* parser); RAPTOR_API void raptor_free_parser(raptor_parser* parser);
/* Handlers */ /* Handlers */
RAPTOR_API void raptor_set_fatal_error_handler(raptor_parser* parser, void *user_data, raptor_message_handler handler); RAPTOR_API void raptor_set_fatal_error_handler(raptor_parser* parser, void *user_data, raptor_message_handler handler);
RAPTOR_API void raptor_set_error_handler(raptor_parser* parser, void *user_ data, raptor_message_handler handler); RAPTOR_API void raptor_set_error_handler(raptor_parser* parser, void *user_ data, raptor_message_handler handler);
RAPTOR_API void raptor_set_warning_handler(raptor_parser* parser, void *use r_data, raptor_message_handler handler); RAPTOR_API void raptor_set_warning_handler(raptor_parser* parser, void *use r_data, raptor_message_handler handler);
RAPTOR_API void raptor_set_statement_handler(raptor_parser* parser, void *u ser_data, raptor_statement_handler handler); RAPTOR_API void raptor_set_statement_handler(raptor_parser* parser, void *u ser_data, raptor_statement_handler handler);
RAPTOR_API void raptor_set_generate_id_handler(raptor_parser* parser, void *user_data, raptor_generate_id_handler handler);
RAPTOR_API void raptor_print_statement(const raptor_statement * const state ment, FILE *stream); RAPTOR_API void raptor_print_statement(const raptor_statement * const state ment, FILE *stream);
RAPTOR_API void raptor_print_statement_as_ntriples(const raptor_statement * statement, FILE *stream); RAPTOR_API void raptor_print_statement_as_ntriples(const raptor_statement * statement, FILE *stream);
RAPTOR_API void raptor_print_statement_detailed(const raptor_statement * st atement, int detailed, FILE *stream); RAPTOR_API void raptor_print_statement_detailed(const raptor_statement * st atement, int detailed, FILE *stream);
RAPTOR_API char* raptor_statement_part_as_counted_string(const void *term, raptor_identifier_type type, raptor_uri* literal_datatype, const unsigned c har *literal_language, size_t* len_p); RAPTOR_API char* raptor_statement_part_as_counted_string(const void *term, raptor_identifier_type type, raptor_uri* literal_datatype, const unsigned c har *literal_language, size_t* len_p);
RAPTOR_API char* raptor_statement_part_as_string(const void *term, raptor_i dentifier_type type, raptor_uri* literal_datatype, const unsigned char *lit eral_language); RAPTOR_API char* raptor_statement_part_as_string(const void *term, raptor_i dentifier_type type, raptor_uri* literal_datatype, const unsigned char *lit eral_language);
RAPTOR_API raptor_locator* raptor_get_locator(raptor_parser* rdf_parser); RAPTOR_API raptor_locator* raptor_get_locator(raptor_parser* rdf_parser);
RAPTOR_API void raptor_set_default_generate_id_parameters(raptor_parser* rd
f_parser, char *prefix, int base);
/* Parsing functions */ /* Parsing functions */
int raptor_parse_chunk(raptor_parser* rdf_parser, const unsigned char *buff er, size_t len, int is_end); RAPTOR_API int raptor_parse_chunk(raptor_parser* rdf_parser, const unsigned char *buffer, size_t len, int is_end);
RAPTOR_API int raptor_parse_file(raptor_parser* rdf_parser, raptor_uri *uri , raptor_uri *base_uri); RAPTOR_API int raptor_parse_file(raptor_parser* rdf_parser, raptor_uri *uri , raptor_uri *base_uri);
RAPTOR_API int raptor_parse_uri(raptor_parser* rdf_parser, raptor_uri *uri, raptor_uri *base_uri); RAPTOR_API int raptor_parse_uri(raptor_parser* rdf_parser, raptor_uri *uri, raptor_uri *base_uri);
RAPTOR_API int raptor_parse_uri_with_connection(raptor_parser* rdf_parser, raptor_uri *uri, raptor_uri *base_uri, void *connection); RAPTOR_API int raptor_parse_uri_with_connection(raptor_parser* rdf_parser, raptor_uri *uri, raptor_uri *base_uri, void *connection);
RAPTOR_API void raptor_parse_abort(raptor_parser* rdf_parser); RAPTOR_API void raptor_parse_abort(raptor_parser* rdf_parser);
RAPTOR_API RAPTOR_DEPRECATED void raptor_parser_abort(raptor_parser* rdf_pa rser, char *reason); RAPTOR_API RAPTOR_DEPRECATED void raptor_parser_abort(raptor_parser* rdf_pa rser, char *reason);
/* Utility functions */ /* Utility functions */
RAPTOR_API void raptor_print_locator(FILE *stream, raptor_locator* locator) ; RAPTOR_API void raptor_print_locator(FILE *stream, raptor_locator* locator) ;
RAPTOR_API int raptor_format_locator(char *buffer, size_t length, raptor_lo cator* locator); RAPTOR_API int raptor_format_locator(char *buffer, size_t length, raptor_lo cator* locator);
RAPTOR_API const char* raptor_get_name(raptor_parser *rdf_parser);
RAPTOR_API const char* raptor_get_label(raptor_parser *rdf_parser);
RAPTOR_API void raptor_set_feature(raptor_parser *parser, raptor_feature fe ature, int value); RAPTOR_API void raptor_set_feature(raptor_parser *parser, raptor_feature fe ature, int value);
RAPTOR_API void raptor_set_parser_strict(raptor_parser* rdf_parser, int is_ strict); RAPTOR_API void raptor_set_parser_strict(raptor_parser* rdf_parser, int is_ strict);
/* URI functions */ /* URI functions */
RAPTOR_API raptor_uri* raptor_new_uri(const char *uri_string); RAPTOR_API raptor_uri* raptor_new_uri(const char *uri_string);
RAPTOR_API raptor_uri* raptor_new_uri_from_uri_local_name(raptor_uri *uri, const char *local_name); RAPTOR_API raptor_uri* raptor_new_uri_from_uri_local_name(raptor_uri *uri, const char *local_name);
RAPTOR_API raptor_uri* raptor_new_uri_relative_to_base(raptor_uri *base_uri , const char *uri_string); RAPTOR_API raptor_uri* raptor_new_uri_relative_to_base(raptor_uri *base_uri , const char *uri_string);
RAPTOR_API raptor_uri* raptor_new_uri_from_id(raptor_uri *base_uri, const u nsigned char *id); RAPTOR_API raptor_uri* raptor_new_uri_from_id(raptor_uri *base_uri, const u nsigned char *id);
RAPTOR_API raptor_uri* raptor_new_uri_for_rdf_concept(const char *name); RAPTOR_API raptor_uri* raptor_new_uri_for_rdf_concept(const char *name);
RAPTOR_API void raptor_free_uri(raptor_uri *uri); RAPTOR_API void raptor_free_uri(raptor_uri *uri);
skipping to change at line 186 skipping to change at line 236
/* Identifier functions */ /* Identifier functions */
RAPTOR_API raptor_identifier* raptor_new_identifier(raptor_identifier_type type, raptor_uri *uri, raptor_uri_source uri_source, unsigned char *id); RAPTOR_API raptor_identifier* raptor_new_identifier(raptor_identifier_type type, raptor_uri *uri, raptor_uri_source uri_source, unsigned char *id);
RAPTOR_API void raptor_init_identifier(raptor_identifier *identifier, rapto r_identifier_type type, raptor_uri *uri, raptor_uri_source uri_source, unsi gned char *id); RAPTOR_API void raptor_init_identifier(raptor_identifier *identifier, rapto r_identifier_type type, raptor_uri *uri, raptor_uri_source uri_source, unsi gned char *id);
RAPTOR_API int raptor_copy_identifier(raptor_identifier *dest, raptor_ident ifier *src); RAPTOR_API int raptor_copy_identifier(raptor_identifier *dest, raptor_ident ifier *src);
RAPTOR_API void raptor_free_identifier(raptor_identifier *identifier); RAPTOR_API void raptor_free_identifier(raptor_identifier *identifier);
/* Utility functions */ /* Utility functions */
RAPTOR_API int raptor_print_ntriples_string(FILE *stream, const char *strin g, const char delim); RAPTOR_API int raptor_print_ntriples_string(FILE *stream, const char *strin g, const char delim);
RAPTOR_API const char* raptor_ntriples_term_as_string (raptor_ntriples_term _type term); RAPTOR_API const char* raptor_ntriples_term_as_string (raptor_ntriples_term _type term);
RAPTOR_API size_t raptor_xml_escape_string(raptor_parser *rdf_parser, const RAPTOR_API size_t raptor_xml_escape_string(const unsigned char *string, siz
unsigned char *string, size_t len, unsigned char *buffer, size_t length, c e_t len, unsigned char *buffer, size_t length, char quote, raptor_simple_me
har quote); ssage_handler error_handler, void *error_data);
/* raptor_xml_writer.c */
/* NOT PUBLIC YET - SEE raptor_internal.h */
/* raptor_uri.c */ /* raptor_uri.c */
RAPTOR_API void raptor_uri_resolve_uri_reference (const char *base_uri, con st char *reference_uri, char *buffer, size_t length); RAPTOR_API void raptor_uri_resolve_uri_reference (const char *base_uri, con st char *reference_uri, char *buffer, size_t length);
RAPTOR_API char *raptor_uri_filename_to_uri_string(const char *filename); RAPTOR_API char *raptor_uri_filename_to_uri_string(const char *filename);
RAPTOR_API char *raptor_uri_uri_string_to_filename(const char *uri_string); RAPTOR_API char *raptor_uri_uri_string_to_filename(const char *uri_string);
RAPTOR_API int raptor_uri_is_file_uri(const char* uri_string); RAPTOR_API int raptor_uri_is_file_uri(const char* uri_string);
RAPTOR_API void raptor_uri_init(void); RAPTOR_API void raptor_uri_init(void);
typedef raptor_uri* (*raptor_new_uri_func) (void *context, const char *uri_
string);
typedef raptor_uri* (*raptor_new_uri_from_uri_local_name_func) (void *conte
xt, raptor_uri *uri, const char *local_name);
typedef raptor_uri* (*raptor_new_uri_relative_to_base_func) (void *context,
raptor_uri *base_uri, const char *uri_string);
typedef raptor_uri* (*raptor_new_uri_for_rdf_concept_func) (void *context,
const char *name);
typedef void (*raptor_free_uri_func) (void *context, raptor_uri *uri);
typedef int (*raptor_uri_equals_func) (void *context, raptor_uri* uri1, rap
tor_uri* uri2);
typedef raptor_uri* (*raptor_uri_copy_func) (void *context, raptor_uri *uri
);
typedef char* (*raptor_uri_as_string_func)(void *context, raptor_uri *uri);
typedef char* (*raptor_uri_as_counted_string_func)(void *context, raptor_ur
i *uri, size_t* len_p);
typedef struct {
/* constructors */
raptor_new_uri_func new_uri;
raptor_new_uri_from_uri_local_name_func new_uri_from_uri_local_name;
raptor_new_uri_relative_to_base_func new_uri_relative_to_base;
raptor_new_uri_for_rdf_concept_func new_uri_for_rdf_concept;
/* destructor */
raptor_free_uri_func free_uri;
/* methods */
raptor_uri_equals_func uri_equals;
raptor_uri_copy_func uri_copy; /* well, copy construct
or */
raptor_uri_as_string_func uri_as_string;
raptor_uri_as_counted_string_func uri_as_counted_string;
int initialised;
} raptor_uri_handler;
RAPTOR_API void raptor_uri_set_handler(raptor_uri_handler *handler, void *c ontext); RAPTOR_API void raptor_uri_set_handler(raptor_uri_handler *handler, void *c ontext);
RAPTOR_API void raptor_uri_get_handler(raptor_uri_handler **handler, void * *context); RAPTOR_API void raptor_uri_get_handler(raptor_uri_handler **handler, void * *context);
#define RAPTOR_RDF_MS_URI "http://www.w3.org/1999/02/22-rdf-syntax-ns#" #define RAPTOR_RDF_MS_URI "http://www.w3.org/1999/02/22-rdf-syntax-ns#"
#define RAPTOR_RDF_SCHEMA_URI "http://www.w3.org/2000/01/rdf-schema#" #define RAPTOR_RDF_SCHEMA_URI "http://www.w3.org/2000/01/rdf-schema#"
/* raptor_www */ /* raptor_www */
RAPTOR_API void raptor_www_init(void); RAPTOR_API void raptor_www_init(void);
RAPTOR_API void raptor_www_finish(void); RAPTOR_API void raptor_www_finish(void);
 End of changes. 13 change blocks. 
40 lines changed or deleted 69 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/