Changes and docs updates for 2012 including removing some expat references

8 files changed, 218 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index ba1c8774..eca68a09 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,138 @@
+2012-02-04  Dave Beckett <dave@dajobe.org>
+
+	* INSTALL.html, LICENSE.html, NEWS.html, README.html,
+	RELEASE.html, TODO.html, UPGRADING.html: 2011
+
+	* configure.ac: tidy xml parser message
+
+	* configure.ac, src/Makefile.am, src/raptor_expat.c,
+	src/raptor_internal.h, src/raptor_rdfxml.c, src/raptor_sax2.c:
+	Remove expat support
+
+	Update configure to properly let you build raptor without any XML
+	support either - it only needs it if a parser that requires XML is
+	configured.
+
+2012-02-01  Dave Beckett <dave@dajobe.org>
+
+	* src/raptor_sax2.c:
+	(raptor_sax2_check_load_uri_string): Failure returned
+
+	* src/raptor_uri.c: casts
+
+	* src/raptor_uri.c:
+	(raptor_new_uri_from_uri_or_file_string): Never free
+	uri_or_file_string
+
+	* src/raptor_uri.c: Make raptor_new_uri_from_uri_or_file_string
+	check for files first.
+
+	(raptor_new_uri_from_uri_or_file_string): If the arg is a file
+	that exists, use that as the path.
+
+	* docs/raptor-1-to-2-map.tsv, docs/raptor2-sections.txt,
+	src/raptor2.h.in, src/raptor_uri.c:
+	(raptor_uri_filename_exists): Added
+
+2012-02-01  Lauri Aalto <laalto@iki.fi>
+
+	* src/raptor_sax2.c:
+	(raptor_sax2_parse_chunk): Return parse errors to caller.
+
+	Fixes part of Issue #0000488
+	http://bugs.librdf.org/mantis/view.php?id=488
+
+	* src/raptor_json.c:
+	(raptor_json_new_term_from_counted_string): RAPTOR_BAD_CAST for
+	shortening size_t -> int cast
+
+	* src/turtle_parser.y:
+	(turtle_parse,raptor_turtle_parse_chunk): Return parse error
+	status to caller
+
+	Fixes Issue #0000488
+	http://bugs.librdf.org/mantis/view.php?id=488
+
+2012-01-30  Dave Beckett <dave@dajobe.org>
+
+	* docs/raptor-1-to-2-map.tsv, docs/raptor2-sections.txt,
+	src/raptor2.h.in, src/raptor_sax2.c, src/raptor_uri.c: More file
+	URI updates
+
+	(raptor_new_uri_from_uri_or_file_string): Added new constructor
+
+	(raptor_uri_uri_string_to_counted_filename): Removed
+
+	(raptor_sax2_check_load_uri_string): Use
+	raptor_new_uri_from_uri_or_file_string() and just check for file:
+
+	(raptor_uri_uri_string_is_file_uri): Just check for file:
+
+	(raptor_uri_file_exists): Check if URI is a file URI and the file
+	exists.
+
+	* src/raptor_internal.h, src/raptor_sax2.c, utils/rapper.c:
+	Consolidate URI policy checks and call SAX2 uri filter
+
+	(raptor_sax2_check_load_uri_string): add and use for policy
+	checks, making file URIs from canonical filename and calling URI
+	filter callback on SAX2.
+
+	rapper (rapper_uri_trace): Use trace word since it is not just
+	processing
+
+2012-01-29  Dave Beckett <dave@dajobe.org>
+
+	* docs/raptor-1-to-2-map.tsv, docs/raptor2-sections.txt,
+	src/raptor2.h.in, src/raptor_internal.h, src/raptor_rdfxml.c,
+	src/raptor_rss.c, src/raptor_sax2.c:
+	(raptor_sax2_set_uri_filter): Added to filter for SAX2
+
+	* src/raptor_www.c:
+	(raptor_www_fetch): Return status code from URI filter
+
+	* docs/raptor-1-to-2-map.tsv, src/raptor2.h.in,
+	src/raptor_option.c, src/raptor_rdfxml.c, src/raptor_rss.c,
+	src/raptor_turtle_writer.c: Add RAPTOR_OPTION_NO_FILE to deny
+	internal file requests
+
+	* src/raptor_json.c:
+	Handle size changing between YAJL V1 and V2
+
+	Use RAPTOR_YAJL_LEN_TYPE macro to deal with the arg type change
+
+2012-01-28  Dave Beckett <dave@dajobe.org>
+
+	* src/raptor_uri.c: code cleanup
+
+	* docs/raptor-1-to-2-map.tsv, docs/raptor2-sections.txt,
+	src/raptor2.h.in, src/raptor_uri.c: Rename file uri string to
+	match convention
+
+	(raptor_uri_uri_string_to_counted_filename_fragment): Added to
+	return count lengths
+
+	(raptor_uri_uri_string_is_file_uri): Use
+	raptor_uri_uri_string_to_counted_filename() after a simple URI
+	test.
+
+	(raptor_uri_uri_string_to_filename): Renamed from
+	raptor_uri_uri_string_as_filename and use above.
+
+	(raptor_uri_uri_string_to_counted_filename): Added using above and
+	returning count.
+
+	* configure.ac, docs/raptor-1-to-2-map.tsv,
+	docs/raptor2-sections.txt, src/raptor2.h.in, src/raptor_uri.c:
+	raptor_uri_uri_string_as_filename
+
+	* src/raptor_internal.h, src/raptor_sax2.c: Add internal SAX2
+	enabled flag for enabling/disabling callbacks
+
+2011-11-27  Dave Beckett <dave@dajobe.org>
+
+	* NEWS.html, RELEASE.html, configure.ac: Bumped version to 2.0.7
+
 2011-11-27  Dave Beckett  <dave@dajobe.org>
 
 	* Snapshotted raptor2_2_0_6 for 2.0.6 release (GIT f9f3768e7080f1f132856b731c232c8cbeac1634)
