-
Notifications
You must be signed in to change notification settings - Fork 28
/
ChangeLog.5
6345 lines (4465 loc) · 215 KB
/
ChangeLog.5
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
2004-12-31 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/raptor_rss.c (raptor_rss10_serialize_terminate): Free all
namespaces, now they are not stacked explicitly. Free namespace
stack.
(raptor_rss10_build_xml_names): Use raptor_new_namespace and don't
start the rdf namespace.
(raptor_rss10_build_xml_names): Use raptor_new_namespace and don't
start the namespaces
((raptor_rss10_serialize_end): Make a namespace stack here, with
only xml: defined.
* raptor/raptor_xml_writer.c
(raptor_xml_writer_start_namespace_full): Deleted.
(main): Declare the foo namespace but don't start it, so that the
xml writer will do that.
* raptor/raptor_xml_writer.c: Optionally declare a namespace stack
internally.
(raptor_new_xml_writer): Add optional raptor_namespace_stack
parameter, if NULL declare one internally.
* rasqal/rasqal_query.c (rasqal_query_results_write): Added,
writing query results in form of
http://www.w3.org/TR/2004/WD-rdf-sparql-XMLres-20041221/
* rasqal/sparql_parser.y: Undef RASQAL_DEBUG 2 always
* raptor/turtle_lexer.l, raptor/turtle_parser.y: Delete unused WS
token
* raptor/raptor_xml_writer.c, raptor/raptor_sax2.c,
raptor/raptor_rss.c, raptor/raptor_rdfxml.c,
raptor/raptor_internal.h, raptor/raptor.h, raptor/libraptor.3:
Rename raptor_sax2_element to raptor_xml_element throughout.
* raptor/raptor_internal.h: Added feature_start_uri to
raptor_serializer
* raptor/raptor_serialize.c (raptor_free_serializer): Tidy up any
feature_start_uri set.
(raptor_serializer_set_feature_string): Added, handling
feature_start_uri. created from a passed in string.
(raptor_serializer_get_feature_string): Added, handling
feature_start_uri as a returned shared string.
* raptor/raptor_parse.c (raptor_parser_set_feature_string): Added,
always failing.
(raptor_parser_get_feature_string): Added, always failing.
* raptor/raptor.h: Added feature RAPTOR_FEATURE_START_URI Added
prototypes for raptor_parser_set_feature_string,
raptor_parser_get_feature_string,
raptor_serializer_set_feature_string,
raptor_serializer_get_feature_string and raptor_feature_value_type
* raptor/raptor_feature.c: Added flag bits for string valued
features. Added startUri (RAPTOR_FEATURE_START_URI) with a string
value.
(raptor_feature_value_type): Added, to return value of a feature.
2004-12-30 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/libraptor.3: Added SAX2 XML Element and XML Writer
classes.
* raptor/raptor_internal.h, raptor/raptor.h: Moved
raptor_sax2_element and raptor_xml_writer to public API.
* raptor/libraptor.3: Added rss-1.0 to raptor_new_serializer
description.
* raptor/libraptor.3: More updates for 1.4.3
2004-12-29 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* librdf/rdf_storage_sqlite.c: Make get_contexts fail rather than
do useless things.
* librdf/rdf_storage_sqlite.c: Moved GET_COLUMN* defines to top.
Deleted all index_contexts - always supported.
(librdf_storage_sqlite_statement_helper): Work when statement=NULL.
(librdf_storage_sqlite_add_statements): Handle when max=4 for
contexts.
(librdf_storage_sqlite_serialise): Debug prepared query.
(librdf_storage_sqlite_context_add_statement): Handle when max=4 for
contexts.
librdf_storage_sqlite_context_serialise_stream_context updated to add
sqlite fields.
(librdf_storage_sqlite_context_serialise): Implemented, based on
librdf_storage_sqlite_serialise and related functions.
* librdf/rdf_storage_sqlite.c
(librdf_storage_sqlite_context_add_statement): Kill fixme, done.
* librdf/rdf_storage_sqlite.c (librdf_storage_sqlite_set_helper):
Add length arg.
(librdf_storage_sqlite_uri_helper,
librdf_storage_sqlite_blank_helper,
librdf_storage_sqlite_literal_helper): Pass length to
librdf_storage_sqlite_set_helper.
(librdf_storage_sqlite_statement_helper): Do context nodes.
(librdf_storage_sqlite_add_statements): Do context node field when
present.
(librdf_storage_sqlite_statement_operator_helper): Added, with
content mostly from librdf_storage_sqlite_contains_statement.
(librdf_storage_sqlite_contains_statement): Use above.
(librdf_storage_sqlite_serialise,
librdf_storage_sqlite_find_statements): Always free stringbuffer.
(librdf_storage_sqlite_context_add_statement): Do context node field
when present.
(librdf_storage_sqlite_context_remove_statement): Implemented using
librdf_storage_sqlite_statement_operator_helper.
* librdf/rdf_storage_sqlite.c:
Added sqlite_DB define for another 2/3 hide
(librdf_storage_sqlite_serialise): Use raptor_stringbuffer_length(sb)
for request length.
* librdf/rdf_storage_sqlite.c:
Alter GET_COLUMN* defines to take vm arg.
* librdf/rdf_storage_sqlite.c:
Fix sqlite_FREE and GET_COLUMN defines for sqlite API v3
* librdf/rdf_storage_sqlite.c: casts for c++
* librdf/rdf_storage_sqlite.c:
Replace all use of fields with unsigned char* fields.
* librdf/rdf_storage_sqlite.c (sqlite_string_escape):
Emit 'string' - 2 more chars.
(librdf_storage_sqlite_uri_helper,
librdf_storage_sqlite_blank_helper): Malloc expressions based on
actual lengths.
(librdf_storage_sqlite_literal_helper): Remove ''s
* librdf/rdf_storage_sqlite.c (librdf_storage_sqlite_set_helper):
Take unsigned values string.
(librdf_storage_sqlite_get_helper): Take unsigned expression string.
(librdf_storage_sqlite_uri_helper): Use unsigned expression.
(librdf_storage_sqlite_literal_helper): Use stringbuffer to build
expression.
(librdf_storage_sqlite_contains_statement): use stringbuffer to build
request.
* librdf/rdf_storage_sqlite.c (librdf_storage_sqlite_open):
Auto-set new if file is missing.
* librdf/rdf_storage_sqlite.c: Revert over EXEC named change.
* librdf/rdf_storage_sqlite.c:
Add macros sqlite_STATEMENT, sqlite_EXEC, sqlite_CLOSE, sqlite_FREE
to hide more V2/V3 differences.
(librdf_storage_sqlite_open): For V2 open failing, set rc.
* librdf/rdf_storage_sqlite.c (librdf_storage_sqlite_get_next_common):
Free temporary datatype uri
* librdf/rdf_node.c (librdf_node_to_counted_string):
Free temporary datatype_uri_string.
* librdf/rdf_storage_sqlite.c
(librdf_storage_sqlite_serialise_finished): Free any statement,
context node.
librdf_storage_sqlite_find_statements_stream_context add to store
query_statement
(librdf_storage_sqlite_find_statements): Store query statement.
(librdf_storage_sqlite_find_statements_finished): Free any query
statement, statement or context node.
* librdf/rdf_storage_sqlite.c: Change context parts pzTail, ppVm
to zTail, vm and for sqlite V2 use vm not vm & ppVm.
* librdf/rdf_storage_sqlite.c: Use SQLITE_API with 2 or 3 to
distinguish apis
* configure.ac: Added --with-sqlite-version to choose V2 or
V3. pkg-config gets the details.
* librdf/rdf_storage_sqlite.c: Casts for c++
* librdf/rdf_serializer_raptor.c
(librdf_serializer_raptor_set_namespace): Cast for c++
2004-12-28 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* librdf/rdf_storage_sqlite.c (librdf_storage_sqlite_exec):
Turn fprintf to debug message.
(librdf_storage_sqlite_get_next_common): turn printing all column
data into debug messages.
(librdf_storage_sqlite_find_statements): Turn fprintf to debug
message.
* configure.ac: Set -g -DLIBRDF_DEBUG in maintainer mode - was
lost somehow.
* librdf/rdf_storage_sqlite.c: code style
* librdf/rdf_storage_sqlite.c (sqlite_construct_select_helper):
Added, to build serialise and find_statements query parts.
(librdf_storage_sqlite_serialise): Move most of query building into
sqlite_construct_select_helper and now call it.
(librdf_storage_sqlite_find_statements): Use
sqlite_construct_select_helper to build guts of query, then add
the WHERE ...
* librdf/rdf_storage_sqlite.c (librdf_storage_sqlite_serialise):
Use raptor_stringbuffer to construct big request.
(librdf_storage_sqlite_get_next_common): Add pointer to statement,
context_node args.
Fill in statement and context node from column values.
Debug print out column names, values.
(librdf_storage_sqlite_serialise_end_of_stream,
librdf_storage_sqlite_serialise_next_statement,
librdf_storage_sqlite_find_statements_next_statement, ): Update
call to librdf_storage_sqlite_get_next_common.
2004-12-27 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* librdf/rdf_storage_sqlite.c (librdf_storage_sqlite_get_helper,
librdf_storage_sqlite_add_statements,
librdf_storage_sqlite_context_add_statement): Use
raptor_stringbuffer to construct requests.
* librdf/rdf_storage_sqlite.c (librdf_storage_sqlite_set_helper):
Use raptor_stringbuffer to construct request.
* librdf/rdf_storage_sqlite.c: Added TRIPLE_NONE node_type
(librdf_storage_sqlite_node_helper): Fail with NULL node.
(librdf_storage_sqlite_statement_helper): Handle NULL nodes, set
ID to -1, type to TRIPLE_NONE.
(librdf_node_to_sqlite_string): Deleted, not used.
(librdf_storage_sqlite_find_statements): Use raptor_stringbuffer to
construct request.
* librdf/rdf_storage_sqlite.c (librdf_storage_sqlite_literal_helper):
Use IDs for datatype URI.
(librdf_storage_sqlite_open): Make uriindex.
* librdf/rdf_storage_sqlite.c (sqlite_string_escape):
Escape ' as '' not \'
(librdf_storage_sqlite_uri_helper): Renamed from
librdf_storage_sqlite_store_uri_helper
(librdf_storage_sqlite_blank_helper): Renamed from
librdf_storage_sqlite_store_blank_helper
(librdf_storage_sqlite_literal_helper): Added
(librdf_storage_sqlite_node_helper): Use
librdf_storage_sqlite_literal_helper.
(librdf_storage_sqlite_open): If new, unlink the file so no need
to do DROP TABLE.
* librdf/rdf_storage_sqlite.c (librdf_storage_sqlite_init):
is_new flag set right, really really.
Added data-driven table descriptions - table_info, NTABLES,
sqlite_table_numbers, sqlite_tables, triple_part, triple_node_type,
triples_fields.
Reorder helper functions.
(sqlite_string_escape): Now always obeys raw_len and nul-terminates
the output.
(librdf_storage_sqlite_exec): Debug print all SQL exec
(librdf_storage_sqlite_set_helper,
librdf_storage_sqlite_get_helper): Added, using table info.
(librdf_storage_sqlite_store_uri_helper): Added, returns or makes an
ID for the given URI.
(librdf_storage_sqlite_store_blank_helper): Added, returns or makes an
ID for the given blank node ID.
(librdf_storage_sqlite_node_helper): Added, turns a librdf_node into
appropriate table IDs, node type and returns to user.
(librdf_storage_sqlite_statement_helper): Uses
librdf_storage_sqlite_node_helper to get node ids, types and field
names for all of a statement.
(librdf_storage_sqlite_open): Use data tables for DROP TABLE,
CREATE TABLE
(librdf_storage_sqlite_size): Use librdf_storage_sqlite_exec only.
(librdf_storage_sqlite_add_statements): Updated dummy INSERT for
new schema.
(librdf_storage_sqlite_contains_statement): Use
librdf_storage_sqlite_statement_helper to build query.
(librdf_storage_sqlite_context_add_statement): Use
librdf_storage_sqlite_statement_helper to build INSERT. Ignores
context fields for now.
2004-12-26 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* utils/rdfproc.c: Added size command calling librdf_model_size.
* librdf/rdf_storage_sqlite.c: Handle sqlite3 and sqlite2
(librdf_storage_sqlite_init): Init is_new correctly.
(librdf_storage_sqlite_open): Create tables, indexes when new.
(librdf_storage_sqlite_get_1int_callback): Grab count value from
argv[0]
(librdf_storage_sqlite_size): Works.
(librdf_storage_sqlite_add_statements): Dummy INSERT works.
(librdf_storage_sqlite_contains_statement): Dummy sql added.
librdf_storage_sqlite_serialise_stream_context added sqlite3 fields
(librdf_storage_sqlite_serialise,
librdf_storage_sqlite_get_next_common,
librdf_storage_sqlite_serialise_finished): sqlite3 support
librdf_storage_sqlite_find_statements_stream_context added sqlite3
fields
(librdf_storage_sqlite_find_statements,
librdf_storage_sqlite_find_statements_finished): sqlite3 support
(librdf_storage_sqlite_context_add_statement): Dummy INSERT added.
(librdf_init_storage_sqlite): Storage name now 'sqlite'.
2004-12-25 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* configure.ac: Check for sqlite3.h or sqlite.h after getting
sqlite paths.
* configure.ac: Use pkg-config sqlite3 or pkg-config sqlite2
* librdf/rdf_serializer.c, librdf/rdf_model.c (main):
Cast for size_t to int
* librdf/rdf_concepts.c: Removed librdf_concept_labels - never used.
* raptor/raptor_rss.c (raptor_rss_parser_processNode):
Turn <guid isPermaLink="true">val</guid>
into <guid rdf:resource="val"/>
(raptor_rss10_emit_item): Always serialize rss:items at the end of
an rss channel.
* raptor/raptor_xml_writer.c, raptor/raptor_xml.c,
raptor/raptor_utf8.c, raptor/raptor_sax2.c, raptor/raptor_rss.c,
raptor/raptor_general.c: Casts for c++. Rename variables
namespace to nspace.
2004-12-24 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/raptor_www_test.c (main): Cast for size_t
2004-12-23 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/raptor_rss.c (raptor_rss10_serialize_statement):
Fix item URI check to use correct
URI. In debugging unknown typed node, print type URI.
* raptor/raptor_rss.c (raptor_rss10_serialize_statement):
Do not look in items with no URI.
(raptor_rss10_build_xml_names): Do not make qnames for types with no
namespace.
* raptor/raptor_rss.c (raptor_rss10_build_items):
Do nothing if there is no seq_uri
* raptor/raptor_rss.c (raptor_init_serializer_rss10):
Give rss 1.0 a URI
* librdf/rdf_serializer.c (librdf_get_serializer_factory):
Ensure that if mime_type or type_uri are
not NULL, the factory must have a non-NULL item and it must match.
* librdf/rdf_serializer.c (librdf_get_serializer_factory):
Ensure that if mime_type or type_uri are
not NULL, the factory must have a non-NULL item and it must match.
* librdf/rdf_parser.c (librdf_get_parser_factory):
Ensure that if mime_type or type_uri are
not NULL, the factory must have a non-NULL item and it must match.
2004-12-21 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* librdf/rdf_storage_mysql.c (librdf_storage_mysql_init): Applied
patch from Morten to only use mysql_real_escape_string if a
connection was made.
(librdf_storage_mysql_find_statements_in_context_next_statement):
Do not call librdf_storage_mysql_find_statements_in_context_finished
when errors happen, the iterator class will do that on destruction.
(librdf_storage_mysql_get_contexts_next_context): Do not call
librdf_storage_mysql_get_contexts_finished when errors happen, the
iterator class will do that on destruction.
* raptor/raptor_rss.c: Added rss_namespace_prefix_strings to list
namespaces to declare. raptor_rss10_serializer_context gains
raptor_namespace_stack nstack field.
(raptor_rss10_serialize_init): Init the namespace stack.
(raptor_rss10_serialize_terminate): Clean namespace stack and any
defined qnames.
(raptor_rss10_emit_item): Padding.
(raptor_rss10_serialize_end): Write namespace decls using stack.
* raptor/raptor_rss.c: Rename some destructors more normally:
(raptor_free_rss_item): Renamed from raptor_item_free.
(raptor_free_rss_items): Renamed from raptor_rss_items_free.
(raptor_rss10_move_statements, raptor_rss10_store_statement):
Record field counts per item.
(raptor_rss10_build_items): Find the rdf:_<n> items and put them
into a raptor sequence.
(raptor_rss10_emit_item): Skeleton rss item writer.
(raptor_rss10_serialize_end): Make the final structures and do the
serializing in skeleton form.
2004-12-20 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/raptor_rss.c: Added seq_uri to
raptor_rss10_serializer_context
(raptor_rss10_serialize_terminate): Tidy seq_uri
(raptor_rss10_move_statements, raptor_rss10_store_statement):
Ignore checking fields with no URI.
(raptor_rss10_serialize_statement): For rdf:Seq node, store the
URI or blank node - as fake URI. Make fake object node correctly
for general statements.
* raptor/raptor_rss.c (raptor_rss_common_init): Prevent 2x
initialising.
(raptor_item_free): Free type URI
(raptor_rss10_serialize_terminate): Call raptor_rss_common_terminate.
(raptor_rss10_move_statements): Use RAPTOR_IDENTIFIER_TYPE_PREDICATE
set raptor_sequence_set_at destroy overwritten object.
(raptor_rss10_store_statement): Use RAPTOR_IDENTIFIER_TYPE_PREDICATE
Make fake URIs from blank node strings and free them.
* raptor/raptor_general.c (raptor_free_statement):
Handle more statement part types.
* raptor/raptor_rss.c: RAPTOR_RSS_FIELDS_SIZE now stops before
UNKNOWN for real field names.
(raptor_rss10_move_statements): Added, to move statements from the
sequence of triples to below a typed node once a new typed node of
the given type appears.
(raptor_rss10_store_statement): Added, to store a given statement
either below an existing typed node or in a sequence of triples if
it can't be found one.
* raptor/raptor_rss.c (raptor_rss10_serialize_statement): iostream
write turned into debug.
2004-12-19 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/raptor_uri.c (raptor_uri_print): Cast for gcc
* raptor/raptor_rss.c: Use raptor_uri in raptor_rss_item.
(raptor_rss_context_init, raptor_rss_context_terminate): Added and
used in parser and serializer init and terminate.
(raptor_rss10_serialize_init): Initialise list of triples, items.
(raptor_rss10_serialize_terminate): Tidy up triples, items.
(raptor_rss10_serialize_statement): Look for known typed nodes,
identify ones matching rss 1.0 model and also look for the rdf:Seq.
Store other triples for later.
(raptor_rss10_serialize_end): Added skeleton.
2004-12-18 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/raptor_uri.c (raptor_uri_print): Added.
* raptor/raptor.h: Added raptor_uri_print
* raptor/raptor_general.c (raptor_statement_copy):
Added statement copy constructor
(raptor_free_statement): Added statement destructor.
* raptor/raptor_internal.h:
Added raptor_statement_copy and raptor_free_statement
* raptor/raptor_rss.c:
Moved parser namespace URIs to common code rss_namespace_uris.
(raptor_rss_common_init, raptor_rss_common_terminate): Added to
initialise and free up common rss items - namespace URIs, URIs for
types and uris for properties.
Added skeleton RSS 1.0 serializer
(raptor_rss10_serialize_init, raptor_rss10_serialize_terminate,
raptor_rss10_serialize_statement,
raptor_rss10_serialize_finish_factory,
raptor_rss10_serializer_register_factory,
raptor_init_serializer_rss10): Added skeleton RSS 1.0 serializer
factory and methods.
* raptor/raptor_general.c (raptor_init):
Added call to raptor_init_serializer_rss10
* raptor/raptor_internal.h: Added raptor_init_serializer_rss10
* raptor/raptor_rss.c (raptor_rss_parse_recognise_syntax):
Add atom checks.
2004-12-17 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/tests/Makefile.am: Added
RDF_MAYFAIL_XML_TEST_FILES,RDF_MAYFAIL_XML_OUT_FILES and rule
check-mayfail-xml-rdf to run checks that may fail due to XML
parser bugs.
* raptor/raptor_iostream.c, raptor/raptor_nfc.c,
raptor/raptor_rdfxml.c, raptor/raptor_sax2.c,
raptor/raptor_serialize.c: Initialising possibly using
uninitialised vars
* raptor/raptor.h, raptor/raptor_internal.h,
raptor/raptor_iostream.c, raptor/raptor_namespace.c,
raptor/raptor_rdfxml.c, raptor/raptor_serialize.c,
raptor/raptor_xml_writer.c, raptor/rdfdump.c: Casts for c++
* raptor/raptor_rdfxml.c: Fix using wrong element name in warnings.
* raptor/raptor_rdfxml.c (raptor_xml_start_element_handler):
Use raptor_sax2_element_set_attributes.
* raptor/raptor_xml_writer.c (raptor_xml_writer_empty_element): Added.
(raptor_xml_writer_start_element, raptor_xml_writer_end_element):
Updated raptor_iostream_write_sax2_element calls
(main): Add attributes and test writing empty element.
* raptor/raptor_internal.h: Added raptor_sax2_element_set_attributes
Added is_empty arg to raptor_iostream_write_sax2_element
Added raptor_xml_writer_empty_element
* raptor/raptor_sax2.c (raptor_sax2_element_set_attributes): Added.
(raptor_print_sax2_element): tidy
(raptor_iostream_write_sax2_element): Added is_empty arg
and use it for <foo... /> form.
2004-12-14 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/libraptor.3: Updated for 1.4.3 so far
* raptor/tests/turtle/README.txt,
raptor/tests/turtle/rdfq-results.out,
raptor/tests/turtle/test-00.out, raptor/tests/turtle/Makefile.am:
Switch to base URI http://www.w3.org/2001/sw/DataAccess/df1/tests/
* raptor/tests/turtle/bad-08.ttl, raptor/tests/turtle/bad-09.ttl,
raptor/tests/turtle/bad-10.ttl, raptor/tests/turtle/bad-11.ttl,
raptor/tests/turtle/bad-12.ttl, raptor/tests/turtle/bad-13.ttl,
raptor/tests/turtle/manifest-bad.ttl,
raptor/tests/turtle/manifest.ttl, raptor/tests/turtle/test-13.out,
raptor/tests/turtle/test-13.ttl, raptor/tests/turtle/Makefile.am,
raptor/tests/turtle/bad-04.ttl, raptor/tests/turtle/bad-05.ttl,
raptor/tests/turtle/bad-06.ttl, raptor/tests/turtle/bad-07.ttl:
Import more bad turtle tests, initial manifest files
* raptor/raptor_namespace.c (raptor_iostream_write_namespace):
Handle ns->uri is NULL and no prefix, i.e. emitting xmlns=""
* raptor/raptor_namespace.c (raptor_namespaces_format): Handle
ns->uri is NULL and no prefix, i.e. emitting xmlns=""
2004-12-08 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* librdf/rdf_uri.c (librdf_new_uri_relative_to_base): Ask for 1
more char for new URI buffer for raptor_uri_resolve_uri_reference
to allow inserting of a missing "/" path.
* librdf/rdf_uri.c (librdf_new_uri_relative_to_base): Ask for 1
more char for new URI buffer for raptor_uri_resolve_uri_reference
to allow inserting of a missing "/" path.
* raptor/raptor_uri.c (raptor_default_new_uri_relative_to_base):
Ask for 1 more char for new URI to allow inserting of a missing
"/" path.
* raptor/raptor_rfc2396.c (raptor_uri_resolve_uri_reference): Add
debug message. When adding a missing path "/", set the path_len
and the uri_len to match.
(main): Added test when a missing abs / path is added.
* rasqal/tests/rdql/testsuite/Makefile.am (check-rdql-correct):
Set PATH then use -s $(srcdir) rather than
lots of envariable passing.
* rasqal/tests/rdql/testsuite/check-rdql:
Merged in changes from check-sparql - use -s . argument now.
* configure.ac:
Delete changing PATH here for OSX. A bad idea as it makes the
configure environment different from the user's.
Added /opt/local to BDB search path for darwinports.
* rasqal/rasqal_engine.c (rasqal_engine_execute_init):
Init current_graph_pattern only if there
are graph patterns.
(rasqal_engine_get_next_result): Handle 0 graph patterns.
* rasqal/tests/sparql/syntax/Makefile.am: Added manifest.n3
Invoke check-sparql-correct test
* rasqal/tests/sparql/syntax/manifest.n3: Test manifest
* rasqal/tests/sparql/syntax/result-0triples.n3:
select with 0 triples result
* rasqal/tests/sparql/syntax/Makefile.am: Added 0triples.rq
* rasqal/tests/sparql/syntax/0triples.rq: Zero graph pattern triples
* rasqal/tests/sparql/syntax/data.n3: typo
* raptor/raptor_sequence.c (raptor_sequence_set_at,
raptor_sequence_get_at): Check for non-negative idx
* raptor/raptor_sequence.c (raptor_sequence_get_at):
Fix index offset check
2004-12-07 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* rasqal/sparql_parser.y (PatternElementForms): Handle empty
GraphPattern1 (NULL sequences)
* rasqal/tests/sparql/part1/dawg-data-01.n3,
rasqal/tests/sparql/part1/dawg-query-002,
rasqal/tests/sparql/simple/dawg-tp-04.rq,
rasqal/tests/sparql/simple/dawg-data-01.n3: foaf:knowns to
foaf:knows
2004-12-02 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/rdfdump.c: Make a raptor_sequence of namespace
declarations declared by '-f xmlns:foo="bar"' and then add them to
the serializer when initialised.
(rdfdump_free_namespace_decl): Added, to provide a helper to
cleanup.
* raptor/raptor_serialize.c (raptor_serialize_set_namespace): Call
factory method declare_namespace.
(raptor_rdfxml_serialize_declare_namespace): Copy the passed in
namespace prefix, URI before storing the namespace.
(raptor_rdfxml_serialize_start): Delete the namespace sequence
contents as the namespaces are declared on the namespace stack,
which is the new owner of the namespaces.
* raptor/raptor_namespace.c
(raptor_new_namespace_parts_from_string): Added, to decode things
like "xmlns:foo='bar'" into prefix, uri strings.
* raptor/raptor.h: Added prototype for
raptor_new_namespace_parts_from_string.
raptor_sequence_free_handler prototype changed to return void
2004-11-30 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* rasqal/tests/sparql/examples/ex2-1a-result.n3,
rasqal/tests/sparql/examples/ex2-2a-result.n3,
rasqal/tests/sparql/examples/ex2-3a-result.n3,
rasqal/tests/sparql/examples/ex2-4a-result.n3,
rasqal/tests/sparql/examples/ex3-result.n3: .
* raptor/raptor_serialize.c (raptor_rdfxml_serialize_init): Add a
sequence of user-declared namespaces.
(raptor_rdfxml_serialize_terminate): Tidy sequence.
(raptor_rdfxml_serialize_declare_namespace): Use sequence to store
declared namespaces.
(raptor_rdfxml_serialize_start): Declare used-defined namespaces
and start them in the namespace stack.
* raptor/raptor_namespace.c (raptor_new_namespace_from_uri): Added
with raptor_new_namespace code.
(raptor_new_namespace): Now a wrapper around
raptor_new_namespace_from_uri.
(raptor_namespace_copy): Use raptor_new_namespace_from_uri.
* raptor/raptor_qname.c (raptor_iostream_write_qname):
Added to write a qname to an iostream.
* raptor/raptor.h: Add prototypes for raptor_iostream_write_qname,
raptor_new_namespace_from_uri
* raptor/raptor_rdfxml.c (raptor_xml_start_element_handler,
raptor_xml_end_element_handler, raptor_xml_comment_handler,
raptor_start_element_grammar, raptor_end_element_grammar,
raptor_cdata_grammar): Update the use of xml_writer for building
parseType="Literal" content to use an iostream. Use more sax2
methods rather than direct access to internals - still some left.
(raptor_xml_parse_init, raptor_xml_parse_start,
raptor_xml_parse_terminate, raptor_inscope_xml_language,
raptor_inscope_base_uri): Move expat/libxml details to
raptor_new_sax2, raptor_sax2_parse_start, raptor_free_sax2,
raptor_sax2_inscope_xml_language, raptor_sax2_inscope_base_uri
respectively.
(raptor_xml_parse_chunk_): Deleted, moved to
raptor_sax2_parse_chunk
* raptor/raptor_xml_writer.c: Change to output to an iostream not
build up a stringbuffer.
(raptor_new_xml_writer): Add iostream arg, delete never-used
canonicalize.
(raptor_free_xml_writer): Remvoe stringbuffer.
(raptor_xml_writer_start_element, raptor_xml_writer_end_element):
Delete stringbuffer and use raptor_iostream_write_sax2_element.
(raptor_xml_writer_cdata): Delete stringbuffer and use
raptor_iostream_write_xml_escaped_string.
(raptor_xml_writer_raw): Added to write just the bytes.
(raptor_xml_writer_comment): Fixed to emit <!-- and -->
(raptor_xml_writer_as_string): Deleted.
(main): Added with test case.
* raptor/raptor_sax2.c (raptor_new_sax2, raptor_free_sax2,
raptor_sax2_inscope_xml_language, raptor_sax2_inscope_base_uri,
raptor_sax2_get_depth, raptor_sax2_inc_depth,
raptor_sax2_dec_depth, raptor_sax2_parse_start,
raptor_sax2_parse_chunk, raptor_sax2_element_get_element): Added.
(raptor_iostream_write_sax2_element): Renamed from
raptor_format_sax2_element and now writing to a raptor_iostream
with no allocing/freeing buffers.
* raptor/raptor_xml.c (raptor_iostream_write_xml_escaped_string):
Added, to write an
XML-escaped version of a string to an iostream
2004-11-29 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/raptor_namespace.c (raptor_iostream_write_namespace):
Added to write a namespace to a raptor_iostream
* raptor/raptor.h: Added raptor_iostream_write_namespace
* raptor/Makefile.am: Added raptor_xml_writer_test
* raptor/raptor_expat.c (raptor_expat_init): Take void* user data
* raptor/raptor_internal.h: raptor_exp_init takes void*
Add user_data to raptor_sax2
Added prototypes or raptor_new_sax2, raptor_free_sax2,
raptor_sax2_parse_start, raptor_sax2_parse_chunk,
raptor_sax2_parse_handle_errors, raptor_sax2_get_depth,
raptor_sax2_inc_depth, raptor_sax2_dec_depth,
raptor_sax2_inscope_xml_language, raptor_sax2_inscope_base_uri,
raptor_sax2_element_get_element, raptor_iostream_write_sax2_element
Deleted raptor_format_sax2_element, raptor_xml_writer_as_string and
raptor_xml_writer_write_to_iostream
Changed raptor_new_xml_writer to write to a raptor_iostream
* raptor/raptor.h: Added raptor_iostream_write_xml_escaped_string
and raptor_namespace_write
* rasqal/rasqal_expr.c (rasqal_expression_evaluate):
UMINUS, PLUS, MINUX, STAR, SLASH are
now done with floating literals.
* rasqal/rasqal_internal.h: Export rasqal_literal_as_floating
* rasqal/rasqal_literal.c (rasqal_new_floating_literal):
Changed to take a double arg
(rasqal_literal_as_floating): Export.
(rasqal_literal_compare): Improve promotion. Promote to float where
needed, especially assuming strings could be a float.
* rasqal/sparql_lexer.l, rasqal/rdql_lexer.l:
Do sscanf here and call rasqal_new_floating_literal with the double.
* rasqal/rasqal.h: rasqal_new_floating_literal takes a double arg
* rasqal/tests/sparql/check-sparql,
rasqal/tests/rdql/testsuite/check-rdql: diff backwards
* rasqal/tests/sparql/part1/dawg-result-002.n3,
rasqal/tests/sparql/part1/dawg-result-003.n3,
rasqal/tests/sparql/simple/result-tp-01.n3,
rasqal/tests/sparql/simple/result-tp-02.n3,
rasqal/tests/sparql/simple/result-tp-03.n3,
rasqal/tests/sparql/simple/result-tp-04.n3,
rasqal/tests/sparql/part1/dawg-result-001.n3: Update to DAWG
latest results removing rs:size triples.
* rasqal/rasqal_literal.c (rasqal_literal_as_integer): For
RASQAL_LITERAL_STRING, also try to evaluate it as a double with
strtod, then return that cast to int if it worked.
* rasqal/sparql_parser.y, rasqal/rdql_parser.y (UnaryExpression):
Make unary plus and minus work; removes 2
shift/reduce conflicts.
* rasqal/rasqal_expr.c:
(rasqal_free_expression, rasqal_expression_foreach,
rasqal_expression_evaluate, rasqal_expression_print):
Added RASQAL_EXPR_UMINUS support.
rasqal_op_labels: added uminus
* rasqal/rasqal.h: Added RASQAL_EXPR_UMINUS
2004-11-26 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/raptor_internal.h: Added prototype for
raptor_xml_writer_write_to_iostream
* raptor/raptor_xml_writer.c
(raptor_xml_writer_write_to_iostream): Added
* raptor/raptor.h: Added prototype for
raptor_iostream_write_stringbuffer
* raptor/raptor_iostream.c: (raptor_iostream_write_stringbuffer) Added
* configure.ac, rasqal/configure.ac, raptor/configure.ac:
--with-dmalloc default is now no
* librdf/Makefile.am: Remove rdf_storage_tstore.h rdf_storage_mysql.h
2004-11-25 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/configure.ac: If expat_source is empty, set it to auto so
no path-to-source is added to libs, includes
2004-11-23 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/tests/ex-55.out, raptor/tests/ex-55.rdf: ex-55
* raptor/tests/Makefile.am: Added ex-55
* librdf/rdf_storage_mysql.h, librdf/rdf_storage_tstore.h: Deleted
* configure.ac:
Rip out STORAGE_OBJS code and make all storage modules have
available/enabled set. memory is always available and required
file, hashes are always available and enabled by default.
Test for sqlite.h
Reduce mysql min to 3.23.56 - should go lower.
2004-11-22 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* librdf/Makefile.am:
Use STORAGE_ conditionals instead of @STORAGE_OBJS@
* librdf/rdf_storage.c:
Delete rdf_storage_hashes.h and rdf_storage_list.h includes, they are
called from rdf_storage.h already.
(librdf_init_storage) Use STORAGE_ defines.
* librdf/rdf_storage_sqlite.c:
don't sleep now, this should be fixed later
* librdf/rdf_storage.h: Use STORAGE_ defines.
Delete rdf_storage_tstore.h and rdf_storage_mysql.h includes
* librdf/rdf_storage.c (librdf_init_storage):
Added call to librdf_init_storage_sqlite
* librdf/Makefile.am: Added rdf_storage_sqlite.c
* librdf/rdf_storage.h: added librdf_init_storage_sqlite prototype
* librdf/rdf_storage_sqlite.c: sqlite storage
2004-11-21 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* rasqal/rasqal_engine.c (rasqal_new_graph_pattern_from_triples):
Init current column to -1 so no execution or tidy happens.
(rasqal_free_graph_pattern): Clean up until reach start_column, not 0.
(rasqal_graph_pattern_init): Do triple init work only if there are
triples.
* rasqal/sparql_parser.y: s/puts/fputs(..., stdout)/
* rasqal/rasqal_engine.c (rasqal_new_graph_pattern_from_sequence):
Fold sequence of 1 graph
pattern into the return value, tidying up.
(rasqal_graph_pattern_print): Print just the triple columns that are
used. Print flags using words.
(rasqal_graph_pattern_get_next_match): Note failing not-implemented
sequence of graph_patterns.
(rasqal_engine_prepare): Do not invoke rasqal_query_order_triples -
does not make sense to do with the graph_pattern code.
(rasqal_engine_get_next_result): Note failing not-implemented
sequence of graph_patterns.
Debug message when an optional graph pattern failed to patch.
* rasqal/rasqal_expr.c (rasqal_variable_set_value):
Debug fatal error when there is no name.
2004-11-20 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* rasqal/rasqal_engine.c (rasqal_new_graph_pattern_from_sequence):
lose triples argument
(rasqal_graph_pattern_get_next_match, rasqal_engine_get_next_result):
Check and fail for sequence of graph_patterns.
* rasqal/rasqal_internal.h:
Update rasqal_new_graph_pattern_from_sequence to lose triples argument
* rasqal/rdql_parser.y (rasqal_rdql_query_engine_prepare):
Use rasqal_new_graph_pattern_from_triples
* rasqal/rasqal_query.c (rasqal_new_query): Init triples here.
(rasqal_query_print): Print graph_patterns
* rasqal/rasqal_internal.h:
Add graph_patterns sequence to rasqal_graph_pattern.
Added prototypes for rasqal_new_graph_pattern_from_triples and
rasqal_new_graph_pattern_from_sequence
* rasqal/rasqal_engine.c (rasqal_new_graph_pattern_from_triples):
Renamed from rasqal_new_graph_pattern
(rasqal_new_graph_pattern_from_sequence): Added to handle a graph
pattern as a sequence of graph patterns.
(rasqal_free_graph_pattern): Handle cleanup for sequence.
(rasqal_graph_pattern_print): Handle sequence and simplify.
(rasqal_engine_execute_init): Abort with messsage if sequence has a
NULL graph pattern in it.
2004-11-19 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* rasqal/rasqal_engine.c (rasqal_engine_execute_init):
Init current_graph_pattern.
(rasqal_engine_get_next_result): Attempt to walk through graph_patterns
without failing on optional ones.
* rasqal/rasqal_internal.h:
Added current_graph_pattern to rasqal_query.
* rasqal/sparql_lexer.l (sparql_token_print): Added UNION token
* rasqal/sparql_parser.y: Added UNION token
* rasqal/sparql_lexer.l: Added UNION|union keyword
* rasqal/sparql_parser.y (rasqal_sparql_query_engine_prepare): Add
graph pqttern of all triples found.
* rasqal/rdql_parser.y (rasqal_rdql_query_engine_prepare): Add
graph pqttern of all triples found.
* rasqal/rasqal_engine.c (rasqal_new_graph_pattern):
No triples_size. Don't init triple_meta
here but on each execution.
(rasqal_free_graph_pattern, rasqal_graph_pattern_get_next_match):
update triple_meta offset
(rasqal_graph_pattern_init): Added, to init for execution.
(rasqal_graph_pattern_print): Added for debug printing.
(rasqal_engine_execute_init): Use query->graph_patterns - init them
with rasqal_graph_pattern_init
(rasqal_engine_execute_finish): Do not delete query->graph_pattern.
(rasqal_engine_get_next_result): Pick 0th item from
query->graph_patterns to execute.
* rasqal/rasqal_query.c (rasqal_new_query, rasqal_free_query):
Init/free
query->graph-patterns sequence
* rasqal/rasqal_internal.h:
Delete triples_count from rasqal_graph_pattern.
Only use exactly what's needed - end-start+1 columns
Added rasqal_graph_pattern_init and rasqal_graph_pattern_print
prototypes
* configure.ac: Doc fix, --with-mysql works for mysql 3/4
* rasqal/sparql_parser.y (PatternElementForms):
'SOURCE * ...' Warn this is ignored.
'Source VarOrURI ...' Set triple origin from the literal
(UnaryExpressionNotPlusMinus): Delete ignored ArgList for now.
* rasqal/rasqal_internal.h: Added rasqal_graph_pattern_adjust prototype
* rasqal/rasqal_engine.c (rasqal_new_graph_pattern,
rasqal_free_graph_pattern): Docs, code tidy.
(rasqal_graph_pattern_adjust): Added, to shift graph pattern
columns.
(rasqal_graph_pattern_get_next_match): Code tidy.
2004-11-17 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* raptor/examples/grapper.c:
Extensively updated to use GTK 2.4, 2.5 features when available.
Triples/Errors windows have a scalable pane between them
Triple columns can be sorted by clicking, width resized.
All known parser features are available on the preferences menu.
Added parser guessing button.
Moved syntax menu to top of display.
Updated about box fields to include more info when possible to
display.
* rasqal/rasqal_engine.c (rasqal_engine_get_next_result):
More code tweaks
* rasqal/rasqal_engine.c (rasqal_engine_get_next_result):
Evaluate constraint_expression
2004-11-16 Dave Beckett <Dave.Beckett@bristol.ac.uk>
* rasqal/rasqal_internal.h, rasqal/rasqal_engine.c:
pattern_graph to graph_pattern
* rasqal/rasqal_engine.c (rasqal_engine_get_next_result):
Inner loop logic tidying.
* rasqal/rasqal_engine.c (rasqal_engine_get_next_result):
triples_size deleted, never used.
* rasqal/rasqal_engine.c: source re-ordering
* rasqal/rasqal_engine.c (rasqal_engine_prepare): set flags here.
(rasqal_engine_execute_init): Always init a new pattern_graph.
* rasqal/rasqal_engine.c (rasqal_engine_execute_init,
rasqal_engine_run): Remove remaining use of query->column field.
* rasqal/rasqal_internal.h: rasqal_query remove column field
* rasqal/rasqal.h: words
* rasqal/rasqal_engine.c:
(rasqal_engine_execute_init); Added pattern_graph field, using
rasqal_new_pattern_graph
(rasqal_engine_execute_finish): Tidy up, deleting pattern_graph.
(rasqal_graph_pattern_get_next_triple): Renamed from
rasqal_engine_get_next_triple_pattern_result and using
rasqal_pattern_graph argument.
(rasqal_new_pattern_graph): tidy.
(rasqal_free_pattern_graph): Delete the triple_meta array.
(rasqal_engine_get_next_result): Use