summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog219
-rw-r--r--Makefile.am2
-rw-r--r--RELEASE.html43
-rw-r--r--docs/raptor-1-to-2-map.tsv1
-rw-r--r--docs/raptor2-sections.txt3
-rw-r--r--librdfa/.gitignore3
-rw-r--r--librdfa/Makefile.am66
-rw-r--r--src/Makefile.am28
-rw-r--r--src/ntriples_parse.c6
-rw-r--r--src/raptor2.h.in4
-rw-r--r--src/raptor_general.c4
-rw-r--r--src/raptor_uri.c4
-rw-r--r--tests/test.html28
-rw-r--r--tests/test.svg26
-rw-r--r--tests/turtle/Makefile.am39
-rw-r--r--tests/turtle/test-35.out1
16 files changed, 347 insertions, 130 deletions
diff --git a/ChangeLog b/ChangeLog
index 8572cf10..6a8ebc99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,222 @@
+2013-11-24 Dave Beckett <dave@dajobe.org>
+
+ * docs/raptor-1-to-2-map.tsv, docs/raptor2-sections.txt,
+ src/ntriples_parse.c, src/raptor2.h.in, src/raptor_uri.c: Renamed
+ raptor_uri_string_is_absolute to raptor_uri_uri_string_is_absolute
+
+2013-11-16 Dave Beckett <dave@dajobe.org>
+
+ * tests/test.html, tests/test.svg: remove unused test.html
+ test.svg files
+
+2013-11-13 Dave Beckett <dave@dajobe.org>
+
+ * src/ntriples_parse.c:
+ Use memmove for overlapping copy [llvm address sanitizer]
+
+ (raptor_ntriples_term): Use memmove to replace memcpy for an
+ overlapping copy.
+
+ Found via LLVM address sanitizer in LLVM 3.4 (SVN) with options:
+ export ASAN_SYMBOLIZER_PATH=/usr/bin/llvm-symbolizer-3.4
+ CC='clang -fsanitize=address -O1 -fno-omit-frame-pointer -g' ./configure ...
+ See https://code.google.com/p/address-sanitizer/wiki/AddressSanitizer
+ and http://llvm.org/releases/3.3/tools/clang/docs/AddressSanitizer.html
+
+2013-11-08 Dave Beckett <dave@dajobe.org>
+
+ * librdfa/Makefile.am: clean plist files
+
+ * src/raptor_general.c: 2013
+
+ * librdfa/.gitignore: ignore plist
+
+ * librdfa/.gitignore: ignore .la
+
+ * librdfa/Makefile.am: Fix make distcheck for librdfa.la
+
+ * src/Makefile.am: src needs -DLIBRDFA_IN_RAPTOR
+
+ * librdfa/Makefile.am: Add analyze target
+
+ * librdfa/Makefile.am, src/Makefile.am: librdfa.la as a
+ convenience library build fixes
+
+ Do not build strtok for librdfa unless needed. Move
+ -DLIBRDFA_IN_RAPTOR include to librdfa dir only
+
+ * Makefile.am, librdfa/Makefile.am, src/Makefile.am: Build
+ librdfa.la as a convenience library
+
+ Trying to get away from the noisy subdir-objects warnings and
+ deprecation messages from newer automakes.
+
+2013-11-02 Dave Beckett <dave@dajobe.org>
+
+ * configure.ac: Fix clang test
+
+ * configure.ac: Check for clang to enable correct discovery of
+ supported warnings
+
+2013-10-30 Dave Beckett <dave@dajobe.org>
+
+ * tests/turtle/Makefile.am, tests/turtle/test-35.out: Remove (now)
+ unused turtle warning tests
+
+2013-10-29 Daniel Richard G <skunk@iSKUNK.ORG>
+
+ * configure.ac, src/Makefile.am, tests/Makefile.am,
+ tests/turtle/Makefile.am: Various build system fixes
+
+ configure.ac:
+ - Place a ":" in the action-if-not-found arguments of the
+ PKG_CHECK_MODULES() calls for LIBXML and LIBCURL to override the
+ default action of quitting with an error, as neither of these
+ libraries are a hard requirement
+
+ src/Makefile.am:
+ - Add parsedate.c to BUILT_SOURCES so that it can be handled
+ properly
+ - Move the parsedate.c rule into the MAINTAINER_MODE block, as
+ only maintainers should be regenerating this file
+ - Bump the "test" rule down after the test-program rules
+
+ tests/Makefile.am:
+ - Add ntriples-2013 to SUBDIRS to fix configure script invocation
+
+ tests/turtle/Makefile.am:
+ - Add logic to prevent breakage when TEST_WARN_FILES is empty
+
+2013-10-02 Dave Beckett <dave@dajobe.org>
+
+ * configure.ac, tests/feeds/Makefile.am: Test for jing and skip
+ feed validation tests if it is missing
+
+2013-09-28 Dave Beckett <dave@dajobe.org>
+
+ * src/raptor_rss.c:
+ (raptor_rss_insert_identifiers): Handle NULL uri [clang]
+
+2013-09-15 Dave Beckett <dave@dajobe.org>
+
+ * src/ntriples_parse.c, src/raptor_internal.h, src/turtle_common.h:
+ Move raptor_turtle_check_uri_string prototype to raptor_internal.h
+
+2013-09-13 Dave Beckett <dave@dajobe.org>
+
+ * tests/rdfxml/ex-59.nt, tests/rdfxml/ex-59.rdf,
+ tests/rdfxml/ex-60.nt, tests/rdfxml/ex-60.rdf: Update tests with
+ legal N-Triples URIs
+
+2013-09-12 Dave Beckett <dave@dajobe.org>
+
+ * src/ntriples_parse.c: Check language tag validity
+
+ * src/ntriples_parse.c: Use raptor_uri_string_is_absolute to check
+ datatype URI is abs
+
+ * src/ntriples_parse.c: Use raptor_uri_string_is_absolute to
+ enforce abs URIs for N-Triples
+
+ * src/raptor2.h.in, src/raptor_uri.c:
+ (raptor_uri_string_is_absolute): Added
+
+ * src/ntriples_parse.c: Check for bad URIs using turtle function -
+ FIXME
+
+ * src/ntriples_parse.c: Check for illegal unicode escapes.
+
+ * src/ntriples_parse.c: Move object_literal_language/datatype to
+ area of code that uses it.
+
+ * src/ntriples_parse.c: Kill use of terms, term_lengths and
+ term_types
+
+ * src/ntriples_parse.c: Make literals once during syntax parsing
+ Move language normalization to same area of code
+
+ * src/ntriples_parse.c: Make URIs in one place during syntax
+ parsing
+
+ * src/ntriples_parse.c: Pass a raptor_term for graph to
+ raptor_ntriples_generate_statement
+
+ * src/ntriples_parse.c: Pass a raptor_term for object to
+ raptor_ntriples_generate_statement
+
+ * src/ntriples_parse.c: Pass a raptor_term for predicate to
+ raptor_ntriples_generate_statement
+
+ * src/ntriples_parse.c: Pass a raptor_term for subject to
+ raptor_ntriples_generate_statement
+
+ (raptor_ntriples_parse_line): Make term here and pass to
+ raptor_ntriples_generate_statement subject
+
+2013-09-10 Dave Beckett <dave@dajobe.org>
+
+ * src/ntriples_parse.c: Remove special error for legacy N-Triples
+ "foo"-LANGTOKEN
+
+ * src/ntriples_parse.c:
+ Remove unused RAPTOR_TERM_CLASS_FULL
+
+ * configure.ac, tests/ntriples-2013/Makefile.am,
+ tests/ntriples-2013/manifest.ttl,
+ tests/ntriples-2013/nt-syntax-bad-base-01.nt,
+ tests/ntriples-2013/nt-syntax-bad-esc-01.nt,
+ tests/ntriples-2013/nt-syntax-bad-esc-02.nt,
+ tests/ntriples-2013/nt-syntax-bad-esc-03.nt,
+ tests/ntriples-2013/nt-syntax-bad-lang-01.nt,
+ tests/ntriples-2013/nt-syntax-bad-num-01.nt,
+ tests/ntriples-2013/nt-syntax-bad-num-02.nt,
+ tests/ntriples-2013/nt-syntax-bad-num-03.nt,
+ tests/ntriples-2013/nt-syntax-bad-prefix-01.nt,
+ tests/ntriples-2013/nt-syntax-bad-string-01.nt,
+ tests/ntriples-2013/nt-syntax-bad-string-02.nt,
+ tests/ntriples-2013/nt-syntax-bad-string-03.nt,
+ tests/ntriples-2013/nt-syntax-bad-string-04.nt,
+ tests/ntriples-2013/nt-syntax-bad-string-05.nt,
+ tests/ntriples-2013/nt-syntax-bad-string-06.nt,
+ tests/ntriples-2013/nt-syntax-bad-string-07.nt,
+ tests/ntriples-2013/nt-syntax-bad-struct-01.nt,
+ tests/ntriples-2013/nt-syntax-bad-struct-02.nt,
+ tests/ntriples-2013/nt-syntax-bad-uri-01.nt,
+ tests/ntriples-2013/nt-syntax-bad-uri-02.nt,
+ tests/ntriples-2013/nt-syntax-bad-uri-03.nt,
+ tests/ntriples-2013/nt-syntax-bad-uri-04.nt,
+ tests/ntriples-2013/nt-syntax-bad-uri-05.nt,
+ tests/ntriples-2013/nt-syntax-bad-uri-06.nt,
+ tests/ntriples-2013/nt-syntax-bad-uri-07.nt,
+ tests/ntriples-2013/nt-syntax-bad-uri-08.nt,
+ tests/ntriples-2013/nt-syntax-bad-uri-09.nt,
+ tests/ntriples-2013/nt-syntax-bnode-01.nt,
+ tests/ntriples-2013/nt-syntax-bnode-02.nt,
+ tests/ntriples-2013/nt-syntax-datatypes-01.nt,
+ tests/ntriples-2013/nt-syntax-datatypes-02.nt,
+ tests/ntriples-2013/nt-syntax-file-01.nt,
+ tests/ntriples-2013/nt-syntax-file-02.nt,
+ tests/ntriples-2013/nt-syntax-file-03.nt,
+ tests/ntriples-2013/nt-syntax-str-esc-01.nt,
+ tests/ntriples-2013/nt-syntax-str-esc-02.nt,
+ tests/ntriples-2013/nt-syntax-str-esc-03.nt,
+ tests/ntriples-2013/nt-syntax-string-01.nt,
+ tests/ntriples-2013/nt-syntax-string-02.nt,
+ tests/ntriples-2013/nt-syntax-string-03.nt,
+ tests/ntriples-2013/nt-syntax-subm-01.nt,
+ tests/ntriples-2013/nt-syntax-uri-01.nt,
+ tests/ntriples-2013/nt-syntax-uri-02.nt,
+ tests/ntriples-2013/nt-syntax-uri-03.nt,
+ tests/ntriples-2013/nt-syntax-uri-04.nt: N-Triples 2013 test suite
+ Current state: all good tests pass. 13 bad tests fail:
+ nt-syntax-bad-uri-01.nt nt-syntax-bad-uri-02.nt
+ nt-syntax-bad-uri-03.nt nt-syntax-bad-uri-04.nt
+ nt-syntax-bad-uri-06.nt nt-syntax-bad-uri-07.nt
+ nt-syntax-bad-uri-08.nt nt-syntax-bad-uri-09.nt
+ nt-syntax-bad-struct-01.nt nt-syntax-bad-struct-02.nt
+ nt-syntax-bad-lang-01.nt nt-syntax-bad-esc-03.nt
+ nt-syntax-bad-string-05.nt
+
2013-09-09 Dave Beckett <dave@dajobe.org>
* src/ntriples_parse.c:
diff --git a/Makefile.am b/Makefile.am
index 94951c0c..fd8fa78e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,7 +22,7 @@
#
-SUBDIRS = src utils docs data tests examples librdfa scripts
+SUBDIRS = librdfa src utils docs data tests examples scripts
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = raptor2.pc
diff --git a/RELEASE.html b/RELEASE.html
index 639c351a..a81b17dc 100644
--- a/RELEASE.html
+++ b/RELEASE.html
@@ -14,6 +14,49 @@
<p>Not yet released.
</p>
+<p>Issues Fixed:</p>
+<ul>
+ <li>None</li>
+</ul>
+
+<h3>Parser changes</h3>
+
+<p>N-Triples parser was updated to support all of
+<a href="http://www.w3.org/TR/2013/CR-n-triples-20131105/">RDF 1.1
+N-Triples - A line-based syntax for an RDF graph</a> (aka N-Triples 2013)
+It now supports <code># comments</code> after the end of
+lines, checks for illegal unicode escapes, checks for bad URIs and
+checks language tags.
+Also removed support for legacy N-Triples
+<code>"foo"-LANGTOKEN</code>.
+Many internal changes were also made.
+</p>
+
+<h3>URI class changes</h3>
+<p>Added <code>raptor_uri_uri_string_is_absolute()</code> to
+check if a URI is absolute.</p>
+
+<h3>Configuration and build changes</h3>
+
+<p>Restructured code to build an internal librdfa convenience library
+(never installed) so that newer automake will stop moaning about
+subdir-objects.
+</p>
+
+<p><code>configure</code> now checks for clang to correctly find
+supported warnings.</p>
+
+<p>Various portability and build fixes (Daniel Richard G)</p>
+
+<p>Build fixes: <code>make check</code> will now work if jing is not
+installed (for feed XML generation validation).
+</p>
+
+<h3>Other changes</h3>
+
+<p>Fixed a few issues found with LLVM 3.4 (SVN) run with address
+sanitizing.</p>
+
<h2 id="rel2_0_10"><a name="rel2_0_10">Raptor2 2.0.10 changes</a></h2>
diff --git a/docs/raptor-1-to-2-map.tsv b/docs/raptor-1-to-2-map.tsv
index 2531197e..78a35199 100644
--- a/docs/raptor-1-to-2-map.tsv
+++ b/docs/raptor-1-to-2-map.tsv
@@ -422,6 +422,7 @@
2.0.9 - - - 2.0.10 int raptor_string_escaped_write (const unsigned char *string, size_t len, const char delim, unsigned int flags, raptor_iostream *iostr) -
2.0.9 - - - 2.0.10 int raptor_term_escaped_write (const raptor_term *term, unsigned int flags, raptor_iostream* iostr) -
2.0.9 - - - 2.0.10 int raptor_uri_escaped_write (raptor_uri* uri, raptor_uri* base_uri, unsigned int flags, raptor_iostream *iostr) -
+2.0.10 - - - 2.0.10 int raptor_uri_uri_string_is_absolute (const unsigned char* uri_string) -
#
# Types
#
diff --git a/docs/raptor2-sections.txt b/docs/raptor2-sections.txt
index e29346d1..976ce44a 100644
--- a/docs/raptor2-sections.txt
+++ b/docs/raptor2-sections.txt
@@ -243,10 +243,11 @@ raptor_uri_to_counted_string
raptor_uri_to_string
raptor_uri_resolve_uri_reference
raptor_uri_filename_to_uri_string
+raptor_uri_uri_string_is_absolute
+raptor_uri_uri_string_is_file_uri
raptor_uri_uri_string_to_filename
raptor_uri_uri_string_to_filename_fragment
raptor_uri_uri_string_to_counted_filename_fragment
-raptor_uri_uri_string_is_file_uri
raptor_uri_print
raptor_uri_get_world
raptor_uri_write
diff --git a/librdfa/.gitignore b/librdfa/.gitignore
index ae45b5b1..3ca6f81d 100644
--- a/librdfa/.gitignore
+++ b/librdfa/.gitignore
@@ -1,4 +1,5 @@
+*.la
*.lo
+*.plist
.deps
-.dirstamp
.libs
diff --git a/librdfa/Makefile.am b/librdfa/Makefile.am
index 1a4467c9..7d53e16a 100644
--- a/librdfa/Makefile.am
+++ b/librdfa/Makefile.am
@@ -1,9 +1,21 @@
# -*- Mode: Makefile -*-
#
-# Makefile for distributing librdfa sources
+# Makefile for librdfa convienience library
#
-EXTRA_DIST = \
+ANALYZE = clang
+ANALYZE_FLAGS = "--analyze"
+# Based on COMPILE target
+ANALYZE_COMMAND = $(ANALYZE) \
+ $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
+ $(ANALYZE_FLAGS)
+
+if LIBRDFA
+noinst_LTLIBRARIES = librdfa.la
+AM_CPPFLAGS = -DLIBRDFA_IN_RAPTOR -I$(srcdir) -I$(top_srcdir)/src
+
+librdfa_la_SOURCES = \
context.c \
curie.c \
iri.c \
@@ -12,14 +24,60 @@ lists.c \
namespace.c \
rdfa.c \
rdfa_utils.c \
-strtok_r.c \
subject.c \
triple.c \
rdfa.h \
rdfa_utils.h \
-strtok_r.h \
config.h
+if NEED_STRTOK_R
+librdfa_la_SOURCES += \
+strtok_r.c \
+strtok_r.h
+endif
+
+
# Do not need:
# mingw32_utils.c
# mingw32_utils.h
+
+else
+
+EXTRA_DIST = \
+context.c \
+curie.c \
+iri.c \
+language.c \
+lists.c \
+namespace.c \
+rdfa.c \
+rdfa_utils.c \
+strtok_r.c \
+subject.c \
+triple.c \
+rdfa.h \
+rdfa_utils.h \
+strtok_r.h \
+config.h
+
+endif
+
+CLEANFILES=*.plist
+
+if MAINTAINER_MODE
+# Run Clang static analyzer over sources.
+analyze: $(SOURCES)
+ @list='$(SOURCES)'; \
+ result=0; \
+ for file in $$list; do \
+ if echo $$file | grep '\.c$$' >/dev/null 2>&1; then \
+ $(RECHO) "Analyzing $$file"; \
+ $(ANALYZE_COMMAND) $(srcdir)/$$file; \
+ status=$$?; \
+ if test $$status != 0; then \
+ result=1; \
+ fi; \
+ fi; \
+ done; \
+ set -e; exit $$result
+endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 3bfd690e..717e8d97 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -162,33 +162,16 @@ BUILT_SOURCES += parsedate.c
endif
-if LIBRDFA
-libraptor2_la_SOURCES += \
-$(top_srcdir)/librdfa/context.c \
-$(top_srcdir)/librdfa/curie.c \
-$(top_srcdir)/librdfa/iri.c \
-$(top_srcdir)/librdfa/language.c \
-$(top_srcdir)/librdfa/lists.c \
-$(top_srcdir)/librdfa/namespace.c \
-$(top_srcdir)/librdfa/rdfa.c \
-$(top_srcdir)/librdfa/rdfa_utils.c \
-$(top_srcdir)/librdfa/subject.c \
-$(top_srcdir)/librdfa/triple.c \
-$(top_srcdir)/librdfa/rdfa.h \
-$(top_srcdir)/librdfa/rdfa_utils.h
-
-if NEED_STRTOK_R
-libraptor2_la_SOURCES += \
-$(top_srcdir)/librdfa/strtok_r.c \
-$(top_srcdir)/librdfa/strtok_r.h
-endif
+libraptor2_la_LIBADD =
+if LIBRDFA
AM_CPPFLAGS += -DLIBRDFA_IN_RAPTOR -I$(top_srcdir)/librdfa
+libraptor2_la_LIBADD += $(top_builddir)/librdfa/librdfa.la
endif
libraptor2_la_LDFLAGS = -version-info @RAPTOR_LIBTOOL_VERSION@ \
@RAPTOR_LDFLAGS@ $(MEM_LIBS)
-libraptor2_la_LIBADD = @LTLIBOBJS@
+libraptor2_la_LIBADD += @LTLIBOBJS@
EXTRA_DIST=\
@@ -301,6 +284,9 @@ raptor_permute_test: $(srcdir)/raptor_permute_test.c libraptor2.la
raptor_snprintf_test: $(srcdir)/snprintf.c libraptor2.la
$(LINK) $(DEFS) $(CPPFLAGS) -I$(srcdir) -I. -DSTANDALONE $(srcdir)/snprintf.c libraptor2.la $(LIBS)
+$(top_builddir)/librdfa/librdfa.la:
+ cd $(top_builddir)/librdfa && $(MAKE) librdfa.la
+
# Some people need a little help ;-)
test: check
diff --git a/src/ntriples_parse.c b/src/ntriples_parse.c
index 1c2ec1e6..bbf19d6d 100644
--- a/src/ntriples_parse.c
+++ b/src/ntriples_parse.c
@@ -270,7 +270,7 @@ raptor_ntriples_term(raptor_parser* rdf_parser,
/* UTF-8 encoding had an error or ended in the middle of a string */
return 1;
}
- memcpy(dest, p-1, unichar_len);
+ memmove(dest, p-1, unichar_len);
dest += unichar_len;
unichar_len--; /* p, *lenp were moved on by 1 earlier */
@@ -557,7 +557,7 @@ raptor_ntriples_parse_line(raptor_parser* rdf_parser,
if(ordinal <= 0)
raptor_parser_error(rdf_parser, "Illegal ordinal value %d in property '%s'.", ordinal, dest);
}
- if(raptor_uri_string_is_absolute(dest) <= 0) {
+ if(raptor_uri_uri_string_is_absolute(dest) <= 0) {
raptor_parser_error(rdf_parser, "URI '%s' is not absolute.", dest);
goto cleanup;
}
@@ -663,7 +663,7 @@ raptor_ntriples_parse_line(raptor_parser* rdf_parser,
goto cleanup;
}
- if(raptor_uri_string_is_absolute(object_literal_datatype) <= 0) {
+ if(raptor_uri_uri_string_is_absolute(object_literal_datatype) <= 0) {
raptor_parser_error(rdf_parser, "Datatype URI '%s' is not absolute.", object_literal_datatype);
rc = 1;
goto cleanup;
diff --git a/src/raptor2.h.in b/src/raptor2.h.in
index 8265aa2e..f380cbdc 100644
--- a/src/raptor2.h.in
+++ b/src/raptor2.h.in
@@ -1313,8 +1313,6 @@ RAPTOR_API
int raptor_uri_file_exists(raptor_uri* uri);
RAPTOR_API
int raptor_uri_escaped_write(raptor_uri* uri, raptor_uri* base_uri, unsigned int flags, raptor_iostream *iostr);
-RAPTOR_API
-int raptor_uri_string_is_absolute(const unsigned char* uri_string);
/* XML utility functions */
RAPTOR_API
@@ -1358,6 +1356,8 @@ RAPTOR_API
int raptor_stringbuffer_append_uri_escaped_counted_string(raptor_stringbuffer* sb, const char* string, size_t length, int space_is_plus);
RAPTOR_API
char* raptor_uri_uri_string_to_counted_filename_fragment(const unsigned char *uri_string, size_t* len_p, unsigned char **fragment_p, size_t* fragment_len_p);
+RAPTOR_API
+int raptor_uri_uri_string_is_absolute(const unsigned char* uri_string);
/**
diff --git a/src/raptor_general.c b/src/raptor_general.c
index ec952ea1..1c8e05a6 100644
--- a/src/raptor_general.c
+++ b/src/raptor_general.c
@@ -48,9 +48,9 @@
/* statics */
-const char * const raptor_short_copyright_string = "Copyright 2000-2012 David Beckett. Copyright 2000-2005 University of Bristol";
+const char * const raptor_short_copyright_string = "Copyright 2000-2013 David Beckett. Copyright 2000-2005 University of Bristol";
-const char * const raptor_copyright_string = "Copyright (C) 2000-2012 David Beckett - http://www.dajobe.org/\nCopyright (C) 2000-2005 University of Bristol - http://www.bristol.ac.uk/";
+const char * const raptor_copyright_string = "Copyright (C) 2000-2013 David Beckett - http://www.dajobe.org/\nCopyright (C) 2000-2005 University of Bristol - http://www.bristol.ac.uk/";
const char * const raptor_license_string = "LGPL 2.1 or newer, GPL 2 or newer, Apache 2.0 or newer.\nSee http://librdf.org/raptor/LICENSE.html for full terms.";
diff --git a/src/raptor_uri.c b/src/raptor_uri.c
index ed9b1ec4..169a6988 100644
--- a/src/raptor_uri.c
+++ b/src/raptor_uri.c
@@ -1707,7 +1707,7 @@ raptor_uri_escaped_write(raptor_uri* uri,
/**
- * raptor_uri_string_is_absolute:
+ * raptor_uri_uri_string_is_absolute:
* @uri_string: uri to check write
*
* Check if a uri string is an absolute URI
@@ -1715,7 +1715,7 @@ raptor_uri_escaped_write(raptor_uri* uri,
* Return value: >0 if absolute, 0 if not, < 0 on failure
**/
int
-raptor_uri_string_is_absolute(const unsigned char* uri_string)
+raptor_uri_uri_string_is_absolute(const unsigned char* uri_string)
{
raptor_uri_detail *detail = NULL;
int rc = -1;
diff --git a/tests/test.html b/tests/test.html
deleted file mode 100644
index 80e106c1..00000000
--- a/tests/test.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-<head>
- <title>Owl</title>
-
- <!-- Test for searching for rdf:RDF inside some other XML
-
- Note: this is not VALID HTML or XHTML since
- the rdf:RDF element and contents is not allowed here. It
- remains well-formed XML.
- -->
- <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:dc="http://purl.org/dc/elements/1.1/">
- <rdf:Description rdf:about="http://example.org/owl.html">
- <dc:title>Monkey Home Page</dc:title>
- <dc:creator>Dave Beckett</dc:creator>
- <dc:description>The monkeys live in the jungle.</dc:description>
- </rdf:Description>
- </rdf:RDF>
-
-</head>
-<body bgcolor="#ffffff">
-
-<h1>Monkeys</h1>
-
-<p>Blah blah blah swinging from trees. Pictures of monkies.</p>
-
-</body>
-</html>
diff --git a/tests/test.svg b/tests/test.svg
deleted file mode 100644
index d8148899..00000000
--- a/tests/test.svg
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg
- height="100"
- width="100"
- id="blah"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:xlink="http://www.w3.org/1999/xlink">
-
- <!-- Test for searching for rdf:RDF inside some other XML -->
-
- <!-- Note: this is legal svg - since the SVG specification allows
- metadata such as rdf to appear inside the metadata tag
- -->
-
- <metadata>
- <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:dc="http://purl.org/dc/elements/1.1/">
- <rdf:Description rdf:about="">
- <dc:title>Simple Example</dc:title>
- <dc:date>2002-10-05</dc:date>
- </rdf:Description>
- </rdf:RDF>
- </metadata>
-
-</svg>
diff --git a/tests/turtle/Makefile.am b/tests/turtle/Makefile.am
index a9bb7f6e..81c45259 100644
--- a/tests/turtle/Makefile.am
+++ b/tests/turtle/Makefile.am
@@ -42,8 +42,6 @@ bad-10.ttl bad-11.ttl bad-12.ttl bad-13.ttl bad-14.ttl bad-16.ttl \
bad-19.ttl bad-20.ttl \
bad-23.ttl bad-24.ttl
-TEST_WARN_FILES=
-
TEST_OUT_FILES=test-00.out test-01.out test-02.out test-03.out \
test-04.out test-05.out test-06.out test-07.out test-08.out \
test-09.out test-10.out test-11.out test-12.out test-13.out \
@@ -67,9 +65,6 @@ ex-38-turtle.out
TURTLE_SERIALIZE_RDF_FILES=ex-62.rdf
-
-TEST_WARN_OUT_FILES= test-35.out
-
TEST_MANIFEST_FILES=manifest.ttl manifest-bad.ttl
# Used to make N-triples output consistent
@@ -82,9 +77,7 @@ RDFS_NS_URI=http://www.w3.org/2000/01/rdf-schema
ALL_TEST_FILES= README.txt \
$(TEST_FILES) \
$(TEST_BAD_FILES) \
- $(TEST_WARN_FILES) \
$(TEST_OUT_FILES) \
- $(TEST_WARN_OUT_FILES) \
$(TEST_MANIFEST_FILES) \
$(TEST_SERIALIZE_FILES) \
$(TEST_SERIALIZE_OUT_FILES) \
@@ -105,7 +98,7 @@ build-rdfdiff:
check-local: check-rdf check-bad-rdf check-turtle-serialize \
check-turtle-serialize-syntax check-turtle-parse-ntriples \
-check-turtle-serialize-rdf check-warn-rdf
+check-turtle-serialize-rdf
if MAINTAINER_MODE
check_rdf_deps = $(TEST_FILES)
@@ -174,36 +167,6 @@ check-bad-rdf: build-rapper $(check_bad_rdf_deps)
set -e; exit $$result
if MAINTAINER_MODE
-check_warn_rdf_deps = $(TEST_WARN_FILES)
-endif
-
-check-warn-rdf: build-rapper $(check_warn_rdf_deps)
- @set +e; result=0; \
- $(RECHO) "Testing Turtle with warnings"; \
- for test in $(TEST_WARN_FILES) .; do \
- test $$test = . && break; \
- name=`basename $$test .ttl` ; \
- baseuri=$(BASE_URI)$$test; \
- $(RECHO) $(RECHO_N) "Checking $$test $(RECHO_C)"; \
- $(RAPPER) -q -i turtle -o ntriples file:$(srcdir)/$$test $$baseuri > $$name.res 2> $$name.err; \
- status=$$?; \
- if test $$status -eq 1 ; then \
- $(RECHO) "FAILED - parsing failed when should have warned"; result=1; \
- $(RECHO) $(RAPPER) -q -i turtle -o ntriples file:$(srcdir)/$$test $$baseuri '>' $$name.res; \
- cat $$name.res; grep Error $$name.err; \
- elif test $$status -eq 2 ; then \
- $(RECHO) "ok"; \
- else \
- $(RECHO) "FAILED - parsing failed with unknown status $$status"; result=1; \
- $(RECHO) $(RAPPER) -q -i turtle -o ntriples file:$(srcdir)/$$test $$baseuri '>' $$name.res; \
- cat $$name.err; \
- cat $$name.res; \
- fi; \
- rm -f $$name.res $$name.err ; \
- done; \
- set -e; exit $$result
-
-if MAINTAINER_MODE
check_turtle_serialize_deps = $(TEST_FILES)
endif
diff --git a/tests/turtle/test-35.out b/tests/turtle/test-35.out
deleted file mode 100644
index f397592f..00000000
--- a/tests/turtle/test-35.out
+++ /dev/null
@@ -1 +0,0 @@
-<http://example.org/resource> <http://example.org#pred> "value"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
View Lorry Controller Status