diff --git a/INSTALL.html b/INSTALL.html
index 1ee07186..77d0349d 100644
--- a/INSTALL.html
+++ b/INSTALL.html
@@ -68,11 +68,11 @@ dependency checking.  It is developed and built on x86 Linux
 and x86 OSX but is also tested on other systems occasionally.
 </p>
 
-<p>Raptor requires an XML parser - either libxml2
-(2.6.8 or newer) or expat.  It will optionally use libcurl, libxml2
-for retrieving URIs.  It will optionally use libxslt (requiring
-libxml2 also) to provide the XSLT functionality for the GRDDL and
-microformats parser.  It will also optionally use
+<p>Raptor optionally the libxml2 XML library (2.6.8 or newer) for
+parsing XML syntaxes.  It will optionally use libcurl, libxml2 or
+libfetch for retrieving URIs.  It will optionally use libxslt
+(requiring libxml2 also) to provide the XSLT functionality for the
+GRDDL and microformats parser.  It will also optionally use
 <a href="http://lloyd.github.com/yajl/">YAJL</a> to provide JSON
 parsers if it is available.
 </p>
@@ -144,12 +144,6 @@ which can be removed from the library with this option.  All NFC
 checks will succeed when this is disabled.
 </p></dd>
 
-<dt><tt>--with-expat-source=DIR</tt><br /></dt>
-<dd><p>Build against a statically compiled expat source tree in
-directory <em>DIR</em>.  This handles the older and newer style 
-expat source directory structures.
-</p></dd>
-
 <dt><code>--enable-debug</code><br /></dt>
 <dd><p>Enable debug messages (default not enabled).
 Maintainer mode automatically enables this.
@@ -192,27 +186,6 @@ allocated with malloc() and released free(), a check is made that the
 memory was allocated in the same library.
 </p></dd>
 
-<dt><tt>--with-xml-parser=NAME</tt><br /></dt>
-<dd><p>Pick an XML parser to use - either <tt>libxml</tt> (default)
-minimum version 2.6.8 or <tt>expat</tt>.  If this option is not given,
-either will be used, with libxml preferred if both are present.
-These can either be installed system libraries or source
-trees in subdirectories of these sources named libxml, expat.
-</p>
-
-<p>Raptor has been tested with various combinations of these libraries
-including expat 1.95.1, 1.95.2, 1.95.7, 1.95.8 and libxml 2.6.8 onwards.
-</p>
-
-<p>libxml1 is not supported.
-</p>
-
-<p>The libxml2 on Apple OSX 10.3.X is quite broken - the headers do
-not match the libraries.  Install your own to get something
-coherent.
-</p>
-</dd>
-
 <dt><tt>--with-www=NAME</tt><br /></dt>
 <dd><p>Pick a WWW library to use - either <tt>curl</tt>, 
 <tt>xml</tt> (for libxml), <tt>libwww</tt> for W3C libwww or
@@ -263,7 +236,7 @@ directory, use:
 <p>Append to the line any additional options you need like this:
 </p>
 <pre>
