| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Remove the file itself, all #include uses of it, and all references to it,
as this file is no longer needed.
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Code style:
1. var = RAPTOR_CALLOC(type, count, size)
Prefering:
var = RAPTOR_CALLOC(type, 1, sizeof(*var))
when count = 1
2. var = RAPTOR_MALLOC(type, size)
3. RAPTOR_FREE(type, var)
The consequence here is allocs that mostly fit into 1 line without so
much boilerplate and duplication of types.
The RAPTOR_MALLOC and RAPTOR_CALLOC now do the cast to the return type.
RAPTOR_FREE takes the object type too but always casts arg to void
This certainly contains many wrong types to the arg but might be used
later in some kind of smart type-aware debugging allocator.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
raptor_log_message: added struct
raptor_log_handler function prototype now takes just user dat and
message.
raptor_world_s gains a static raptor_log_message for use in errors.
No field here is reference counted.
(raptor_log_error): Rename arg to text and init raptor_log_message
structure in world object.
Updated rapper and rdfdiff log handler functions to new signature.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
function typedef raptor_log_handler renamed from
raptor_message_handler and takes log level arg too.
(raptor_world_set_fatal_error_handler,
raptor_world_set_error_handler, raptor_world_set_warning_handler):
Deleted.
(raptor_world_set_log_handler): Added
typedef raptor_error_handlers deleted
(raptor_error_handlers_init): Deleted.
(raptor_new_world): Init world MAGIC so that in libxml cases, can
validate world arg pointer. Remove init of error handlers and last
log level.
struct raptor_serializer_s deleted error/warning handler/data that
were no longer used.
(raptor_libxml_xmlStructuredError_handler_global): Validate world
magic number.
(raptor_new_parser): Do not need to init error handler locator.
Update callers in utilities rapper and rdfdiff.
(rapper_log_handler): Added replacing rdfdump_error_handler() and
rdfdump_warning_handler.
(rapper_free_namespace_decl): Renamed from rdfdump_free_namespace_decl.
(rdfdiff_log_handler): Added replacing rdfdiff_error_handler() and
rdfdiff_warning_handler.
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
(raptor_statement_print): Renamed from raptor_print_statement
(raptor_statement_print_as_ntriples): Renamed from
raptor_print_statement_as_ntriples
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(raptor_parser_get_feature): Renamed from raptor_get_feature.
(raptor_parser_get_label): Renamed from raptor_get_label.
(raptor_parser_get_locator): Renamed from raptor_get_locator.
(raptor_parser_get_mime_type): Renamed from raptor_get_mime_type.
(raptor_parser_get_name): Renamed from raptor_get_name.
(raptor_parser_get_need_base_uri): Renamed from
raptor_get_need_base_uri.
(raptor_world_get_parser_factory): Renamed from
raptor_get_parser_factory.
(raptor_parser_parse_abort): Renamed from raptor_parse_abort.
(raptor_parser_parse_chunk): Renamed from raptor_parse_chunk.
(raptor_parser_set_uri_filter_no_net): Renamed from
raptor_parse_uri_no_net_filter.
(raptor_parser_get_new_generated_i): Renamed from
raptor_parser_generate_id.
(raptor_parser_set_default_generate_id_parameters): Renamed from
raptor_set_default_generate_id_parameters.
(raptor_parser_set_generate_id_handler): Renamed from
raptor_set_generate_id_handler.
(raptor_parser_set_graph_handler): Renamed from
raptor_set_graph_handler.
(raptor_parser_set_namespace_handler): Renamed from
raptor_set_namespace_handler.
(raptor_parser_set_statement_handler): Renamed from
raptor_set_statement_handler.
(raptor_parser_parse_start): Renamed from raptor_start_parse.
|
|
|
|
|
|
|
|
|
|
|
| |
(raptor_print_locator): Renamed from raptor_print_locator_v2 and
loses world arg.
(raptor_format_locator): Renamed from raptor_format_locator_v2 and
loses world arg.
(raptor_locator_uri_string): Renamed from raptor_locator_uri_v2 and
renamed to reflect returns a string not a raptor_uri*
|
|
|
|
|
|
|
|
|
|
|
| |
raptor_term gains union value with uri field, literal struct and
blank field for URI, Literal and Blank rdf terms.
Lots of consequent changes; mostly mechanical search and replace.
Removed several (raptor_uri*)value and (unsigned char*)value casts.
(raptor_rss10_move_statements): Changes but when zeroing uri /
literal, do that in separate steps rather than assigning to value.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Compiles, does not all work.
(raptor_statement_init): Init usage.
(raptor_statement_copy): Now just a usage increment; comment out old
copying code.
(raptor_free_statement): Free on zero usage.
(raptor_free_term): Free on zero usage.
(raptor_new_term_from_term, raptor_new_term_from_uri,
raptor_new_term_from_literal, raptor_new_term_from_blank): Added new
term constructors - taking ownership of their input objects.
(raptor_rdfxml_generate_statement): Create raptor_term objects to
generate reified statements.
Update lots of uses in parsers and serializers of object.field to
object->field for pointer based access.
|
|
|
|
|
|
|
|
|
|
|
|
| |
Based on librdf_uri reference counted uris with interning in an
librdf_hash, this uses a raptor_avltree to store/lookup previously
seen uris so that a single URI string has one raptor_uri* object.
Removed initial world parameter from all raptor_uri class methods.
Update all callers of above.
rdfdiff debug prints also updated to generate ntriples
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
(raptor_world_set_fatal_error_handler): Renamed from
raptor_set_fatal_error_handler from parser class.
(raptor_world_set_error_handler): Renamed from
raptor_set_error_handler from parser class.
(raptor_world_set_warning_handler): Renamed from
raptor_set_warning_handler from parser class.
Updated rapper.c and rdfdiff.c to use new names and calling convention.
|
|
|
|
|
|
|
|
| |
The enum values changed:
from RAPTOR_IDENTIFIER_TYPE_RESOURCE to RAPTOR_TERM_TYPE_URI,
from RAPTOR_IDENTIFIER_TYPE_ANONYMOUS to RAPTOR_TERM_TYPE_BLANK,
from RAPTOR_IDENTIFIER_TYPE_LITERAL to RAPTOR_TERM_TYPE_LITERAL and
from RAPTOR_IDENTIFIER_TYPE_UNKNOWN to RAPTOR_TERM_TYPE_UNKNOWN.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was used for rdf:parseType="Literal" object literals internally
but publically always is turned into RAPTOR_IDENTIFIER_TYPE_LITERAL.
raptor_identifier_type loses RAPTOR_IDENTIFIER_TYPE_XML_LITERAL
value.
Removed all code for this which mostly was deleting switch cases but
also deletes some functions from the Turtle and RDF/XML-abbrev
serializers.
(raptor_rdfxmla_emit_xml_literal, raptor_turtle_emit_xml_literal):
Deleted.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
raptor_identifier loses ordinal field.
Consequent removal of RAPTOR_IDENTIFIER_TYPE_ORDINAL from cases
especially handling predicates.
(raptor_rdfxml_end_element_grammar, raptor_rdfxml_generate_statement,
raptor_rdfxml_process_property_attributes,
raptor_rdfxml_serialize_statement): Most changes were made here to
generate a URI instead of the ordinal integers from the various
rdf:li element forms.
Multiple serializers are now simpler in not having to check for
predicate (or even subject/object) ordinals. Several
if ordinal {ordinal handling } .. else {uri handling}
were removed.
rdfdiff lost several checks for ordinal/resource alternatives.
(rdfdiff_ordinal_equals_resource): Deleted.
|
|
|
|
| |
for equality.
|
|
|
|
|
|
|
|
|
|
|
| |
This is a short term stage before merging raptor_term with
raptor_identifier and getting rid of raptor_triple (in N3 and Turtle
parsers). Also want to make the 3 raptor_terms in raptor_statement
as object references not statics, and add a graph term.
raptor_identifier_type should be raptor_term_type and have less
values: kill ordinal and predicate types.
Lots of structure name field changes everywhere statement is used.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
raptor_statment gains a raptor_world* field.
raptor_statement_v2 typedef is deleted.
(raptor_print_statement_as_ntriples_common,
raptor_statement_compare_common): Deleted these internal helper
functions.
(raptor_print_statement_v2): Renamed to raptor_print_statement
(raptor_print_statement_as_ntriples_v2): Renamed to
raptor_print_statement_as_ntriples.
(raptor_statement_part_as_counted_string_v2): Renamed to
raptor_statement_part_as_counted_string.
(raptor_statement_part_as_string_v2): Renamed to
raptor_statement_part_as_string.
(raptor_statement_compare_v2): Renamed to raptor_statement_compare.
(raptor_statement_copy): Loses world arg.
(raptor_statement_copy_v2, raptor_statement_copy_v2_from_v1):
Deleted.
(raptor_free_statement): Loses world arg.
(raptor_free_statement_v2, raptor_print_statement_v1): Deleted
(raptor_statement_init): Added to initialise statically a allocated
statement.
(raptor_new_parser_v2): Init static statement with
raptor_statement_init().
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
with rdfdiff_collect_statements, removing duplicates for each file
then compare afterwards.
(rdfdiff_statement_equals): Edited to have one return.
(rdfdiff_statement_find): Added
(rdfdiff_statement_exists): Uses rdfdiff_statement_find.
(rdfdiff_compare_statements): Removed.
(main): Use rdfdiff_collect_statements and after both files are read
in, walk through and remove common statements from the from_file
list.
|
|
|
|
|
| |
(rdfdiff_collect_statements): Use rdfdiff_statement_exists to not add
duplicate statements.
|
|
|
|
| |
from_file's URI.
|
|
|
|
|
| |
if the from file is a local file or relative URI, it can be given an
absolute base.
|
| |
|
| |
|
|
|
|
|
| |
(rdfdiff_statement_equals): Fix comparisons of literals with/out
language with/out datatype.
|