Update to 1.0.18:

Xapian-core 1.0.18 (2009-02-14):

API:

* Document: Add new add_boolean_term() method, which is an alias for add_term()
  with wdfinc=0.

* QueryParser:

  + Add support for quoting boolean terms so they can contain arbitrary
    characters (partly addresses ticket#128).

  + Add ENCLOSING_MARK and COMBINING_SPACING_MARK categories, plus several
    zero-width space characters, as phrase generators.  This mirrors a better
    fix in 1.1.4, but without losing compatibility with existing databases.

  + Fix handling of an explicit AND before a hated term (foo AND -bar).
    (ticket#447)

* TermIterator: Only include trailing '+' or '#' on a term if it isn't followed
  by a word character (makes more sense and matches QueryParser's behaviour).
  (ticket#446)

* Database: Fix many methods to behave better on a database with no
  subdatabases, such as is constructed by Database().  Fixes ticket#415.

testsuite:

* Add test coverage for xapian-compact, and improve coverage for
  WritableDatabase::replace_document().

* apitest: Rename matchfunctor<n> to matchdecider<n> to match current
  terminology.

flint backend:

* When updating documents, don't update posting entries which haven't changed.
  Largely fixes ticket #250.

* If the number of entries in the position table happened to be 4294967296 or
  an exact multiple, Xapian would ignore positional data for that table when
  running queries.

* Iterating all the terms in the database with a prefix is now slightly more
  efficient.

* Fix locking code to work if stdin and/or stdout have been closed.

* If a document is replaced with itself unmodified, we no longer increase the
  automatic flush counter.

* When iterating a posting list modified since the last flush(), the reported
  wdf is now correct (previously it was too high by its old value).

* Replacing a document deleted since the last flush failed to update the
  collection frequency and wdf, and caused an assertion failure when assertions
  were enabled.

* WritableDatabase::replace_document() didn't always remove old positional
  data (the only effect is that the position table was bloated by unwanted
  entries).

* xapian-inspect:

  + New "until" command which shows entries until a specified key is reached.

  + New "open" command which allows easy switching between tables.

* xapian-compact: Fix typos in --help output.

quartz backend:

* Replacing a document deleted since the last flush failed to update the
  collection frequency and wdf, and caused an assertion failure when assertions
  were enabled.

* WritableDatabase::replace_document() didn't always remove old positional
  data (the only effect is that the position table was bloated by unwanted
  entries).

remote backend:

* Throw UnimplementedError if a MatchDecider is used with the remote backend.
  Previously Xapian returned incorrect results in this case.

build system:

* configure: With --enable-maintainer-mode, enable -Werror for GCC >= 4.1
  rather than >= 4.0 as Apple's GCC 4.0 gives bogus uninitialised variable
  warnings.

documentation:

* The API documentation now includes Xapian::Error and subclasses, and doesn't
  mention Xapian::Query::Internal.

* Make clear in the Xapian::Document API documentation that this class is a
  lazy handle and discuss the issues this can cause.

* INSTALL: Improve text about zlib dependency.

* HACKING: Add details of our licensing policy for accepting patches.

examples:

* quest: If no database is specified, still parse the query and report
  Query::get_description() to provide an easy way to check how a query parses.

portability:

* Fix GCC 4.2 warning.

xapian-core 1.0.17 (2009-11-18):

API:

* QueryParser:

  + Fix handling of a group of two or more terms which are all stopwords which
    notably caused issues when default_op was OP_AND, but could probably
    manifest in other cases too.  Fixes ticket#406.

  + Fix interaction of FLAG_PARTIAL and FLAG_SYNONYM.  (ticket#407)

* Database: A database created via the default constructor no longer causes a
  segfault when the methods get_metadata() or metadata_keys_begin() are called.

flint backend:

* Don't try to close the fd one more than the maximum allowable when locking
  the database.  Harmless, except it causes a warning when running under
  valgrind.  (ticket#408)

remote backend:

* Xapian::Sorter isn't supported with the remote backend so throw
  UnimplementedError rather than giving incorrect results.  (ticket#384)

* Fix potential reading off the end of the MSet which is returned internally
  by the remote server.

documentation:

* Various documentation comment improvements for the Database class.

examples:

* examples/quest.cc: Tighten up the type of the error we catch to detect an
  unknown stemming language.

portability:

* xapian-config: Need to quote ^ for Solaris /bin/sh.

* configure: Actually use any flags we determine are needed to switch the
  compiler to proper ANSI C++ mode, when building xapian-core - this stopped
  working in 1.0.12, breaking support for HP's aCC, Compaq's cxx, Sun's CC, and
  SGI's CC.

3 files changed, 73 insertions, 8 deletions

diff --git a/textproc/xapian/Makefile b/textproc/xapian/Makefile
index fcc689d7937..c7e86da963c 100644
--- a/textproc/xapian/Makefile
+++ b/textproc/xapian/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.10 2009/09/10 18:53:47 schmonz Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/16 14:51:26 wiz Exp $
 #
 
-DISTNAME=	xapian-core-1.0.16
+DISTNAME=	xapian-core-1.0.18
 PKGNAME=	${DISTNAME:S/-core//}
 CATEGORIES=	textproc
-MASTER_SITES=	http://oligarchy.co.uk/xapian/1.0.16/
+MASTER_SITES=	http://oligarchy.co.uk/xapian/1.0.18/
 
 MAINTAINER=	schmonz@NetBSD.org
 HOMEPAGE=	http://xapian.org/
diff --git a/textproc/xapian/PLIST b/textproc/xapian/PLIST
index ac33521b8c9..15b982de96a 100644
--- a/textproc/xapian/PLIST
+++ b/textproc/xapian/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2009/08/27 13:21:53 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/02/16 14:51:26 wiz Exp $
 bin/copydatabase
 bin/delve
 ${PLIST.quartz}bin/quartzcheck
@@ -54,6 +54,9 @@ share/aclocal/xapian.m4
 share/doc/xapian-core/admin_notes.html
 share/doc/xapian-core/apidoc.pdf
 share/doc/xapian-core/apidoc/html/annotated.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1AssertionError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1AssertionError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1AssertionError__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1BM25Weight__inherit__graph.png
@@ -62,10 +65,34 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1BoolWeight.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1BoolWeight__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1Database-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1Database.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCorruptError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCorruptError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCorruptError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCreateError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCreateError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseCreateError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseLockError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseLockError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseLockError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseModifiedError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseModifiedError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseModifiedError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseOpeningError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseOpeningError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseOpeningError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseVersionError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseVersionError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DatabaseVersionError__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1Database__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1DateValueRangeProcessor-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1DateValueRangeProcessor.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1DateValueRangeProcessor__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1DocNotFoundError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DocNotFoundError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1DocNotFoundError__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1Document-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1Document.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1ESet-members.html
@@ -74,8 +101,11 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1ESetIterator-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1ESetIterator.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1Enquire-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1Enquire.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1Error-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1Error.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1ErrorHandler-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1ErrorHandler.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1Error__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDecider-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDecider.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDeciderAnd-members.html
@@ -85,6 +115,21 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDeciderFilterTerms-member
 share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDeciderFilterTerms.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDeciderFilterTerms__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1ExpandDecider__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1FeatureUnavailableError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1FeatureUnavailableError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1FeatureUnavailableError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1InternalError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1InternalError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1InternalError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1InvalidArgumentError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1InvalidArgumentError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1InvalidArgumentError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1InvalidOperationError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1InvalidOperationError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1InvalidOperationError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1LogicError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1LogicError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1LogicError__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1MSet-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1MSet.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1MSetIterator-members.html
@@ -94,6 +139,12 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1MatchDecider.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1MultiValueSorter-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1MultiValueSorter.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1MultiValueSorter__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1NetworkError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1NetworkError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1NetworkError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1NetworkTimeoutError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1NetworkTimeoutError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1NetworkTimeoutError__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1NumberValueRangeProcessor-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1NumberValueRangeProcessor.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1NumberValueRangeProcessor__inherit__graph.png
@@ -105,8 +156,17 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1Query-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1Query.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1QueryParser-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1QueryParser.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1QueryParserError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1QueryParserError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1QueryParserError__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1RSet-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1RSet.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1RangeError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1RangeError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1RangeError__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1RuntimeError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1RuntimeError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1RuntimeError__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1SimpleStopper-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1SimpleStopper.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1SimpleStopper__inherit__graph.png
@@ -128,6 +188,9 @@ share/doc/xapian-core/apidoc/html/classXapian_1_1TermIterator.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1TradWeight-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1TradWeight.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1TradWeight__inherit__graph.png
+share/doc/xapian-core/apidoc/html/classXapian_1_1UnimplementedError-members.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1UnimplementedError.html
+share/doc/xapian-core/apidoc/html/classXapian_1_1UnimplementedError__inherit__graph.png
 share/doc/xapian-core/apidoc/html/classXapian_1_1Utf8Iterator-members.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1Utf8Iterator.html
 share/doc/xapian-core/apidoc/html/classXapian_1_1ValueIterator-members.html
@@ -146,6 +209,7 @@ share/doc/xapian-core/apidoc/html/document_8h.html
 share/doc/xapian-core/apidoc/html/doxygen.css
 share/doc/xapian-core/apidoc/html/doxygen.png
 share/doc/xapian-core/apidoc/html/enquire_8h.html
+share/doc/xapian-core/apidoc/html/error_8h.html
 share/doc/xapian-core/apidoc/html/errorhandler_8h.html
 share/doc/xapian-core/apidoc/html/expanddecider_8h.html
 share/doc/xapian-core/apidoc/html/files.html
@@ -235,6 +299,7 @@ share/doc/xapian-core/apidoc/html/inherit__graph__20.png
 share/doc/xapian-core/apidoc/html/inherit__graph__21.png
 share/doc/xapian-core/apidoc/html/inherit__graph__22.png
 share/doc/xapian-core/apidoc/html/inherit__graph__23.png
+share/doc/xapian-core/apidoc/html/inherit__graph__24.png
 share/doc/xapian-core/apidoc/html/inherit__graph__3.png
 share/doc/xapian-core/apidoc/html/inherit__graph__4.png
 share/doc/xapian-core/apidoc/html/inherit__graph__5.png
diff --git a/textproc/xapian/distinfo b/textproc/xapian/distinfo
index 28617b0a432..0b6af3a0725 100644
--- a/textproc/xapian/distinfo
+++ b/textproc/xapian/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2009/11/24 21:57:53 agc Exp $
+$NetBSD: distinfo,v 1.9 2010/02/16 14:51:26 wiz Exp $
 
-SHA1 (xapian-core-1.0.16.tar.gz) = a3b40bdcff2dfa3256c4e0e90a66ce039ab8023f
-RMD160 (xapian-core-1.0.16.tar.gz) = ec6990e15e7612a71f45ec478121f1581490f36c
-Size (xapian-core-1.0.16.tar.gz) = 2976409 bytes
+SHA1 (xapian-core-1.0.18.tar.gz) = 36f2cfc082c8a18d63bc31319f241a717ea3dd1e
+RMD160 (xapian-core-1.0.18.tar.gz) = 2757ff6837c21d6d7209ffe9b90ae41f48e85f59
+Size (xapian-core-1.0.18.tar.gz) = 3318636 bytes
 SHA1 (patch-aa) = 13ed32d321966aed09b25ea5fb66cf8ae4e59181
 SHA1 (patch-ab) = da0ddb6ee3cef1b463afdd92f889e27eae5f3075