-   ./configure --prefix=/usr --with-xml-parser=expat
+   ./configure --prefix=/usr --enable-parsers=rdfxml
 </pre>
 
 
@@ -384,7 +357,7 @@ or read the HTML version in docs/rapper.html or on the
 
 <hr />
 
-<p>Copyright 2000-2011 <a href="http://www.dajobe.org/">Dave Beckett</a><br />Copyright 2000-2005 <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
+<p>Copyright 2000-2012 <a href="http://www.dajobe.org/">Dave Beckett</a><br />Copyright 2000-2005 <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
 
 </body>
 </html>
diff --git a/LICENSE.html b/LICENSE.html
index 46d1e7f2..dd272be3 100644
--- a/LICENSE.html
+++ b/LICENSE.html
@@ -23,7 +23,7 @@
 
  <blockquote>
  <p>
-Copyright (C) 2000-2011 <a href="http://www.dajobe.org/">David Beckett</a><br />
+Copyright (C) 2000-2012 <a href="http://www.dajobe.org/">David Beckett</a><br />
 Copyright (C) 2000-2005 <a href="http://www.bristol.ac.uk/">University of Bristol</a>.
 All Rights Reserved.
  </p>
@@ -68,7 +68,7 @@ All Rights Reserved.
    <blockquote>
 
      <p>
-     Copyright (C) 2000-2011 <a href="http://www.dajobe.org/">David Beckett</a><br />
+     Copyright (C) 2000-2012 <a href="http://www.dajobe.org/">David Beckett</a><br />
      Copyright (C) 2000-2005 <a href="http://www.bristol.ac.uk/">University of Bristol</a>.
      </p>
        
@@ -93,7 +93,7 @@ All Rights Reserved.
 
 <hr />
 
-<p>Copyright (C) 2000-2011 <a href="http://www.dajobe.org/">David Beckett</a><br />Copyright (C) 2000-2005 <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
+<p>Copyright (C) 2000-2012 <a href="http://www.dajobe.org/">David Beckett</a><br />Copyright (C) 2000-2005 <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
 
 </body>
 </html>
diff --git a/NEWS.html b/NEWS.html
index b105b73d..716379c0 100644
--- a/NEWS.html
+++ b/NEWS.html
@@ -8,7 +8,7 @@
 
 <h1 style="text-align:center">Raptor RDF Syntax Library - News</h1>
 
-<h2 id="D2011-XX-XX-V2.0.7">2011-XX-XX Raptor2 Version 2.0.7 Released</h2>
+<h2 id="D2012-XX-XX-V2.0.7">2012-XX-XX Raptor2 Version 2.0.7 Released</h2>
 
 <p>Not yet released.
 </p>
@@ -767,7 +767,7 @@ Added better XML parser auto-detection for various expats and libxml
 
 <hr />
 
-<p>Copyright (C) 2001-2011 <a href="http://www.dajobe.org/">Dave Beckett</a><br />Copyright (C) 2001-2005 <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
+<p>Copyright (C) 2001-2012 <a href="http://www.dajobe.org/">Dave Beckett</a><br />Copyright (C) 2001-2005 <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
 
 </body>
 </html>
diff --git a/README.html b/README.html
index d63e0ec5..51c50189 100644
--- a/README.html
+++ b/README.html
@@ -70,7 +70,7 @@ and file-by-file changes in the <a href="ChangeLog">ChangeLog</a>.
 <li>Fully handles the <a href="http://www.w3.org/TR/rdf-syntax-grammar/">RDF/XML syntax updates</a> for <a href="http://www.w3.org/TR/xmlbase/">XML Base</a>, <code>xml:lang</code>, RDF datatyping and Collections.</li>
 <li>Handles all RDF vocabularies such as <a href="http://www.foaf-project.org/">FOAF</a>, <a href="http://www.purl.org/rss/1.0/">RSS 1.0</a>, <a href="http://dublincore.org/">Dublin Core</a>, <a href="http://www.w3.org/TR/owl-features/">OWL</a>, <a href="http://usefulinc.com/doap">DOAP</a></li>
 <li>Handles <code>rdf:resource</code> / <code>resource</code> attributes</li>
-<li>Uses <a href="http://expat.sourceforge.net/">expat</a> and/or (GNOME) <a href="http://xmlsoft.org/">libxml</a> XML parsers as available or required</li>
+<li>Uses <a href="http://xmlsoft.org/">libxml</a> XML parser</li>
 </ul>
 
 
@@ -297,7 +297,7 @@ future plans and announcement of releases.
 
 <hr />
 
-<p>Copyright (C) 2000-2011 <a href="http://www.dajobe.org/">Dave Beckett</a><br />Copyright (C) 2000-2005 <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
+<p>Copyright (C) 2000-2012 <a href="http://www.dajobe.org/">Dave Beckett</a><br />Copyright (C) 2000-2005 <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
 
 </body>
 </html>
diff --git a/RELEASE.html b/RELEASE.html
index 6f44c2d2..056e78e7 100644
--- a/RELEASE.html
+++ b/RELEASE.html
@@ -14,6 +14,72 @@
 <p>Not yet released.
 </p>
 
+<p>Issues Fixed:</p>
+<ul>
+  <li><a href="http://bugs.librdf.org/mantis/view.php?id=448">0000448</a>: Turtle parser does not return error status from turtle_parse_chunk()</li>
+</ul>
+
+<p>Removed Expat support since expat has not had a release in years
+and libxml2 works well.  This allows some code simplification.
+Updated <code>configure</code> so that if Raptor is configured with
+no parser that requires an XML parser, libxml2 will not be required.
+</p>
+
+
+<h3>Parser class changes</h3>
+
+<p>RDF/JSON parser handles an API change between YAJL V1 and V2.
+</p>
+
+<p>Turtle parser now returns parser errors to
+<code>raptor_parse_chunk()</code>.
+Fixes <a href="http://bugs.librdf.org/mantis/view.php?id=488">Issue #0000488</a>
+</p>
+
+
+<h3>SAX2 class changes</h3>
+
+<p>
+Added <code>raptor_sax2_set_uri_filter()</code> to set a URI filter
+for any SAX2 calls that do internal lookups of URIs.
+</p>
+
+
+<h3>URI class changes</h3>
+
+<p>Added new URI constructor
+<code>raptor_new_uri_from_uri_or_file_string()</code>
+to build a URI from a URI string or a filename string, normalizing
+the result to a <code>file:</code> URI.
+</p>
+
+<p>Added
+<code>raptor_uri_uri_string_to_counted_filename_fragment()</code> to
+turn a URI string to a filename and URI fragment along with string
+output string counts.
+</p>
+
+<p>Added utility methods for checking if a file: URI or filename is a
+file that exists:
+<code>raptor_uri_file_exists()</code> and
+<code>raptor_uri_filename_exists()</code>
+</p>
+
+
+<h3>WWW class changes</h3>
+
+<p>The <code>raptor_www_fetch()</code> call now returns the status
+from any URI filter that returns a non-0 response.
+</p>
+
+
+<h3>Other changes</h3>
+
+<p>
+Added option <code>RAPTOR_OPTION_NO_FILE</code> to deny internal file
+requests.
+</p>
+
 
 <h2 id="rel2_0_6"><a name="rel2_0_6">Raptor2 2.0.6 changes</a></h2>
 
@@ -3921,7 +3987,7 @@ for constructing strings from substrings appended or prepended.</p>
 
 <hr />
 
-<p>Copyright (C) 2003-2011 <a href="http://www.dajobe.org/">Dave Beckett</a><br />Copyright (C) 2003-2005 <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
+<p>Copyright (C) 2003-2012 <a href="http://www.dajobe.org/">Dave Beckett</a><br />Copyright (C) 2003-2005 <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
 
 </body>
 </html>
diff --git a/TODO.html b/TODO.html
index 78e2b2bc..4752f05b 100644
--- a/TODO.html
+++ b/TODO.html
@@ -14,7 +14,7 @@
 
 <hr />
 
-<p>Copyright (C) 2001-2011 <a href="http://www.dajobe.org/">Dave Beckett</a><br />Copyright (C) 2001-2005 <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
+<p>Copyright (C) 2001-2012 <a href="http://www.dajobe.org/">Dave Beckett</a><br />Copyright (C) 2001-2005 <a href="http://www.bristol.ac.uk/">University of Bristol</a></p>
 
 </body>
 </html>
diff --git a/UPGRADING.html b/UPGRADING.html
index efb9692d..38ba3dd9 100644
--- a/UPGRADING.html
+++ b/UPGRADING.html
@@ -153,7 +153,7 @@ Raptor code.
 
 <hr />
 
-<p>Copyright 2010-2011 <a href="http://www.dajobe.org/">Dave Beckett</a></p>
+<p>Copyright 2010-2012 <a href="http://www.dajobe.org/">Dave Beckett</a></p>
 
 </body>
 </html>