Request 736 (accepted)

Overview

Request 736 (accepted)

No description set

Created by vanmeeuwen over 9 years ago
In state accepted

Submit xapian-core

Submit package Kolab:Development / xapian-core to package Kontact:4.13:Development / xapian-core

xapian-core.spec Added

@@ -0,0 +1,270 @@
+Name: xapian-core
+Version: 1.2.16
+Release: 1%{?dist}
+Summary: The Xapian Probabilistic Information Retrieval Library
+
+Group: Applications/Databases
+License: GPLv2+
+URL: http://www.xapian.org/
+# Repack for the sake of Debian packaging in the OBS
+Source0: http://www.oligarchy.co.uk/xapian/%{version}/%{name}-%{version}.tar.gz
+
+Patch1: xapian-add-snippet-generator.patch
+Patch2: xapian-fix-snippet-first-char-nonword.patch
+Patch3: xapian-some-cjk-chars-are-punctuation.patch
+Patch4: xapian-change-snippet-generator-to-deque.patch
+Patch5: xapian-fix-snippet-generator-CJK.patch
+Patch6: xapian-fix-snippet-generator-punctuation-in-match.patch
+Patch9: xapian-autoconf-2.63.patch
+
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: gcc-c++
+BuildRequires: libuuid-devel
+BuildRequires: zlib-devel
+
+%if 0%{?suse_version}
+Requires: libxapian22 = %{version}
+%else
+Requires: %{name}-libs = %{version}-%{release}
+%endif
+
+%description
+Xapian is an Open Source Probabilistic Information Retrieval Library. It
+offers a highly adaptable toolkit that allows developers to easily add advanced
+indexing and search facilities to applications
+
+%if 0%{?suse_version}
+%package -n libxapian22
+%else
+%package libs
+%endif
+Summary: Xapian search engine libraries
+Group: System Environment/Libraries
+%if 0%{?suse_version} > 1220 && 0%{?suse_version}
+Requires: libz1
+%endif
+
+%if 0%{?suse_version}
+%description -n libxapian22
+%else
+%description libs
+%endif
+Xapian is an Open Source Probabilistic Information Retrieval framework. It
+offers a highly adaptable toolkit that allows developers to easily add advanced
+indexing and search facilities to applications. This package provides the
+libraries for applications using Xapian functionality
+
+%package devel
+Group: Development/Libraries
+Summary: Files needed for building packages which use Xapian
+Requires: %{name} = %{version}-%{release}
+%if 0%{?suse_version}
+Requires: libxapian22 = %{version}
+%else
+Requires: %{name}-libs = %{version}-%{release}
+%endif
+Requires: libuuid-devel
+
+%description devel
+Xapian is an Open Source Probabilistic Information Retrieval framework. It
+offers a highly adaptable toolkit that allows developers to easily add advanced
+indexing and search facilities to applications. This package provides the
+files needed for building packages which use Xapian
+
+%prep
+%setup -q
+
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
+%if 0%{?rhel} < 7 && 0%{?fedora} < 1 && 0%{?suse_version} < 1
+%patch9 -p1
+%endif
+
+%build
+aclocal -I m4
+automake --add-missing
+autoreconf -v
+# Disable SSE on x86, but leave it intact for x86_64
+%ifarch x86_64
+%configure --disable-static
+%else
+%configure --disable-static --disable-sse
+%endif
+
+# Remove rpath as per https://fedoraproject.org/wiki/Packaging/Guidelines#Beware_of_Rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+
+make %{?_smp_mflags} V=1
+
+%install
+make install DESTDIR=%{buildroot} INSTALL='install -p'
+
+# Remove libtool archives
+# find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
+
+# Remove the dev docs, we pick them up below
+rm -rf %{buildroot}%{_datadir}/doc/%{name}
+
+%if 0%{?suse_version}
+%post -n libxapian22 -p /sbin/ldconfig
+%else
+%post libs -p /sbin/ldconfig
+%endif
+
+%if 0%{?suse_version}
+%postun -n libxapian22 -p /sbin/ldconfig
+%else
+%postun libs -p /sbin/ldconfig
+%endif
+
+%files
+%defattr(-,root,root,-)
+%{_bindir}/xapian*
+%exclude %{_bindir}/xapian-config
+%{_bindir}/quest
+%{_bindir}/delve
+%{_bindir}/copydatabase
+%{_bindir}/simpleindex
+%{_bindir}/simplesearch
+%{_bindir}/simpleexpand
+# man pages may be gzipped, hence the trailing wildcard.
+%{_mandir}/man1/xapian*
+%exclude %{_mandir}/man1/xapian-config.1.gz
+%{_mandir}/man1/quest.1*
+%{_mandir}/man1/delve.1*
+%{_mandir}/man1/copydatabase.1*
+
+%if 0%{?suse_version}
+%files -n libxapian22
+%else
+%files libs
+%endif
+%defattr(-,root,root,-)
+%doc AUTHORS ChangeLog COPYING NEWS README
+%{_libdir}/libxapian.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%doc HACKING PLATFORMS docs/*html docs/apidoc docs/*pdf
+%{_bindir}/xapian-config
+%dir %{_includedir}/xapian
+%{_includedir}/xapian.h
+%{_includedir}/xapian/base.h
+%{_includedir}/xapian/compactor.h
+%{_includedir}/xapian/database.h
+%{_includedir}/xapian/dbfactory.h
+%{_includedir}/xapian/deprecated.h
+%{_includedir}/xapian/derefwrapper.h
+%{_includedir}/xapian/document.h
+%{_includedir}/xapian/enquire.h
+%{_includedir}/xapian/error.h
+%{_includedir}/xapian/errorhandler.h
+%{_includedir}/xapian/expanddecider.h
+%{_includedir}/xapian/keymaker.h
+%{_includedir}/xapian/matchspy.h
+%{_includedir}/xapian/positioniterator.h
+%{_includedir}/xapian/postingiterator.h
+%{_includedir}/xapian/postingsource.h
+%{_includedir}/xapian/query.h
+%{_includedir}/xapian/queryparser.h
+%{_includedir}/xapian/registry.h
+%{_includedir}/xapian/stem.h
+%{_includedir}/xapian/snippetgenerator.h
+%{_includedir}/xapian/termgenerator.h
+%{_includedir}/xapian/termiterator.h
+%{_includedir}/xapian/types.h
+%{_includedir}/xapian/unicode.h
+%{_includedir}/xapian/valueiterator.h
+%{_includedir}/xapian/valuesetmatchdecider.h
+%{_includedir}/xapian/version.h
+%{_includedir}/xapian/visibility.h
+%{_includedir}/xapian/weight.h
+%{_libdir}/libxapian.so
+%{_libdir}/libxapian.la
+%if 0%{?suse_version}
+%dir %{_libdir}/cmake
+%endif
+%{_libdir}/cmake/xapian
+%{_datadir}/aclocal/xapian.m4
+# man pages may be gzipped, hence the trailing wildcard.
+%{_mandir}/man1/xapian-config.1*
+
+%changelog
+* Sun Jan 12 2014 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.16-1
+- Update to 1.2.16
+
+* Fri Aug 23 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.15-1
+- Update to 1.2.15
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Sat Mar 23 2013 Peter Robinson <pbrobinson@fedoraproject.org> 1.2.14
+- Update to 1.2.14
+
+* Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Sun Jul 22 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.12-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed Jul 4 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.12-1
+- Update to 1.2.12
+
+* Sun Apr 29 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.9-1
+- Update to 1.2.9
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.8-2
+- Rebuilt for c++ ABI breakage
+
+* Sat Jan 21 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.8-1
+- Update to 1.2.8
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Aug 18 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.7-1
+- Update to 1.2.7
+
+* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Sun Jan 16 2011 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.4-1
+- Update to 1.2.4
+
+* Mon Aug 30 2010 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.3-1
+- Update to 1.2.3
+
+* Thu Aug 5 2010 Adel Gadllah <adel.gadllah@gmail.com> - 1.2.2-5
+- Reenable SSE on x86_64
+
+* Thu Aug 5 2010 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.2-4
+- Disable SSE instructions by default
+
+* Wed Jul 14 2010 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.2-3
+- And remove non spec cut-n-paste issue
+
+* Wed Jul 14 2010 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.2-2
+- Add cmake stuff
+
+* Wed Jul 14 2010 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.2-1
+- Update to 1.2.2
+
+* Fri May 7 2010 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.0-4
+- Move license to libs package, a few other spc cleanups
+
+* Fri May 7 2010 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.0-3
+- Add the libtool archive (temporarily) to fix build of bindings
+
+* Sat May 1 2010 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.0-2
+- Upload new source 
+
+* Sat May 1 2010 Peter Robinson <pbrobinson@fedoraproject.org> - 1.2.0-1
+- Update to 1.2.0

xapian-add-snippet-generator.patch Added

@@ -0,0 +1,1916 @@
+diff -urN xapian-core-1.2.16.orig/include/Makefile.mk xapian-core-1.2.16/include/Makefile.mk
+--- xapian-core-1.2.16.orig/include/Makefile.mk	2013-12-04 01:13:14.000000000 +0100
++++ xapian-core-1.2.16/include/Makefile.mk	2014-01-18 02:30:09.866605174 +0100
+@@ -28,6 +28,7 @@
+ 	include/xapian/query.h\
+ 	include/xapian/queryparser.h\
+ 	include/xapian/registry.h\
++	include/xapian/snippetgenerator.h\
+ 	include/xapian/stem.h\
+ 	include/xapian/termgenerator.h\
+ 	include/xapian/termiterator.h\
+diff -urN xapian-core-1.2.16.orig/include/xapian/snippetgenerator.h xapian-core-1.2.16/include/xapian/snippetgenerator.h
+--- xapian-core-1.2.16.orig/include/xapian/snippetgenerator.h	1970-01-01 01:00:00.000000000 +0100
++++ xapian-core-1.2.16/include/xapian/snippetgenerator.h	2014-01-18 02:30:09.867605168 +0100
+@@ -0,0 +1,178 @@
++/** @file snippetgenerator.h
++ * @brief parse free text and generate snippets
++ */
++/* Copyright (C) 2007,2009,2011 Olly Betts
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#ifndef XAPIAN_INCLUDED_SNIPPETGENERATOR_H
++#define XAPIAN_INCLUDED_SNIPPETGENERATOR_H
++
++#include <xapian/base.h>
++#include <xapian/types.h>
++#include <xapian/unicode.h>
++#include <xapian/visibility.h>
++
++#include <string>
++
++namespace Xapian {
++
++class Stem;
++
++/** Parses a piece of text and generate snippets.
++ *
++ * This module takes a piece of text and parses it to produce words which are
++ * then used to match against a set of matched terms previously returned
++ * from a query. The output is a snippet, i.e. string showing the matches
++ * highlighted and some surrounding context.
++ */
++class XAPIAN_VISIBILITY_DEFAULT SnippetGenerator {
++ public:
++ /// @private @internal Class representing the SnippetGenerator internals.
++ class Internal;
++ /// @private @internal Reference counted internals.
++ Xapian::Internal::RefCntPtr<Internal> internal;
++
++ /// Copy constructor.
++ SnippetGenerator(const SnippetGenerator & o);
++
++ /// Assignment.
++ SnippetGenerator & operator=(const SnippetGenerator & o);
++
++ /// Default constructor.
++ SnippetGenerator();
++
++ /// Destructor.
++ ~SnippetGenerator();
++
++ /// Set the Xapian::Stem object to be used for generating stemmed terms.
++ void set_stemmer(const Xapian::Stem & stemmer);
++
++ /** Add a match term to be highlighted.
++ *
++ * The term will be stemmed if a stemmer has been configured.
++ * The term will be matched case insensitively but the case
++ * will be preserved in the snippets output.
++ *
++ * @param term A term to be highlighted in the snippets.
++ */
++ void add_match(const std::string & term);
++
++ /** Accept some text.
++ *
++ * @param itor	Utf8Iterator pointing to the text to index.
++ */
++ void accept_text(const Xapian::Utf8Iterator & itor);
++
++ /** Accept some text in a std::string.
++ *
++ * @param text	The text to index.
++ */
++ void accept_text(const std::string & text) {
++	return accept_text(Utf8Iterator(text));
++ }
++
++ /** Increase the term position used by index_text.
++ *
++ * This can be used between indexing text from different fields or other
++ * places to prevent phrase searches from spanning between them (e.g.
++ * between the title and body text, or between two chapters in a book).
++ *
++ * @param delta	Amount to increase the term position by (default: 100).
++ */
++ void increase_termpos(Xapian::termcount delta = 100);
++
++ /// Get the current term position.
++ Xapian::termcount get_termpos() const;
++
++ /** Set the current term position.
++ *
++ * @param termpos	The new term position to set.
++ */
++ void set_termpos(Xapian::termcount termpos);
++
++ /** Get the pre-match string.
++ */
++ std::string get_pre_match() const;
++
++ /** Set the pre-match string.
++ *
++ * Matched terms are shown in the snippets string surrounded
++ * by the pre-match and post-match strings, whose default values
++ * are "" and "".
++ *
++ * @param text The new pre-match string to set.
++ */
++ void set_pre_match(std::string & text);
++
++ /** Get the post-match string.
++ */
++ std::string get_post_match() const;
++
++ /** Set the post-match string.
++ *
++ * Matched terms are shown in each snippet string surrounded
++ * by the pre-match and post-match strings, whose default values
++ * are "" and "".
++ *
++ * @param text The new post-match string to set.
++ */
++ void set_post_match(std::string & text);
++
++ /** Get the inter-snippet string.
++ */
++ std::string get_inter_snippet() const;
++
++ /** Set the inter-snippet string.
++ *
++ * Snippets are shown separated by the inter-snippet string, whose
++ * default value is "...".
++ *
++ * @param text The new inter-snippet string to set.
++ */
++ void set_inter_snippet(std::string & text);
++
++ /** Get the context length, in words
++ */
++ unsigned get_context_length() const;
++
++ /** Set the context length, in words
++ *
++ * Before and after each highlighted match, each snippet
++ * shows some context. This parameter controls how many
++ * words of context are shown.
++ */
++ void set_context_length(unsigned length);
++
++ /** Get the resulting snippets string.
++ */
++ std::string get_snippets();
++
++ /** Reset the snippets state for another set of text.
++ *
++ * Resets the snippet results, matches, termpos, and any saved
++ * context, so that another document or another field of the same
++ * document can be accepted. Preserves parameters like stemmer etc.
++ */
++ void reset();
++
++ /// Return a string describing this object.
++ std::string get_description() const;
++};
++
++}
++
++#endif // XAPIAN_INCLUDED_SNIPPETGENERATOR_H
+diff -urN xapian-core-1.2.16.orig/include/xapian.h xapian-core-1.2.16/include/xapian.h
+--- xapian-core-1.2.16.orig/include/xapian.h	2013-12-04 01:13:14.000000000 +0100
++++ xapian-core-1.2.16/include/xapian.h	2014-01-18 02:30:09.866605174 +0100
+@@ -68,6 +68,7 @@
+ #include <xapian/queryparser.h>
+ #include <xapian/valuesetmatchdecider.h>
+ #include <xapian/weight.h>
++#include <xapian/snippetgenerator.h>
+ 
+ // Stemming
+ #include <xapian/stem.h>
+diff -urN xapian-core-1.2.16.orig/include/xapian.h.orig xapian-core-1.2.16/include/xapian.h.orig
+--- xapian-core-1.2.16.orig/include/xapian.h.orig	1970-01-01 01:00:00.000000000 +0100
++++ xapian-core-1.2.16/include/xapian.h.orig	2013-12-04 01:13:14.000000000 +0100
+@@ -0,0 +1,126 @@
++/** @file xapian.h
++ * @brief Public interfaces for the Xapian library.
++ */
++// Copyright (C) 2003,2004,2005,2007,2008,2009,2010,2012,2013 Olly Betts
++//
++// This program is free software; you can redistribute it and/or modify
++// it under the terms of the GNU General Public License as published by
++// the Free Software Foundation; either version 2 of the License, or
++// (at your option) any later version.
++//
++// This program is distributed in the hope that it will be useful,
++// but WITHOUT ANY WARRANTY; without even the implied warranty of
++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++// GNU General Public License for more details.
++//
++// You should have received a copy of the GNU General Public License
++// along with this program; if not, write to the Free Software
++// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++
++#ifndef XAPIAN_INCLUDED_XAPIAN_H
++#define XAPIAN_INCLUDED_XAPIAN_H
++
++#ifdef slots
++# ifdef Q_OBJECT
++// Qt headers '#define slots' by default, which clashes with us using it as a
++// class member name. Including <xapian.h> first is a simple workaround, or
++// you can use 'no_keywords' to stop Qt polluting the global macro namespace,
++// as described here:
++//
++// http://qt-project.org/doc/qt-5.0/signalsandslots.html#using-qt-with-3rd-party-signals-and-slots
++# error "Include <xapian.h> before Qt headers, or put 'CONFIG += no_keywords' in your .pro file and use Q_SLOTS instead of slots, etc"
++# endif
++# ifdef WT_API
++// Argh, copycat polluters!
++# error "Include <xapian.h> before Wt headers, or define WT_NO_SLOT_MACROS to stop Wt from defining the macros 'slots' and 'SLOT()'"
++# endif
++#endif
++
++// Set defines for library version and check C++ ABI versions match.
++#include <xapian/version.h>
++
++// Types
++#include <xapian/types.h>
++
++// Exceptions
++#include <xapian/error.h>
++#include <xapian/errorhandler.h>
++
++// Access to databases, documents, etc.
++#include <xapian/database.h>
++#include <xapian/dbfactory.h>
++#include <xapian/document.h>
++#include <xapian/positioniterator.h>
++#include <xapian/postingiterator.h>
++#include <xapian/termiterator.h>
++#include <xapian/valueiterator.h>
++
++// Indexing
++#include <xapian/termgenerator.h>
++
++// Searching
++#include <xapian/enquire.h>
++#include <xapian/expanddecider.h>
++#include <xapian/keymaker.h>
++#include <xapian/matchspy.h>
++#include <xapian/postingsource.h>
++#include <xapian/query.h>
++#include <xapian/queryparser.h>
++#include <xapian/valuesetmatchdecider.h>
++#include <xapian/weight.h>
++
++// Stemming
++#include <xapian/stem.h>
++
++// Subclass registry
++#include <xapian/registry.h>
++
++// Unicode support
++#include <xapian/unicode.h>
++
++// Database compaction and merging
++#include <xapian/compactor.h>
++
++// ELF visibility annotations for GCC.
++#include <xapian/visibility.h>
++
++/// The Xapian namespace contains public interfaces for the Xapian library.
++namespace Xapian {
++
++// Functions returning library version:
++
++/** Report the version string of the library which the program is linked with.
++ *
++ * This may be different to the version compiled against (given by
++ * XAPIAN_VERSION) if shared libraries are being used.
++ */
++XAPIAN_VISIBILITY_DEFAULT
++const char * version_string();
++
++/** Report the major version of the library which the program is linked with.
++ *
++ * This may be different to the version compiled against (given by
++ * XAPIAN_MAJOR_VERSION) if shared libraries are being used.
++ */
++XAPIAN_VISIBILITY_DEFAULT
++int major_version();
++
++/** Report the minor version of the library which the program is linked with.
++ *
++ * This may be different to the version compiled against (given by
++ * XAPIAN_MINOR_VERSION) if shared libraries are being used.
++ */
++XAPIAN_VISIBILITY_DEFAULT
++int minor_version();
++
++/** Report the revision of the library which the program is linked with.
++ *
++ * This may be different to the version compiled against (given by
++ * XAPIAN_REVISION) if shared libraries are being used.
++ */
++XAPIAN_VISIBILITY_DEFAULT
++int revision();
++
++}
++
++#endif /* XAPIAN_INCLUDED_XAPIAN_H */
+diff -urN xapian-core-1.2.16.orig/queryparser/Makefile.mk xapian-core-1.2.16/queryparser/Makefile.mk
+--- xapian-core-1.2.16.orig/queryparser/Makefile.mk	2013-12-04 01:13:23.000000000 +0100
++++ xapian-core-1.2.16/queryparser/Makefile.mk	2014-01-18 02:30:09.867605168 +0100
+@@ -8,7 +8,8 @@
+ 	queryparser/cjk-tokenizer.h\
+ 	queryparser/queryparser_internal.h\
+ 	queryparser/queryparser_token.h\
+-	queryparser/termgenerator_internal.h
++	queryparser/termgenerator_internal.h\
++	queryparser/snippetgenerator_internal.h
+ 
+ lemon_built_sources =\
+ 	queryparser/queryparser_internal.cc\
+@@ -62,4 +63,6 @@
+ 	queryparser/queryparser.cc\
+ 	queryparser/queryparser_internal.cc\
+ 	queryparser/termgenerator.cc\
+-	queryparser/termgenerator_internal.cc
++	queryparser/termgenerator_internal.cc\
++	queryparser/snippetgenerator.cc\
++	queryparser/snippetgenerator_internal.cc
+diff -urN xapian-core-1.2.16.orig/queryparser/snippetgenerator.cc xapian-core-1.2.16/queryparser/snippetgenerator.cc
+--- xapian-core-1.2.16.orig/queryparser/snippetgenerator.cc	1970-01-01 01:00:00.000000000 +0100
++++ xapian-core-1.2.16/queryparser/snippetgenerator.cc	2014-01-18 02:30:09.867605168 +0100
+@@ -0,0 +1,151 @@
++/** @file snippetgenerator.cc
++ * @brief SnippetGenerator class implementation
++ */
++/* Copyright (C) 2007 Olly Betts
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#include <config.h>
++
++#include <xapian/snippetgenerator.h>
++#include <xapian/types.h>
++
++#include "snippetgenerator_internal.h"
++
++#include "str.h"
++
++using namespace std;
++using namespace Xapian;
++
++SnippetGenerator::SnippetGenerator(const SnippetGenerator & o) : internal(o.internal) { }
++
++SnippetGenerator &
++SnippetGenerator::operator=(const SnippetGenerator & o) {
++ internal = o.internal;
++ return *this;
++}
++
++SnippetGenerator::SnippetGenerator() : internal(new SnippetGenerator::Internal) { }
++
++SnippetGenerator::~SnippetGenerator() { }
++
++void
++SnippetGenerator::set_stemmer(const Xapian::Stem & stemmer)
++{
++ internal->stemmer = stemmer;
++}
++
++void
++SnippetGenerator::add_match(const std::string & term)
++{
++ internal->add_match(term);
++}
++
++void
++SnippetGenerator::accept_text(const Xapian::Utf8Iterator & itor)
++{
++ internal->accept_text(itor);
++}
++
++void
++SnippetGenerator::increase_termpos(Xapian::termcount delta)
++{
++ internal->termpos += delta;
++}
++
++Xapian::termcount
++SnippetGenerator::get_termpos() const
++{
++ return internal->termpos;
++}
++
++void
++SnippetGenerator::set_termpos(Xapian::termcount termpos)
++{
++ internal->termpos = termpos;
++}
++
++std::string
++SnippetGenerator::get_pre_match() const
++{
++ return internal->pre_match;
++}
++
++void
++SnippetGenerator::set_pre_match(std::string & text)
++{
++ internal->pre_match = text;
++}
++
++std::string
++SnippetGenerator::get_post_match() const
++{
++ return internal->post_match;
++}
++
++void
++SnippetGenerator::set_post_match(std::string & text)
++{
++ internal->post_match = text;
++}
++
++std::string
++SnippetGenerator::get_inter_snippet() const
++{
++ return internal->inter_snippet;
++}
++
++void
++SnippetGenerator::set_inter_snippet(std::string & text)
++{
++ internal->inter_snippet = text;
++}
++
++unsigned
++SnippetGenerator::get_context_length() const
++{
++ return internal->context_length;
++}
++
++void
++SnippetGenerator::set_context_length(unsigned length)
++{
++ internal->context_length = length;
++}
++
++std::string
++SnippetGenerator::get_snippets()
++{
++ return internal->result;
++}
++
++void
++SnippetGenerator::reset()
++{
++ internal->reset();
++}
++
++string
++SnippetGenerator::get_description() const
++{
++ string s("Xapian::SnippetGenerator(");
++ if (internal.get()) {
++	s += "stem=";
++	s += internal->stemmer.get_description();
++ }
++ s += ")";
++ return s;
++}
+diff -urN xapian-core-1.2.16.orig/queryparser/snippetgenerator_internal.cc xapian-core-1.2.16/queryparser/snippetgenerator_internal.cc
+--- xapian-core-1.2.16.orig/queryparser/snippetgenerator_internal.cc	1970-01-01 01:00:00.000000000 +0100
++++ xapian-core-1.2.16/queryparser/snippetgenerator_internal.cc	2014-01-18 02:30:09.867605168 +0100
+@@ -0,0 +1,328 @@
++/** @file snippetgenerator_internal.cc
++ * @brief SnippetGenerator class internals
++ */
++/* Copyright (C) 2007,2010,2011 Olly Betts
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#include <config.h>
++
++#include "snippetgenerator_internal.h"
++
++#include <xapian/queryparser.h>
++#include <xapian/unicode.h>
++
++#include "stringutils.h"
++
++#include <limits>
++#include <string>
++#include "cjk-tokenizer.h"
++
++using namespace std;
++
++namespace Xapian {
++
++void
++SnippetGenerator::Internal::add_match(const std::string & term)
++{
++ string stem = Unicode::tolower(term);
++ if (stemmer.internal.get())
++	stem = stemmer(stem);
++ matches.insert(stem);
++}
++
++void
++SnippetGenerator::Internal::accept_term(const string & term, termcount pos)
++{
++ string stem = Unicode::tolower(term);
++ if (stemmer.internal.get())
++	stem = stemmer(stem);
++
++ // we don't keep context across termpos discontinuities
++ if (pos > (lastpos+2)) {
++	// there is no queue::clear() dammit
++	while (!context.empty())
++	 context.pop();
++	leading_nonword = "";
++ }
++ lastpos = pos;
++ nwhitespace = 0;
++
++ if (matches.find(stem) != matches.end()) {
++	// found a match
++	if (pos > horizon + context.size() + 1 && result != "") {
++	 // there was a gap from the end of the context after
++	 // the previous snippet, so start a new snippet
++	 result += inter_snippet;
++	} else {
++	 result += leading_nonword;
++	}
++	leading_nonword = "";
++
++	// flush the before-context
++	while (!context.empty()) {
++	 result += context.front();
++	 context.pop();
++	}
++
++	// emit the match, highlighted
++	result += pre_match;
++	result += term;
++	result += post_match;
++
++	// set the horizon to mark the end of the after-context
++	horizon = pos + context_length;
++ } else if (pos <= horizon) {
++	// the after-context for a match
++	result += term;
++ } else {
++	// not explicitly in a context, but remember the
++	// term in the context queue for later
++	context.push(term);
++	while (context.size() > context_length)
++	 context.pop();
++	// this order handles the context_length=0 case gracefully
++ }
++}
++
++void
++SnippetGenerator::Internal::accept_nonword_char(unsigned ch, termcount pos)
++{
++ if (context.empty() && leading_nonword != "") {
++	Unicode::append_utf8(leading_nonword, ch);
++	return;
++ }
++
++ if (Unicode::is_whitespace(ch)) {
++	if (++nwhitespace > 1)
++	 return;
++	ch = ' ';
++ } else {
++	nwhitespace = 0;
++ }
++
++ if (pos <= horizon) {
++	// the last word of the after-context of a snippet
++	if (ch == ' ' && pos == horizon) {
++	 // after-context ends on first whitespace
++	 // after the last word in the horizon,
++	 // ...unless another one abuts it, but we
++	 // don't know that yet, so keep it around
++	 // just in case
++	 Unicode::append_utf8(leading_nonword, ch);
++	 return;
++	}
++
++	// the after-context for a match
++	Unicode::append_utf8(result, ch);
++ } else {
++	if (context.size())
++	 Unicode::append_utf8(context.back(), ch);
++ }
++}
++
++// Put a limit on the size of terms to help prevent the index being bloated
++// by useless junk terms.
++static const unsigned int MAX_PROB_TERM_LENGTH = 64;
++// FIXME: threshold is currently in bytes of UTF-8 representation, not unicode
++// characters - what actually makes most sense here?
++
++inline bool
++U_isupper(unsigned ch) {
++ return (ch < 128 && C_isupper((unsigned char)ch));
++}
++
++inline unsigned check_wordchar(unsigned ch) {
++ if (Unicode::is_wordchar(ch)) return ch;
++ return 0;
++}
++
++/** Value representing "ignore this" when returned by check_infix() or
++ * check_infix_digit().
++ */
++const unsigned UNICODE_IGNORE = numeric_limits<unsigned>::max();
++
++inline unsigned check_infix(unsigned ch) {
++ if (ch == '\'' || ch == '&' || ch == 0xb7 || ch == 0x5f4 || ch == 0x2027) {
++	// Unicode includes all these except '&' in its word boundary rules,
++	// as well as 0x2019 (which we handle below) and ':' (for Swedish
++	// apparently, but we ignore this for now as it's problematic in
++	// real world cases).
++	return ch;
++ }
++ // 0x2019 is Unicode apostrophe and single closing quote.
++ // 0x201b is Unicode single opening quote with the tail rising.
++ if (ch == 0x2019 || ch == 0x201b) return '\'';
++ if (ch >= 0x200b && (ch <= 0x200d || ch == 0x2060 || ch == 0xfeff))
++	return UNICODE_IGNORE;
++ return 0;
++}
++
++inline unsigned check_infix_digit(unsigned ch) {
++ // This list of characters comes from Unicode's word identifying algorithm.
++ switch (ch) {
++	case ',':
++	case '.':
++	case ';':
++	case 0x037e: // GREEK QUESTION MARK
++	case 0x0589: // ARMENIAN FULL STOP
++	case 0x060D: // ARABIC DATE SEPARATOR
++	case 0x07F8: // NKO COMMA
++	case 0x2044: // FRACTION SLASH
++	case 0xFE10: // PRESENTATION FORM FOR VERTICAL COMMA
++	case 0xFE13: // PRESENTATION FORM FOR VERTICAL COLON
++	case 0xFE14: // PRESENTATION FORM FOR VERTICAL SEMICOLON
++	 return ch;
++ }
++ if (ch >= 0x200b && (ch <= 0x200d || ch == 0x2060 || ch == 0xfeff))
++	return UNICODE_IGNORE;
++ return 0;
++}
++
++inline bool
++is_digit(unsigned ch) {
++ return (Unicode::get_category(ch) == Unicode::DECIMAL_DIGIT_NUMBER);
++}
++
++inline unsigned check_suffix(unsigned ch) {
++ if (ch == '+' || ch == '#') return ch;
++ // FIXME: what about '-'?
++ return 0;
++}
++
++void
++SnippetGenerator::Internal::accept_text(Utf8Iterator itor)
++{
++ bool cjk_ngram = CJK::is_cjk_enabled();
++
++ while (true) {
++	// Advance to the start of the next term.
++	unsigned ch;
++	while (true) {
++	 if (itor == Utf8Iterator()) return;
++	 ch = check_wordchar(*itor);
++	 if (ch) break;
++	 accept_nonword_char(*itor, termpos);
++	 ++itor;
++	}
++
++	string term;
++	// Look for initials separated by '.' (e.g. P.T.O., U.N.C.L.E).
++	// Don't worry if there's a trailing '.' or not.
++	if (U_isupper(*itor)) {
++	 const Utf8Iterator end;
++	 Utf8Iterator p = itor;
++	 do {
++		Unicode::append_utf8(term, Unicode::tolower(*p++));
++	 } while (p != end && *p == '.' && ++p != end && U_isupper(*p));
++	 // One letter does not make an acronym! If we handled a single
++	 // uppercase letter here, we wouldn't catch M&S below.
++	 if (term.size() > 1) {
++		// Check there's not a (lower case) letter or digit
++		// immediately after it.
++		if (p == end || !Unicode::is_wordchar(*p)) {
++		 itor = p;
++		 goto endofterm;
++		}
++	 }
++	 term.resize(0);
++	}
++
++	while (true) {
++	 if (cjk_ngram && CJK::codepoint_is_cjk(*itor)) {
++		const string & cjk = CJK::get_cjk(itor);
++		for (CJKTokenIterator tk(cjk); tk != CJKTokenIterator(); ++tk) {
++		 const string & cjk_token = *tk;
++		 if (cjk_token.size() > MAX_PROB_TERM_LENGTH) continue;
++
++		 // Add unstemmed form positional information.
++		 accept_term(cjk_token, ++termpos);
++		}
++		while (true) {
++		 if (itor == Utf8Iterator()) return;
++		 ch = check_wordchar(*itor);
++		 if (ch) break;
++		 accept_nonword_char(*itor, termpos);
++		 ++itor;
++		}
++	 }
++	 unsigned prevch;
++	 do {
++		Unicode::append_utf8(term, ch);
++		prevch = ch;
++		if (++itor == Utf8Iterator() ||
++		 (cjk_ngram && CJK::codepoint_is_cjk(*itor)))
++		 goto endofterm;
++		ch = check_wordchar(*itor);
++	 } while (ch);
++
++	 Utf8Iterator next(itor);
++	 ++next;
++	 if (next == Utf8Iterator()) break;
++	 unsigned nextch = check_wordchar(*next);
++	 if (!nextch) break;
++	 unsigned infix_ch = *itor;
++	 if (is_digit(prevch) && is_digit(*next)) {
++		infix_ch = check_infix_digit(infix_ch);
++	 } else {
++		// Handle things like '&' in AT&T, apostrophes, etc.
++		infix_ch = check_infix(infix_ch);
++	 }
++	 if (!infix_ch) break;
++	 if (infix_ch != UNICODE_IGNORE)
++		Unicode::append_utf8(term, infix_ch);
++	 ch = nextch;
++	 itor = next;
++	}
++
++	{
++	 size_t len = term.size();
++	 unsigned count = 0;
++	 while ((ch = check_suffix(*itor))) {
++		if (++count > 3) {
++		 term.resize(len);
++		 break;
++		}
++		Unicode::append_utf8(term, ch);
++		if (++itor == Utf8Iterator()) goto endofterm;
++	 }
++	 // Don't index fish+chips as fish+ chips.
++	 if (Unicode::is_wordchar(*itor))
++		term.resize(len);
++	}
++
++endofterm:
++	if (term.size() > MAX_PROB_TERM_LENGTH) continue;
++	accept_term(term, ++termpos);
++ }
++}
++
++
++void
++SnippetGenerator::Internal::reset()
++{
++ result = "";
++ horizon = 0;
++ lastpos = 0;
++ nwhitespace = 0;
++ while (!context.empty())
++	context.pop();
++ matches.clear();
++ termpos = 0;
++ leading_nonword = "";
++}
++
++}
+diff -urN xapian-core-1.2.16.orig/queryparser/snippetgenerator_internal.h xapian-core-1.2.16/queryparser/snippetgenerator_internal.h
+--- xapian-core-1.2.16.orig/queryparser/snippetgenerator_internal.h	1970-01-01 01:00:00.000000000 +0100
++++ xapian-core-1.2.16/queryparser/snippetgenerator_internal.h	2014-01-18 02:30:09.867605168 +0100
+@@ -0,0 +1,66 @@
++/** @file snippetgenerator_internal.h
++ * @brief SnippetGenerator class internals
++ */
++/* Copyright (C) 2007 Olly Betts
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#ifndef XAPIAN_INCLUDED_SNIPPETGENERATOR_INTERNAL_H
++#define XAPIAN_INCLUDED_SNIPPETGENERATOR_INTERNAL_H
++
++#include <xapian/base.h>
++#include <xapian/snippetgenerator.h>
++#include <xapian/queryparser.h>
++#include <xapian/stem.h>
++#include <tr1/unordered_set>
++#include <queue>
++
++namespace Xapian {
++
++class SnippetGenerator::Internal : public Xapian::Internal::RefCntBase {
++ friend class SnippetGenerator;
++ Stem stemmer;
++ std::string pre_match;
++ std::string post_match;
++ std::string inter_snippet;
++ termcount context_length;
++ std::tr1::unordered_set<std::string> matches;
++ unsigned nwhitespace;
++ std::string leading_nonword;
++
++ termcount horizon;
++ termcount lastpos;
++ std::queue<std::string> context;
++ std::string result;
++
++ termcount termpos;
++
++ void accept_term(const std::string & term, termcount pos);
++ void accept_nonword_char(unsigned ch, termcount pos);
++
++ public:
++ Internal() : pre_match(""), post_match(""),
++		 inter_snippet("..."), context_length(5),
++		 nwhitespace(0), horizon(0), lastpos(0),
++		 termpos(0) { }
++ void add_match(const std::string & term);
++ void accept_text(Utf8Iterator itor);
++ void reset();
++};
++
++}
++
++#endif // XAPIAN_INCLUDED_SNIPPETGENERATOR_INTERNAL_H
+diff -urN xapian-core-1.2.16.orig/tests/termgentest.cc xapian-core-1.2.16/tests/termgentest.cc
+--- xapian-core-1.2.16.orig/tests/termgentest.cc	2013-12-04 01:13:56.000000000 +0100
++++ xapian-core-1.2.16/tests/termgentest.cc	2014-01-18 02:30:09.868605163 +0100
+@@ -1,4 +1,4 @@
+-/* termgentest.cc: Tests of Xapian::TermGenerator
++/* termgentest.cc: Tests of Xapian::TermGenerator & SnippetGenerator
+ *
+ * Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010,2013 Olly Betts
+ * Copyright (C) 2007 Lemur Consulting Ltd
+@@ -835,12 +835,128 @@
+ return true;
+ }
+ 
++static bool test_snipgen1()
++{
++ Xapian::SnippetGenerator snipgen;
++ snipgen.set_context_length(3);
++
++ std::string text("Readymade photo booth (typeWriter), occupy "
++		 "DreamCatcher Polaroid four loko butcher "
++		 "gentrify. Williamsburg, banh mi gastropub.");
++
++ snipgen.reset();
++ snipgen.add_match("readymade");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "Readymade "
++				 "photo booth (typeWriter),");
++
++ snipgen.reset();
++ snipgen.add_match("Readymade");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "Readymade "
++				 "photo booth (typeWriter),");
++
++ snipgen.reset();
++ snipgen.add_match("reAdyMaDe");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "Readymade "
++				 "photo booth (typeWriter),");
++
++ snipgen.reset();
++ snipgen.add_match("photo");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "Readymade "
++				 "photo "
++				 "booth (typeWriter), occupy");
++
++ snipgen.reset();
++ snipgen.add_match("occupy");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "photo booth (typeWriter), "
++				 "occupy "
++				 "DreamCatcher Polaroid four");
++
++ snipgen.reset();
++ snipgen.add_match("gastropub");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "Williamsburg, banh mi "
++				 "gastropub.");
++
++ snipgen.reset();
++ snipgen.add_match("dreamcatcher");
++ snipgen.add_match("butcher");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "booth (typeWriter), occupy "
++				 "DreamCatcher "
++				 "Polaroid four loko "
++				 "butcher "
++				 "gentrify. Williamsburg, banh");
++
++ snipgen.reset();
++ snipgen.add_match("occupy");
++ snipgen.add_match("williamsburg");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "photo booth (typeWriter), "
++				 "occupy "
++				 "DreamCatcher Polaroid four loko butcher gentrify. "
++				 "Williamsburg, "
++				 "banh mi gastropub.");
++
++ snipgen.reset();
++ snipgen.add_match("occupy");
++ snipgen.add_match("banh");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "photo booth (typeWriter), "
++				 "occupy "
++				 "DreamCatcher Polaroid four"
++				 "..."
++				 "butcher gentrify. Williamsburg, "
++				 "banh "
++				 "mi gastropub.");
++
++ return true;
++}
++
++static bool test_sg_stem()
++{
++ Xapian::SnippetGenerator snipgen;
++ snipgen.set_context_length(3);
++ Xapian::Stem stemmer("en");
++ snipgen.set_stemmer(stemmer);
++
++ std::string text("She sells sea shells by the sea shore");
++
++ snipgen.reset();
++ snipgen.add_match("shells");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "She sells sea shells by the sea");
++
++ snipgen.reset();
++ snipgen.add_match("shell");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "She sells sea shells by the sea");
++
++ snipgen.reset();
++ snipgen.add_match("shelled");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "She sells sea shells by the sea");
++
++ snipgen.reset();
++ snipgen.add_match("shelling");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "She sells sea shells by the sea");
++
++ return true;
++}
++
+ /// Test cases for the TermGenerator.
+ static const test_desc tests[] = {
+ TESTCASE(termgen1),
+ TESTCASE(tg_spell1),
+ TESTCASE(tg_spell2),
+ TESTCASE(tg_max_word_length1),
++ TESTCASE(snipgen1),
++ TESTCASE(sg_stem),
+ END_OF_TESTCASES
+ };
+ 
+diff -urN xapian-core-1.2.16.orig/tests/termgentest.cc.orig xapian-core-1.2.16/tests/termgentest.cc.orig
+--- xapian-core-1.2.16.orig/tests/termgentest.cc.orig	1970-01-01 01:00:00.000000000 +0100
++++ xapian-core-1.2.16/tests/termgentest.cc.orig	2013-12-04 01:13:56.000000000 +0100
+@@ -0,0 +1,862 @@
++/* termgentest.cc: Tests of Xapian::TermGenerator
++ *
++ * Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010,2013 Olly Betts
++ * Copyright (C) 2007 Lemur Consulting Ltd
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License as
++ * published by the Free Software Foundation; either version 2 of the
++ * License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301
++ * USA
++ */
++
++#include <config.h>
++
++#include <xapian.h>
++
++#include <iostream>
++#include <string>
++
++#include "str.h"
++#include "testsuite.h"
++#include "testutils.h"
++#include "utils.h"
++
++#include <stdlib.h> // For setenv() or putenv()
++
++using namespace std;
++
++#define TESTCASE(S) {#S, test_##S}
++#define END_OF_TESTCASES {0, 0}
++
++struct test {
++ // A string of options, separated by commas.
++ // Valid options are:
++ // - cont: don't clear the document, so add to the previous output
++ // - nopos: Don't store positions.
++ // - weight=N: where N is a number - set the weight to N.
++ // - stem=FOO: Change stemming algorithm to foo ("none" to turn off).
++ // (this persists for subsequent tests until it's turned off).
++ // - all: Set stemming strategy to STEM_ALL.
++ // (this persists for subsequent tests until it's turned off).
++ // - all_z: Set stemming strategy to STEM_ALL_Z.
++ // (this persists for subsequent tests until it's turned off).
++ // - none: Set stemming strategy to STEM_NONE.
++ // (this persists for subsequent tests until it's turned off).
++ // - some: Set stemming strategy to STEM_SOME.
++ // (this persists for subsequent tests until it's turned off).
++ // - prefix=FOO: Use the specified prefix.
++ // (this persists for subsequent tests until it's turned off).
++ const char *options;
++
++ // The text to be processed.
++ const char *text;
++
++ // The expected output.
++ //
++ // This is the list of terms in the resulting document, in sorted order,
++ // followed by ":WDF" if the wdf is not equal to the length of the position
++ // list, followed by "[POSITIONS]" if positional information is stored,
++ // where POSITIONS is a comma separated list of numbers.
++ const char *expect;
++};
++
++static const test test_simple[] = {
++ // A basic test with a hyphen
++ { "", "simple-example", "example[2] simple[1]" },
++ { "cont,weight=2",
++	 "simple-example", "example:3[2,104] simple:3[1,103]" },
++
++ // Test parsing of initials
++ { "", "I.B.M.", "ibm[1]" },
++ { "", "I.B.M", "ibm[1]" },
++ { "", "I.B.", "ib[1]" },
++ { "", "I.B", "ib[1]" },
++ { "", "I.", "i[1]" },
++
++ // Test parsing initials with a stemmer.
++ { "stem=en",
++	 "I.B.M.", "Zibm:1 ibm[1]" },
++ { "", "I.B.M", "Zibm:1 ibm[1]" },
++ { "", "I.B.", "Zib:1 ib[1]" },
++ { "", "I.B", "Zib:1 ib[1]" },
++ { "", "I.", "Zi:1 i[1]" },
++ { "", "I.B.M. P.C.", "Zibm:1 Zpc:1 ibm[1] pc[2]" },
++ { "", "I.B.M P.C.", "Zibm:1 Zpc:1 ibm[1] pc[2]" },
++
++ // Test parsing numbers
++ { "", "1.0 1000,000.99 0.9.9,", "0.9.9[3] 1.0[1] 1000,000.99[2]" },
++ { "", "Pi is 3.1415926536 approximately", "3.1415926536[3] Zapproxim:1 Zis:1 Zpi:1 approximately[4] is[2] pi[1]"},
++
++ // Test parsing some capitalised words
++ { "", "hello World Test", "Zhello:1 Ztest:1 Zworld:1 hello[1] test[3] world[2]" },
++ { "prefix=XA", "hello", "XAhello[1] ZXAhello:1" },
++ { "prefix=XA", "hello World Test", "XAhello[1] XAtest[3] XAworld[2] ZXAhello:1 ZXAtest:1 ZXAworld:1" },
++
++ // Assorted tests, corresponding to tests in queryparsertest.
++ { "prefix=", "time_t", "Ztime_t:1 time_t[1]" },
++ { "", "stock -cooking", "Zcook:1 Zstock:1 cooking[2] stock[1]" },
++ { "", "d- school report", "Zd:1 Zreport:1 Zschool:1 d[1] report[3] school[2]" },
++ { "", "gtk+ -gnome", "Zgnome:1 Zgtk+:1 gnome[2] gtk+[1]" },
++ { "", "c++ -d--", "Zc++:1 Zd:1 c++[1] d[2]" },
++ { "", "cd'r toebehoren", "Zcd'r:1 Ztoebehoren:1 cd'r[1] toebehoren[2]" },
++
++ // Test discarding of terms > 64 bytes.
++ { "", "a REALLYREALLYREALLYREALLYREALLYREALLYREALLYREALLYREALLYREALLYLONG term",
++ "Za:1 Zreallyreallyreallyreallyreallyreallyreallyreallyreallyreallylong:1 Zterm:1 a[1] reallyreallyreallyreallyreallyreallyreallyreallyreallyreallylong[2] term[3]" },
++ { "", "a REALLYREALLYREALLYREALLYREALLYREALLYREALLYREALLYREALLYREALLYLONGX term", "Za:1 Zterm:1 a[1] term[2]" },
++
++ // In 1.1.4, ENCLOSING_MARK and COMBINING_SPACING_MARK were added, and
++ // code to ignore several zero-width space characters was added.
++ { "", "\xe1\x80\x9d\xe1\x80\xae\xe2\x80\x8b\xe1\x80\x80\xe1\x80\xae\xe2\x80\x8b\xe1\x80\x95\xe1\x80\xad\xe2\x80\x8b\xe1\x80\x9e\xe1\x80\xaf\xe1\x80\xb6\xe1\x80\xb8\xe2\x80\x8b\xe1\x80\x85\xe1\x80\xbd\xe1\x80\xb2\xe2\x80\x8b\xe1\x80\x9e\xe1\x80\xb0\xe2\x80\x8b\xe1\x80\x99\xe1\x80\xbb\xe1\x80\xac\xe1\x80\xb8\xe1\x80\x80",
++ "Z\xe1\x80\x9d\xe1\x80\xae\xe1\x80\x80\xe1\x80\xae\xe1\x80\x95\xe1\x80\xad\xe1\x80\x9e\xe1\x80\xaf\xe1\x80\xb6\xe1\x80\xb8\xe1\x80\x85\xe1\x80\xbd\xe1\x80\xb2\xe1\x80\x9e\xe1\x80\xb0\xe1\x80\x99\xe1\x80\xbb\xe1\x80\xac\xe1\x80\xb8\xe1\x80\x80:1 \xe1\x80\x9d\xe1\x80\xae\xe1\x80\x80\xe1\x80\xae\xe1\x80\x95\xe1\x80\xad\xe1\x80\x9e\xe1\x80\xaf\xe1\x80\xb6\xe1\x80\xb8\xe1\x80\x85\xe1\x80\xbd\xe1\x80\xb2\xe1\x80\x9e\xe1\x80\xb0\xe1\x80\x99\xe1\x80\xbb\xe1\x80\xac\xe1\x80\xb8\xe1\x80\x80[1]" },
++
++ { "", "fish+chips", "Zchip:1 Zfish:1 chips[2] fish[1]" },
++
++ // Basic CJK tests:
++ { "stem=", "久有归天", "久[1] 久有:1 天[4] 归[3] 归天:1 有[2] 有归:1" },
++ { "", "극지라", "극[1] 극지:1 라[3] 지[2] 지라:1" },
++ { "", "ウルス アップ", "ア[4] アッ:1 ウ[1] ウル:1 ス[3] ッ[5] ップ:1 プ[6] ル[2] ルス:1" },
++
++ // CJK with prefix:
++ { "prefix=XA", "发送从", "XA从[3] XA发[1] XA发送:1 XA送[2] XA送从:1" },
++ { "prefix=XA", "点卡思考", "XA卡[2] XA卡思:1 XA思[3] XA思考:1 XA点[1] XA点卡:1 XA考[4]" },
++
++ // CJK mixed with non-CJK:
++ { "prefix=", "インtestタ", "test[3] イ[1] イン:1 タ[4] ン[2]" },
++ { "", "配this is合a个 test!", "a[5] is[3] test[7] this[2] 个[6] 合[4] 配[1]" },
++
++ // CJK with CJK punctuation
++ // the text contains U+FF01 FULLWIDTH EXCLAMATION MARK which
++ // is both a CJK character and a non-word character; it should
++ // be handled as non-word text and not appear in any term
++ { "", "申込み！月額円", "み[3] 円[6] 月[4] 月額:1 申[1] 申込:1 込[2] 込み:1 額[5] 額円:1" },
++
++ // Test set_stemming_strategy():
++ { "stem=en,none",
++	 "Unstemmed words!", "unstemmed[1] words[2]" },
++
++ { "all",
++	 "Only stemmed words!", "onli[1] stem[2] word[3]" },
++
++ { "all_z",
++	 "Only stemmed words!", "Zonli[1] Zstem[2] Zword[3]" },
++
++ // All following tests are for things which we probably don't really want to
++ // behave as they currently do, but we haven't found a sufficiently general
++ // way to implement them yet.
++
++ // Test number like things
++ { "stem=en,some",
++	 "11:59", "11[1] 59[2]" },
++ { "", "11:59am", "11[1] 59am[2]" },
++
++ { NULL, NULL, NULL }
++};
++
++#if 0
++// These are the queries from the main query parser test. We'll gradually
++// convert them into termgenerator test cases.
++ { "Mg2+ Cl-", "(mg2+:(pos=1) OR cl:(pos=2))" },
++ { "\"c++ library\"", "(c++:(pos=1) PHRASE 2 library:(pos=2))" },
++ { "A&L A&RMCO AD&D", "(a&l:(pos=1) OR a&rmco:(pos=2) OR ad&d:(pos=3))" },
++ { "C# vs C++", "(c#:(pos=1) OR Zvs:(pos=2) OR c++:(pos=3))" },
++ { "j##", "Zj##:(pos=1)" },
++ { "a#b", "(Za:(pos=1) OR Zb:(pos=2))" },
++ { "O.K. U.N.C.L.E XY.Z.", "(ok:(pos=1) OR uncle:(pos=2) OR (xy:(pos=3) PHRASE 2 z:(pos=4)))" },
++ { "author:orwell animal farm", "(ZAorwel:(pos=1) OR Zanim:(pos=2) OR Zfarm:(pos=3))" },
++ { "author:Orwell Animal Farm", "(Aorwell:(pos=1) OR animal:(pos=2) OR farm:(pos=3))" },
++ // Regression test for bug reported in 0.9.6.
++ { "author:\"orwell\" title:\"animal\"", "(Aorwell:(pos=1) OR XTanimal:(pos=2))" },
++ // Regression test for bug related to one reported in 0.9.6.
++ { "author:(orwell) title:(animal)", "(ZAorwel:(pos=1) OR ZXTanim:(pos=2))" },
++ // Regression test for bug caused by fix for previous bug.
++ { "author:\"milne, a.a.\"", "(Amilne:(pos=1) PHRASE 3 Aa:(pos=2) PHRASE 3 Aa:(pos=3))" },
++ { "author:\"milne a.a.\"", "(Amilne:(pos=1) PHRASE 3 Aa:(pos=2) PHRASE 3 Aa:(pos=3))" },
++ // Regression test for bug reported in 0.9.7.
++ { "site:/path/name", "H/path/name" },
++ // Regression test for bug introduced into (and fixed in) SVN prior to 1.0.
++ { "author:/path/name", "(author:(pos=1) PHRASE 3 path:(pos=2) PHRASE 3 name:(pos=3))" },
++ // Regression test for bug introduced into (and fixed in) SVN prior to 1.0.
++ { "author:(title::case)", "(Atitle:(pos=1) PHRASE 2 Acase:(pos=2))" },
++ { "\"1.4\"", "1.4:(pos=1)" },
++ { "\"1.\"", "1:(pos=1)" },
++ { "\"A#.B.\"", "(a#:(pos=1) PHRASE 2 b:(pos=2))" },
++ { "h\xc3\xb6hle", "Zh\xc3\xb6hle:(pos=1)" },
++ { "one +two three", "(Ztwo:(pos=2) AND_MAYBE (Zone:(pos=1) OR Zthree:(pos=3)))" },
++ { "subject:test other", "(ZXTtest:(pos=1) OR Zother:(pos=2))" },
++ { "subject:\"space flight\"", "(XTspace:(pos=1) PHRASE 2 XTflight:(pos=2))" },
++ { "author:(twain OR poe) OR flight", "(ZAtwain:(pos=1) OR ZApoe:(pos=2) OR Zflight:(pos=3))" },
++ { "author:(twain OR title:pit OR poe)", "(ZAtwain:(pos=1) OR ZXTpit:(pos=2) OR ZApoe:(pos=3))" },
++ { "title:2001 title:space", "(XT2001:(pos=1) OR ZXTspace:(pos=2))" },
++ { "(title:help)", "ZXThelp:(pos=1)" },
++ { "beer NOT \"orange juice\"", "(Zbeer:(pos=1) AND_NOT (orange:(pos=2) PHRASE 2 juice:(pos=3)))" },
++ { "beer AND NOT lager", "(Zbeer:(pos=1) AND_NOT Zlager:(pos=2))" },
++ { "one AND two", "(Zone:(pos=1) AND Ztwo:(pos=2))" },
++ { "one A.N.D. two", "(Zone:(pos=1) OR and:(pos=2) OR Ztwo:(pos=3))" },
++ { "one \xc3\x81ND two", "(Zone:(pos=1) OR \xc3\xa1nd:(pos=2) OR Ztwo:(pos=3))" },
++ { "one author:AND two", "(Zone:(pos=1) OR Aand:(pos=2) OR Ztwo:(pos=3))" },
++ { "author:hyphen-ated", "(Ahyphen:(pos=1) PHRASE 2 Aated:(pos=2))" },
++ { "cvs site:xapian.org", "(Zcvs:(pos=1) FILTER Hxapian.org)" },
++ { "cvs -site:xapian.org", "(Zcvs:(pos=1) AND_NOT Hxapian.org)" },
++ { "site:xapian.org mail", "(Zmail:(pos=1) FILTER Hxapian.org)" },
++ { "-site:xapian.org mail", "(Zmail:(pos=1) AND_NOT Hxapian.org)" },
++ { "site:xapian.org", "Hxapian.org" },
++ { "mug +site:xapian.org -site:cvs.xapian.org", "((Zmug:(pos=1) AND_NOT Hcvs.xapian.org) FILTER Hxapian.org)" },
++ { "mug -site:cvs.xapian.org +site:xapian.org", "((Zmug:(pos=1) AND_NOT Hcvs.xapian.org) FILTER Hxapian.org)" },
++ { "NOT windows", "Syntax: <expression> NOT <expression>" },
++ { "a AND (NOT b)", "Syntax: <expression> NOT <expression>" },
++ { "AND NOT windows", "Syntax: <expression> AND NOT <expression>" },
++ { "gordian NOT", "Syntax: <expression> NOT <expression>" },
++ { "gordian AND NOT", "Syntax: <expression> AND NOT <expression>" },
++ { "foo OR (something AND)", "Syntax: <expression> AND <expression>" },
++ { "OR foo", "Syntax: <expression> OR <expression>" },
++ { "XOR", "Syntax: <expression> XOR <expression>" },
++ { "hard\xa0space", "(Zhard:(pos=1) OR Zspace:(pos=2))" },
++ { " white\r\nspace\ttest ", "(Zwhite:(pos=1) OR Zspace:(pos=2) OR Ztest:(pos=3))" },
++ { "one AND two/three", "(Zone:(pos=1) AND (two:(pos=2) PHRASE 2 three:(pos=3)))" },
++ { "one AND /two/three", "(Zone:(pos=1) AND (two:(pos=2) PHRASE 2 three:(pos=3)))" },
++ { "one AND/two/three", "(Zone:(pos=1) AND (two:(pos=2) PHRASE 2 three:(pos=3)))" },
++ { "one +/two/three", "((two:(pos=2) PHRASE 2 three:(pos=3)) AND_MAYBE Zone:(pos=1))" },
++ { "one//two", "(one:(pos=1) PHRASE 2 two:(pos=2))" },
++ { "\"missing quote", "(missing:(pos=1) PHRASE 2 quote:(pos=2))" },
++ { "DVD+RW", "(dvd:(pos=1) OR rw:(pos=2))" }, // Would a phrase be better?
++ { "+\"must have\" optional", "((must:(pos=1) PHRASE 2 have:(pos=2)) AND_MAYBE Zoption:(pos=3))" },
++ { "one NEAR two NEAR three", "(one:(pos=1) NEAR 12 two:(pos=2) NEAR 12 three:(pos=3))" },
++ { "something NEAR/3 else", "(something:(pos=1) NEAR 4 else:(pos=2))" },
++ { "a NEAR/6 b NEAR c", "(a:(pos=1) NEAR 8 b:(pos=2) NEAR 8 c:(pos=3))" },
++ { "something ADJ else", "(something:(pos=1) PHRASE 11 else:(pos=2))" },
++ { "something ADJ/3 else", "(something:(pos=1) PHRASE 4 else:(pos=2))" },
++ { "a ADJ/6 b ADJ c", "(a:(pos=1) PHRASE 8 b:(pos=2) PHRASE 8 c:(pos=3))" },
++ // Regression test - Unicode character values were truncated to 8 bits
++ // before testing C_isdigit(), so this rather artificial example parsed
++ // to: (a:(pos=1) NEAR 262 b:(pos=2))
++ { "a NEAR/\xc4\xb5 b", "((a:(pos=1) NEAR 11 \xc4\xb5:(pos=2)) OR Zb:(pos=3))" },
++ // Real world examples from tweakers.net:
++ { "Call to undefined function: imagecreate()", "(call:(pos=1) OR Zto:(pos=2) OR Zundefin:(pos=3) OR Zfunction:(pos=4) OR imagecreate:(pos=5))" },
++ { "mysql_fetch_row(): supplied argument is not a valid MySQL result resource", "(mysql_fetch_row:(pos=1) OR Zsuppli:(pos=2) OR Zargument:(pos=3) OR Zis:(pos=4) OR Znot:(pos=5) OR Za:(pos=6) OR Zvalid:(pos=7) OR mysql:(pos=8) OR Zresult:(pos=9) OR Zresourc:(pos=10))" },
++ { "php date() nedelands", "(Zphp:(pos=1) OR date:(pos=2) OR Znedeland:(pos=3))" },
++ { "wget domein --http-user", "(Zwget:(pos=1) OR Zdomein:(pos=2) OR (http:(pos=3) PHRASE 2 user:(pos=4)))" },
++ { "@home problemen", "(Zhome:(pos=1) OR Zproblemen:(pos=2))" },
++ { "'ipacsum'", "Zipacsum:(pos=1)" },
++ { "canal + ", "Zcanal:(pos=1)" },
++ { "/var/run/mysqld/mysqld.sock", "(var:(pos=1) PHRASE 5 run:(pos=2) PHRASE 5 mysqld:(pos=3) PHRASE 5 mysqld:(pos=4) PHRASE 5 sock:(pos=5))" },
++ { "\"QSI-161 drivers\"", "(qsi:(pos=1) PHRASE 3 161:(pos=2) PHRASE 3 drivers:(pos=3))" },
++ { "\"e-cube\" barebone", "((e:(pos=1) PHRASE 2 cube:(pos=2)) OR Zbarebon:(pos=3))" },
++ { "\"./httpd: symbol not found: dlopen\"", "(httpd:(pos=1) PHRASE 5 symbol:(pos=2) PHRASE 5 not:(pos=3) PHRASE 5 found:(pos=4) PHRASE 5 dlopen:(pos=5))" },
++ { "ERROR 2003: Can't connect to MySQL server on 'localhost' (10061)", "(error:(pos=1) OR 2003:(pos=2) OR can't:(pos=3) OR Zconnect:(pos=4) OR Zto:(pos=5) OR mysql:(pos=6) OR Zserver:(pos=7) OR Zon:(pos=8) OR Zlocalhost:(pos=9) OR 10061:(pos=10))" },
++ { "location.href = \"\"", "(location:(pos=1) PHRASE 2 href:(pos=2))" },
++ { "method=\"post\" action=\"\">", "(method:(pos=1) OR post:(pos=2) OR action:(pos=3))" },
++ { "behuizing 19\" inch", "(Zbehuiz:(pos=1) OR 19:(pos=2) OR inch:(pos=3))" },
++ { "19\" rack", "(19:(pos=1) OR rack:(pos=2))" },
++ { "3,5\" mainboard", "(3,5:(pos=1) OR mainboard:(pos=2))" },
++ { "553 sorry, that domain isn't in my list of allowed rcpthosts (#5.7.1)", "(553:(pos=1) OR Zsorri:(pos=2) OR Zthat:(pos=3) OR Zdomain:(pos=4) OR Zisn't:(pos=5) OR Zin:(pos=6) OR Zmy:(pos=7) OR Zlist:(pos=8) OR Zof:(pos=9) OR Zallow:(pos=10) OR Zrcpthost:(pos=11) OR 5.7.1:(pos=12))" },
++ { "data error (clic redundancy check)", "(Zdata:(pos=1) OR Zerror:(pos=2) OR Zclic:(pos=3) OR Zredund:(pos=4) OR Zcheck:(pos=5))" },
++ { "? mediaplayer 9\"", "(Zmediaplay:(pos=1) OR 9:(pos=2))" },
++ { "date(\"w\")", "(date:(pos=1) OR w:(pos=2))" },
++ { "Syntaxisfout (operator ontbreekt ASP", "(syntaxisfout:(pos=1) OR Zoper:(pos=2) OR Zontbreekt:(pos=3) OR asp:(pos=4))" },
++ { "Request.ServerVariables(\"logon_user\")", "((request:(pos=1) PHRASE 2 servervariables:(pos=2)) OR logon_user:(pos=3))" },
++ { "ASP \"request.form\" van \\\"enctype=\"MULTIPART/FORM-DATA\"\\\"", "(asp:(pos=1) OR (request:(pos=2) PHRASE 2 form:(pos=3)) OR Zvan:(pos=4) OR enctype:(pos=5) OR (multipart:(pos=6) PHRASE 3 form:(pos=7) PHRASE 3 data:(pos=8)))" },
++ { "USER ftp (Login failed): Invalid shell: /sbin/nologin", "(user:(pos=1) OR Zftp:(pos=2) OR login:(pos=3) OR Zfail:(pos=4) OR invalid:(pos=5) OR Zshell:(pos=6) OR (sbin:(pos=7) PHRASE 2 nologin:(pos=8)))" },
++ { "ip_masq_new(proto=TCP)", "(ip_masq_new:(pos=1) OR proto:(pos=2) OR tcp:(pos=3))" },
++ { "\"document.write(\"", "(document:(pos=1) PHRASE 2 write:(pos=2))" },
++ { "ERROR 1045: Access denied for user: 'root@localhost' (Using password: NO)", "(error:(pos=1) OR 1045:(pos=2) OR access:(pos=3) OR Zdeni:(pos=4) OR Zfor:(pos=5) OR Zuser:(pos=6) OR (root:(pos=7) PHRASE 2 localhost:(pos=8)) OR using:(pos=9) OR Zpassword:(pos=10) OR no:(pos=11))" },
++ { "TIP !! subtitles op TV-out (via DVD max g400)", "(tip:(pos=1) OR Zsubtitl:(pos=2) OR Zop:(pos=3) OR (tv:(pos=4) PHRASE 2 out:(pos=5)) OR Zvia:(pos=6) OR dvd:(pos=7) OR Zmax:(pos=8) OR Zg400:(pos=9))" },
++ { "Gigabyte 8PE667 (de Ultra versie) of Asus A7N8X Deluxe", "(gigabyte:(pos=1) OR 8pe667:(pos=2) OR Zde:(pos=3) OR ultra:(pos=4) OR Zversi:(pos=5) OR Zof:(pos=6) OR asus:(pos=7) OR a7n8x:(pos=8) OR deluxe:(pos=9))" },
++ { "\"1) Ze testen 8x AF op de GFFX tegen \"", "(1:(pos=1) PHRASE 9 ze:(pos=2) PHRASE 9 testen:(pos=3) PHRASE 9 8x:(pos=4) PHRASE 9 af:(pos=5) PHRASE 9 op:(pos=6) PHRASE 9 de:(pos=7) PHRASE 9 gffx:(pos=8) PHRASE 9 tegen:(pos=9))" },
++ { "\") Ze houden geen rekening met de kwaliteit van AF. Als ze dat gedaan hadden dan waren ze tot de conclusie gekomen dat Performance AF (dus Bilinear AF) op de 9700Pro goed te vergelijken is met Balanced AF op de GFFX. En dan hadden ze ook gezien dat de GFFX niet kan tippen aan de Quality AF van de 9700Pro.\"", "(ze:(pos=1) PHRASE 59 houden:(pos=2) PHRASE 59 geen:(pos=3) PHRASE 59 rekening:(pos=4) PHRASE 59 met:(pos=5) PHRASE 59 de:(pos=6) PHRASE 59 kwaliteit:(pos=7) PHRASE 59 van:(pos=8) PHRASE 59 af:(pos=9) PHRASE 59 als:(pos=10) PHRASE 59 ze:(pos=11) PHRASE 59 dat:(pos=12) PHRASE 59 gedaan:(pos=13) PHRASE 59 hadden:(pos=14) PHRASE 59 dan:(pos=15) PHRASE 59 waren:(pos=16) PHRASE 59 ze:(pos=17) PHRASE 59 tot:(pos=18) PHRASE 59 de:(pos=19) PHRASE 59 conclusie:(pos=20) PHRASE 59 gekomen:(pos=21) PHRASE 59 dat:(pos=22) PHRASE 59 performance:(pos=23) PHRASE 59 af:(pos=24) PHRASE 59 dus:(pos=25) PHRASE 59 bilinear:(pos=26) PHRASE 59 af:(pos=27) PHRASE 59 op:(pos=28) PHRASE 59 de:(pos=29) PHRASE 59 9700pro:(pos=30) PHRASE 59 goed:(pos=31) PHRASE 59 te:(pos=32) PHRASE 59 vergelijken:(pos=33) PHRASE 59 is:(pos=34) PHRASE 59 met:(pos=35) PHRASE 59 balanced:(pos=36) PHRASE 59 af:(pos=37) PHRASE 59 op:(pos=38) PHRASE 59 de:(pos=39) PHRASE 59 gffx:(pos=40) PHRASE 59 en:(pos=41) PHRASE 59 dan:(pos=42) PHRASE 59 hadden:(pos=43) PHRASE 59 ze:(pos=44) PHRASE 59 ook:(pos=45) PHRASE 59 gezien:(pos=46) PHRASE 59 dat:(pos=47) PHRASE 59 de:(pos=48) PHRASE 59 gffx:(pos=49) PHRASE 59 niet:(pos=50) PHRASE 59 kan:(pos=51) PHRASE 59 tippen:(pos=52) PHRASE 59 aan:(pos=53) PHRASE 59 de:(pos=54) PHRASE 59 quality:(pos=55) PHRASE 59 af:(pos=56) PHRASE 59 van:(pos=57) PHRASE 59 de:(pos=58) PHRASE 59 9700pro:(pos=59))" },
++ { "\"Ze houden geen rekening met de kwaliteit van AF. Als ze dat gedaan hadden dan waren ze tot de conclusie gekomen dat Performance AF (dus Bilinear AF) op de 9700Pro goed te vergelijken is met Balanced AF op de GFFX. En dan hadden ze ook gezien dat de GFFX niet kan tippen aan de Quality AF van de 9700Pro.\"", "(ze:(pos=1) PHRASE 59 houden:(pos=2) PHRASE 59 geen:(pos=3) PHRASE 59 rekening:(pos=4) PHRASE 59 met:(pos=5) PHRASE 59 de:(pos=6) PHRASE 59 kwaliteit:(pos=7) PHRASE 59 van:(pos=8) PHRASE 59 af:(pos=9) PHRASE 59 als:(pos=10) PHRASE 59 ze:(pos=11) PHRASE 59 dat:(pos=12) PHRASE 59 gedaan:(pos=13) PHRASE 59 hadden:(pos=14) PHRASE 59 dan:(pos=15) PHRASE 59 waren:(pos=16) PHRASE 59 ze:(pos=17) PHRASE 59 tot:(pos=18) PHRASE 59 de:(pos=19) PHRASE 59 conclusie:(pos=20) PHRASE 59 gekomen:(pos=21) PHRASE 59 dat:(pos=22) PHRASE 59 performance:(pos=23) PHRASE 59 af:(pos=24) PHRASE 59 dus:(pos=25) PHRASE 59 bilinear:(pos=26) PHRASE 59 af:(pos=27) PHRASE 59 op:(pos=28) PHRASE 59 de:(pos=29) PHRASE 59 9700pro:(pos=30) PHRASE 59 goed:(pos=31) PHRASE 59 te:(pos=32) PHRASE 59 vergelijken:(pos=33) PHRASE 59 is:(pos=34) PHRASE 59 met:(pos=35) PHRASE 59 balanced:(pos=36) PHRASE 59 af:(pos=37) PHRASE 59 op:(pos=38) PHRASE 59 de:(pos=39) PHRASE 59 gffx:(pos=40) PHRASE 59 en:(pos=41) PHRASE 59 dan:(pos=42) PHRASE 59 hadden:(pos=43) PHRASE 59 ze:(pos=44) PHRASE 59 ook:(pos=45) PHRASE 59 gezien:(pos=46) PHRASE 59 dat:(pos=47) PHRASE 59 de:(pos=48) PHRASE 59 gffx:(pos=49) PHRASE 59 niet:(pos=50) PHRASE 59 kan:(pos=51) PHRASE 59 tippen:(pos=52) PHRASE 59 aan:(pos=53) PHRASE 59 de:(pos=54) PHRASE 59 quality:(pos=55) PHRASE 59 af:(pos=56) PHRASE 59 van:(pos=57) PHRASE 59 de:(pos=58) PHRASE 59 9700pro:(pos=59))" },
++ { "$structure = imap_header($mbox, $tt);", "(Zstructur:(pos=1) OR imap_header:(pos=2) OR Zmbox:(pos=3) OR Ztt:(pos=4))" },
++ { "\"ifup: Could not get a valid interface name: -> skipped\"", "(ifup:(pos=1) PHRASE 9 could:(pos=2) PHRASE 9 not:(pos=3) PHRASE 9 get:(pos=4) PHRASE 9 a:(pos=5) PHRASE 9 valid:(pos=6) PHRASE 9 interface:(pos=7) PHRASE 9 name:(pos=8) PHRASE 9 skipped:(pos=9))" },
++ { "Er kan geen combinatie van filters worden gevonden om de gegevensstroom te genereren. (Error=80040218)", "(er:(pos=1) OR Zkan:(pos=2) OR Zgeen:(pos=3) OR Zcombinati:(pos=4) OR Zvan:(pos=5) OR Zfilter:(pos=6) OR Zworden:(pos=7) OR Zgevonden:(pos=8) OR Zom:(pos=9) OR Zde:(pos=10) OR Zgegevensstroom:(pos=11) OR Zte:(pos=12) OR Zgenereren:(pos=13) OR error:(pos=14) OR 80040218:(pos=15))" },
++ { "ereg_replace(\"\\\\\",\"\\/\"", "ereg_replace:(pos=1)" },
++ { "\\\\\"divx+geen+geluid\\\\\"", "(divx:(pos=1) PHRASE 3 geen:(pos=2) PHRASE 3 geluid:(pos=3))" },
++ { "lcase(\"string\")", "(lcase:(pos=1) OR string:(pos=2))" },
++ { "isEmpty( ) functie in visual basic", "(isempty:(pos=1) OR Zfuncti:(pos=2) OR Zin:(pos=3) OR Zvisual:(pos=4) OR Zbasic:(pos=5))" },
++ { "*** stop: 0x0000001E (0xC0000005,0x00000000,0x00000000,0x00000000)", "(Zstop:(pos=1) OR 0x0000001e:(pos=2) OR 0xc0000005,0x00000000,0x00000000,0x00000000:(pos=3))" },
++ { "\"ctrl+v+c+a fout\"", "(ctrl:(pos=1) PHRASE 5 v:(pos=2) PHRASE 5 c:(pos=3) PHRASE 5 a:(pos=4) PHRASE 5 fout:(pos=5))" },
++ { "Server.CreateObject(\"ADODB.connection\")", "((server:(pos=1) PHRASE 2 createobject:(pos=2)) OR (adodb:(pos=3) PHRASE 2 connection:(pos=4)))" },
++ { "Presario 6277EA-XP model P4/28 GHz-120GB-DVD-CDRW (512MBWXP) (470048-012)", "(presario:(pos=1) OR (6277ea:(pos=2) PHRASE 2 xp:(pos=3)) OR Zmodel:(pos=4) OR (p4:(pos=5) PHRASE 2 28:(pos=6)) OR (ghz:(pos=7) PHRASE 4 120gb:(pos=8) PHRASE 4 dvd:(pos=9) PHRASE 4 cdrw:(pos=10)) OR 512mbwxp:(pos=11) OR (470048:(pos=12) PHRASE 2 012:(pos=13)))" },
++ { "Failed to connect agent. (AGENT=dbaxchg2, EC=UserId =NUll)", "(failed:(pos=1) OR Zto:(pos=2) OR Zconnect:(pos=3) OR Zagent:(pos=4) OR agent:(pos=5) OR Zdbaxchg2:(pos=6) OR ec:(pos=7) OR userid:(pos=8) OR null:(pos=9))" },
++ { "delphi CreateOleObject(\"MSXML2.DomDocument\")", "(Zdelphi:(pos=1) OR createoleobject:(pos=2) OR (msxml2:(pos=3) PHRASE 2 domdocument:(pos=4)))" },
++ { "Unhandled exeption in IEXPLORE.EXE (FTAPP.DLL)", "(unhandled:(pos=1) OR Zexept:(pos=2) OR Zin:(pos=3) OR (iexplore:(pos=4) PHRASE 2 exe:(pos=5)) OR (ftapp:(pos=6) PHRASE 2 dll:(pos=7)))" },
++ { "IBM High Rate Wireless LAN PCI Adapter (Low Profile Enabled)", "(ibm:(pos=1) OR high:(pos=2) OR rate:(pos=3) OR wireless:(pos=4) OR lan:(pos=5) OR pci:(pos=6) OR adapter:(pos=7) OR low:(pos=8) OR profile:(pos=9) OR enabled:(pos=10))" },
++ { "asp ' en \"", "(Zasp:(pos=1) OR Zen:(pos=2))" },
++ { "Hercules 3D Prophet 8500 LE 64MB (OEM, Radeon 8500 LE)", "(hercules:(pos=1) OR 3d:(pos=2) OR prophet:(pos=3) OR 8500:(pos=4) OR le:(pos=5) OR 64mb:(pos=6) OR oem:(pos=7) OR radeon:(pos=8) OR 8500:(pos=9) OR le:(pos=10))" },
++ { "session_set_cookie_params(echo \"hoi\")", "(session_set_cookie_params:(pos=1) OR Zecho:(pos=2) OR hoi:(pos=3))" },
++ { "windows update werkt niet (windows se", "(Zwindow:(pos=1) OR Zupdat:(pos=2) OR Zwerkt:(pos=3) OR Zniet:(pos=4) OR Zwindow:(pos=5) OR Zse:(pos=6))" },
++ { "De statuscode van de fout is ( 0 x 4 , 0 , 0 , 0 )", "(de:(pos=1) OR Zstatuscod:(pos=2) OR Zvan:(pos=3) OR Zde:(pos=4) OR Zfout:(pos=5) OR Zis:(pos=6) OR 0:(pos=7) OR Zx:(pos=8) OR 4:(pos=9) OR 0:(pos=10) OR 0:(pos=11) OR 0:(pos=12))" },
++ { "sony +(u20 u-20)", "((Zu20:(pos=2) OR (u:(pos=3) PHRASE 2 20:(pos=4))) AND_MAYBE Zsoni:(pos=1))" },
++ { "[crit] (17)File exists: unable to create scoreboard (name-based shared memory failure)", "(Zcrit:(pos=1) OR 17:(pos=2) OR file:(pos=3) OR Zexist:(pos=4) OR Zunabl:(pos=5) OR Zto:(pos=6) OR Zcreat:(pos=7) OR Zscoreboard:(pos=8) OR (name:(pos=9) PHRASE 2 based:(pos=10)) OR Zshare:(pos=11) OR Zmemori:(pos=12) OR Zfailur:(pos=13))" },
++ { "directories lokaal php (uitlezen OR inladen)", "(Zdirectori:(pos=1) OR Zlokaal:(pos=2) OR Zphp:(pos=3) OR Zuitlezen:(pos=4) OR Zinladen:(pos=5))" },
++ { "(multi pc modem)+ (line sync)", "(Zmulti:(pos=1) OR Zpc:(pos=2) OR Zmodem:(pos=3) OR Zline:(pos=4) OR Zsync:(pos=5))" },
++ { "xp 5.1.2600.0 (xpclient.010817-1148)", "(Zxp:(pos=1) OR 5.1.2600.0:(pos=2) OR (xpclient:(pos=3) PHRASE 3 010817:(pos=4) PHRASE 3 1148:(pos=5)))" },
++ { "DirectDraw test results: Failure at step 5 (User verification of rectangles): HRESULT = 0x00000000 (error code) Direct3D 7 test results: Failure at step 32 (User verification of Direct3D rendering): HRESULT = 0x00000000 (error code) Direct3D 8 test results: Failure at step 32 (User verification of Direct3D rendering): HRESULT = 0x00000000 (error code) Direct3D 9 test results: Failure at step 32 (User verification of Direct3D rendering): HRESULT = 0x00000000 (error code)", "(directdraw:(pos=1) OR Ztest:(pos=2) OR Zresult:(pos=3) OR failure:(pos=4) OR Zat:(pos=5) OR Zstep:(pos=6) OR 5:(pos=7) OR user:(pos=8) OR Zverif:(pos=9) OR Zof:(pos=10) OR Zrectangl:(pos=11) OR hresult:(pos=12) OR 0x00000000:(pos=13) OR Zerror:(pos=14) OR Zcode:(pos=15) OR direct3d:(pos=16) OR 7:(pos=17) OR Ztest:(pos=18) OR Zresult:(pos=19) OR failure:(pos=20) OR Zat:(pos=21) OR Zstep:(pos=22) OR 32:(pos=23) OR user:(pos=24) OR Zverif:(pos=25) OR Zof:(pos=26) OR direct3d:(pos=27) OR Zrender:(pos=28) OR hresult:(pos=29) OR 0x00000000:(pos=30) OR Zerror:(pos=31) OR Zcode:(pos=32) OR direct3d:(pos=33) OR 8:(pos=34) OR Ztest:(pos=35) OR Zresult:(pos=36) OR failure:(pos=37) OR Zat:(pos=38) OR Zstep:(pos=39) OR 32:(pos=40) OR user:(pos=41) OR Zverif:(pos=42) OR Zof:(pos=43) OR direct3d:(pos=44) OR Zrender:(pos=45) OR hresult:(pos=46) OR 0x00000000:(pos=47) OR Zerror:(pos=48) OR Zcode:(pos=49) OR direct3d:(pos=50) OR 9:(pos=51) OR Ztest:(pos=52) OR Zresult:(pos=53) OR failure:(pos=54) OR Zat:(pos=55) OR Zstep:(pos=56) OR 32:(pos=57) OR user:(pos=58) OR Zverif:(pos=59) OR Zof:(pos=60) OR direct3d:(pos=61) OR Zrender:(pos=62) OR hresult:(pos=63) OR 0x00000000:(pos=64) OR Zerror:(pos=65) OR Zcode:(pos=66))" },
++ { "Thermaltake Aquarius II waterkoeling (kompleet voor P4 en XP)", "(thermaltake:(pos=1) OR aquarius:(pos=2) OR ii:(pos=3) OR Zwaterkoel:(pos=4) OR Zkompleet:(pos=5) OR Zvoor:(pos=6) OR p4:(pos=7) OR Zen:(pos=8) OR xp:(pos=9))" },
++ { "E3501 unable to add job to database (EC=-2005)", "(e3501:(pos=1) OR Zunabl:(pos=2) OR Zto:(pos=3) OR Zadd:(pos=4) OR Zjob:(pos=5) OR Zto:(pos=6) OR Zdatabas:(pos=7) OR ec:(pos=8) OR 2005:(pos=9))" },
++ { "\"arp -s\" ip veranderen", "((arp:(pos=1) PHRASE 2 s:(pos=2)) OR Zip:(pos=3) OR Zveranderen:(pos=4))" },
++ { "header(\"content-type: application/octet-stream\");", "(header:(pos=1) OR (content:(pos=2) PHRASE 2 type:(pos=3)) OR (application:(pos=4) PHRASE 3 octet:(pos=5) PHRASE 3 stream:(pos=6)))" },
++ { "$datum = date(\"d-m-Y\");", "(Zdatum:(pos=1) OR date:(pos=2) OR (d:(pos=3) PHRASE 3 m:(pos=4) PHRASE 3 y:(pos=5)))" },
++ { "\"'\" +asp", "Zasp:(pos=1)" },
++ { "+session +[", "Zsession:(pos=1)" },
++ { "Dit apparaat kan niet starten. (Code 10)", "(dit:(pos=1) OR Zapparaat:(pos=2) OR Zkan:(pos=3) OR Zniet:(pos=4) OR Zstarten:(pos=5) OR code:(pos=6) OR 10:(pos=7))" },
++ { "\"You cannot use the Administration program while the Domino Server is running. Either shut down the Domino Server (but keep the file server running) or choose the ican labeled 'Lotus Notes' instead.\"", "(you:(pos=1) PHRASE 32 cannot:(pos=2) PHRASE 32 use:(pos=3) PHRASE 32 the:(pos=4) PHRASE 32 administration:(pos=5) PHRASE 32 program:(pos=6) PHRASE 32 while:(pos=7) PHRASE 32 the:(pos=8) PHRASE 32 domino:(pos=9) PHRASE 32 server:(pos=10) PHRASE 32 is:(pos=11) PHRASE 32 running:(pos=12) PHRASE 32 either:(pos=13) PHRASE 32 shut:(pos=14) PHRASE 32 down:(pos=15) PHRASE 32 the:(pos=16) PHRASE 32 domino:(pos=17) PHRASE 32 server:(pos=18) PHRASE 32 but:(pos=19) PHRASE 32 keep:(pos=20) PHRASE 32 the:(pos=21) PHRASE 32 file:(pos=22) PHRASE 32 server:(pos=23) PHRASE 32 running:(pos=24) PHRASE 32 or:(pos=25) PHRASE 32 choose:(pos=26) PHRASE 32 the:(pos=27) PHRASE 32 ican:(pos=28) PHRASE 32 labeled:(pos=29) PHRASE 32 lotus:(pos=30) PHRASE 32 notes:(pos=31) PHRASE 32 instead:(pos=32))" },
++ { "\"+irq +veranderen +xp\"", "(irq:(pos=1) PHRASE 3 veranderen:(pos=2) PHRASE 3 xp:(pos=3))" },
++ { "\"is not a member of 'operator``global namespace''' + c++", "(is:(pos=1) PHRASE 9 not:(pos=2) PHRASE 9 a:(pos=3) PHRASE 9 member:(pos=4) PHRASE 9 of:(pos=5) PHRASE 9 operator:(pos=6) PHRASE 9 global:(pos=7) PHRASE 9 namespace:(pos=8) PHRASE 9 c++:(pos=9))" },
++ { "mkdir() failed (File exists) php", "(mkdir:(pos=1) OR Zfail:(pos=2) OR file:(pos=3) OR Zexist:(pos=4) OR Zphp:(pos=5))" },
++ { "laatsteIndex(int n)", "(laatsteindex:(pos=1) OR Zint:(pos=2) OR Zn:(pos=3))" },
++ { "\"line+in\" OR \"c8783\"", "((line:(pos=1) PHRASE 2 in:(pos=2)) OR c8783:(pos=3))" },
++ { "if ($_POST['Submit'])", "(Zif:(pos=1) OR _post:(pos=2) OR submit:(pos=3))" },
++ { "NEC DVD+-RW ND-1300A", "(nec:(pos=1) OR (dvd+:(pos=2) PHRASE 2 rw:(pos=3)) OR (nd:(pos=4) PHRASE 2 1300a:(pos=5)))" },
++ { "*String not found* (*String not found*.)", "(string:(pos=1) OR Znot:(pos=2) OR found:(pos=3) OR string:(pos=4) OR Znot:(pos=5) OR found:(pos=6))" },
++ { "MSI G4Ti4200-TD 128MB (GeForce4 Ti4200)", "(msi:(pos=1) OR (g4ti4200:(pos=2) PHRASE 2 td:(pos=3)) OR 128mb:(pos=4) OR geforce4:(pos=5) OR ti4200:(pos=6))" },
++ { "href=\"#\"", "href:(pos=1)" },
++ { "Request.ServerVariables(\"REMOTE_USER\") javascript", "((request:(pos=1) PHRASE 2 servervariables:(pos=2)) OR remote_user:(pos=3) OR Zjavascript:(pos=4))" },
++ { "XF86Config(-4) waar", "(xf86config:(pos=1) OR 4:(pos=2) OR Zwaar:(pos=3))" },
++ { "Unknown (tag 2000)", "(unknown:(pos=1) OR Ztag:(pos=2) OR 2000:(pos=3))" },
++ { "KT4V(MS-6712)", "(kt4v:(pos=1) OR (ms:(pos=2) PHRASE 2 6712:(pos=3)))" },
++ { "scheduled+AND+nieuwsgroepen+AND+updaten", "(Zschedul:(pos=1) AND Znieuwsgroepen:(pos=2) AND Zupdaten:(pos=3))" },
++ { "137(netbios-ns)", "(137:(pos=1) OR (netbios:(pos=2) PHRASE 2 ns:(pos=3)))" },
++ { "HARWARE ERROR, TRACKING SERVO (4:0X09:0X01)", "(harware:(pos=1) OR error:(pos=2) OR tracking:(pos=3) OR servo:(pos=4) OR (4:(pos=5) PHRASE 3 0x09:(pos=6) PHRASE 3 0x01:(pos=7)))" },
++ { "Chr(10) wat is code van \" teken", "(chr:(pos=1) OR 10:(pos=2) OR Zwat:(pos=3) OR Zis:(pos=4) OR Zcode:(pos=5) OR Zvan:(pos=6) OR Zteken:(pos=7))" },
++ { "wat is code van \" teken", "(Zwat:(pos=1) OR Zis:(pos=2) OR Zcode:(pos=3) OR Zvan:(pos=4) OR teken:(pos=5))" },
++ { "The Jet VBA file (VBAJET.dll for 16-bit version, VBAJET32.dll version", "(the:(pos=1) OR jet:(pos=2) OR vba:(pos=3) OR Zfile:(pos=4) OR (vbajet:(pos=5) PHRASE 2 dll:(pos=6)) OR Zfor:(pos=7) OR (16:(pos=8) PHRASE 2 bit:(pos=9)) OR Zversion:(pos=10) OR (vbajet32:(pos=11) PHRASE 2 dll:(pos=12)) OR Zversion:(pos=13))" },
++ { "Permission denied (publickey,password,keyboard-interactive).", "(permission:(pos=1) OR Zdeni:(pos=2) OR Zpublickey:(pos=3) OR Zpassword:(pos=4) OR (keyboard:(pos=5) PHRASE 2 interactive:(pos=6)))" },
++ { "De lees- of schrijfbewerking (\"written\") op het geheugen is mislukt", "(de:(pos=1) OR Zlee:(pos=2) OR Zof:(pos=3) OR Zschrijfbewerk:(pos=4) OR written:(pos=5) OR Zop:(pos=6) OR Zhet:(pos=7) OR Zgeheugen:(pos=8) OR Zis:(pos=9) OR Zmislukt:(pos=10))" },
++ { "Primary IDE channel no 80 conductor cable installed\"", "(primary:(pos=1) OR ide:(pos=2) OR Zchannel:(pos=3) OR Zno:(pos=4) OR 80:(pos=5) OR Zconductor:(pos=6) OR Zcabl:(pos=7) OR installed:(pos=8))" },
++ { "\"2020 NEAR zoom\"", "(2020:(pos=1) PHRASE 3 near:(pos=2) PHRASE 3 zoom:(pos=3))" },
++ { "setcookie(\"naam\",\"$user\");", "(setcookie:(pos=1) OR naam:(pos=2) OR user:(pos=3))" },
++ { "MSI 645 Ultra (MS-6547) Ver1", "(msi:(pos=1) OR 645:(pos=2) OR ultra:(pos=3) OR (ms:(pos=4) PHRASE 2 6547:(pos=5)) OR ver1:(pos=6))" },
++ { "if ($HTTP", "(Zif:(pos=1) OR http:(pos=2))" },
++ { "data error(cyclic redundancy check)", "(Zdata:(pos=1) OR error:(pos=2) OR Zcyclic:(pos=3) OR Zredund:(pos=4) OR Zcheck:(pos=5))" },
++ { "UObject::StaticAllocateObject <- (NULL None) <- UObject::StaticConstructObject <- InitEngine", "((uobject:(pos=1) PHRASE 2 staticallocateobject:(pos=2)) OR null:(pos=3) OR none:(pos=4) OR (uobject:(pos=5) PHRASE 2 staticconstructobject:(pos=6)) OR initengine:(pos=7))" },
++ { "Failure at step 8 (Creating 3D Device)", "(failure:(pos=1) OR Zat:(pos=2) OR Zstep:(pos=3) OR 8:(pos=4) OR creating:(pos=5) OR 3d:(pos=6) OR device:(pos=7))" },
++ { "Call Shell(\"notepad.exe\",", "(call:(pos=1) OR shell:(pos=2) OR (notepad:(pos=3) PHRASE 2 exe:(pos=4)))" },
++ { "2.5\" harddisk converter", "(2.5:(pos=1) OR (harddisk:(pos=2) PHRASE 2 converter:(pos=3)))" }, // FIXME better if " didn't generate a phrase here...
++ { "creative labs \"dvd+rw\"", "(Zcreativ:(pos=1) OR Zlab:(pos=2) OR (dvd:(pos=3) PHRASE 2 rw:(pos=4)))" },
++ { "\"het beleid van deze computer staat u niet toe interactief", "(het:(pos=1) PHRASE 10 beleid:(pos=2) PHRASE 10 van:(pos=3) PHRASE 10 deze:(pos=4) PHRASE 10 computer:(pos=5) PHRASE 10 staat:(pos=6) PHRASE 10 u:(pos=7) PHRASE 10 niet:(pos=8) PHRASE 10 toe:(pos=9) PHRASE 10 interactief:(pos=10))" },
++ { "ati radeon \"driver cleaner", "(Zati:(pos=1) OR Zradeon:(pos=2) OR (driver:(pos=3) PHRASE 2 cleaner:(pos=4)))" },
++ { "\"../\" path", "Zpath:(pos=1)" },
++ { "(novell client) workstation only", "(Znovel:(pos=1) OR Zclient:(pos=2) OR Zworkstat:(pos=3) OR Zonli:(pos=4))" },
++ { "Unable to find libgd.(a|so) anywhere", "(unable:(pos=1) OR Zto:(pos=2) OR Zfind:(pos=3) OR Zlibgd:(pos=4) OR Za:(pos=5) OR Zso:(pos=6) OR Zanywher:(pos=7))" },
++ { "\"libstdc++-libc6.1-1.so.2\"", "(libstdc++:(pos=1) PHRASE 5 libc6.1:(pos=2) PHRASE 5 1:(pos=3) PHRASE 5 so:(pos=4) PHRASE 5 2:(pos=5))" },
++ { "ipsec_setup (/etc/ipsec.conf, line 1) cannot open configuration file \"/etc/ipsec.conf\" -- `' aborted", "(Zipsec_setup:(pos=1) OR (etc:(pos=2) PHRASE 3 ipsec:(pos=3) PHRASE 3 conf:(pos=4)) OR Zline:(pos=5) OR 1:(pos=6) OR Zcannot:(pos=7) OR Zopen:(pos=8) OR Zconfigur:(pos=9) OR Zfile:(pos=10) OR (etc:(pos=11) PHRASE 3 ipsec:(pos=12) PHRASE 3 conf:(pos=13)) OR Zabort:(pos=14))" },
++ { "Forwarden van domeinnaam (naar HTTP adres)", "(forwarden:(pos=1) OR Zvan:(pos=2) OR Zdomeinnaam:(pos=3) OR Znaar:(pos=4) OR http:(pos=5) OR Zadr:(pos=6))" },
++ { "Compaq HP, 146.8 GB (MPN-286716-B22) Hard Drives", "(compaq:(pos=1) OR hp:(pos=2) OR 146.8:(pos=3) OR gb:(pos=4) OR (mpn:(pos=5) PHRASE 3 286716:(pos=6) PHRASE 3 b22:(pos=7)) OR hard:(pos=8) OR drives:(pos=9))" },
++ { "httpd (no pid file) not running", "(Zhttpd:(pos=1) OR Zno:(pos=2) OR Zpid:(pos=3) OR Zfile:(pos=4) OR Znot:(pos=5) OR Zrun:(pos=6))" },
++ { "apache httpd (pid file) not running", "(Zapach:(pos=1) OR Zhttpd:(pos=2) OR Zpid:(pos=3) OR Zfile:(pos=4) OR Znot:(pos=5) OR Zrun:(pos=6))" },
++ { "Klasse is niet geregistreerd (Fout=80040154).", "(klasse:(pos=1) OR Zis:(pos=2) OR Zniet:(pos=3) OR Zgeregistreerd:(pos=4) OR fout:(pos=5) OR 80040154:(pos=6))" },
++ { "\"dvd+r\" \"dvd-r\"", "((dvd:(pos=1) PHRASE 2 r:(pos=2)) OR (dvd:(pos=3) PHRASE 2 r:(pos=4)))" },
++ { "\"=\" tekens uit csvfile", "(Zteken:(pos=1) OR Zuit:(pos=2) OR Zcsvfile:(pos=3))" },
++ { "libc.so.6(GLIBC_2.3)", "((libc:(pos=1) PHRASE 3 so:(pos=2) PHRASE 3 6:(pos=3)) OR glibc_2.3:(pos=4))" },
++ { "Sitecom Broadband xDSL / Cable Router 4S (DC-202)", "(sitecom:(pos=1) OR broadband:(pos=2) OR Zxdsl:(pos=3) OR cable:(pos=4) OR router:(pos=5) OR 4s:(pos=6) OR (dc:(pos=7) PHRASE 2 202:(pos=8)))" },
++ { "(t-mobile) bereik", "((t:(pos=1) PHRASE 2 mobile:(pos=2)) OR Zbereik:(pos=3))" },
++ { "error LNK2001: unresolved external symbol \"public", "(Zerror:(pos=1) OR lnk2001:(pos=2) OR Zunresolv:(pos=3) OR Zextern:(pos=4) OR Zsymbol:(pos=5) OR public:(pos=6))" },
++ { "patch linux exploit -p)", "(Zpatch:(pos=1) OR Zlinux:(pos=2) OR Zexploit:(pos=3) OR Zp:(pos=4))" },
++ { "MYD not found (Errcode: 2)", "(myd:(pos=1) OR Znot:(pos=2) OR Zfound:(pos=3) OR errcode:(pos=4) OR 2:(pos=5))" },
++ { "ob_start(\"ob_gzhandler\"); file download", "(ob_start:(pos=1) OR ob_gzhandler:(pos=2) OR Zfile:(pos=3) OR Zdownload:(pos=4))" },
++ { "ECS Elitegroup K7VZA (VIA VT8363/VT8363A)", "(ecs:(pos=1) OR elitegroup:(pos=2) OR k7vza:(pos=3) OR via:(pos=4) OR (vt8363:(pos=5) PHRASE 2 vt8363a:(pos=6)))" },
++ { "ASUS A7V8X (LAN + Serial-ATA + Firewire + Raid + Audio)", "(asus:(pos=1) OR a7v8x:(pos=2) OR lan:(pos=3) OR (serial:(pos=4) PHRASE 2 ata:(pos=5)) OR firewire:(pos=6) OR raid:(pos=7) OR audio:(pos=8))" },
++ { "Javascript:history.go(-1)", "((javascript:(pos=1) PHRASE 3 history:(pos=2) PHRASE 3 go:(pos=3)) OR 1:(pos=4))" },
++ { "java :) als icon", "(Zjava:(pos=1) OR Zal:(pos=2) OR Zicon:(pos=3))" },
++ { "onmouseover=setPointer(this", "(onmouseover:(pos=1) OR setpointer:(pos=2) OR Zthis:(pos=3))" },
++ { "\" in vbscript", "(in:(pos=1) PHRASE 2 vbscript:(pos=2))" },
++ { "IRC (FAQ OR (hulp NEAR bij))", "(irc:(pos=1) OR faq:(pos=2) OR (hulp:(pos=3) NEAR 11 bij:(pos=4)))" },
++ { "setProperty(\"McSquare\"+i, _xscale, _xscale++);", "(setproperty:(pos=1) OR mcsquare:(pos=2) OR Zi:(pos=3) OR _xscale:(pos=4) OR _xscale++:(pos=5))" },
++ { "[warn] Apache does not support line-end comments. Consider using quotes around argument: \"#-1\"", "(Zwarn:(pos=1) OR apache:(pos=2) OR Zdoe:(pos=3) OR Znot:(pos=4) OR Zsupport:(pos=5) OR (line:(pos=6) PHRASE 2 end:(pos=7)) OR Zcomment:(pos=8) OR consider:(pos=9) OR Zuse:(pos=10) OR Zquot:(pos=11) OR Zaround:(pos=12) OR Zargument:(pos=13) OR 1:(pos=14))" },
++ { "(php.ini) (memory_limit)", "((php:(pos=1) PHRASE 2 ini:(pos=2)) OR Zmemory_limit:(pos=3))" },
++ { "line 8: syntax error near unexpected token `kernel_thread(f'", "(Zline:(pos=1) OR 8:(pos=2) OR Zsyntax:(pos=3) OR Zerror:(pos=4) OR Znear:(pos=5) OR Zunexpect:(pos=6) OR Ztoken:(pos=7) OR kernel_thread:(pos=8) OR Zf:(pos=9))" },
++ { "VXD NAVEX()@)", "(vxd:(pos=1) OR navex:(pos=2))" },
++ { "\"Iiyama AS4314UT 17\" \"", "(iiyama:(pos=1) PHRASE 3 as4314ut:(pos=2) PHRASE 3 17:(pos=3))" },
++ { "include (\"$id.html\");", "(Zinclud:(pos=1) OR (id:(pos=2) PHRASE 2 html:(pos=3)))" },
++ { "include id.Today's date is: <? print (date (\"M d, Y\")); ?>hp", "(Zinclud:(pos=1) OR (id:(pos=2) PHRASE 2 today's:(pos=3)) OR Zdate:(pos=4) OR Zis:(pos=5) OR Zprint:(pos=6) OR Zdate:(pos=7) OR (m:(pos=8) PHRASE 3 d:(pos=9) PHRASE 3 y:(pos=10)) OR Zhp:(pos=11))" },
++ { "(program files\\common) opstarten", "(Zprogram:(pos=1) OR (files:(pos=2) PHRASE 2 common:(pos=3)) OR Zopstarten:(pos=4))" },
++ { "java \" string", "(Zjava:(pos=1) OR string:(pos=2))" },
++ { "+=", "" },
++ { "php +=", "Zphp:(pos=1)" },
++ { "[php] ereg_replace(\".\"", "(Zphp:(pos=1) OR ereg_replace:(pos=2))" },
++ { "\"echo -e\" kleur", "((echo:(pos=1) PHRASE 2 e:(pos=2)) OR Zkleur:(pos=3))" },
++ { "adobe premiere \"-1\"", "(Zadob:(pos=1) OR Zpremier:(pos=2) OR 1:(pos=3))" },
++ { "DVD brander \"+\" en \"-\"", "(dvd:(pos=1) OR Zbrander:(pos=2) OR Zen:(pos=3))" },
++ { "inspirion \"dvd+R\"", "(Zinspirion:(pos=1) OR (dvd:(pos=2) PHRASE 2 r:(pos=3)))" },
++ { "asp 0x80040E14)", "(Zasp:(pos=1) OR 0x80040e14:(pos=2))" },
++ { "\"e-tech motorola router", "(e:(pos=1) PHRASE 4 tech:(pos=2) PHRASE 4 motorola:(pos=3) PHRASE 4 router:(pos=4))" },
++ { "bluetooth '1.3.2.19\"", "(Zbluetooth:(pos=1) OR 1.3.2.19:(pos=2))" },
++ { "ms +-connect", "(Zms:(pos=1) OR Zconnect:(pos=2))" },
++ { "php+print+\"", "(Zphp:(pos=1) OR print+:(pos=2))" },
++ { "athlon 1400 :welke videokaart\"", "(Zathlon:(pos=1) OR 1400:(pos=2) OR Zwelk:(pos=3) OR videokaart:(pos=4))" },
++ { "+-dvd", "Zdvd:(pos=1)" },
++ { "glftpd \"-new-\"", "(Zglftpd:(pos=1) OR new:(pos=2))" },
++ { "\"scandisk + dos5.0", "(scandisk:(pos=1) PHRASE 2 dos5.0:(pos=2))" },
++ { "socket\$\$", "socket:(pos=1)" },
++ { "msn (e-tech) router", "(Zmsn:(pos=1) OR (e:(pos=2) PHRASE 2 tech:(pos=3)) OR Zrouter:(pos=4))" },
++ { "Het grote Epox 8k3a+ ervaring/prob topic\"", "(het:(pos=1) OR Zgrote:(pos=2) OR epox:(pos=3) OR 8k3a+:(pos=4) OR (ervaring:(pos=5) PHRASE 2 prob:(pos=6)) OR topic:(pos=7))" },
++ { "\"CF+bluetooth\"", "(cf:(pos=1) PHRASE 2 bluetooth:(pos=2))" },
++ { "kwaliteit (s-video) composite verschil tv out", "(Zkwaliteit:(pos=1) OR (s:(pos=2) PHRASE 2 video:(pos=3)) OR Zcomposit:(pos=4) OR Zverschil:(pos=5) OR Ztv:(pos=6) OR Zout:(pos=7))" },
++ { "Wie kan deze oude hardware nog gebruiken\" Deel", "(wie:(pos=1) OR Zkan:(pos=2) OR Zdeze:(pos=3) OR Zoud:(pos=4) OR Zhardwar:(pos=5) OR Znog:(pos=6) OR gebruiken:(pos=7) OR deel:(pos=8))" },
++ { "Public Declare Sub Sleep Lib \"kernel32\" (ByVal dwMilliseconds As Long)", "(public:(pos=1) OR declare:(pos=2) OR sub:(pos=3) OR sleep:(pos=4) OR lib:(pos=5) OR kernel32:(pos=6) OR byval:(pos=7) OR Zdwmillisecond:(pos=8) OR as:(pos=9) OR long:(pos=10))" },
++ { "for inclusion (include_path='.:/usr/share/php')", "(Zfor:(pos=1) OR Zinclus:(pos=2) OR include_path:(pos=3) OR (usr:(pos=4) PHRASE 3 share:(pos=5) PHRASE 3 php:(pos=6)))" },
++ { "\"muziek 2x zo snel\"\"", "(muziek:(pos=1) PHRASE 4 2x:(pos=2) PHRASE 4 zo:(pos=3) PHRASE 4 snel:(pos=4))" },
++ { "execCommand('inserthorizontalrule'", "(execcommand:(pos=1) OR Zinserthorizontalrul:(pos=2))" },
++ { "specs: IBM PS/2, Intel 8086 @ 25 mhz!!, 2 mb intern, 50 mb hd, 5.5\" floppy drive, toetsenbord en geen muis", "(Zspec:(pos=1) OR ibm:(pos=2) OR (ps:(pos=3) PHRASE 2 2:(pos=4)) OR intel:(pos=5) OR 8086:(pos=6) OR 25:(pos=7) OR Zmhz:(pos=8) OR 2:(pos=9) OR Zmb:(pos=10) OR Zintern:(pos=11) OR 50:(pos=12) OR Zmb:(pos=13) OR Zhd:(pos=14) OR 5.5:(pos=15) OR (floppy:(pos=16) PHRASE 6 drive:(pos=17) PHRASE 6 toetsenbord:(pos=18) PHRASE 6 en:(pos=19) PHRASE 6 geen:(pos=20) PHRASE 6 muis:(pos=21)))" },
++ { "History: GetEventTool <- GetMusicManager <- GetMusicScript <- DMCallRoutine <- AMusicScriptEvent::execCallRoutine <- UObject::execClassContext <- (U2GameInfo M08A1.U2GameInfo0 @ Function U2.U2GameInfo.NotifyLevelChangeEnd : 0075 line 744) <- UObject::ProcessEvent <- (U2GameInfo M08A1.U2GameInfo0, Function U2.U2GameInfo.NotifyLevelChangeEnd) <- UGameEngine::LoadMap <- LocalMapURL <- UGameEngine::Browse <- ServerTravel <- UGameEngine::Tick <- UpdateWorld <- MainLoop", "(history:(pos=1) OR geteventtool:(pos=2) OR getmusicmanager:(pos=3) OR getmusicscript:(pos=4) OR dmcallroutine:(pos=5) OR (amusicscriptevent:(pos=6) PHRASE 2 execcallroutine:(pos=7)) OR (uobject:(pos=8) PHRASE 2 execclasscontext:(pos=9)) OR u2gameinfo:(pos=10) OR (m08a1:(pos=11) PHRASE 2 u2gameinfo0:(pos=12)) OR function:(pos=13) OR (u2:(pos=14) PHRASE 3 u2gameinfo:(pos=15) PHRASE 3 notifylevelchangeend:(pos=16)) OR 0075:(pos=17) OR Zline:(pos=18) OR 744:(pos=19) OR (uobject:(pos=20) PHRASE 2 processevent:(pos=21)) OR u2gameinfo:(pos=22) OR (m08a1:(pos=23) PHRASE 2 u2gameinfo0:(pos=24)) OR function:(pos=25) OR (u2:(pos=26) PHRASE 3 u2gameinfo:(pos=27) PHRASE 3 notifylevelchangeend:(pos=28)) OR (ugameengine:(pos=29) PHRASE 2 loadmap:(pos=30)) OR localmapurl:(pos=31) OR (ugameengine:(pos=32) PHRASE 2 browse:(pos=33)) OR servertravel:(pos=34) OR (ugameengine:(pos=35) PHRASE 2 tick:(pos=36)) OR updateworld:(pos=37) OR mainloop:(pos=38))" },
++ { "Support AMD XP 2400+ & 2600+ (K7T Turbo2 only)", "(support:(pos=1) OR amd:(pos=2) OR xp:(pos=3) OR 2400+:(pos=4) OR 2600+:(pos=5) OR k7t:(pos=6) OR turbo2:(pos=7) OR Zonli:(pos=8))" },
++ { "'\"> bla", "(br:(pos=1) PHRASE 3 bla:(pos=2) PHRASE 3 br:(pos=3))" },
++ { "The instruction at \"0x30053409\" referenced memory at \"0x06460504\". The memory could not be \"read'. Click OK to terminate the application.", "(the:(pos=1) OR Zinstruct:(pos=2) OR Zat:(pos=3) OR 0x30053409:(pos=4) OR Zreferenc:(pos=5) OR Zmemori:(pos=6) OR Zat:(pos=7) OR 0x06460504:(pos=8) OR the:(pos=9) OR Zmemori:(pos=10) OR Zcould:(pos=11) OR Znot:(pos=12) OR Zbe:(pos=13) OR (read:(pos=14) PHRASE 7 click:(pos=15) PHRASE 7 ok:(pos=16) PHRASE 7 to:(pos=17) PHRASE 7 terminate:(pos=18) PHRASE 7 the:(pos=19) PHRASE 7 application:(pos=20)))" },
++ { "\"(P5A-b)\"", "(p5a:(pos=1) PHRASE 2 b:(pos=2))" },
++ { "(13,5 > 13) == no-go!", "(13,5:(pos=1) OR 13:(pos=2) OR (no:(pos=3) PHRASE 2 go:(pos=4)))" },
++ { "eth not found \"ifconfig -a\"", "(Zeth:(pos=1) OR Znot:(pos=2) OR Zfound:(pos=3) OR (ifconfig:(pos=4) PHRASE 2 a:(pos=5)))" },
++ { "<META NAME=\"ROBOTS", "(meta:(pos=1) OR name:(pos=2) OR robots:(pos=3))" },
++ { "lp0: using parport0 (interrupt-driven)", "(Zlp0:(pos=1) OR Zuse:(pos=2) OR Zparport0:(pos=3) OR (interrupt:(pos=4) PHRASE 2 driven:(pos=5)))" },
++ { "ULTRA PC-TUNING, COOLING & MODDING (4,6)", "(ultra:(pos=1) OR (pc:(pos=2) PHRASE 2 tuning:(pos=3)) OR cooling:(pos=4) OR modding:(pos=5) OR 4,6:(pos=6))" },
++ { "512MB PC2700 DDR SDRAM Rood (Dane-Elec)", "(512mb:(pos=1) OR pc2700:(pos=2) OR ddr:(pos=3) OR sdram:(pos=4) OR rood:(pos=5) OR (dane:(pos=6) PHRASE 2 elec:(pos=7)))" },
++ { "header(\"Content Type: text/html\");", "(header:(pos=1) OR content:(pos=2) OR type:(pos=3) OR (text:(pos=4) PHRASE 2 html:(pos=5)))" },
++ { "\"-RW\" \"+RW\"", "(rw:(pos=1) OR rw:(pos=2))" },
++ { "\"cresta digital answering machine", "(cresta:(pos=1) PHRASE 4 digital:(pos=2) PHRASE 4 answering:(pos=3) PHRASE 4 machine:(pos=4))" },
++ { "Arctic Super Silent PRO TC (Athlon/P3 - 2,3 GHz)", "(arctic:(pos=1) OR super:(pos=2) OR silent:(pos=3) OR pro:(pos=4) OR tc:(pos=5) OR (athlon:(pos=6) PHRASE 2 p3:(pos=7)) OR 2,3:(pos=8) OR ghz:(pos=9))" },
++ { "c++ fopen \"r+t\"", "(Zc++:(pos=1) OR Zfopen:(pos=2) OR (r:(pos=3) PHRASE 2 t:(pos=4)))" },
++ { "c++ fopen (r+t)", "(Zc++:(pos=1) OR Zfopen:(pos=2) OR Zr:(pos=3) OR Zt:(pos=4))" },
++ { "\"DVD+R\"", "(dvd:(pos=1) PHRASE 2 r:(pos=2))" },
++ { "Class.forName(\"jdbc.odbc.JdbcOdbcDriver\");", "((class:(pos=1) PHRASE 2 forname:(pos=2)) OR (jdbc:(pos=3) PHRASE 3 odbc:(pos=4) PHRASE 3 jdbcodbcdriver:(pos=5)))" },
++ { "perl(find.pl)", "(perl:(pos=1) OR (find:(pos=2) PHRASE 2 pl:(pos=3)))" },
++ { "\"-5v\" voeding", "(5v:(pos=1) OR Zvoed:(pos=2))" },
++ { "\"-5v\" power supply", "(5v:(pos=1) OR Zpower:(pos=2) OR Zsuppli:(pos=3))" },
++ { "An Error occurred whie attempting to initialize the Borland Database Engine (error $2108)", "(an:(pos=1) OR error:(pos=2) OR Zoccur:(pos=3) OR Zwhie:(pos=4) OR Zattempt:(pos=5) OR Zto:(pos=6) OR Ziniti:(pos=7) OR Zthe:(pos=8) OR borland:(pos=9) OR database:(pos=10) OR engine:(pos=11) OR Zerror:(pos=12) OR 2108:(pos=13))" },
++ { "(error $2108) Borland", "(Zerror:(pos=1) OR 2108:(pos=2) OR borland:(pos=3))" },
++ { "On Friday 04 April 2003 09:32, Edwin van Eersel wrote: > ik voel me eigenlijk wel behoorlijk kut :)", "(on:(pos=1) OR friday:(pos=2) OR 04:(pos=3) OR april:(pos=4) OR 2003:(pos=5) OR (09:(pos=6) PHRASE 2 32:(pos=7)) OR edwin:(pos=8) OR Zvan:(pos=9) OR eersel:(pos=10) OR Zwrote:(pos=11) OR Zik:(pos=12) OR Zvoel:(pos=13) OR Zme:(pos=14) OR Zeigenlijk:(pos=15) OR Zwel:(pos=16) OR Zbehoorlijk:(pos=17) OR Zkut:(pos=18))" },
++ { "Elektrotechniek + \"hoe bevalt het?\"\"", "(elektrotechniek:(pos=1) OR (hoe:(pos=2) PHRASE 3 bevalt:(pos=3) PHRASE 3 het:(pos=4)))" },
++ { "Shortcuts in menu (java", "(shortcuts:(pos=1) OR Zin:(pos=2) OR Zmenu:(pos=3) OR Zjava:(pos=4))" },
++ { "detonator+settings\"", "(Zdeton:(pos=1) OR settings:(pos=2))" },
++ { "(ez-bios) convert", "((ez:(pos=1) PHRASE 2 bios:(pos=2)) OR Zconvert:(pos=3))" },
++ { "Sparkle 7100M4 64MB (GeForce4 MX440)", "(sparkle:(pos=1) OR 7100m4:(pos=2) OR 64mb:(pos=3) OR geforce4:(pos=4) OR mx440:(pos=5))" },
++ { "freebsd \"boek OR newbie\"", "(Zfreebsd:(pos=1) OR (boek:(pos=2) PHRASE 3 or:(pos=3) PHRASE 3 newbie:(pos=4)))" },
++ { "for (;;) c++", "(Zfor:(pos=1) OR Zc++:(pos=2))" },
++ { "1700+-2100+", "(1700+:(pos=1) PHRASE 2 2100+:(pos=2))" },
++ { "PHP Warning: Invalid library (maybe not a PHP library) 'libmysqlclient.so'", "(php:(pos=1) OR warning:(pos=2) OR invalid:(pos=3) OR Zlibrari:(pos=4) OR Zmayb:(pos=5) OR Znot:(pos=6) OR Za:(pos=7) OR php:(pos=8) OR Zlibrari:(pos=9) OR (libmysqlclient:(pos=10) PHRASE 2 so:(pos=11)))" },
++ { "NEC DV-5800B (Bul", "(nec:(pos=1) OR (dv:(pos=2) PHRASE 2 5800b:(pos=3)) OR bul:(pos=4))" },
++ { "org.jdom.input.SAXBuilder.<init>(SAXBuilder.java)", "((org:(pos=1) PHRASE 4 jdom:(pos=2) PHRASE 4 input:(pos=3) PHRASE 4 saxbuilder:(pos=4)) OR init:(pos=5) OR (saxbuilder:(pos=6) PHRASE 2 java:(pos=7)))" },
++ { "AMD Athlon XP 2500+ (1,83GHz, 512KB)", "(amd:(pos=1) OR athlon:(pos=2) OR xp:(pos=3) OR 2500+:(pos=4) OR 1,83ghz:(pos=5) OR 512kb:(pos=6))" },
++ { "'q ben\"", "(Zq:(pos=1) OR ben:(pos=2))" },
++ { "getsmbfilepwent: malformed password entry (uid not number)", "(Zgetsmbfilepw:(pos=1) OR Zmalform:(pos=2) OR Zpassword:(pos=3) OR Zentri:(pos=4) OR Zuid:(pos=5) OR Znot:(pos=6) OR Znumber:(pos=7))" },
++ { "\xc3\xb6ude onderdelen\"", "(Z\xc3\xb6ude:(pos=1) OR onderdelen:(pos=2))" },
++ { "Heeft iemand enig idee waarom de pioneer (zelf met originele firmware van pioneer) bij mij niet wil flashen ?" "?", "(heeft:(pos=1) OR Ziemand:(pos=2) OR Zenig:(pos=3) OR Zide:(pos=4) OR Zwaarom:(pos=5) OR Zde:(pos=6) OR Zpioneer:(pos=7) OR Zzelf:(pos=8) OR Zmet:(pos=9) OR Zoriginel:(pos=10) OR Zfirmwar:(pos=11) OR Zvan:(pos=12) OR Zpioneer:(pos=13) OR Zbij:(pos=14) OR Zmij:(pos=15) OR Zniet:(pos=16) OR Zwil:(pos=17) OR Zflashen:(pos=18))" }, // Split ? and ? to avoid trigram problems
++ { "asus a7v266 bios nieuw -(a7v266-e)", "((Zasus:(pos=1) OR Za7v266:(pos=2) OR Zbio:(pos=3) OR Znieuw:(pos=4)) AND_NOT (a7v266:(pos=5) PHRASE 2 e:(pos=6)))" },
++ { "cybercom \"dvd+r\"", "(Zcybercom:(pos=1) OR (dvd:(pos=2) PHRASE 2 r:(pos=3)))" },
++ { "AMD PCNET Family Ethernet Adapter (PCI-ISA)", "(amd:(pos=1) OR pcnet:(pos=2) OR family:(pos=3) OR ethernet:(pos=4) OR adapter:(pos=5) OR (pci:(pos=6) PHRASE 2 isa:(pos=7)))" },
++ { "relais +/-", "Zrelai:(pos=1)" },
++ { "formules (slepen OR doortrekken) excel", "(Zformul:(pos=1) OR Zslepen:(pos=2) OR Zdoortrekken:(pos=3) OR Zexcel:(pos=4))" },
++ { "\"%English", "english:(pos=1)" },
++ { "select max( mysql", "(Zselect:(pos=1) OR max:(pos=2) OR Zmysql:(pos=3))" },
++ { "leejow(saait", "(leejow:(pos=1) OR Zsaait:(pos=2))" },
++ { "'Windows 2000 Advanced Server\" netwerkverbinding valt steeds weg", "(windows:(pos=1) OR 2000:(pos=2) OR advanced:(pos=3) OR server:(pos=4) OR (netwerkverbinding:(pos=5) PHRASE 4 valt:(pos=6) PHRASE 4 steeds:(pos=7) PHRASE 4 weg:(pos=8)))" },
++ { "K7T Turbo 2 (MS-6330)", "(k7t:(pos=1) OR turbo:(pos=2) OR 2:(pos=3) OR (ms:(pos=4) PHRASE 2 6330:(pos=5)))" },
++ { "failed to receive data from the client agent. (ec=1)", "(Zfail:(pos=1) OR Zto:(pos=2) OR Zreceiv:(pos=3) OR Zdata:(pos=4) OR Zfrom:(pos=5) OR Zthe:(pos=6) OR Zclient:(pos=7) OR Zagent:(pos=8) OR ec:(pos=9) OR 1:(pos=10))" },
++ { "\"cannot find -lz\"", "(cannot:(pos=1) PHRASE 3 find:(pos=2) PHRASE 3 lz:(pos=3))" },
++ { "undefined reference to `mysql_drop_db'\"", "(Zundefin:(pos=1) OR Zrefer:(pos=2) OR Zto:(pos=3) OR Zmysql_drop_db:(pos=4))" },
++ { "search form asp \"%'", "(Zsearch:(pos=1) OR Zform:(pos=2) OR Zasp:(pos=3))" },
++ { "(dvd+r) kwaliteit", "(Zdvd:(pos=1) OR Zr:(pos=2) OR Zkwaliteit:(pos=3))" },
++ { "Fatal error: Allowed memory size of 8388608 bytes exhausted (tried to allocate 35 bytes)", "(fatal:(pos=1) OR Zerror:(pos=2) OR allowed:(pos=3) OR Zmemori:(pos=4) OR Zsize:(pos=5) OR Zof:(pos=6) OR 8388608:(pos=7) OR Zbyte:(pos=8) OR Zexhaust:(pos=9) OR Ztri:(pos=10) OR Zto:(pos=11) OR Zalloc:(pos=12) OR 35:(pos=13) OR Zbyte:(pos=14))" },
++ { "geluid (schokt OR hapert)", "(Zgeluid:(pos=1) OR Zschokt:(pos=2) OR Zhapert:(pos=3))" },
++ { "Het wordt pas echt leuk als het hard staat!! >:)", "(het:(pos=1) OR Zwordt:(pos=2) OR Zpas:(pos=3) OR Zecht:(pos=4) OR Zleuk:(pos=5) OR Zal:(pos=6) OR Zhet:(pos=7) OR Zhard:(pos=8) OR Zstaat:(pos=9))" },
++ { "Uw configuratie bestand bevat instellingen (root zonder wachtwoord) die betrekking hebben tot de standaard MySQL account. Uw MySQL server draait met deze standaard waardes, en is open voor ongewilde toegang, het wordt dus aangeraden dit op te lossen", "(uw:(pos=1) OR Zconfigurati:(pos=2) OR Zbestand:(pos=3) OR Zbevat:(pos=4) OR Zinstellingen:(pos=5) OR Zroot:(pos=6) OR Zzonder:(pos=7) OR Zwachtwoord:(pos=8) OR Zdie:(pos=9) OR Zbetrekk:(pos=10) OR Zhebben:(pos=11) OR Ztot:(pos=12) OR Zde:(pos=13) OR Zstandaard:(pos=14) OR mysql:(pos=15) OR Zaccount:(pos=16) OR uw:(pos=17) OR mysql:(pos=18) OR Zserver:(pos=19) OR Zdraait:(pos=20) OR Zmet:(pos=21) OR Zdeze:(pos=22) OR Zstandaard:(pos=23) OR Zwaard:(pos=24) OR Zen:(pos=25) OR Zis:(pos=26) OR Zopen:(pos=27) OR Zvoor:(pos=28) OR Zongewild:(pos=29) OR Ztoegang:(pos=30) OR Zhet:(pos=31) OR Zwordt:(pos=32) OR Zdus:(pos=33) OR Zaangeraden:(pos=34) OR Zdit:(pos=35) OR Zop:(pos=36) OR Zte:(pos=37) OR Zlossen:(pos=38))" },
++ { "(library qt-mt) not found", "(Zlibrari:(pos=1) OR (qt:(pos=2) PHRASE 2 mt:(pos=3)) OR Znot:(pos=4) OR Zfound:(pos=5))" },
++ { "Qt (>= Qt 3.0.3) (library qt-mt) not found", "(qt:(pos=1) OR qt:(pos=2) OR 3.0.3:(pos=3) OR Zlibrari:(pos=4) OR (qt:(pos=5) PHRASE 2 mt:(pos=6)) OR Znot:(pos=7) OR Zfound:(pos=8))" },
++ { "setup was unable to find (or could not read) the language specific setup resource dll, unable to continue. Please reboot and try again.", "(Zsetup:(pos=1) OR Zwas:(pos=2) OR Zunabl:(pos=3) OR Zto:(pos=4) OR Zfind:(pos=5) OR Zor:(pos=6) OR Zcould:(pos=7) OR Znot:(pos=8) OR Zread:(pos=9) OR Zthe:(pos=10) OR Zlanguag:(pos=11) OR Zspecif:(pos=12) OR Zsetup:(pos=13) OR Zresourc:(pos=14) OR Zdll:(pos=15) OR Zunabl:(pos=16) OR Zto:(pos=17) OR Zcontinu:(pos=18) OR please:(pos=19) OR Zreboot:(pos=20) OR Zand:(pos=21) OR Ztri:(pos=22) OR Zagain:(pos=23))" },
++ { "Titan TTC-D5TB(4/CU35)", "(titan:(pos=1) OR (ttc:(pos=2) PHRASE 2 d5tb:(pos=3)) OR (4:(pos=4) PHRASE 2 cu35:(pos=5)))" },
++ { "[php] date( min", "(Zphp:(pos=1) OR date:(pos=2) OR Zmin:(pos=3))" },
++ { "EPOX EP-8RDA+ (nForce2 SPP+MCP-T) Rev. 1.1", "(epox:(pos=1) OR (ep:(pos=2) PHRASE 2 8rda+:(pos=3)) OR Znforce2:(pos=4) OR spp:(pos=5) OR (mcp:(pos=6) PHRASE 2 t:(pos=7)) OR rev:(pos=8) OR 1.1:(pos=9))" },
++ { "554 5.4.6 Too many hops 53 (25 max)", "(554:(pos=1) OR 5.4.6:(pos=2) OR too:(pos=3) OR Zmani:(pos=4) OR Zhop:(pos=5) OR 53:(pos=6) OR 25:(pos=7) OR Zmax:(pos=8))" },
++ { "ik had toch nog een vraagje: er zijn nu eigenlijk alleen maar schijfjes van 4.7GB alleen straks zullen er vast schijfjes van meer dan 4.7GB komen. Zal deze brander dit wel kunnen schijven?" "?(na bijvoorbeeld een firmware update?) ben erg benieuwd", "(Zik:(pos=1) OR Zhad:(pos=2) OR Ztoch:(pos=3) OR Znog:(pos=4) OR Zeen:(pos=5) OR Zvraagj:(pos=6) OR Zer:(pos=7) OR Zzijn:(pos=8) OR Znu:(pos=9) OR Zeigenlijk:(pos=10) OR Zalleen:(pos=11) OR Zmaar:(pos=12) OR Zschijfj:(pos=13) OR Zvan:(pos=14) OR 4.7gb:(pos=15) OR Zalleen:(pos=16) OR Zstrak:(pos=17) OR Zzullen:(pos=18) OR Zer:(pos=19) OR Zvast:(pos=20) OR Zschijfj:(pos=21) OR Zvan:(pos=22) OR Zmeer:(pos=23) OR Zdan:(pos=24) OR 4.7gb:(pos=25) OR Zkomen:(pos=26) OR zal:(pos=27) OR Zdeze:(pos=28) OR Zbrander:(pos=29) OR Zdit:(pos=30) OR Zwel:(pos=31) OR Zkunnen:(pos=32) OR Zschijven:(pos=33) OR Zna:(pos=34) OR Zbijvoorbeeld:(pos=35) OR Zeen:(pos=36) OR Zfirmwar:(pos=37) OR Zupdat:(pos=38) OR Zben:(pos=39) OR Zerg:(pos=40) OR Zbenieuwd:(pos=41))" }, // Split ? and ? to avoid trigram problems
++ { "ati linux drivers (4.3.0)", "(Zati:(pos=1) OR Zlinux:(pos=2) OR Zdriver:(pos=3) OR 4.3.0:(pos=4))" },
++ { "ENCAPSED_AND_WHITESPACE", "encapsed_and_whitespace:(pos=1)" },
++ { "lpadmin: add-printer (set device) failed: client-error-not-possible", "(Zlpadmin:(pos=1) OR (add:(pos=2) PHRASE 2 printer:(pos=3)) OR Zset:(pos=4) OR Zdevic:(pos=5) OR Zfail:(pos=6) OR (client:(pos=7) PHRASE 4 error:(pos=8) PHRASE 4 not:(pos=9) PHRASE 4 possible:(pos=10)))" },
++ { "welke dvd \"+r\" media", "(Zwelk:(pos=1) OR Zdvd:(pos=2) OR r:(pos=3) OR Zmedia:(pos=4))" },
++ { "Warning: stat failed for fotos(errno=2 - No such file or directory)", "(warning:(pos=1) OR Zstat:(pos=2) OR Zfail:(pos=3) OR Zfor:(pos=4) OR fotos:(pos=5) OR errno:(pos=6) OR 2:(pos=7) OR no:(pos=8) OR Zsuch:(pos=9) OR Zfile:(pos=10) OR Zor:(pos=11) OR Zdirectori:(pos=12))" },
++ { "dvd +/-", "Zdvd:(pos=1)" },
++ { "7vaxp +voltage mod\"", "(Zvoltag:(pos=2) AND_MAYBE (7vaxp:(pos=1) OR mod:(pos=3)))" },
++ { "lpt port (SPP/EPP) is enabled", "(Zlpt:(pos=1) OR Zport:(pos=2) OR (spp:(pos=3) PHRASE 2 epp:(pos=4)) OR Zis:(pos=5) OR Zenabl:(pos=6))" },
++ { "getenv(\"HTTP_REFERER\")", "(getenv:(pos=1) OR http_referer:(pos=2))" },
++ { "Error setting display mode: CreateDevice failed (D3DERR_DRIVERINTERNALERROR)", "(error:(pos=1) OR Zset:(pos=2) OR Zdisplay:(pos=3) OR Zmode:(pos=4) OR createdevice:(pos=5) OR Zfail:(pos=6) OR d3derr_driverinternalerror:(pos=7))" },
++ { "Exception number: c0000005 (access violation)", "(exception:(pos=1) OR Znumber:(pos=2) OR Zc0000005:(pos=3) OR Zaccess:(pos=4) OR Zviolat:(pos=5))" },
++ { "header(\"Content-type:application/octetstream\");", "(header:(pos=1) OR (content:(pos=2) PHRASE 4 type:(pos=3) PHRASE 4 application:(pos=4) PHRASE 4 octetstream:(pos=5)))" },
++ { "java.security.AccessControlException: access denied (java.lang.RuntimePermission accessClassInPackage.sun.jdbc.odbc)", "((java:(pos=1) PHRASE 3 security:(pos=2) PHRASE 3 accesscontrolexception:(pos=3)) OR Zaccess:(pos=4) OR Zdeni:(pos=5) OR (java:(pos=6) PHRASE 3 lang:(pos=7) PHRASE 3 runtimepermission:(pos=8)) OR (accessclassinpackage:(pos=9) PHRASE 4 sun:(pos=10) PHRASE 4 jdbc:(pos=11) PHRASE 4 odbc:(pos=12)))" },
++ { "(001.part.met", "(001:(pos=1) PHRASE 3 part:(pos=2) PHRASE 3 met:(pos=3))" },
++ { "Warning: mail(): Use the -f option (5th param) to include valid reply-to address ! in /usr/home/vdb/www/mail.php on line 79", "(warning:(pos=1) OR mail:(pos=2) OR use:(pos=3) OR Zthe:(pos=4) OR Zf:(pos=5) OR Zoption:(pos=6) OR 5th:(pos=7) OR Zparam:(pos=8) OR Zto:(pos=9) OR Zinclud:(pos=10) OR Zvalid:(pos=11) OR (reply:(pos=12) PHRASE 2 to:(pos=13)) OR Zaddress:(pos=14) OR Zin:(pos=15) OR (usr:(pos=16) PHRASE 6 home:(pos=17) PHRASE 6 vdb:(pos=18) PHRASE 6 www:(pos=19) PHRASE 6 mail:(pos=20) PHRASE 6 php:(pos=21)) OR Zon:(pos=22) OR Zline:(pos=23) OR 79:(pos=24))" },
++ { "PHP Use the -f option (5th param)", "((php:(pos=1) OR use:(pos=2) OR Zthe:(pos=3) OR Zoption:(pos=5) OR 5th:(pos=6) OR Zparam:(pos=7)) AND_NOT Zf:(pos=4))" },
++ { "dvd \"+\" \"-\"", "Zdvd:(pos=1)" },
++ { "bericht ( %)", "Zbericht:(pos=1)" },
++ { "2500+ of 2600+ (niett OC)", "(2500+:(pos=1) OR Zof:(pos=2) OR 2600+:(pos=3) OR Zniett:(pos=4) OR oc:(pos=5))" },
++ { "maxtor windows xp werkt The drivers for this device are not installed. (Code 28)", "(Zmaxtor:(pos=1) OR Zwindow:(pos=2) OR Zxp:(pos=3) OR Zwerkt:(pos=4) OR the:(pos=5) OR Zdriver:(pos=6) OR Zfor:(pos=7) OR Zthis:(pos=8) OR Zdevic:(pos=9) OR Zare:(pos=10) OR Znot:(pos=11) OR Zinstal:(pos=12) OR code:(pos=13) OR 28:(pos=14))" },
++ { "Warning: stat failed for /mnt/web/react/got/react/board/non-www/headlines/tnet-headlines.txt (errno=2 - No such file or directory) in /mnt/web/react/got/react/global/non-www/templates/got/functions.inc.php on line 303", "(warning:(pos=1) OR Zstat:(pos=2) OR Zfail:(pos=3) OR Zfor:(pos=4) OR (mnt:(pos=5) PHRASE 12 web:(pos=6) PHRASE 12 react:(pos=7) PHRASE 12 got:(pos=8) PHRASE 12 react:(pos=9) PHRASE 12 board:(pos=10) PHRASE 12 non:(pos=11) PHRASE 12 www:(pos=12) PHRASE 12 headlines:(pos=13) PHRASE 12 tnet:(pos=14) PHRASE 12 headlines:(pos=15) PHRASE 12 txt:(pos=16)) OR errno:(pos=17) OR 2:(pos=18) OR no:(pos=19) OR Zsuch:(pos=20) OR Zfile:(pos=21) OR Zor:(pos=22) OR Zdirectori:(pos=23) OR Zin:(pos=24) OR (mnt:(pos=25) PHRASE 13 web:(pos=26) PHRASE 13 react:(pos=27) PHRASE 13 got:(pos=28) PHRASE 13 react:(pos=29) PHRASE 13 global:(pos=30) PHRASE 13 non:(pos=31) PHRASE 13 www:(pos=32) PHRASE 13 templates:(pos=33) PHRASE 13 got:(pos=34) PHRASE 13 functions:(pos=35) PHRASE 13 inc:(pos=36) PHRASE 13 php:(pos=37)) OR Zon:(pos=38) OR Zline:(pos=39) OR 303:(pos=40))" },
++ { "apm: BIOS version 1.2 Flags 0x03 (Driver version 1.16)", "(Zapm:(pos=1) OR bios:(pos=2) OR Zversion:(pos=3) OR 1.2:(pos=4) OR flags:(pos=5) OR 0x03:(pos=6) OR driver:(pos=7) OR Zversion:(pos=8) OR 1.16:(pos=9))" },
++ { "GA-8IHXP(3.0)", "((ga:(pos=1) PHRASE 2 8ihxp:(pos=2)) OR 3.0:(pos=3))" },
++ { "8IHXP(3.0)", "(8ihxp:(pos=1) OR 3.0:(pos=2))" },
++ { "na\xc2\xb7si (de ~ (m.))", "(Zna\xc2\xb7si:(pos=1) OR Zde:(pos=2) OR Zm:(pos=3))" },
++ { "header(\"Content-Disposition: attachment;", "(header:(pos=1) OR (content:(pos=2) PHRASE 3 disposition:(pos=3) PHRASE 3 attachment:(pos=4)))" },
++ { "\"header(\"Content-Disposition: attachment;\"", "(header:(pos=1) OR (content:(pos=2) PHRASE 2 disposition:(pos=3)) OR Zattach:(pos=4))" },
++ { "\"Beep -f\"", "(beep:(pos=1) PHRASE 2 f:(pos=2))" },
++ { "kraan NEAR (Elektrisch OR Electrisch)", "(Zkraan:(pos=1) OR near:(pos=2) OR elektrisch:(pos=3) OR or:(pos=4) OR electrisch:(pos=5))" },
++ { "checking for Qt... configure: error: Qt (>= Qt 3.0.2) (headers and libraries) not found. Please check your installation!", "(Zcheck:(pos=1) OR Zfor:(pos=2) OR qt:(pos=3) OR Zconfigur:(pos=4) OR Zerror:(pos=5) OR qt:(pos=6) OR qt:(pos=7) OR 3.0.2:(pos=8) OR Zheader:(pos=9) OR Zand:(pos=10) OR Zlibrari:(pos=11) OR Znot:(pos=12) OR Zfound:(pos=13) OR please:(pos=14) OR Zcheck:(pos=15) OR Zyour:(pos=16) OR Zinstal:(pos=17))" },
++ { "parse error, unexpected '\\\"', expecting T_STRING or T_VARIABLE or T_NUM_STRING", "(Zpars:(pos=1) OR Zerror:(pos=2) OR Zunexpect:(pos=3) OR (expecting:(pos=4) PHRASE 6 t_string:(pos=5) PHRASE 6 or:(pos=6) PHRASE 6 t_variable:(pos=7) PHRASE 6 or:(pos=8) PHRASE 6 t_num_string:(pos=9)))" },
++ { "ac3 (0x2000) \"Dolby Laboratories,", "(Zac3:(pos=1) OR 0x2000:(pos=2) OR (dolby:(pos=3) PHRASE 2 laboratories:(pos=4)))" },
++ { "Movie.FileName=(\"../../../~animations/\"+lesson1.recordset.fields('column3')+\"Intro.avi\")", "((movie:(pos=1) PHRASE 2 filename:(pos=2)) OR animations:(pos=3) OR (lesson1:(pos=4) PHRASE 3 recordset:(pos=5) PHRASE 3 fields:(pos=6)) OR Zcolumn3:(pos=7) OR (intro:(pos=8) PHRASE 2 avi:(pos=9)))" },
++ { "502 Permission Denied - Permission Denied - news.chello.nl -- http://www.chello.nl/ (Typhoon v1.2.3)", "(502:(pos=1) OR permission:(pos=2) OR denied:(pos=3) OR permission:(pos=4) OR denied:(pos=5) OR (news:(pos=6) PHRASE 3 chello:(pos=7) PHRASE 3 nl:(pos=8)) OR (http:(pos=9) PHRASE 4 www:(pos=10) PHRASE 4 chello:(pos=11) PHRASE 4 nl:(pos=12)) OR typhoon:(pos=13) OR Zv1.2.3:(pos=14))" },
++ { "Motion JPEG (MJPEG codec)", "(motion:(pos=1) OR jpeg:(pos=2) OR mjpeg:(pos=3) OR Zcodec:(pos=4))" },
++ { ": zoomtext\"", "zoomtext:(pos=1)" },
++ { "Your SORT command does not seem to support the \"-r -n -k 7\"", "(your:(pos=1) OR sort:(pos=2) OR Zcommand:(pos=3) OR Zdoe:(pos=4) OR Znot:(pos=5) OR Zseem:(pos=6) OR Zto:(pos=7) OR Zsupport:(pos=8) OR Zthe:(pos=9) OR (r:(pos=10) PHRASE 4 n:(pos=11) PHRASE 4 k:(pos=12) PHRASE 4 7:(pos=13)))" },
++ { "Geef de naam van de MSDOS prompt op C:\\\\WINDOWS.COM\\\"", "(geef:(pos=1) OR Zde:(pos=2) OR Znaam:(pos=3) OR Zvan:(pos=4) OR Zde:(pos=5) OR msdos:(pos=6) OR Zprompt:(pos=7) OR Zop:(pos=8) OR (c:(pos=9) PHRASE 3 windows:(pos=10) PHRASE 3 com:(pos=11)))" },
++ { "\"\"wa is fase\"", "(Zwa:(pos=1) OR Zis:(pos=2) OR fase:(pos=3))" },
++ { "<v:imagedata src=\"", "((v:(pos=1) PHRASE 2 imagedata:(pos=2)) OR src:(pos=3))" },
++ { "system(play ringin.wav); ?>", "(system:(pos=1) OR Zplay:(pos=2) OR (ringin:(pos=3) PHRASE 2 wav:(pos=4)))" },
++ { "\"perfect NEAR systems\"", "(perfect:(pos=1) PHRASE 3 near:(pos=2) PHRASE 3 systems:(pos=3))" },
++ { "LoadLibrary(\"mainta/gamex86.dll\") failed", "(loadlibrary:(pos=1) OR (mainta:(pos=2) PHRASE 3 gamex86:(pos=3) PHRASE 3 dll:(pos=4)) OR Zfail:(pos=5))" },
++ { "DATE_FORMAT('1997-10-04 22:23:00', '%W %M %Y');", "(date_format:(pos=1) OR (1997:(pos=2) PHRASE 3 10:(pos=3) PHRASE 3 04:(pos=4)) OR (22:(pos=5) PHRASE 3 23:(pos=6) PHRASE 3 00:(pos=7)) OR w:(pos=8) OR m:(pos=9) OR y:(pos=10))" },
++ { "secundaire IDE-controller (dubbele fifo)", "(Zsecundair:(pos=1) OR (ide:(pos=2) PHRASE 2 controller:(pos=3)) OR Zdubbel:(pos=4) OR Zfifo:(pos=5))" },
++ { "\"Postal2+Explorer.exe\"", "(postal2:(pos=1) PHRASE 3 explorer:(pos=2) PHRASE 3 exe:(pos=3))" },
++ { "COUNT(*)", "count:(pos=1)" },
++ { "Nuttige Windows progs (1/11)", "(nuttige:(pos=1) OR windows:(pos=2) OR Zprog:(pos=3) OR (1:(pos=4) PHRASE 2 11:(pos=5)))" },
++ { "if(usercode==passcode==)", "(if:(pos=1) OR usercode:(pos=2) OR passcode:(pos=3))" },
++ { "lg 8160b (dvd+r)", "(Zlg:(pos=1) OR 8160b:(pos=2) OR Zdvd:(pos=3) OR Zr:(pos=4))" },
++ { "iPAQ Pocket PC 2002 End User Update (EUU - Service Pack)", "(Zipaq:(pos=1) OR pocket:(pos=2) OR pc:(pos=3) OR 2002:(pos=4) OR end:(pos=5) OR user:(pos=6) OR update:(pos=7) OR euu:(pos=8) OR service:(pos=9) OR pack:(pos=10))" },
++ { "'ipod pakt tags niet\"", "(Zipod:(pos=1) OR Zpakt:(pos=2) OR Ztag:(pos=3) OR niet:(pos=4))" },
++ { "\"DVD+/-R\"", "(dvd+:(pos=1) PHRASE 2 r:(pos=2))" },
++ { "\"DVD+R DVD-R\"", "(dvd:(pos=1) PHRASE 4 r:(pos=2) PHRASE 4 dvd:(pos=3) PHRASE 4 r:(pos=4))" },
++ { "php ;) in een array zetten", "(Zphp:(pos=1) OR Zin:(pos=2) OR Zeen:(pos=3) OR Zarray:(pos=4) OR Zzetten:(pos=5))" },
++ { "De inhoud van uw advertentie is niet geschikt voor plaatsing op marktplaats! (001", "(de:(pos=1) OR Zinhoud:(pos=2) OR Zvan:(pos=3) OR Zuw:(pos=4) OR Zadvertenti:(pos=5) OR Zis:(pos=6) OR Zniet:(pos=7) OR Zgeschikt:(pos=8) OR Zvoor:(pos=9) OR Zplaats:(pos=10) OR Zop:(pos=11) OR Zmarktplaat:(pos=12) OR 001:(pos=13))" },
++ { "creative (soundblaster OR sb) 128", "(Zcreativ:(pos=1) OR Zsoundblast:(pos=2) OR Zsb:(pos=3) OR 128:(pos=4))" },
++ { "Can't open file: (errno: 145)", "(can't:(pos=1) OR Zopen:(pos=2) OR Zfile:(pos=3) OR Zerrno:(pos=4) OR 145:(pos=5))" },
++ { "Formateren lukt niet(98,XP)", "(formateren:(pos=1) OR Zlukt:(pos=2) OR niet:(pos=3) OR 98:(pos=4) OR xp:(pos=5))" },
++ { "access denied (java.io.", "(Zaccess:(pos=1) OR Zdeni:(pos=2) OR (java:(pos=3) PHRASE 2 io:(pos=4)))" },
++ { "(access denied (java.io.)", "(Zaccess:(pos=1) OR Zdeni:(pos=2) OR (java:(pos=3) PHRASE 2 io:(pos=4)))" },
++ { "wil niet installeren ( crc fouten)", "(Zwil:(pos=1) OR Zniet:(pos=2) OR Zinstalleren:(pos=3) OR Zcrc:(pos=4) OR Zfouten:(pos=5))" },
++ { "(DVD+RW) brandsoftware meerdere", "(dvd:(pos=1) OR rw:(pos=2) OR Zbrandsoftwar:(pos=3) OR Zmeerder:(pos=4))" },
++ { "(database OF databases) EN geheugen", "(Zdatabas:(pos=1) OR of:(pos=2) OR Zdatabas:(pos=3) OR en:(pos=4) OR Zgeheugen:(pos=5))" },
++ { "(server 2003) winroute", "(Zserver:(pos=1) OR 2003:(pos=2) OR Zwinrout:(pos=3))" },
++ { "54MHz (kanaal 2 VHF) tot tenminste 806 MHz (kanaal 69 UHF)", "(54mhz:(pos=1) OR Zkanaal:(pos=2) OR 2:(pos=3) OR vhf:(pos=4) OR Ztot:(pos=5) OR Ztenminst:(pos=6) OR 806:(pos=7) OR mhz:(pos=8) OR Zkanaal:(pos=9) OR 69:(pos=10) OR uhf:(pos=11))" },
++ { "(draadloos OR wireless) netwerk", "(Zdraadloo:(pos=1) OR Zwireless:(pos=2) OR Znetwerk:(pos=3))" },
++ { "localtime(time(NULL));", "(localtime:(pos=1) OR time:(pos=2) OR null:(pos=3))" },
++ { "ob_start(\"ob_gzhandler\");", "(ob_start:(pos=1) OR ob_gzhandler:(pos=2))" },
++ { "PPP Closed : LCP Time-out (VPN-0)", "(ppp:(pos=1) OR closed:(pos=2) OR lcp:(pos=3) OR (time:(pos=4) PHRASE 2 out:(pos=5)) OR (vpn:(pos=6) PHRASE 2 0:(pos=7)))" },
++ { "COM+-gebeurtenissysteem", "(com+:(pos=1) PHRASE 2 gebeurtenissysteem:(pos=2))" },
++ { "rcpthosts (#5.7.1)", "(Zrcpthost:(pos=1) OR 5.7.1:(pos=2))" },
++ { "Dit apparaat werkt niet goed omdat Windows de voor dit apparaat vereiste stuurprogramma's niet kan laden. (Code 31)", "(dit:(pos=1) OR Zapparaat:(pos=2) OR Zwerkt:(pos=3) OR Zniet:(pos=4) OR Zgo:(pos=5) OR Zomdat:(pos=6) OR windows:(pos=7) OR Zde:(pos=8) OR Zvoor:(pos=9) OR Zdit:(pos=10) OR Zapparaat:(pos=11) OR Zvereist:(pos=12) OR Zstuurprogramma:(pos=13) OR Zniet:(pos=14) OR Zkan:(pos=15) OR Zladen:(pos=16) OR code:(pos=17) OR 31:(pos=18))" },
++ { "window.open( scrollbar", "((window:(pos=1) PHRASE 2 open:(pos=2)) OR Zscrollbar:(pos=3))" },
++ { "T68i truc ->", "(t68i:(pos=1) OR Ztruc:(pos=2))" },
++ { "T68i ->", "t68i:(pos=1)" },
++ { "\"de lijn is bezet\"\"", "(de:(pos=1) PHRASE 4 lijn:(pos=2) PHRASE 4 is:(pos=3) PHRASE 4 bezet:(pos=4))" },
++ { "if (eregi(\"", "(Zif:(pos=1) OR eregi:(pos=2))" },
++ { "This device is not working properly because Windows cannot load the drivers required for this device. (Code 31)", "(this:(pos=1) OR Zdevic:(pos=2) OR Zis:(pos=3) OR Znot:(pos=4) OR Zwork:(pos=5) OR Zproper:(pos=6) OR Zbecaus:(pos=7) OR windows:(pos=8) OR Zcannot:(pos=9) OR Zload:(pos=10) OR Zthe:(pos=11) OR Zdriver:(pos=12) OR Zrequir:(pos=13) OR Zfor:(pos=14) OR Zthis:(pos=15) OR Zdevic:(pos=16) OR code:(pos=17) OR 31:(pos=18))" },
++ { "execCommand(\"Paste\");", "(execcommand:(pos=1) OR paste:(pos=2))" },
++ { "\"-1 unread\"", "(1:(pos=1) PHRASE 2 unread:(pos=2))" },
++ { "\"www.historical-fire-engines", "(www:(pos=1) PHRASE 4 historical:(pos=2) PHRASE 4 fire:(pos=3) PHRASE 4 engines:(pos=4))" },
++ { "\"DVD+RW\" erase", "((dvd:(pos=1) PHRASE 2 rw:(pos=2)) OR Zeras:(pos=3))" },
++ { "[showjekamer)", "Zshowjekam:(pos=1)" },
++ { "The description for Event ID 1 in Source True Vector Engine ) cannot be found. The local computer may not have the necessary registry information or message DLL files to display messages from a remote computer. You may be able to use the /AUXSOURC", "(the:(pos=1) OR Zdescript:(pos=2) OR Zfor:(pos=3) OR event:(pos=4) OR id:(pos=5) OR 1:(pos=6) OR Zin:(pos=7) OR source:(pos=8) OR true:(pos=9) OR vector:(pos=10) OR engine:(pos=11) OR Zcannot:(pos=12) OR Zbe:(pos=13) OR Zfound:(pos=14) OR the:(pos=15) OR Zlocal:(pos=16) OR Zcomput:(pos=17) OR Zmay:(pos=18) OR Znot:(pos=19) OR Zhave:(pos=20) OR Zthe:(pos=21) OR Znecessari:(pos=22) OR Zregistri:(pos=23) OR Zinform:(pos=24) OR Zor:(pos=25) OR Zmessag:(pos=26) OR dll:(pos=27) OR Zfile:(pos=28) OR Zto:(pos=29) OR Zdisplay:(pos=30) OR Zmessag:(pos=31) OR Zfrom:(pos=32) OR Za:(pos=33) OR Zremot:(pos=34) OR Zcomput:(pos=35) OR you:(pos=36) OR Zmay:(pos=37) OR Zbe:(pos=38) OR Zabl:(pos=39) OR Zto:(pos=40) OR Zuse:(pos=41) OR Zthe:(pos=42) OR auxsourc:(pos=43))" },
++ { "org.apache.jasper.JasperException: This absolute uri (http://java.sun.com/jstl/core) cannot be resolved in either web.xml or the jar files deployed with this application", "((org:(pos=1) PHRASE 4 apache:(pos=2) PHRASE 4 jasper:(pos=3) PHRASE 4 jasperexception:(pos=4)) OR this:(pos=5) OR Zabsolut:(pos=6) OR Zuri:(pos=7) OR (http:(pos=8) PHRASE 6 java:(pos=9) PHRASE 6 sun:(pos=10) PHRASE 6 com:(pos=11) PHRASE 6 jstl:(pos=12) PHRASE 6 core:(pos=13)) OR Zcannot:(pos=14) OR Zbe:(pos=15) OR Zresolv:(pos=16) OR Zin:(pos=17) OR Zeither:(pos=18) OR (web:(pos=19) PHRASE 2 xml:(pos=20)) OR Zor:(pos=21) OR Zthe:(pos=22) OR Zjar:(pos=23) OR Zfile:(pos=24) OR Zdeploy:(pos=25) OR Zwith:(pos=26) OR Zthis:(pos=27) OR Zapplic:(pos=28))" },
++ { "This absolute uri (http://java.sun.com/jstl/core) cannot be resolved in either web.xml or the jar files deployed with this application", "(this:(pos=1) OR Zabsolut:(pos=2) OR Zuri:(pos=3) OR (http:(pos=4) PHRASE 6 java:(pos=5) PHRASE 6 sun:(pos=6) PHRASE 6 com:(pos=7) PHRASE 6 jstl:(pos=8) PHRASE 6 core:(pos=9)) OR Zcannot:(pos=10) OR Zbe:(pos=11) OR Zresolv:(pos=12) OR Zin:(pos=13) OR Zeither:(pos=14) OR (web:(pos=15) PHRASE 2 xml:(pos=16)) OR Zor:(pos=17) OR Zthe:(pos=18) OR Zjar:(pos=19) OR Zfile:(pos=20) OR Zdeploy:(pos=21) OR Zwith:(pos=22) OR Zthis:(pos=23) OR Zapplic:(pos=24))" },
++ { "vervangen # \"/", "Zvervangen:(pos=1)" },
++ { "vervangen # /\"", "Zvervangen:(pos=1)" },
++ { "while(list($key, $val) = each($HTTP_POST_VARS))", "(while:(pos=1) OR list:(pos=2) OR Zkey:(pos=3) OR Zval:(pos=4) OR each:(pos=5) OR http_post_vars:(pos=6))" },
++ { "PowerDVD does not support the current display mode. (DDraw Overlay mode is recommended)", "(powerdvd:(pos=1) OR Zdoe:(pos=2) OR Znot:(pos=3) OR Zsupport:(pos=4) OR Zthe:(pos=5) OR Zcurrent:(pos=6) OR Zdisplay:(pos=7) OR Zmode:(pos=8) OR ddraw:(pos=9) OR overlay:(pos=10) OR Zmode:(pos=11) OR Zis:(pos=12) OR Zrecommend:(pos=13))" },
++ { "Warning: Unexpected character in input: '' (ASCII=92) state=1 highlight", "(warning:(pos=1) OR unexpected:(pos=2) OR Zcharact:(pos=3) OR Zin:(pos=4) OR Zinput:(pos=5) OR ascii:(pos=6) OR 92:(pos=7) OR state:(pos=8) OR 1:(pos=9) OR Zhighlight:(pos=10))" },
++ { "error: Qt-1.4 (headers and libraries) not found. Please check your installation!", "(Zerror:(pos=1) OR (qt:(pos=2) PHRASE 2 1.4:(pos=3)) OR Zheader:(pos=4) OR Zand:(pos=5) OR Zlibrari:(pos=6) OR Znot:(pos=7) OR Zfound:(pos=8) OR please:(pos=9) OR Zcheck:(pos=10) OR Zyour:(pos=11) OR Zinstal:(pos=12))" },
++ { "Error while initializing the sound driver: device /dev/dsp can't be opened (No such device) The sound server will continue, using the null output device.", "(error:(pos=1) OR Zwhile:(pos=2) OR Ziniti:(pos=3) OR Zthe:(pos=4) OR Zsound:(pos=5) OR Zdriver:(pos=6) OR Zdevic:(pos=7) OR (dev:(pos=8) PHRASE 2 dsp:(pos=9)) OR Zcan't:(pos=10) OR Zbe:(pos=11) OR Zopen:(pos=12) OR no:(pos=13) OR Zsuch:(pos=14) OR Zdevic:(pos=15) OR the:(pos=16) OR Zsound:(pos=17) OR Zserver:(pos=18) OR Zwill:(pos=19) OR Zcontinu:(pos=20) OR Zuse:(pos=21) OR Zthe:(pos=22) OR Znull:(pos=23) OR Zoutput:(pos=24) OR Zdevic:(pos=25))" },
++ { "mag mijn waarschuwing nu weg ? ;)", "(Zmag:(pos=1) OR Zmijn:(pos=2) OR Zwaarschuw:(pos=3) OR Znu:(pos=4) OR Zweg:(pos=5))" },
++ { "Abit NF7-S (nForce 2 Chipset) Rev 2.0", "(abit:(pos=1) OR (nf7:(pos=2) PHRASE 2 s:(pos=3)) OR Znforc:(pos=4) OR 2:(pos=5) OR chipset:(pos=6) OR rev:(pos=7) OR 2.0:(pos=8))" },
++ { "Setup Could Not Verify the Integrity of the File\" Error Message Occurs When You Try to Install Windows XP Service Pack 1", "(setup:(pos=1) OR could:(pos=2) OR not:(pos=3) OR verify:(pos=4) OR Zthe:(pos=5) OR integrity:(pos=6) OR Zof:(pos=7) OR Zthe:(pos=8) OR file:(pos=9) OR (error:(pos=10) PHRASE 13 message:(pos=11) PHRASE 13 occurs:(pos=12) PHRASE 13 when:(pos=13) PHRASE 13 you:(pos=14) PHRASE 13 try:(pos=15) PHRASE 13 to:(pos=16) PHRASE 13 install:(pos=17) PHRASE 13 windows:(pos=18) PHRASE 13 xp:(pos=19) PHRASE 13 service:(pos=20) PHRASE 13 pack:(pos=21) PHRASE 13 1:(pos=22)))" },
++ { "(browser 19) citrix", "(Zbrowser:(pos=1) OR 19:(pos=2) OR Zcitrix:(pos=3))" },
++ { "preg_replace (.*?)", "Zpreg_replac:(pos=1)" },
++ { "formule excel #naam\"?\"", "(Zformul:(pos=1) OR Zexcel:(pos=2) OR naam:(pos=3))" },
++ { "->", "" },
++ { "De instructie op 0x77f436f7 verwijst naar geheugen op 0x007f4778. De lees-of schrijfbewerking (\"written\") op het geheugen is mislukt", "(de:(pos=1) OR Zinstructi:(pos=2) OR Zop:(pos=3) OR 0x77f436f7:(pos=4) OR Zverwijst:(pos=5) OR Znaar:(pos=6) OR Zgeheugen:(pos=7) OR Zop:(pos=8) OR 0x007f4778:(pos=9) OR de:(pos=10) OR (lees:(pos=11) PHRASE 2 of:(pos=12)) OR Zschrijfbewerk:(pos=13) OR written:(pos=14) OR Zop:(pos=15) OR Zhet:(pos=16) OR Zgeheugen:(pos=17) OR Zis:(pos=18) OR Zmislukt:(pos=19))" },
++ { "<iframe src=\"www.tweakers.net></iframe>", "(Zifram:(pos=1) OR src:(pos=2) OR (www:(pos=3) PHRASE 4 tweakers:(pos=4) PHRASE 4 net:(pos=5) PHRASE 4 iframe:(pos=6)))" },
++ { "\"rpm -e httpd\"", "(rpm:(pos=1) PHRASE 3 e:(pos=2) PHRASE 3 httpd:(pos=3))" },
++ { "automatisch op All Flis (*.*)", "(Zautomatisch:(pos=1) OR Zop:(pos=2) OR all:(pos=3) OR flis:(pos=4))" },
++ { "(Windows; U; Windows NT 5.1; en-US; rv:1.3b) Gecko/20030210", "(windows:(pos=1) OR u:(pos=2) OR windows:(pos=3) OR nt:(pos=4) OR 5.1:(pos=5) OR (en:(pos=6) PHRASE 2 us:(pos=7)) OR (rv:(pos=8) PHRASE 2 1.3b:(pos=9)) OR (gecko:(pos=10) PHRASE 2 20030210:(pos=11)))" },
++ { "en-US; rv:1.3b) Gecko/20030210", "((en:(pos=1) PHRASE 2 us:(pos=2)) OR (rv:(pos=3) PHRASE 2 1.3b:(pos=4)) OR (gecko:(pos=5) PHRASE 2 20030210:(pos=6)))" },
++ { "\"en-US; rv:1.3b) Gecko/20030210\"", "(en:(pos=1) PHRASE 6 us:(pos=2) PHRASE 6 rv:(pos=3) PHRASE 6 1.3b:(pos=4) PHRASE 6 gecko:(pos=5) PHRASE 6 20030210:(pos=6))" },
++ { "(./) chmod.sh", "(chmod:(pos=1) PHRASE 2 sh:(pos=2))" },
++ { "document.write(ssg(\" html", "((document:(pos=1) PHRASE 2 write:(pos=2)) OR ssg:(pos=3) OR html:(pos=4))" },
++ { "superstack \"mac+adressen\"", "(Zsuperstack:(pos=1) OR (mac:(pos=2) PHRASE 2 adressen:(pos=3)))" },
++ { "IIS getenv(REMOTE_HOST)_", "(iis:(pos=1) OR getenv:(pos=2) OR remote_host:(pos=3) OR _:(pos=4))" },
++ { "IIS en getenv(REMOTE_HOST)", "(iis:(pos=1) OR Zen:(pos=2) OR getenv:(pos=3) OR remote_host:(pos=4))" },
++ { "php getenv(\"HTTP_REFERER\")", "(Zphp:(pos=1) OR getenv:(pos=2) OR http_referer:(pos=3))" },
++ { "nec+-1300", "(nec+:(pos=1) PHRASE 2 1300:(pos=2))" },
++ { "smbpasswd script \"-s\"", "(Zsmbpasswd:(pos=1) OR Zscript:(pos=2) OR s:(pos=3))" },
++ { "leestekens \" \xc3\xb6 \xc3\xab", "(Zleesteken:(pos=1) OR (\xc3\xb6:(pos=2) PHRASE 2 \xc3\xab:(pos=3)))" },
++ { "freesco and (all seeing eye)", "(Zfreesco:(pos=1) OR Zand:(pos=2) OR Zall:(pos=3) OR Zsee:(pos=4) OR Zeye:(pos=5))" },
++ { "('all seeing eye') and freesco", "(Zall:(pos=1) OR Zsee:(pos=2) OR Zeye:(pos=3) OR Zand:(pos=4) OR Zfreesco:(pos=5))" },
++ { "\"[......\"", "" },
++ { "Error = 11004 (500 No Data (Winsock error #11004))", "(error:(pos=1) OR 11004:(pos=2) OR 500:(pos=3) OR no:(pos=4) OR data:(pos=5) OR winsock:(pos=6) OR Zerror:(pos=7) OR 11004:(pos=8))" },
++ { "gegevensfout (cyclishe redundantiecontrole)", "(Zgegevensfout:(pos=1) OR Zcyclish:(pos=2) OR Zredundantiecontrol:(pos=3))" },
++ { "firmware versie waar NEC\"", "(Zfirmwar:(pos=1) OR Zversi:(pos=2) OR Zwaar:(pos=3) OR nec:(pos=4))" },
++ { "nu.nl \"-1\"", "((nu:(pos=1) PHRASE 2 nl:(pos=2)) OR 1:(pos=3))" },
++ { "provider+-webspace", "(provider+:(pos=1) PHRASE 2 webspace:(pos=2))" },
++ { "verschil \"dvd+rw\" \"dvd-rw\"", "(Zverschil:(pos=1) OR (dvd:(pos=2) PHRASE 2 rw:(pos=3)) OR (dvd:(pos=4) PHRASE 2 rw:(pos=5)))" },
++ { "(dhcp client) + hangt", "(Zdhcp:(pos=1) OR Zclient:(pos=2) OR Zhangt:(pos=3))" },
++ { "MSI 875P Neo-FIS2R (Intel 875P)", "(msi:(pos=1) OR 875p:(pos=2) OR (neo:(pos=3) PHRASE 2 fis2r:(pos=4)) OR intel:(pos=5) OR 875p:(pos=6))" },
++ { "voeding passief gekoeld\"", "(Zvoed:(pos=1) OR Zpassief:(pos=2) OR gekoeld:(pos=3))" },
++ { "if (mysql_num_rows($resultaat)==1)", "(Zif:(pos=1) OR mysql_num_rows:(pos=2) OR Zresultaat:(pos=3) OR 1:(pos=4))" },
++ { "Server.CreateObject(\"Persits.Upload.1\")", "((server:(pos=1) PHRASE 2 createobject:(pos=2)) OR (persits:(pos=3) PHRASE 3 upload:(pos=4) PHRASE 3 1:(pos=5)))" },
++ { "if(cod>9999999)cod=parseInt(cod/64)", "(if:(pos=1) OR cod:(pos=2) OR 9999999:(pos=3) OR cod:(pos=4) OR parseint:(pos=5) OR (cod:(pos=6) PHRASE 2 64:(pos=7)))" },
++ { "if (cod>9999999", "(Zif:(pos=1) OR cod:(pos=2) OR 9999999:(pos=3))" },
++ { "\"rm -rf /bin/laden\"", "(rm:(pos=1) PHRASE 4 rf:(pos=2) PHRASE 4 bin:(pos=3) PHRASE 4 laden:(pos=4))" },
++ { "\">>> 0) & 0xFF\"", "(0:(pos=1) PHRASE 2 0xff:(pos=2))" },
++ { "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\"> document.body.scrollHeight", "(doctype:(pos=1) OR html:(pos=2) OR public:(pos=3) OR (w3c:(pos=4) PHRASE 5 dtd:(pos=5) PHRASE 5 html:(pos=6) PHRASE 5 4.01:(pos=7) PHRASE 5 en:(pos=8)) OR (document:(pos=9) PHRASE 3 body:(pos=10) PHRASE 3 scrollheight:(pos=11)))" },
++ { " window.resizeBy(offsetX,offsetY)kweet", "(br:(pos=1) OR (window:(pos=2) PHRASE 2 resizeby:(pos=3)) OR Zoffsetx:(pos=4) OR Zoffseti:(pos=5) OR p:(pos=6) OR Zkweet:(pos=7))" },
++ { "linux humor :)", "(Zlinux:(pos=1) OR Zhumor:(pos=2))" },
++ { "ClassFactory kan aangevraagde klasse niet leveren (Fout=80040111)", "(classfactory:(pos=1) OR Zkan:(pos=2) OR Zaangevraagd:(pos=3) OR Zklass:(pos=4) OR Zniet:(pos=5) OR Zleveren:(pos=6) OR fout:(pos=7) OR 80040111:(pos=8))" },
++ { "remote_smtp defer (-44)", "(Zremote_smtp:(pos=1) OR Zdefer:(pos=2) OR 44:(pos=3))" },
++ { "txtlogin.getText().trim().toUpperCase().intern() == inuser[2 * (i - 1) + 2].trim().toUpperCase().intern() && txtpass.getText().trim().toUpperCase().intern() == inuser[2 * (i - 1) + 3].trim().toUpperCase().intern())", "((txtlogin:(pos=1) PHRASE 2 gettext:(pos=2)) OR trim:(pos=3) OR touppercase:(pos=4) OR intern:(pos=5) OR inuser:(pos=6) OR 2:(pos=7) OR Zi:(pos=8) OR 1:(pos=9) OR 2:(pos=10) OR trim:(pos=11) OR touppercase:(pos=12) OR intern:(pos=13) OR (txtpass:(pos=14) PHRASE 2 gettext:(pos=15)) OR trim:(pos=16) OR touppercase:(pos=17) OR intern:(pos=18) OR inuser:(pos=19) OR 2:(pos=20) OR Zi:(pos=21) OR 1:(pos=22) OR 3:(pos=23) OR trim:(pos=24) OR touppercase:(pos=25) OR intern:(pos=26))" },
++ { "Koper + amoniak (NH2", "(koper:(pos=1) OR Zamoniak:(pos=2) OR nh2:(pos=3))" },
++ { "nec dvd -/+r", "((Znec:(pos=1) OR Zdvd:(pos=2)) AND_NOT Zr:(pos=3))" }, // Not ideal at all - "-" shouldn't fire here...
++ { "er is een gereserveerde fout (-1104) opgetreden", "(Zer:(pos=1) OR Zis:(pos=2) OR Zeen:(pos=3) OR Zgereserveerd:(pos=4) OR Zfout:(pos=5) OR 1104:(pos=6) OR Zopgetreden:(pos=7))" },
++ { "Cor \$CCN\$'\" <cor.kloet@ccn.controlec.nl>", "(cor:(pos=1) OR ccn:(pos=2) OR (cor:(pos=3) PHRASE 5 kloet:(pos=4) PHRASE 5 ccn:(pos=5) PHRASE 5 controlec:(pos=6) PHRASE 5 nl:(pos=7)))" },
++ { "Warning: Failed opening for inclusion (include_path='') in Unknown on line 0", "(warning:(pos=1) OR failed:(pos=2) OR Zopen:(pos=3) OR Zfor:(pos=4) OR Zinclus:(pos=5) OR include_path:(pos=6) OR Zin:(pos=7) OR unknown:(pos=8) OR Zon:(pos=9) OR Zline:(pos=10) OR 0:(pos=11))" },
++ { "\"~\" + \"c:\\\"", "Zc:(pos=1)" },
++ { "mysql count(*)", "(Zmysql:(pos=1) OR count:(pos=2))" },
++ { "for %f in (*.*) do", "(Zfor:(pos=1) OR Zf:(pos=2) OR Zin:(pos=3) OR Zdo:(pos=4))" },
++ { "raar \"~\" bestand", "(Zraar:(pos=1) OR Zbestand:(pos=2))" },
++ { "NEC DVD +-R/RW 1300", "(nec:(pos=1) OR dvd:(pos=2) OR (r:(pos=3) PHRASE 2 rw:(pos=4)) OR 1300:(pos=5))" },
++ { "approved (ref: 38446-263)", "(Zapprov:(pos=1) OR Zref:(pos=2) OR (38446:(pos=3) PHRASE 2 263:(pos=4)))" },
++ { "GA-7VRXP(2.0)", "((ga:(pos=1) PHRASE 2 7vrxp:(pos=2)) OR 2.0:(pos=3))" },
++ { "~ Could not retrieve directory listing for \"/\"", "(could:(pos=1) OR Znot:(pos=2) OR Zretriev:(pos=3) OR Zdirectori:(pos=4) OR Zlist:(pos=5) OR Zfor:(pos=6))" },
++ { "asp CreateObject(\"Word.Document\")", "(Zasp:(pos=1) OR createobject:(pos=2) OR (word:(pos=3) PHRASE 2 document:(pos=4)))" },
++ { "De lees- of schrijfbewerking (\"written\") op het geheugen is mislukt.", "(de:(pos=1) OR Zlee:(pos=2) OR Zof:(pos=3) OR Zschrijfbewerk:(pos=4) OR written:(pos=5) OR Zop:(pos=6) OR Zhet:(pos=7) OR Zgeheugen:(pos=8) OR Zis:(pos=9) OR Zmislukt:(pos=10))" },
++ { "putStr (map (\\x -> chr (round (21/2 * x^3 - 92 * x^2 + 503/2 * x - 105))) [1..4])", "(Zputstr:(pos=1) OR Zmap:(pos=2) OR ((Zx:(pos=3) OR Zround:(pos=5) OR (21:(pos=6) PHRASE 2 2:(pos=7)) OR Zx:(pos=8) OR 3:(pos=9) OR 92:(pos=10) OR Zx:(pos=11) OR 2:(pos=12) OR (503:(pos=13) PHRASE 2 2:(pos=14)) OR Zx:(pos=15) OR 105:(pos=16)) AND_NOT Zchr:(pos=4)) OR (1:(pos=17) PHRASE 2 4:(pos=18)))" },
++ { "parent.document.getElementById(\\\"leftmenu\\\").cols", "((parent:(pos=1) PHRASE 3 document:(pos=2) PHRASE 3 getelementbyid:(pos=3)) OR leftmenu:(pos=4) OR Zcol:(pos=5))" },
++ { "<% if not isEmpty(Request.QueryString) then", "(Zif:(pos=1) OR Znot:(pos=2) OR isempty:(pos=3) OR (request:(pos=4) PHRASE 2 querystring:(pos=5)) OR Zthen:(pos=6))" },
++ { "Active Desktop (Hier issie)", "(active:(pos=1) OR desktop:(pos=2) OR hier:(pos=3) OR Zissi:(pos=4))" },
++ { "Asus A7V8X (LAN + Sound)", "(asus:(pos=1) OR a7v8x:(pos=2) OR lan:(pos=3) OR sound:(pos=4))" },
++ { "Novell This pentium class machine (or greater) lacks some required CPU feature(s", "(novell:(pos=1) OR this:(pos=2) OR Zpentium:(pos=3) OR Zclass:(pos=4) OR Zmachin:(pos=5) OR Zor:(pos=6) OR Zgreater:(pos=7) OR Zlack:(pos=8) OR Zsome:(pos=9) OR Zrequir:(pos=10) OR cpu:(pos=11) OR feature:(pos=12) OR Zs:(pos=13))" },
++ { "sql server install fails error code (-1)", "(Zsql:(pos=1) OR Zserver:(pos=2) OR Zinstal:(pos=3) OR Zfail:(pos=4) OR Zerror:(pos=5) OR Zcode:(pos=6) OR 1:(pos=7))" },
++ { "session_register(\"login\");", "(session_register:(pos=1) OR login:(pos=2))" },
++ { "\"kylix+ndmb\"", "(kylix:(pos=1) PHRASE 2 ndmb:(pos=2))" },
++ { "Cannot find imap library (libc-client.a).", "(cannot:(pos=1) OR Zfind:(pos=2) OR Zimap:(pos=3) OR Zlibrari:(pos=4) OR (libc:(pos=5) PHRASE 3 client:(pos=6) PHRASE 3 a:(pos=7)))" },
++ { "If ($_SESSION[\"Login\"] == 1)", "(if:(pos=1) OR _session:(pos=2) OR login:(pos=3) OR 1:(pos=4))" },
++ { "You have an error in your SQL syntax near '1')' at line 1", "(you:(pos=1) OR Zhave:(pos=2) OR Zan:(pos=3) OR Zerror:(pos=4) OR Zin:(pos=5) OR Zyour:(pos=6) OR sql:(pos=7) OR Zsyntax:(pos=8) OR Znear:(pos=9) OR 1:(pos=10) OR Zat:(pos=11) OR Zline:(pos=12) OR 1:(pos=13))" },
++ { "ASRock K7VT2 (incl. LAN)", "(asrock:(pos=1) OR k7vt2:(pos=2) OR Zincl:(pos=3) OR lan:(pos=4))" },
++ { "+windows98 +(geen communicatie) +ie5", "(Zwindows98:(pos=1) AND (Zgeen:(pos=2) OR Zcommunicati:(pos=3)) AND Zie5:(pos=4))" },
++ { "\"xterm -fn\"", "(xterm:(pos=1) PHRASE 2 fn:(pos=2))" },
++ { "IRQL_NOT_LESS_OR_EQUAL", "irql_not_less_or_equal:(pos=1)" },
++ { "access query \"NOT IN\"", "(Zaccess:(pos=1) OR Zqueri:(pos=2) OR (not:(pos=3) PHRASE 2 in:(pos=4)))" },
++ { "\"phrase one \"phrase two\"", "((phrase:(pos=1) PHRASE 2 one:(pos=2)) OR Zphrase:(pos=3) OR two:(pos=4))" }, // FIXME: 2 phrases better?
++ { "NEAR 207 46 249 27", "(near:(pos=1) OR 207:(pos=2) OR 46:(pos=3) OR 249:(pos=4) OR 27:(pos=5))" },
++ { "- NEAR 12V voeding", "(near:(pos=1) OR 12v:(pos=2) OR Zvoed:(pos=3))" },
++ { "waarom \"~\" in directorynaam", "(Zwaarom:(pos=1) OR Zin:(pos=2) OR Zdirectorynaam:(pos=3))" },
++#endif
++
++static string
++format_doc_termlist(const Xapian::Document & doc)
++{
++ string output;
++ Xapian::TermIterator it;
++ for (it = doc.termlist_begin(); it != doc.termlist_end(); ++it) {
++	if (!output.empty()) output += ' ';
++	output += *it;
++	if (it.positionlist_count() != 0) {
++	 // If we've got a position list, only display the wdf if it's not
++	 // the length of the positionlist.
++	 if (it.get_wdf() != it.positionlist_count()) {
++	 output += ':';
++		output += str(it.get_wdf());
++	 }
++	 char ch = '[';
++	 Xapian::PositionIterator posit;
++	 for (posit = it.positionlist_begin(); posit != it.positionlist_end(); posit++) {
++		output += ch;
++		ch = ',';
++		output += str(*posit);
++	 }
++	 output += ']';
++	} else if (it.get_wdf() != 0) {
++	 // If no position list, display any non-zero wdfs.
++	 output += ':';
++	 output += str(it.get_wdf());
++	}
++ }
++ return output;
++}
++
++static bool test_termgen1()
++{
++ Xapian::TermGenerator termgen;
++ Xapian::Document doc;
++ termgen.set_document(doc);
++ string prefix;
++
++ for (const test *p = test_simple; p->text; ++p) {
++	int weight = 1;
++	bool new_doc = true;
++	bool nopos = false;
++
++	const char * o = p->options;
++	while (*o != '\0') {
++	 if (*o == ',') ++o;
++	 if (strncmp(o, "cont", 4) == 0) {
++		o += 4;
++		new_doc = false;
++	 } else if (strncmp(o, "nopos", 5) == 0) {
++		o += 5;
++		nopos = true;
++	 } else if (strncmp(o, "weight=", 7) == 0) {
++		o += 7;
++		weight = atoi(o);
++		while (*o >= '0' && *o <= '9')
++		 ++o;
++	 } else if (strncmp(o, "stem=", 5) == 0) {
++		o += 5;
++		string stemmer;
++		while (*o != '\0' && *o != ',') {
++		 stemmer += *o;
++		 ++o;
++		}
++		termgen.set_stemmer(Xapian::Stem(stemmer));
++		tout << "Setting stemmer to: " << stemmer << '\n';
++	 } else if (strncmp(o, "all_z", 5) == 0) {
++		o += 5;
++		termgen.set_stemming_strategy(termgen.STEM_ALL_Z);
++	 } else if (strncmp(o, "all", 3) == 0) {
++		o += 3;
++		termgen.set_stemming_strategy(termgen.STEM_ALL);
++	 } else if (strncmp(o, "none", 4) == 0) {
++		o += 4;
++		termgen.set_stemming_strategy(termgen.STEM_NONE);
++	 } else if (strncmp(o, "some", 4) == 0) {
++		o += 4;
++		termgen.set_stemming_strategy(termgen.STEM_SOME);
++	 } else if (strncmp(o, "prefix=", 7) == 0) {
++		o += 7;
++		prefix.resize(0);
++		while (*o != '\0' && *o != ',') {
++		 prefix += *o;
++		 ++o;
++		}
++	 } else {
++		FAIL_TEST("Invalid options string: " << p->options);
++	 }
++	}
++
++	if (new_doc) {
++	 doc = Xapian::Document();
++	 termgen.set_document(doc);
++	} else {
++	 termgen.increase_termpos();
++	}
++
++	string expect, output;
++	expect = p->expect;
++	try {
++	 if (nopos) {
++		termgen.index_text_without_positions(p->text, weight, prefix);
++	 } else {
++		termgen.index_text(p->text, weight, prefix);
++	 }
++	 output = format_doc_termlist(doc);
++	} catch (const Xapian::Error &e) {
++	 output = e.get_description();
++	} catch (...) {
++	 output = "Unknown exception!";
++	}
++	if (prefix.empty())
++	 tout << "Text: " << p->text << '\n';
++	else
++	 tout << "Prefix: " << prefix << " Text: " << p->text << '\n';
++	TEST_STRINGS_EQUAL(output, expect);
++ }
++ return true;
++}
++
++/// Test spelling data generation.
++static bool test_tg_spell1()
++{
++ mkdir(".flint", 0755);
++ string dbdir = ".flint/tg_spell1";
++ Xapian::WritableDatabase db(dbdir, Xapian::DB_CREATE_OR_OVERWRITE);
++
++ Xapian::TermGenerator termgen;
++ Xapian::Document doc;
++
++ termgen.set_document(doc);
++ termgen.set_database(db);
++ termgen.set_flags(Xapian::TermGenerator::FLAG_SPELLING);
++
++ termgen.index_text("hello world hullo");
++ termgen.index_text("zebra", 1, "S");
++ termgen.index_text("hello mum hallo");
++
++ TEST_STRINGS_EQUAL(db.get_spelling_suggestion("hillo"), "hello");
++ TEST_STRINGS_EQUAL(db.get_spelling_suggestion("hillo"), "hello");
++ TEST_STRINGS_EQUAL(db.get_spelling_suggestion("hull"), "hullo");
++ TEST_STRINGS_EQUAL(db.get_spelling_suggestion("mamm"), "mum");
++ // Prefixed terms should be ignored for spelling currently.
++ TEST_STRINGS_EQUAL(db.get_spelling_suggestion("zzebra"), "");
++
++ return true;
++}
++
++/// Regression test for bug fixed in 1.0.5 - previously this segfaulted.
++static bool test_tg_spell2()
++{
++ Xapian::TermGenerator termgen;
++ Xapian::Document doc;
++
++ termgen.set_document(doc);
++ termgen.set_flags(Xapian::TermGenerator::FLAG_SPELLING);
++
++ TEST_EXCEPTION(Xapian::InvalidOperationError, termgen.index_text("foo"));
++
++ return true;
++}
++
++static bool test_tg_max_word_length1()
++{
++ Xapian::TermGenerator termgen;
++ termgen.set_stemmer(Xapian::Stem("en"));
++ termgen.set_max_word_length(4);
++
++ Xapian::Document doc;
++ termgen.set_document(doc);
++
++ termgen.index_text("cups bowls mugs");
++
++ TEST_STRINGS_EQUAL(format_doc_termlist(doc),
++		 "Zcup:1 Zmug:1 cups[1] mugs[2]");
++
++ return true;
++}
++
++/// Test cases for the TermGenerator.
++static const test_desc tests[] = {
++ TESTCASE(termgen1),
++ TESTCASE(tg_spell1),
++ TESTCASE(tg_spell2),
++ TESTCASE(tg_max_word_length1),
++ END_OF_TESTCASES
++};
++
++int main(int argc, char **argv)
++try {
++ // FIXME: It would be better to test with and without XAPIAN_CJK_NGRAM set.
++#ifdef HAVE__PUTENV_S
++ _putenv_s("XAPIAN_CJK_NGRAM", "1");
++#elif defined HAVE_SETENV
++ setenv("XAPIAN_CJK_NGRAM", "1", 1);
++#else
++ putenv(const_cast<char*>("XAPIAN_CJK_NGRAM=1"));
++#endif
++ test_driver::parse_command_line(argc, argv);
++ return test_driver::run(tests);
++} catch (const char * e) {
++ cout << e << endl;
++ return 1;
++}

xapian-autoconf-2.63.patch Added

xapian-change-snippet-generator-to-deque.patch Added

@@ -0,0 +1,81 @@
+Index: xapian-core-1.2.12/queryparser/snippetgenerator_internal.cc
+===================================================================
+--- xapian-core-1.2.12.orig/queryparser/snippetgenerator_internal.cc	2013-01-22 17:26:51.189726001 +1100
++++ xapian-core-1.2.12/queryparser/snippetgenerator_internal.cc	2013-01-23 14:48:33.159726001 +1100
+@@ -53,9 +61,7 @@
+ 
+ // we don't keep context across termpos discontinuities
+ if (pos > (lastpos+2)) {
+-	// there is no queue::clear() dammit
+-	while (!context.empty())
+-	 context.pop();
++	context.clear();
+ 	leading_nonword = "";
+ }
+ lastpos = pos;
+@@ -75,7 +85,7 @@
+ 	// flush the before-context
+ 	while (!context.empty()) {
+ 	 result += context.front();
+-	 context.pop();
++	 context.pop_front();
+ 	}
+ 
+ 	// emit the match, highlighted
+@@ -91,16 +106,22 @@
+ } else {
+ 	// not explicitly in a context, but remember the
+ 	// term in the context queue for later
+-	context.push(term);
+-	while (context.size() > context_length) {
+-	 context.pop();
+-	 leading_nonword = "";
+-	}
+-	// this order handles the context_length=0 case gracefully
++	push_context(term);
+ }
+ }
+ 
+ void
++SnippetGenerator::Internal::push_context(const string & term)
++{
++ context.push_back(term);
++ while (context.size() > context_length) {
++	context.pop_front();
++	leading_nonword = "";
++ }
++ // this order handles the context_length=0 case gracefully
++}
++
++void
+ SnippetGenerator::Internal::accept_nonword_char(unsigned ch, termcount pos)
+ {
+ if (context.empty() && leading_nonword != "") {
+@@ -326,8 +378,7 @@
+ horizon = 0;
+ lastpos = 0;
+ nwhitespace = 0;
+- while (!context.empty())
+-	context.pop();
++ context.clear();
+ matches.clear();
+ termpos = 0;
+ leading_nonword = "";
+Index: xapian-core-1.2.12/queryparser/snippetgenerator_internal.h
+===================================================================
+--- xapian-core-1.2.12.orig/queryparser/snippetgenerator_internal.h	2013-01-22 17:35:38.249726001 +1100
++++ xapian-core-1.2.12/queryparser/snippetgenerator_internal.h	2013-01-23 14:47:50.239726001 +1100
+@@ -43,11 +43,12 @@
+ 
+ termcount horizon;
+ termcount lastpos;
+- std::queue<std::string> context;
++ std::deque<std::string> context;
+ std::string result;
+ 
+ termcount termpos;
+ 
++ void push_context(const std::string & term);
+ void accept_term(const std::string & term, termcount pos);
+ void accept_nonword_char(unsigned ch, termcount pos);
+

xapian-fix-snippet-first-char-nonword.patch Added

@@ -0,0 +1,87 @@
+Fix nonword chars before 1st word in snippet generator
+
+Such characters were being spuriously added to the result string
+regardless of whether a match was present or not.
+
+Index: xapian-core-1fmwheezy28569/queryparser/snippetgenerator_internal.cc
+===================================================================
+--- xapian-core-1fmwheezy28569.orig/queryparser/snippetgenerator_internal.cc	2013-05-24 06:57:11.742793603 +0000
++++ xapian-core-1fmwheezy28569/queryparser/snippetgenerator_internal.cc	2013-05-24 07:01:21.433656331 +0000
+@@ -92,8 +92,10 @@ SnippetGenerator::Internal::accept_term(
+ 	// not explicitly in a context, but remember the
+ 	// term in the context queue for later
+ 	context.push(term);
+-	while (context.size() > context_length)
++	while (context.size() > context_length) {
+ 	 context.pop();
++	 leading_nonword = "";
++	}
+ 	// this order handles the context_length=0 case gracefully
+ }
+ }
+@@ -114,7 +116,11 @@ SnippetGenerator::Internal::accept_nonwo
+ 	nwhitespace = 0;
+ }
+ 
+- if (pos <= horizon) {
++ if (!pos) {
++	// non-word characters before the first word
++	Unicode::append_utf8(leading_nonword, ch);
++ }
++ else if (pos <= horizon) {
+ 	// the last word of the after-context of a snippet
+ 	if (ch == ' ' && pos == horizon) {
+ 	 // after-context ends on first whitespace
+Index: xapian-core-1fmwheezy28569/tests/termgentest.cc
+===================================================================
+--- xapian-core-1fmwheezy28569.orig/tests/termgentest.cc	2013-05-24 07:01:06.206456378 +0000
++++ xapian-core-1fmwheezy28569/tests/termgentest.cc	2013-05-24 07:01:21.433656331 +0000
+@@ -917,6 +917,40 @@ static bool test_snipgen1()
+ return true;
+ }
+ 
++static bool test_sg_first_nonword()
++{
++ Xapian::SnippetGenerator snipgen;
++ snipgen.set_context_length(3);
++
++ // first character is a non-word character - this
++ // exercises some obscure code paths
++ std::string text("[Brooklyn] Re: locavore cosby sweater");
++
++ // no match at all
++ snipgen.reset();
++ snipgen.add_match("readymade");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "");
++
++ // matched first word
++ snipgen.reset();
++ snipgen.add_match("brooklyn");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "["
++				 "Brooklyn"
++				 "] Re: locavore cosby");
++
++ // matched second word
++ snipgen.reset();
++ snipgen.add_match("re");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "[Brooklyn] "
++				 "Re: "
++				 "locavore cosby sweater");
++
++ return true;
++}
++
+ static bool test_sg_stem()
+ {
+ Xapian::SnippetGenerator snipgen;
+@@ -956,6 +990,7 @@ static const test_desc tests[] = {
+ TESTCASE(tg_spell2),
+ TESTCASE(tg_max_word_length1),
+ TESTCASE(snipgen1),
++ TESTCASE(sg_first_nonword),
+ TESTCASE(sg_stem),
+ END_OF_TESTCASES
+ };

xapian-fix-snippet-generator-CJK.patch Added

@@ -0,0 +1,250 @@
+Index: xapian-core-1fmwheezy28569/queryparser/snippetgenerator_internal.cc
+===================================================================
+--- xapian-core-1fmwheezy28569.orig/queryparser/snippetgenerator_internal.cc	2013-05-24 07:12:27.000000000 +0000
++++ xapian-core-1fmwheezy28569/queryparser/snippetgenerator_internal.cc	2013-05-24 07:12:38.830056601 +0000
+@@ -44,8 +44,16 @@ SnippetGenerator::Internal::add_match(co
+ matches.insert(stem);
+ }
+ 
++// 'ngram_len' is the length in *characters* (not octets) of an N-gram,
++// or 0 if 'term' is a complete term. We use this to detect when we
++// are being passed N-grams. We also rely on the behaviour of the
++// CJKTokenizer class which returns N-grams in increasing length order,
++// so that when ngram_len==1 we know the N-gram base position just
++// incremented.
++
+ void
+-SnippetGenerator::Internal::accept_term(const string & term, termcount pos)
++SnippetGenerator::Internal::accept_term(const string & term,
++					termcount pos, int ngram_len)
+ {
+ string stem = Unicode::tolower(term);
+ if (stemmer.internal.get())
+@@ -55,13 +63,17 @@ SnippetGenerator::Internal::accept_term(
+ if (pos > (lastpos+2)) {
+ 	context.clear();
+ 	leading_nonword = "";
++	pending_1gram = "";
++	ignore_1grams = 0;
+ }
++ if (ngram_len <= 1)
++	xpos += (pos - lastpos);
+ lastpos = pos;
+ nwhitespace = 0;
+ 
+ if (matches.find(stem) != matches.end()) {
+ 	// found a match
+-	if (pos > horizon + context.size() + 1 && result != "") {
++	if (xpos > horizon + context.size() + 1 && result != "") {
+ 	 // there was a gap from the end of the context after
+ 	 // the previous snippet, so start a new snippet
+ 	 result += inter_snippet;
+@@ -70,6 +82,11 @@ SnippetGenerator::Internal::accept_term(
+ 	}
+ 	leading_nonword = "";
+ 
++	if (ngram_len == 1 && pending_1gram != "") {
++	 push_context(pending_1gram);
++	 pending_1gram = "";
++	}
++
+ 	// flush the before-context
+ 	while (!context.empty()) {
+ 	 result += context.front();
+@@ -81,15 +98,39 @@ SnippetGenerator::Internal::accept_term(
+ 	result += term;
+ 	result += post_match;
+ 
++	// some following 1-grams may be included in the
++	// match text, so don't add them to context.
++	ignore_1grams = (ngram_len > 1 ? ngram_len-1 : 0);
++
+ 	// set the horizon to mark the end of the after-context
+-	horizon = pos + context_length;
+- } else if (pos <= horizon) {
++	horizon = xpos + context_length + ignore_1grams;
++ } else if (xpos <= horizon) {
+ 	// the after-context for a match
+-	result += term;
++	if (ngram_len == 0) {
++	 result += term;
++	} else if (ngram_len == 1) {
++	 if (ignore_1grams)
++		ignore_1grams--;
++	 else
++		result += term;
++	}
++	// don't keep N>1 N-grams in context, they're redundant
+ } else {
+ 	// not explicitly in a context, but remember the
+ 	// term in the context queue for later
+-	push_context(term);
++	if (ngram_len == 0) {
++	 push_context(term);
++	} else if (ngram_len == 1) {
++	 if (pending_1gram != "") {
++		push_context(pending_1gram);
++		pending_1gram = "";
++	 }
++	 if (ignore_1grams)
++		ignore_1grams--;
++	 else
++		pending_1gram = term;
++	}
++	// don't keep N>1 N-grams in context, they're redundant
+ }
+ }
+ 
+@@ -111,6 +152,7 @@ SnippetGenerator::Internal::accept_nonwo
+ 	Unicode::append_utf8(leading_nonword, ch);
+ 	return;
+ }
++ xpos += (pos - lastpos);
+ 
+ if (Unicode::is_whitespace(ch)) {
+ 	if (++nwhitespace > 1)
+@@ -120,13 +162,19 @@ SnippetGenerator::Internal::accept_nonwo
+ 	nwhitespace = 0;
+ }
+ 
++ if (pending_1gram != "") {
++	push_context(pending_1gram);
++	pending_1gram = "";
++ }
++ ignore_1grams = 0;
++
+ if (!pos) {
+ 	// non-word characters before the first word
+ 	Unicode::append_utf8(leading_nonword, ch);
+ }
+- else if (pos <= horizon) {
++ else if (xpos <= horizon) {
+ 	// the last word of the after-context of a snippet
+-	if (ch == ' ' && pos == horizon) {
++	if (ch == ' ' && xpos == horizon) {
+ 	 // after-context ends on first whitespace
+ 	 // after the last word in the horizon,
+ 	 // ...unless another one abuts it, but we
+@@ -261,7 +309,7 @@ SnippetGenerator::Internal::accept_text(
+ 		 if (cjk_token.size() > MAX_PROB_TERM_LENGTH) continue;
+ 
+ 		 // Add unstemmed form positional information.
+-		 accept_term(cjk_token, ++termpos);
++		 accept_term(cjk_token, ++termpos, tk.get_length());
+ 		}
+ 		while (true) {
+ 		 if (itor == Utf8Iterator()) return;
+@@ -318,7 +366,7 @@ SnippetGenerator::Internal::accept_text(
+ 
+ endofterm:
+ 	if (term.size() > MAX_PROB_TERM_LENGTH) continue;
+-	accept_term(term, ++termpos);
++	accept_term(term, ++termpos, 0);
+ }
+ }
+ 
+@@ -329,11 +377,14 @@ SnippetGenerator::Internal::reset()
+ result = "";
+ horizon = 0;
+ lastpos = 0;
++ xpos = 0;
+ nwhitespace = 0;
+ context.clear();
+ matches.clear();
+ termpos = 0;
+ leading_nonword = "";
++ pending_1gram = "";
++ ignore_1grams = 0;
+ }
+ 
+ }
+Index: xapian-core-1fmwheezy28569/tests/termgentest.cc
+===================================================================
+--- xapian-core-1fmwheezy28569.orig/tests/termgentest.cc	2013-05-24 07:01:21.000000000 +0000
++++ xapian-core-1fmwheezy28569/tests/termgentest.cc	2013-05-24 07:14:13.617074471 +0000
+@@ -951,6 +951,51 @@ static bool test_sg_first_nonword()
+ return true;
+ }
+ 
++static bool test_sg_cjk_punctuation()
++{
++ Xapian::SnippetGenerator snipgen;
++ snipgen.set_context_length(3);
++ Xapian::Stem stemmer("en");
++ snipgen.set_stemmer(stemmer);
++
++ std::string text("申込み殺到！Nexus7が0円！WiMAX月額3,770円使い放題とセットでお得");
++
++ // the text contains U+FF01 FULLWIDTH EXCLAMATION MARK which
++ // is both a CJK character and a non-word character; it should
++ // be handled as non-word text and appear in both the before
++ // and after contexts
++ snipgen.reset();
++ snipgen.add_match("Nexus7");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "み殺到！Nexus7が0円！");
++
++ return true;
++}
++
++static bool test_sg_cjk_ngrams()
++{
++ Xapian::SnippetGenerator snipgen;
++ snipgen.set_context_length(3);
++ Xapian::Stem stemmer("en");
++ snipgen.set_stemmer(stemmer);
++
++ std::string text("申込み殺到！Nexus7が0円！WiMAX月額3,770円使い放題とセットでお得");
++
++ // a one-character CJK search term should be matched
++ snipgen.reset();
++ snipgen.add_match("放");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "円使い放題とセ");
++
++ // a two-character CJK search term should be matched
++ snipgen.reset();
++ snipgen.add_match("放題");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "円使い放題とセッ");
++
++ return true;
++}
++
+ static bool test_sg_stem()
+ {
+ Xapian::SnippetGenerator snipgen;
+@@ -992,6 +1037,8 @@ static const test_desc tests[] = {
+ TESTCASE(snipgen1),
+ TESTCASE(sg_first_nonword),
+ TESTCASE(sg_stem),
++ TESTCASE(sg_cjk_punctuation),
++ TESTCASE(sg_cjk_ngrams),
+ END_OF_TESTCASES
+ };
+ 
+Index: xapian-core-1fmwheezy28569/queryparser/snippetgenerator_internal.h
+===================================================================
+--- xapian-core-1fmwheezy28569.orig/queryparser/snippetgenerator_internal.h	2013-05-24 07:12:27.000000000 +0000
++++ xapian-core-1fmwheezy28569/queryparser/snippetgenerator_internal.h	2013-05-24 07:12:38.830056601 +0000
+@@ -40,16 +40,19 @@ class SnippetGenerator::Internal : publi
+ std::tr1::unordered_set<std::string> matches;
+ unsigned nwhitespace;
+ std::string leading_nonword;
++ std::string pending_1gram;
++ unsigned ignore_1grams;
+ 
+ termcount horizon;
+ termcount lastpos;
++ termcount xpos;	// doesn't count N>1 N-grams
+ std::deque<std::string> context;
+ std::string result;
+ 
+ termcount termpos;
+ 
+ void push_context(const std::string & term);
+- void accept_term(const std::string & term, termcount pos);
++ void accept_term(const std::string & term, termcount pos, int ngram_len);
+ void accept_nonword_char(unsigned ch, termcount pos);
+ 
+ public:

xapian-fix-snippet-generator-punctuation-in-match.patch Added

@@ -0,0 +1,120 @@
+Index: xapian-core-1fmwheezy28569/queryparser/snippetgenerator_internal.cc
+===================================================================
+--- xapian-core-1fmwheezy28569.orig/queryparser/snippetgenerator_internal.cc	2013-05-24 07:12:38.830056601 +0000
++++ xapian-core-1fmwheezy28569/queryparser/snippetgenerator_internal.cc	2013-05-24 07:14:31.928112153 +0000
+@@ -35,15 +35,6 @@ using namespace std;
+ 
+ namespace Xapian {
+ 
+-void
+-SnippetGenerator::Internal::add_match(const std::string & term)
+-{
+- string stem = Unicode::tolower(term);
+- if (stemmer.internal.get())
+-	stem = stemmer(stem);
+- matches.insert(stem);
+-}
+-
+ // 'ngram_len' is the length in *characters* (not octets) of an N-gram,
+ // or 0 if 'term' is a complete term. We use this to detect when we
+ // are being passed N-grams. We also rely on the behaviour of the
+@@ -370,6 +361,48 @@ endofterm:
+ }
+ }
+ 
++void
++SnippetGenerator::Internal::add_match(const std::string & str)
++{
++ unsigned ch;
++ Utf8Iterator itor(str);
++ while (true) {
++
++	// skip non-word characters
++	while (true) {
++	 if (itor == Utf8Iterator()) return;
++	 ch = check_wordchar(*itor);
++	 ++itor;
++	 if (ch) break;
++	}
++
++	string term;
++	Unicode::append_utf8(term, ch);
++
++#if 0
++	// treat CJK characters as 1-character terms
++	// this is probably wrong.
++	if (CJK::codepoint_is_cjk(ch)) {
++	 matches.insert(term);
++	 continue;
++	}
++#endif
++
++	// collect word characters into a term
++	while (true) {
++	 if (itor == Utf8Iterator()) break;
++	 ch = check_wordchar(*itor);
++	 if (!ch) break;
++	 Unicode::append_utf8(term, ch);
++	 ++itor;
++	}
++
++	string stem = Unicode::tolower(term);
++	if (stemmer.internal.get())
++	 stem = stemmer(stem);
++	matches.insert(stem);
++ }
++}
+ 
+ void
+ SnippetGenerator::Internal::reset()
+Index: xapian-core-1fmwheezy28569/tests/termgentest.cc
+===================================================================
+--- xapian-core-1fmwheezy28569.orig/tests/termgentest.cc	2013-05-24 07:14:13.617074471 +0000
++++ xapian-core-1fmwheezy28569/tests/termgentest.cc	2013-05-24 07:14:31.928112153 +0000
+@@ -1028,6 +1028,38 @@ static bool test_sg_stem()
+ return true;
+ }
+ 
++static bool test_sg_match_punctuation()
++{
++ Xapian::SnippetGenerator snipgen;
++ snipgen.set_context_length(3);
++ Xapian::Stem stemmer("en");
++ snipgen.set_stemmer(stemmer);
++
++ std::string text("alpha beta gamma delta put-a-bird-on-it epsilon zeta eta theta");
++
++ // a simple word search term should be matched
++ snipgen.reset();
++ snipgen.add_match("bird");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "delta put-a-bird-on-it epsilon");
++
++ // adding a search term including punctuation is like
++ // adding multiple search terms
++ snipgen.reset();
++ snipgen.add_match("a-bird");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "gamma delta put-a-bird-on-it epsilon");
++
++ snipgen.reset();
++ snipgen.add_match("put-a-bird-on-it");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "beta gamma delta "
++				 "put-a-bird-on-it "
++				 "epsilon zeta eta");
++
++ return true;
++}
++
+ /// Test cases for the TermGenerator.
+ static const test_desc tests[] = {
+ TESTCASE(termgen1),
+@@ -1039,6 +1071,7 @@ static const test_desc tests[] = {
+ TESTCASE(sg_stem),
+ TESTCASE(sg_cjk_punctuation),
+ TESTCASE(sg_cjk_ngrams),
++ TESTCASE(sg_match_punctuation),
+ END_OF_TESTCASES
+ };
+

xapian-snippetgenerator-collated.patch Added

@@ -0,0 +1,1134 @@
+diff -urN xapian-core-1.2.16.orig/include/Makefile.mk xapian-core-1.2.16/include/Makefile.mk
+--- xapian-core-1.2.16.orig/include/Makefile.mk	2013-12-04 01:13:14.000000000 +0100
++++ xapian-core-1.2.16/include/Makefile.mk	2014-01-18 12:13:18.299275423 +0100
+@@ -28,6 +28,7 @@
+ 	include/xapian/query.h\
+ 	include/xapian/queryparser.h\
+ 	include/xapian/registry.h\
++	include/xapian/snippetgenerator.h\
+ 	include/xapian/stem.h\
+ 	include/xapian/termgenerator.h\
+ 	include/xapian/termiterator.h\
+diff -urN xapian-core-1.2.16.orig/include/xapian/snippetgenerator.h xapian-core-1.2.16/include/xapian/snippetgenerator.h
+--- xapian-core-1.2.16.orig/include/xapian/snippetgenerator.h	1970-01-01 01:00:00.000000000 +0100
++++ xapian-core-1.2.16/include/xapian/snippetgenerator.h	2014-01-18 12:13:18.299275423 +0100
+@@ -0,0 +1,178 @@
++/** @file snippetgenerator.h
++ * @brief parse free text and generate snippets
++ */
++/* Copyright (C) 2007,2009,2011 Olly Betts
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#ifndef XAPIAN_INCLUDED_SNIPPETGENERATOR_H
++#define XAPIAN_INCLUDED_SNIPPETGENERATOR_H
++
++#include <xapian/base.h>
++#include <xapian/types.h>
++#include <xapian/unicode.h>
++#include <xapian/visibility.h>
++
++#include <string>
++
++namespace Xapian {
++
++class Stem;
++
++/** Parses a piece of text and generate snippets.
++ *
++ * This module takes a piece of text and parses it to produce words which are
++ * then used to match against a set of matched terms previously returned
++ * from a query. The output is a snippet, i.e. string showing the matches
++ * highlighted and some surrounding context.
++ */
++class XAPIAN_VISIBILITY_DEFAULT SnippetGenerator {
++ public:
++ /// @private @internal Class representing the SnippetGenerator internals.
++ class Internal;
++ /// @private @internal Reference counted internals.
++ Xapian::Internal::RefCntPtr<Internal> internal;
++
++ /// Copy constructor.
++ SnippetGenerator(const SnippetGenerator & o);
++
++ /// Assignment.
++ SnippetGenerator & operator=(const SnippetGenerator & o);
++
++ /// Default constructor.
++ SnippetGenerator();
++
++ /// Destructor.
++ ~SnippetGenerator();
++
++ /// Set the Xapian::Stem object to be used for generating stemmed terms.
++ void set_stemmer(const Xapian::Stem & stemmer);
++
++ /** Add a match term to be highlighted.
++ *
++ * The term will be stemmed if a stemmer has been configured.
++ * The term will be matched case insensitively but the case
++ * will be preserved in the snippets output.
++ *
++ * @param term A term to be highlighted in the snippets.
++ */
++ void add_match(const std::string & term);
++
++ /** Accept some text.
++ *
++ * @param itor	Utf8Iterator pointing to the text to index.
++ */
++ void accept_text(const Xapian::Utf8Iterator & itor);
++
++ /** Accept some text in a std::string.
++ *
++ * @param text	The text to index.
++ */
++ void accept_text(const std::string & text) {
++	return accept_text(Utf8Iterator(text));
++ }
++
++ /** Increase the term position used by index_text.
++ *
++ * This can be used between indexing text from different fields or other
++ * places to prevent phrase searches from spanning between them (e.g.
++ * between the title and body text, or between two chapters in a book).
++ *
++ * @param delta	Amount to increase the term position by (default: 100).
++ */
++ void increase_termpos(Xapian::termcount delta = 100);
++
++ /// Get the current term position.
++ Xapian::termcount get_termpos() const;
++
++ /** Set the current term position.
++ *
++ * @param termpos	The new term position to set.
++ */
++ void set_termpos(Xapian::termcount termpos);
++
++ /** Get the pre-match string.
++ */
++ std::string get_pre_match() const;
++
++ /** Set the pre-match string.
++ *
++ * Matched terms are shown in the snippets string surrounded
++ * by the pre-match and post-match strings, whose default values
++ * are "" and "".
++ *
++ * @param text The new pre-match string to set.
++ */
++ void set_pre_match(std::string & text);
++
++ /** Get the post-match string.
++ */
++ std::string get_post_match() const;
++
++ /** Set the post-match string.
++ *
++ * Matched terms are shown in each snippet string surrounded
++ * by the pre-match and post-match strings, whose default values
++ * are "" and "".
++ *
++ * @param text The new post-match string to set.
++ */
++ void set_post_match(std::string & text);
++
++ /** Get the inter-snippet string.
++ */
++ std::string get_inter_snippet() const;
++
++ /** Set the inter-snippet string.
++ *
++ * Snippets are shown separated by the inter-snippet string, whose
++ * default value is "...".
++ *
++ * @param text The new inter-snippet string to set.
++ */
++ void set_inter_snippet(std::string & text);
++
++ /** Get the context length, in words
++ */
++ unsigned get_context_length() const;
++
++ /** Set the context length, in words
++ *
++ * Before and after each highlighted match, each snippet
++ * shows some context. This parameter controls how many
++ * words of context are shown.
++ */
++ void set_context_length(unsigned length);
++
++ /** Get the resulting snippets string.
++ */
++ std::string get_snippets();
++
++ /** Reset the snippets state for another set of text.
++ *
++ * Resets the snippet results, matches, termpos, and any saved
++ * context, so that another document or another field of the same
++ * document can be accepted. Preserves parameters like stemmer etc.
++ */
++ void reset();
++
++ /// Return a string describing this object.
++ std::string get_description() const;
++};
++
++}
++
++#endif // XAPIAN_INCLUDED_SNIPPETGENERATOR_H
+diff -urN xapian-core-1.2.16.orig/include/xapian.h xapian-core-1.2.16/include/xapian.h
+--- xapian-core-1.2.16.orig/include/xapian.h	2013-12-04 01:13:14.000000000 +0100
++++ xapian-core-1.2.16/include/xapian.h	2014-01-18 12:13:18.299275423 +0100
+@@ -68,6 +68,7 @@
+ #include <xapian/queryparser.h>
+ #include <xapian/valuesetmatchdecider.h>
+ #include <xapian/weight.h>
++#include <xapian/snippetgenerator.h>
+ 
+ // Stemming
+ #include <xapian/stem.h>
+diff -urN xapian-core-1.2.16.orig/queryparser/Makefile.mk xapian-core-1.2.16/queryparser/Makefile.mk
+--- xapian-core-1.2.16.orig/queryparser/Makefile.mk	2013-12-04 01:13:23.000000000 +0100
++++ xapian-core-1.2.16/queryparser/Makefile.mk	2014-01-18 12:13:18.300275419 +0100
+@@ -8,7 +8,8 @@
+ 	queryparser/cjk-tokenizer.h\
+ 	queryparser/queryparser_internal.h\
+ 	queryparser/queryparser_token.h\
+-	queryparser/termgenerator_internal.h
++	queryparser/termgenerator_internal.h\
++	queryparser/snippetgenerator_internal.h
+ 
+ lemon_built_sources =\
+ 	queryparser/queryparser_internal.cc\
+@@ -62,4 +63,6 @@
+ 	queryparser/queryparser.cc\
+ 	queryparser/queryparser_internal.cc\
+ 	queryparser/termgenerator.cc\
+-	queryparser/termgenerator_internal.cc
++	queryparser/termgenerator_internal.cc\
++	queryparser/snippetgenerator.cc\
++	queryparser/snippetgenerator_internal.cc
+diff -urN xapian-core-1.2.16.orig/queryparser/snippetgenerator.cc xapian-core-1.2.16/queryparser/snippetgenerator.cc
+--- xapian-core-1.2.16.orig/queryparser/snippetgenerator.cc	1970-01-01 01:00:00.000000000 +0100
++++ xapian-core-1.2.16/queryparser/snippetgenerator.cc	2014-01-18 12:13:18.301275414 +0100
+@@ -0,0 +1,151 @@
++/** @file snippetgenerator.cc
++ * @brief SnippetGenerator class implementation
++ */
++/* Copyright (C) 2007 Olly Betts
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#include <config.h>
++
++#include <xapian/snippetgenerator.h>
++#include <xapian/types.h>
++
++#include "snippetgenerator_internal.h"
++
++#include "str.h"
++
++using namespace std;
++using namespace Xapian;
++
++SnippetGenerator::SnippetGenerator(const SnippetGenerator & o) : internal(o.internal) { }
++
++SnippetGenerator &
++SnippetGenerator::operator=(const SnippetGenerator & o) {
++ internal = o.internal;
++ return *this;
++}
++
++SnippetGenerator::SnippetGenerator() : internal(new SnippetGenerator::Internal) { }
++
++SnippetGenerator::~SnippetGenerator() { }
++
++void
++SnippetGenerator::set_stemmer(const Xapian::Stem & stemmer)
++{
++ internal->stemmer = stemmer;
++}
++
++void
++SnippetGenerator::add_match(const std::string & term)
++{
++ internal->add_match(term);
++}
++
++void
++SnippetGenerator::accept_text(const Xapian::Utf8Iterator & itor)
++{
++ internal->accept_text(itor);
++}
++
++void
++SnippetGenerator::increase_termpos(Xapian::termcount delta)
++{
++ internal->termpos += delta;
++}
++
++Xapian::termcount
++SnippetGenerator::get_termpos() const
++{
++ return internal->termpos;
++}
++
++void
++SnippetGenerator::set_termpos(Xapian::termcount termpos)
++{
++ internal->termpos = termpos;
++}
++
++std::string
++SnippetGenerator::get_pre_match() const
++{
++ return internal->pre_match;
++}
++
++void
++SnippetGenerator::set_pre_match(std::string & text)
++{
++ internal->pre_match = text;
++}
++
++std::string
++SnippetGenerator::get_post_match() const
++{
++ return internal->post_match;
++}
++
++void
++SnippetGenerator::set_post_match(std::string & text)
++{
++ internal->post_match = text;
++}
++
++std::string
++SnippetGenerator::get_inter_snippet() const
++{
++ return internal->inter_snippet;
++}
++
++void
++SnippetGenerator::set_inter_snippet(std::string & text)
++{
++ internal->inter_snippet = text;
++}
++
++unsigned
++SnippetGenerator::get_context_length() const
++{
++ return internal->context_length;
++}
++
++void
++SnippetGenerator::set_context_length(unsigned length)
++{
++ internal->context_length = length;
++}
++
++std::string
++SnippetGenerator::get_snippets()
++{
++ return internal->result;
++}
++
++void
++SnippetGenerator::reset()
++{
++ internal->reset();
++}
++
++string
++SnippetGenerator::get_description() const
++{
++ string s("Xapian::SnippetGenerator(");
++ if (internal.get()) {
++	s += "stem=";
++	s += internal->stemmer.get_description();
++ }
++ s += ")";
++ return s;
++}
+diff -urN xapian-core-1.2.16.orig/queryparser/snippetgenerator_internal.cc xapian-core-1.2.16/queryparser/snippetgenerator_internal.cc
+--- xapian-core-1.2.16.orig/queryparser/snippetgenerator_internal.cc	1970-01-01 01:00:00.000000000 +0100
++++ xapian-core-1.2.16/queryparser/snippetgenerator_internal.cc	2014-01-18 12:15:09.221768695 +0100
+@@ -0,0 +1,423 @@
++/** @file snippetgenerator_internal.cc
++ * @brief SnippetGenerator class internals
++ */
++/* Copyright (C) 2007,2010,2011 Olly Betts
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#include <config.h>
++
++#include "snippetgenerator_internal.h"
++
++#include <xapian/queryparser.h>
++#include <xapian/unicode.h>
++
++#include "stringutils.h"
++
++#include <limits>
++#include <string>
++#include "cjk-tokenizer.h"
++
++using namespace std;
++
++namespace Xapian {
++
++// 'ngram_len' is the length in *characters* (not octets) of an N-gram,
++// or 0 if 'term' is a complete term. We use this to detect when we
++// are being passed N-grams. We also rely on the behaviour of the
++// CJKTokenizer class which returns N-grams in increasing length order,
++// so that when ngram_len==1 we know the N-gram base position just
++// incremented.
++
++void
++SnippetGenerator::Internal::accept_term(const string & term,
++					termcount pos, int ngram_len)
++{
++ string stem = Unicode::tolower(term);
++ if (stemmer.internal.get())
++	stem = stemmer(stem);
++
++ // we don't keep context across termpos discontinuities
++ if (pos > (lastpos+2)) {
++	context.clear();
++	leading_nonword = "";
++	pending_1gram = "";
++	ignore_1grams = 0;
++ }
++ if (ngram_len <= 1)
++	xpos += (pos - lastpos);
++ lastpos = pos;
++ nwhitespace = 0;
++
++ if (matches.find(stem) != matches.end()) {
++	// found a match
++	if (xpos > horizon + context.size() + 1 && result != "") {
++	 // there was a gap from the end of the context after
++	 // the previous snippet, so start a new snippet
++	 result += inter_snippet;
++	} else {
++	 result += leading_nonword;
++	}
++	leading_nonword = "";
++
++	if (ngram_len == 1 && pending_1gram != "") {
++	 push_context(pending_1gram);
++	 pending_1gram = "";
++	}
++
++	// flush the before-context
++	while (!context.empty()) {
++	 result += context.front();
++	 context.pop_front();
++	}
++
++	// emit the match, highlighted
++	result += pre_match;
++	result += term;
++	result += post_match;
++
++	// some following 1-grams may be included in the
++	// match text, so don't add them to context.
++	ignore_1grams = (ngram_len > 1 ? ngram_len-1 : 0);
++
++	// set the horizon to mark the end of the after-context
++	horizon = xpos + context_length + ignore_1grams;
++ } else if (xpos <= horizon) {
++	// the after-context for a match
++	if (ngram_len == 0) {
++	 result += term;
++	} else if (ngram_len == 1) {
++	 if (ignore_1grams)
++		ignore_1grams--;
++	 else
++		result += term;
++	}
++	// don't keep N>1 N-grams in context, they're redundant
++ } else {
++	// not explicitly in a context, but remember the
++	// term in the context queue for later
++	if (ngram_len == 0) {
++	 push_context(term);
++	} else if (ngram_len == 1) {
++	 if (pending_1gram != "") {
++		push_context(pending_1gram);
++		pending_1gram = "";
++	 }
++	 if (ignore_1grams)
++		ignore_1grams--;
++	 else
++		pending_1gram = term;
++	}
++	// don't keep N>1 N-grams in context, they're redundant
++ }
++}
++
++void
++SnippetGenerator::Internal::push_context(const string & term)
++{
++ context.push_back(term);
++ while (context.size() > context_length) {
++	context.pop_front();
++	leading_nonword = "";
++ }
++ // this order handles the context_length=0 case gracefully
++}
++
++void
++SnippetGenerator::Internal::accept_nonword_char(unsigned ch, termcount pos)
++{
++ if (context.empty() && leading_nonword != "") {
++	Unicode::append_utf8(leading_nonword, ch);
++	return;
++ }
++ xpos += (pos - lastpos);
++
++ if (Unicode::is_whitespace(ch)) {
++	if (++nwhitespace > 1)
++	 return;
++	ch = ' ';
++ } else {
++	nwhitespace = 0;
++ }
++
++ if (pending_1gram != "") {
++	push_context(pending_1gram);
++	pending_1gram = "";
++ }
++ ignore_1grams = 0;
++
++ if (!pos) {
++	// non-word characters before the first word
++	Unicode::append_utf8(leading_nonword, ch);
++ }
++ else if (xpos <= horizon) {
++	// the last word of the after-context of a snippet
++	if (ch == ' ' && xpos == horizon) {
++	 // after-context ends on first whitespace
++	 // after the last word in the horizon,
++	 // ...unless another one abuts it, but we
++	 // don't know that yet, so keep it around
++	 // just in case
++	 Unicode::append_utf8(leading_nonword, ch);
++	 return;
++	}
++
++	// the after-context for a match
++	Unicode::append_utf8(result, ch);
++ } else {
++	if (context.size())
++	 Unicode::append_utf8(context.back(), ch);
++ }
++}
++
++// Put a limit on the size of terms to help prevent the index being bloated
++// by useless junk terms.
++static const unsigned int MAX_PROB_TERM_LENGTH = 64;
++// FIXME: threshold is currently in bytes of UTF-8 representation, not unicode
++// characters - what actually makes most sense here?
++
++inline bool
++U_isupper(unsigned ch) {
++ return (ch < 128 && C_isupper((unsigned char)ch));
++}
++
++inline unsigned check_wordchar(unsigned ch) {
++ if (Unicode::is_wordchar(ch)) return ch;
++ return 0;
++}
++
++/** Value representing "ignore this" when returned by check_infix() or
++ * check_infix_digit().
++ */
++const unsigned UNICODE_IGNORE = numeric_limits<unsigned>::max();
++
++inline unsigned check_infix(unsigned ch) {
++ if (ch == '\'' || ch == '&' || ch == 0xb7 || ch == 0x5f4 || ch == 0x2027) {
++	// Unicode includes all these except '&' in its word boundary rules,
++	// as well as 0x2019 (which we handle below) and ':' (for Swedish
++	// apparently, but we ignore this for now as it's problematic in
++	// real world cases).
++	return ch;
++ }
++ // 0x2019 is Unicode apostrophe and single closing quote.
++ // 0x201b is Unicode single opening quote with the tail rising.
++ if (ch == 0x2019 || ch == 0x201b) return '\'';
++ if (ch >= 0x200b && (ch <= 0x200d || ch == 0x2060 || ch == 0xfeff))
++	return UNICODE_IGNORE;
++ return 0;
++}
++
++inline unsigned check_infix_digit(unsigned ch) {
++ // This list of characters comes from Unicode's word identifying algorithm.
++ switch (ch) {
++	case ',':
++	case '.':
++	case ';':
++	case 0x037e: // GREEK QUESTION MARK
++	case 0x0589: // ARMENIAN FULL STOP
++	case 0x060D: // ARABIC DATE SEPARATOR
++	case 0x07F8: // NKO COMMA
++	case 0x2044: // FRACTION SLASH
++	case 0xFE10: // PRESENTATION FORM FOR VERTICAL COMMA
++	case 0xFE13: // PRESENTATION FORM FOR VERTICAL COLON
++	case 0xFE14: // PRESENTATION FORM FOR VERTICAL SEMICOLON
++	 return ch;
++ }
++ if (ch >= 0x200b && (ch <= 0x200d || ch == 0x2060 || ch == 0xfeff))
++	return UNICODE_IGNORE;
++ return 0;
++}
++
++inline bool
++is_digit(unsigned ch) {
++ return (Unicode::get_category(ch) == Unicode::DECIMAL_DIGIT_NUMBER);
++}
++
++inline unsigned check_suffix(unsigned ch) {
++ if (ch == '+' || ch == '#') return ch;
++ // FIXME: what about '-'?
++ return 0;
++}
++
++void
++SnippetGenerator::Internal::accept_text(Utf8Iterator itor)
++{
++ bool cjk_ngram = CJK::is_cjk_enabled();
++
++ while (true) {
++	// Advance to the start of the next term.
++	unsigned ch;
++	while (true) {
++	 if (itor == Utf8Iterator()) return;
++	 ch = check_wordchar(*itor);
++	 if (ch) break;
++	 accept_nonword_char(*itor, termpos);
++	 ++itor;
++	}
++
++	string term;
++	// Look for initials separated by '.' (e.g. P.T.O., U.N.C.L.E).
++	// Don't worry if there's a trailing '.' or not.
++	if (U_isupper(*itor)) {
++	 const Utf8Iterator end;
++	 Utf8Iterator p = itor;
++	 do {
++		Unicode::append_utf8(term, Unicode::tolower(*p++));
++	 } while (p != end && *p == '.' && ++p != end && U_isupper(*p));
++	 // One letter does not make an acronym! If we handled a single
++	 // uppercase letter here, we wouldn't catch M&S below.
++	 if (term.size() > 1) {
++		// Check there's not a (lower case) letter or digit
++		// immediately after it.
++		if (p == end || !Unicode::is_wordchar(*p)) {
++		 itor = p;
++		 goto endofterm;
++		}
++	 }
++	 term.resize(0);
++	}
++
++	while (true) {
++	 if (cjk_ngram &&
++		CJK::codepoint_is_cjk(*itor) &&
++		Unicode::is_wordchar(*itor)) {
++		const string & cjk = CJK::get_cjk(itor);
++		for (CJKTokenIterator tk(cjk); tk != CJKTokenIterator(); ++tk) {
++		 const string & cjk_token = *tk;
++		 if (cjk_token.size() > MAX_PROB_TERM_LENGTH) continue;
++
++		 // Add unstemmed form positional information.
++		 accept_term(cjk_token, ++termpos, tk.get_length());
++		}
++		while (true) {
++		 if (itor == Utf8Iterator()) return;
++		 ch = check_wordchar(*itor);
++		 if (ch) break;
++		 accept_nonword_char(*itor, termpos);
++		 ++itor;
++		}
++	 }
++	 unsigned prevch;
++	 do {
++		Unicode::append_utf8(term, ch);
++		prevch = ch;
++		if (++itor == Utf8Iterator() ||
++		 (cjk_ngram && CJK::codepoint_is_cjk(*itor)))
++		 goto endofterm;
++		ch = check_wordchar(*itor);
++	 } while (ch);
++
++	 Utf8Iterator next(itor);
++	 ++next;
++	 if (next == Utf8Iterator()) break;
++	 unsigned nextch = check_wordchar(*next);
++	 if (!nextch) break;
++	 unsigned infix_ch = *itor;
++	 if (is_digit(prevch) && is_digit(*next)) {
++		infix_ch = check_infix_digit(infix_ch);
++	 } else {
++		// Handle things like '&' in AT&T, apostrophes, etc.
++		infix_ch = check_infix(infix_ch);
++	 }
++	 if (!infix_ch) break;
++	 if (infix_ch != UNICODE_IGNORE)
++		Unicode::append_utf8(term, infix_ch);
++	 ch = nextch;
++	 itor = next;
++	}
++
++	{
++	 size_t len = term.size();
++	 unsigned count = 0;
++	 while ((ch = check_suffix(*itor))) {
++		if (++count > 3) {
++		 term.resize(len);
++		 break;
++		}
++		Unicode::append_utf8(term, ch);
++		if (++itor == Utf8Iterator()) goto endofterm;
++	 }
++	 // Don't index fish+chips as fish+ chips.
++	 if (Unicode::is_wordchar(*itor))
++		term.resize(len);
++	}
++
++endofterm:
++	if (term.size() > MAX_PROB_TERM_LENGTH) continue;
++	accept_term(term, ++termpos, 0);
++ }
++}
++
++void
++SnippetGenerator::Internal::add_match(const std::string & str)
++{
++ unsigned ch;
++ Utf8Iterator itor(str);
++ while (true) {
++
++	// skip non-word characters
++	while (true) {
++	 if (itor == Utf8Iterator()) return;
++	 ch = check_wordchar(*itor);
++	 ++itor;
++	 if (ch) break;
++	}
++
++	string term;
++	Unicode::append_utf8(term, ch);
++
++#if 0
++	// treat CJK characters as 1-character terms
++	// this is probably wrong.
++	if (CJK::codepoint_is_cjk(ch)) {
++	 matches.insert(term);
++	 continue;
++	}
++#endif
++
++	// collect word characters into a term
++	while (true) {
++	 if (itor == Utf8Iterator()) break;
++	 ch = check_wordchar(*itor);
++	 if (!ch) break;
++	 Unicode::append_utf8(term, ch);
++	 ++itor;
++	}
++
++	string stem = Unicode::tolower(term);
++	if (stemmer.internal.get())
++	 stem = stemmer(stem);
++	matches.insert(stem);
++ }
++}
++
++void
++SnippetGenerator::Internal::reset()
++{
++ result = "";
++ horizon = 0;
++ lastpos = 0;
++ xpos = 0;
++ nwhitespace = 0;
++ context.clear();
++ matches.clear();
++ termpos = 0;
++ leading_nonword = "";
++ pending_1gram = "";
++ ignore_1grams = 0;
++}
++
++}
+diff -urN xapian-core-1.2.16.orig/queryparser/snippetgenerator_internal.h xapian-core-1.2.16/queryparser/snippetgenerator_internal.h
+--- xapian-core-1.2.16.orig/queryparser/snippetgenerator_internal.h	1970-01-01 01:00:00.000000000 +0100
++++ xapian-core-1.2.16/queryparser/snippetgenerator_internal.h	2014-01-18 12:15:01.721802963 +0100
+@@ -0,0 +1,70 @@
++/** @file snippetgenerator_internal.h
++ * @brief SnippetGenerator class internals
++ */
++/* Copyright (C) 2007 Olly Betts
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 2 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
++ */
++
++#ifndef XAPIAN_INCLUDED_SNIPPETGENERATOR_INTERNAL_H
++#define XAPIAN_INCLUDED_SNIPPETGENERATOR_INTERNAL_H
++
++#include <xapian/base.h>
++#include <xapian/snippetgenerator.h>
++#include <xapian/queryparser.h>
++#include <xapian/stem.h>
++#include <tr1/unordered_set>
++#include <queue>
++
++namespace Xapian {
++
++class SnippetGenerator::Internal : public Xapian::Internal::RefCntBase {
++ friend class SnippetGenerator;
++ Stem stemmer;
++ std::string pre_match;
++ std::string post_match;
++ std::string inter_snippet;
++ termcount context_length;
++ std::tr1::unordered_set<std::string> matches;
++ unsigned nwhitespace;
++ std::string leading_nonword;
++ std::string pending_1gram;
++ unsigned ignore_1grams;
++
++ termcount horizon;
++ termcount lastpos;
++ termcount xpos;	// doesn't count N>1 N-grams
++ std::deque<std::string> context;
++ std::string result;
++
++ termcount termpos;
++
++ void push_context(const std::string & term);
++ void accept_term(const std::string & term, termcount pos, int ngram_len);
++ void accept_nonword_char(unsigned ch, termcount pos);
++
++ public:
++ Internal() : pre_match(""), post_match(""),
++		 inter_snippet("..."), context_length(5),
++		 nwhitespace(0), horizon(0), lastpos(0),
++		 termpos(0) { }
++ void add_match(const std::string & term);
++ void accept_text(Utf8Iterator itor);
++ void reset();
++};
++
++}
++
++#endif // XAPIAN_INCLUDED_SNIPPETGENERATOR_INTERNAL_H
+diff -urN xapian-core-1.2.16.orig/tests/termgentest.cc xapian-core-1.2.16/tests/termgentest.cc
+--- xapian-core-1.2.16.orig/tests/termgentest.cc	2013-12-04 01:13:56.000000000 +0100
++++ xapian-core-1.2.16/tests/termgentest.cc	2014-01-18 12:15:09.222768690 +0100
+@@ -1,4 +1,4 @@
+-/* termgentest.cc: Tests of Xapian::TermGenerator
++/* termgentest.cc: Tests of Xapian::TermGenerator & SnippetGenerator
+ *
+ * Copyright (C) 2002,2003,2004,2005,2006,2007,2008,2009,2010,2013 Olly Betts
+ * Copyright (C) 2007 Lemur Consulting Ltd
+@@ -835,12 +835,243 @@
+ return true;
+ }
+ 
++static bool test_snipgen1()
++{
++ Xapian::SnippetGenerator snipgen;
++ snipgen.set_context_length(3);
++
++ std::string text("Readymade photo booth (typeWriter), occupy "
++		 "DreamCatcher Polaroid four loko butcher "
++		 "gentrify. Williamsburg, banh mi gastropub.");
++
++ snipgen.reset();
++ snipgen.add_match("readymade");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "Readymade "
++				 "photo booth (typeWriter),");
++
++ snipgen.reset();
++ snipgen.add_match("Readymade");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "Readymade "
++				 "photo booth (typeWriter),");
++
++ snipgen.reset();
++ snipgen.add_match("reAdyMaDe");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "Readymade "
++				 "photo booth (typeWriter),");
++
++ snipgen.reset();
++ snipgen.add_match("photo");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "Readymade "
++				 "photo "
++				 "booth (typeWriter), occupy");
++
++ snipgen.reset();
++ snipgen.add_match("occupy");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "photo booth (typeWriter), "
++				 "occupy "
++				 "DreamCatcher Polaroid four");
++
++ snipgen.reset();
++ snipgen.add_match("gastropub");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "Williamsburg, banh mi "
++				 "gastropub.");
++
++ snipgen.reset();
++ snipgen.add_match("dreamcatcher");
++ snipgen.add_match("butcher");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "booth (typeWriter), occupy "
++				 "DreamCatcher "
++				 "Polaroid four loko "
++				 "butcher "
++				 "gentrify. Williamsburg, banh");
++
++ snipgen.reset();
++ snipgen.add_match("occupy");
++ snipgen.add_match("williamsburg");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "photo booth (typeWriter), "
++				 "occupy "
++				 "DreamCatcher Polaroid four loko butcher gentrify. "
++				 "Williamsburg, "
++				 "banh mi gastropub.");
++
++ snipgen.reset();
++ snipgen.add_match("occupy");
++ snipgen.add_match("banh");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "photo booth (typeWriter), "
++				 "occupy "
++				 "DreamCatcher Polaroid four"
++				 "..."
++				 "butcher gentrify. Williamsburg, "
++				 "banh "
++				 "mi gastropub.");
++
++ return true;
++}
++
++static bool test_sg_first_nonword()
++{
++ Xapian::SnippetGenerator snipgen;
++ snipgen.set_context_length(3);
++
++ // first character is a non-word character - this
++ // exercises some obscure code paths
++ std::string text("[Brooklyn] Re: locavore cosby sweater");
++
++ // no match at all
++ snipgen.reset();
++ snipgen.add_match("readymade");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "");
++
++ // matched first word
++ snipgen.reset();
++ snipgen.add_match("brooklyn");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "["
++				 "Brooklyn"
++				 "] Re: locavore cosby");
++
++ // matched second word
++ snipgen.reset();
++ snipgen.add_match("re");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "[Brooklyn] "
++				 "Re: "
++				 "locavore cosby sweater");
++
++ return true;
++}
++
++static bool test_sg_cjk_punctuation()
++{
++ Xapian::SnippetGenerator snipgen;
++ snipgen.set_context_length(3);
++ Xapian::Stem stemmer("en");
++ snipgen.set_stemmer(stemmer);
++
++ std::string text("申込み殺到！Nexus7が0円！WiMAX月額3,770円使い放題とセットでお得");
++
++ // the text contains U+FF01 FULLWIDTH EXCLAMATION MARK which
++ // is both a CJK character and a non-word character; it should
++ // be handled as non-word text and appear in both the before
++ // and after contexts
++ snipgen.reset();
++ snipgen.add_match("Nexus7");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "み殺到！Nexus7が0円！");
++
++ return true;
++}
++
++static bool test_sg_cjk_ngrams()
++{
++ Xapian::SnippetGenerator snipgen;
++ snipgen.set_context_length(3);
++ Xapian::Stem stemmer("en");
++ snipgen.set_stemmer(stemmer);
++
++ std::string text("申込み殺到！Nexus7が0円！WiMAX月額3,770円使い放題とセットでお得");
++
++ // a one-character CJK search term should be matched
++ snipgen.reset();
++ snipgen.add_match("放");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "円使い放題とセ");
++
++ // a two-character CJK search term should be matched
++ snipgen.reset();
++ snipgen.add_match("放題");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "円使い放題とセッ");
++
++ return true;
++}
++
++static bool test_sg_stem()
++{
++ Xapian::SnippetGenerator snipgen;
++ snipgen.set_context_length(3);
++ Xapian::Stem stemmer("en");
++ snipgen.set_stemmer(stemmer);
++
++ std::string text("She sells sea shells by the sea shore");
++
++ snipgen.reset();
++ snipgen.add_match("shells");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "She sells sea shells by the sea");
++
++ snipgen.reset();
++ snipgen.add_match("shell");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "She sells sea shells by the sea");
++
++ snipgen.reset();
++ snipgen.add_match("shelled");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "She sells sea shells by the sea");
++
++ snipgen.reset();
++ snipgen.add_match("shelling");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "She sells sea shells by the sea");
++
++ return true;
++}
++
++static bool test_sg_match_punctuation()
++{
++ Xapian::SnippetGenerator snipgen;
++ snipgen.set_context_length(3);
++ Xapian::Stem stemmer("en");
++ snipgen.set_stemmer(stemmer);
++
++ std::string text("alpha beta gamma delta put-a-bird-on-it epsilon zeta eta theta");
++
++ // a simple word search term should be matched
++ snipgen.reset();
++ snipgen.add_match("bird");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "delta put-a-bird-on-it epsilon");
++
++ // adding a search term including punctuation is like
++ // adding multiple search terms
++ snipgen.reset();
++ snipgen.add_match("a-bird");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "gamma delta put-a-bird-on-it epsilon");
++
++ snipgen.reset();
++ snipgen.add_match("put-a-bird-on-it");
++ snipgen.accept_text(text);
++ TEST_EQUAL(snipgen.get_snippets(), "beta gamma delta "
++				 "put-a-bird-on-it "
++				 "epsilon zeta eta");
++
++ return true;
++}
++
+ /// Test cases for the TermGenerator.
+ static const test_desc tests[] = {
+ TESTCASE(termgen1),
+ TESTCASE(tg_spell1),
+ TESTCASE(tg_spell2),
+ TESTCASE(tg_max_word_length1),
++ TESTCASE(snipgen1),
++ TESTCASE(sg_first_nonword),
++ TESTCASE(sg_stem),
++ TESTCASE(sg_cjk_punctuation),
++ TESTCASE(sg_cjk_ngrams),
++ TESTCASE(sg_match_punctuation),
+ END_OF_TESTCASES
+ };
+

xapian-some-cjk-chars-are-punctuation.patch Added

debian.changelog Added

@@ -0,0 +1,816 @@
+xapian-core (1.2.16-0~kolab1) unstable; urgency=low
+
+ * Under the hood rebuild
+
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> Sat, 18 Jan 2014 02:41:58 +0100
+
+xapian-core (1.2.16-2) unstable; urgency=low
+
+ * Fix creation of directory sse2 variant gets installed into.
+
+ -- Olly Betts <olly@survex.com> Fri, 06 Dec 2013 10:11:48 +1300
+
+xapian-core (1.2.16-1) unstable; urgency=low
+
+ * New upstream release:
+ + Fix xapian-chert-update's -b option to work rather than always
+ segfaulting. (Closes: #716484)
+ * debian/watch: Fix to only consider stable releases, and to look for
+ .tar.xz which upstream now uses.
+ * debian/control.in: "Standards-Version: 3.9.5" (no changes required).
+ * debian/rules,libxapianVERSION.install: Stop using brace expansion, fixing
+ lintian warning brace-expansion-in-debhelper-config-file - instead install
+ the sse2 build (where done) directly into the libxapianNN package
+ directory.
+ * debian/rules: Drop workaround for avr32 build timing out.
+ * debian/control.in: Packaging now stored in git in debian collab-maint.
+
+ -- Olly Betts <olly@survex.com> Fri, 06 Dec 2013 07:59:30 +1300
+
+xapian-core (1.2.15-2) unstable; urgency=low
+
+ * debian/control.in: libxapian22 - "Priority: optional" to
+ match overrides file.
+ * debian/rules: Fix target dependencies so we don't run the testsuite twice.
+ * debian/rules: Mark build-arch and build-indep as phony targets.
+ * debian/copyright: Update to include 2013.
+
+ -- Olly Betts <olly@survex.com> Tue, 28 May 2013 10:33:34 +0000
+
+xapian-core (1.2.15-1) unstable; urgency=low
+
+ * New upstream release:
+ + Incorporates both the patches we were carrying.
+ * debian/control.in: Standards-Version: 3.9.4 (no changes required).
+ * Fix binary-arch to depend on build-arch and binary-indep to depend on
+ build-indep (previously both depended on build).
+ * Add lintian overrides for hardening-no-fortify-functions false positives.
+
+ -- Olly Betts <olly@survex.com> Fri, 10 May 2013 10:22:12 +0000
+
+xapian-core (1.2.12-2) unstable; urgency=low
+
+ * New patch fix-db-write-lock.patch which fixes database write locking to
+ work when the lock file is already open in the same process.
+ (Closes: #695542)
+ * New patch replication-above-32GB.patch which fixes database replication to
+ handle files > 32GB. (Closes: #695643)
+
+ -- Olly Betts <olly@survex.com> Tue, 11 Dec 2012 04:22:04 +0000
+
+xapian-core (1.2.12-1) unstable; urgency=low
+
+ * New upstream release.
+ + Checks if Qt headers have already been included and defined 'slots' as
+ a macro, and if so gives a clear error advising how to work around this
+ (previously compilation would fail with a confusing error).
+ (Closes: #651696)
+ * debian/rules: Calculate the soversion in a simpler way, using awk.
+
+ -- Olly Betts <olly@survex.com> Thu, 28 Jun 2012 07:53:22 +0000
+
+xapian-core (1.2.10-2) unstable; urgency=low
+
+ * Enable hardening flags, based on patch from Moritz Muehlenhoff.
+ (Closes: #672836)
+
+ -- Olly Betts <olly@survex.com> Sun, 20 May 2012 11:45:04 +0000
+
+xapian-core (1.2.10-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control.in: Standards-Version: 3.9.3 (no changes required).
+ * debian/copyright: Update copyright years.
+
+ -- Olly Betts <olly@survex.com> Thu, 10 May 2012 03:15:27 +0000
+
+xapian-core (1.2.8-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: Update "Suggests:" of -dbg package.
+
+ -- Olly Betts <olly@survex.com> Sat, 17 Dec 2011 07:24:42 +0000
+
+xapian-core (1.2.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control.in: Standards-Version: 3.9.2 (no changes required).
+ * debian/rules: Add build-arch and build-indep targets.
+
+ -- Olly Betts <olly@survex.com> Fri, 12 Aug 2011 01:37:23 +0000
+
+xapian-core (1.2.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fix up link to the internal sourcedocs in internals.html to point to those
+ on the Xapian website.
+
+ -- Olly Betts <olly@survex.com> Wed, 06 Apr 2011 02:19:10 +0000
+
+xapian-core (1.2.4-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Olly Betts <olly@survex.com> Tue, 21 Dec 2010 07:32:14 +0000
+
+xapian-core (1.2.3-2) unstable; urgency=low
+
+ * Only include debug symbols for the shared library in the debug package
+ (Closes: #594455).
+
+ -- Olly Betts <olly@survex.com> Thu, 26 Aug 2010 07:10:51 +0000
+
+xapian-core (1.2.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Upload to unstable.
+ * debian/control.in:
+ + Standards-Version: 3.9.1 (no changes required).
+ * debian/patches/check-select-errors.patch: Drop, merged upstream.
+
+ -- Olly Betts <olly@survex.com> Tue, 24 Aug 2010 11:18:50 +0000
+
+xapian-core (1.2.2-4) experimental; urgency=low
+
+ * Add patch check-select-errors.patch which will hopefully fix erratic FTBFS
+ on alpha and mipsel, or at least help to debug them.
+
+ -- Olly Betts <olly@survex.com> Wed, 07 Jul 2010 12:06:07 +0000
+
+xapian-core (1.2.2-3) experimental; urgency=low
+
+ * The special case code to add 'usr/lib/sse2' to libxapian22.install doesn't
+ work as this file is generated when the source package is made, not at
+ binary package build time. Instead use 'usr/lib/{,sse2}/libxapian.so.*'
+ which will package the sse2 version if it has been built, and won't give
+ an error if it doesn't.
+
+ -- Olly Betts <olly@survex.com> Wed, 07 Jul 2010 03:04:44 +0000
+
+xapian-core (1.2.2-2) experimental; urgency=low
+
+ * debian/rules: Fix typo in handling sse2 variant on i386/*-i386.
+
+ -- Olly Betts <olly@survex.com> Tue, 06 Jul 2010 16:19:40 +0000
+
+xapian-core (1.2.2-1) experimental; urgency=low
+
+ * New upstream release:
+ + debian/patches: All patches incorporated upstream, so remove.
+ + Package new upstream cmake support files in libxapian-dev.
+ * Drop quilt dependencies now we're using source format "3.0 (quilt)".
+ * On i386 and *-i386, build both SSE2 and i386 versions of the library. The
+ main motivation is correctness (upstream now defaults to using SSE because
+ excess precision from 387 FP instructions can cause inconsistencies in
+ weight calculations) but the SSE2 build is faster too (~6%).
+ * debian/rules: Try re-enabling optimisation on alpha - it's been more
+ than a year.
+ * debian/rules: Use dh_prep instead of dh_clean -k.
+
+ -- Olly Betts <olly@survex.com> Tue, 06 Jul 2010 13:33:37 +0000
+
+xapian-core (1.2.0-3) experimental; urgency=low
+
+ * debian/patches/ftbfs-on-hurd-fix.patch: Fix FTBFS on hurd due to SA_SIGINFO
+ not being defined.
+ * debian/patches/cursor-next-on-modified-table-fix-1.2.patch: Fix bug which
+ manifests in notmuch 0.3.1 testsuite. (Closes: #579951)
+ * Update to require dh7 and use dh compact level 7.
+ * Switch to dpkg-source 3.0 (quilt) format.
+
+ -- Olly Betts <olly@survex.com> Wed, 05 May 2010 09:49:36 +0000
+
+xapian-core (1.2.0-2) experimental; urgency=low
+
+ * debian/patches/fix-header-installation-location.patch: Fix installation
+ location of headers.
+ * debian/rules: Empty dependency_libs in .la file.
+
+ -- Olly Betts <olly@survex.com> Mon, 03 May 2010 02:04:37 +0000
+
+xapian-core (1.2.0-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/control.in: Update "Suggests" of -dbg package (libgcc2-dbg and
+ libstdc++6-4.0-dbg removed; libstdc++6-4.4-dbg added).
+
+ -- Olly Betts <olly@survex.com> Thu, 29 Apr 2010 07:33:26 +0000
+
+xapian-core (1.1.5-1) experimental; urgency=low
+
+ * New upstream release.
+ * debian/patches/runtest-no-fd-ulimit.patch: Drop patch - upstream now has
+ fd leak checking in the test harness and has removed the ulimit.
+ * debian/control.in:
+ + Drop conflict on libxapian2 as that's too ancient to be relevant now.
+ + Just use ${binary:Version} - sarge has reached EOL and I'm not intending
+ to backport 1.1.x to dapper.
+ + Add uuid-dev as a build dependency.
+
+ -- Olly Betts <olly@survex.com> Sat, 24 Apr 2010 07:51:31 +0000
+
+xapian-core (1.0.19-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Olly Betts <olly@survex.com> Thu, 15 Apr 2010 08:01:52 +0000
+
+xapian-core (1.0.18-1) unstable; urgency=low
+
+ * New upstream release.
+ + Includes fix for Xapian ticket#250. Closes: #564830
+
+ -- Olly Betts <olly@survex.com> Sun, 14 Feb 2010 12:17:31 +0000
+
+xapian-core (1.0.17+svn13879-1) experimental; urgency=low
+
+ * Snapshot from upstream branches/1.0 including patch for Xapian ticket#250.
+ * debian/control.in:
+ + Remove "DM-Upload-Allowed: yes" as I'm now a DD.
+ + Add "Vcs-Browser:" and "Vcs-svn:".
+ + Standards-Version: 3.8.4 (no changes required).
+ + Add '${misc:Depends}' for xapian-doc to placate lintian.
+ * debian/rules: Update licence boilerplate from GPLv2+ to MIT/X.
+ * debian/copyright: Update copyright years.
+
+ -- Olly Betts <olly@survex.com> Tue, 02 Feb 2010 11:21:32 +0000
+
+xapian-core (1.0.17-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Olly Betts <olly@survex.com> Thu, 19 Nov 2009 04:05:59 +0000
+
+xapian-core (1.0.16-3) unstable; urgency=low
+
+ * The lsof probing reveals that the fd ulimit problem isn't due to extra
+ fds being open, so remove it as it has served its purpose, and instead
+ just disable the fd ulimit for now.
+
+ -- Olly Betts <olly@survex.com> Mon, 14 Sep 2009 06:19:30 +0100
+
+xapian-core (1.0.16-2) unstable; urgency=low
+
+ * Add build dependency on lsof which the new fd ulimit patch uses.
+
+ -- Olly Betts <olly@survex.com> Sun, 13 Sep 2009 11:04:09 +0100
+
+xapian-core (1.0.16-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/rules: Force nocheck into DEB_BUILD_OPTIONS on avr32 to try to stop
+ the build from timing out.
+ * debian/README.source: Added.
+ * debian/patches: Replace the patch to disable the fd ulimit on alpha with
+ one to use lsof to report and count the number of already open fds, and
+ then add this number to the limit we were going to set.
+
+ -- Olly Betts <olly@survex.com> Sat, 12 Sep 2009 14:18:31 +0100
+
+xapian-core (1.0.15-2) unstable; urgency=low
+
+ * debian/rules: Include /usr/share/quilt/quilt.make much earlier so that
+ QUILT_STAMPFN is actually set when we try to use it. This means that
+ the patch(es) will actually be applied (presumably 1.0.14-2 built on
+ alpha just by luck).
+ * debian/rules: Build with "-g" so that the -dbg package is more useful.
+ * debian/rules: Disable optimisation for avr32 in the hope that will avoid
+ the build failing with "Took too long".
+ * debian/rules: Add -ffloat-store for i386-hurd to try to get topercent2 to
+ pass.
+
+ -- Olly Betts <olly@survex.com> Fri, 28 Aug 2009 05:09:14 +0000
+
+xapian-core (1.0.15-1) unstable; urgency=low
+
+ * New upstream release.
+ * xapian-tools now depends on the same version of libxapian15 to avoid
+ problems with some undocumented symbols xapian-compact uses.
+ * Fix typo in package description.
+ * debian/rules: Set DEB_HOST_ARCH by calling dpkg-architecture if it isn't
+ already set so that behaviour is the same when running debian/rules "by
+ hand".
+ * debian/control.in: Standards-Version: 3.8.3 (no changes required).
+ * debian/patches/runtest-no-fd-ulimit-on-alpha.patch: Add a description of
+ the patch.
+
+ -- Olly Betts <olly@survex.com> Thu, 27 Aug 2009 03:17:52 +0100
+
+xapian-core (1.0.14-2) unstable; urgency=medium
+
+ * "urgency=medium" as 1.0.14-1 has aged 5 days and only FTBFS on alpha
+ because of a new ulimit in the testsuite in 1.0.14-1.
+ * debian/rules,debian/control.in,debian/patches/series: Add support for
+ managing patches with quilt, but only add quilt as a build dependency
+ if there are patches. Also autogenerate the versioned dependency on
+ debhelper using debian/compat.
+ * debian/patches/runtest-no-fd-ulimit-on-alpha.patch: Fix FTBFS on alpha
+ by disabling the new fd ulimit in the test harness on that architecture.
+
+ -- Olly Betts <olly@survex.com> Wed, 05 Aug 2009 02:53:41 +0000
+
+xapian-core (1.0.14-1) unstable; urgency=low
+
+ * New upstream release.
+ + debian/patch: Changes included upstream so remove.
+ * debian/control.in: Standards-Version: 3.8.2 (no changes required).
+ * debian/control.in: Update required debhelper version.
+ * debian/copyright: Update for the MIT/X relicensing of the serialise-double
+ code.
+ * debian/rules: Explicitly disable use of valgrind for the testsuite -
+ otherwise if someone builds their own package with valgrind installed (as
+ developer boxes often do), the test suite run will take a really long
+ time.
+
+ -- Olly Betts <olly@survex.com> Thu, 30 Jul 2009 03:01:21 +0100
+
+xapian-core (1.0.13-3) unstable; urgency=low
+
+ * debian/patch: Backport more testsuite patches from upstream SVN:
+ + Don't bother trying to count CPU time for child processes, as it's hard
+ to ensure that the child processes have finished with the current
+ framework, and just counting time in the current process checks most
+ things (the local backend tests cover much of the work done by the
+ server part of the remote backend).
+ + Increase the number of tests until the first sample takes more than
+ 0.001 seconds to avoid trying to base calculations on a length of time
+ we probably can't reliably measure to start with.
+ + Always give the full exception message (was conditional on --verbose).
+ Tidy up output for reporting the various different exception types and
+ other failures to give more consistent output.
+
+ -- Olly Betts <olly@survex.com> Fri, 19 Jun 2009 10:43:48 +0100
+
+xapian-core (1.0.13-2) unstable; urgency=low
+
+ * debian/patch: Backport two patches from upstream SVN:
+ + Fix failure of topercent2 on some architectures.
+ + Fix leaking of fds used to launch xapian-tcpsrv for remotetcp test,
+ which hopefully will cure sporadic test failures on some buildds.
+ * debian/rules: Reenable testsuite on m68k now that topercent2 should pass
+ reliably.
+ * debian/rules: Improve comment describing why we disable optimisation on
+ alpha.
+
+ -- Olly Betts <olly@survex.com> Sat, 13 Jun 2009 10:54:22 +0000
+
+xapian-core (1.0.13-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/TODO: Update since we now have a -dbg package with debugging
+ symbols.
+ * debian/control.in: Better description for libxapian<SOVERSION>-dbg.
+ * debian/rules: Don't allow CODENAME to be set in the environment.
+ * Relicense the Debian packaging under the MIT/X licence.
+ * debian/patch: Changes included upstream so remove.
+
+ -- Olly Betts <olly@survex.com> Wed, 10 Jun 2009 14:03:15 +0100
+
+xapian-core (1.0.12-2) unstable; urgency=low
+
+ * debian/control.in: libxapian<SOVERSION>-dbg should be section debug not
+ libs.
+ * debian/copyright: Update for 2009. /usr/share/common-licenses/GPL ->
+ /usr/share/licenses/GPL-2 since the former is now a symlink to GPL-3
+ and Xapian is GPL v2 or later.
+ * debian/patch: Patch from upstream SVN to fix equality test of const char *
+ with string literal to use strcmp().
+
+ -- Olly Betts <olly@survex.com> Sun, 3 May 2009 05:59:02 +0100
+
+xapian-core (1.0.12-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control.in: Standards-Version: 3.8.1 (no changes required).
+ * debian/compat: Increase from 4 to 5 since 4 is now deprecated in sid and
+ 5 is supported by all currently supported Debian and Ubuntu releases.
+ * debian/control.in,debian/rules: Split off debug information into a new
+ libxapian<SOVERSION>-dbg package.
+
+ -- Olly Betts <olly@survex.com> Sun, 26 Apr 2009 13:45:21 +0100
+
+xapian-core (1.0.10-2) unstable; urgency=low
+
+ * debian/control.in: Demote xapian-doc and xapian-examples from Recommends
+ to Suggests of libxapian<N>-dev. Closes: #516511, #516512
+ * debian/rules: Force noopt on alpha to try to work around likely toolchain
+ bug which is causing a SEGV in the testsuite when an exception is thrown.
+
+ -- Olly Betts <olly@survex.com> Tue, 24 Feb 2009 12:57:04 +0000
+
+xapian-core (1.0.10-1) unstable; urgency=low
+
+ * New upstream release.
+ + Builds with GCC 4.4 snapshot. Closes: #505413
+ + debian/patch: All changes included upstream so remove.
+ * debian/control.in: Update libxapian15 to "Priority: important" to match
+ the override file.
+ * debian/control.in: Add "DM-Upload-Allowed: yes" since I'm now a Debian
+ Maintainer.
+
+ -- Olly Betts <olly@survex.com> Wed, 18 Feb 2009 04:15:19 +0000
+
+xapian-core (1.0.7-4) unstable; urgency=low
+
+ * debian/patch: Backport fix from upstream SVN which fixes segfaults when
+ using OP_ELITE_SET on x86 and possibly m68k due to excess precision
+ causing a comparison operator to report true for both a>b and b>a.
+
+ -- Olly Betts <olly@survex.com> Thu, 09 Oct 2008 12:58:25 +0100
+
+xapian-core (1.0.7-3) unstable; urgency=low
+
+ * debian/rules: Run "make all" and "make check" as separate commands to
+ avoid hitting parallel building bugs. Closes: #493390
+ * debian/patch: Backport fixes for upstream bug #287 (which can cause
+ database corruption), and a bug without a ticket which causes problems
+ iterating over tables created lazily after the database has had commits
+ which are still in sequential mode.
+
+ -- Olly Betts <olly@survex.com> Fri, 8 Aug 2008 09:46:20 +0100
+
+xapian-core (1.0.7-2) unstable; urgency=low
+
+ * debian/rules: Fix configure and build rules to be parallel make safe
+ (caused FTBFS on s390 buildd).
+ * debian/rules: Temporarily disable the testsuite on m68k while we resolve
+ why topercent2 is failing there. It's a new regression test for a minor
+ bug supposedly fixed in 1.0.7, so it's not like it actually worked any
+ better in the currently installed 1.0.5-1 packages.
+
+ -- Olly Betts <olly@survex.com> Tue, 29 Jul 2008 11:50:35 +0100
+
+xapian-core (1.0.7-1) unstable; urgency=low
+
+ * New upstream release.
+ + Add "nl" for selecting the Dutch stemmer, which was accidentally missing
+ from the list of language codes recognised. Reported by Joey Hess.
+ Closes: #484458
+ * debian/copyright: Update for 2008 and a few other minor changes.
+ * debian/control.in: Add "${shlibs:Depends}, ${misc:Depends}" to "Depends"
+ to fix a policy violation (dependencies will pull them in anyway so this
+ hasn't caused problems in practice). Omission noticed by Niko Tyni.
+ * debian/control.in: Move libxapianNN-dev from "Depends" to "Recommends"
+ for xapian-examples since it's not actually needed to run the built
+ examples.
+ * debian/rules: Add support for parallel=<n> in DEB_BUILD_OPTIONS, as
+ recommended by policy 3.8.0. Use $(filter ...) instead of $(find ...)
+ to check for noopt in DEB_BUILD_OPTIONS to avoid false matches on
+ substrings of non-standard options (e.g. snooptables).
+ * debian/rules: Run the xapian-core testsuite unless nocheck is specified
+ in DEB_BUILD_OPTIONS. It takes 3.5 minutes on x86-64, so hopefully
+ shouldn't be too painful for slower architectures.
+ * debian/control.in: Standards-Version: 3.8.0
+ * debian/watch: Add watch file. Not useful for me as I make the upstream
+ releases, but DEHS, etc find it useful.
+ * debian/xapian-doc.doc-base.apidocs: Section "Apps/Programming" is no
+ longer valid - use section "Programming/C++" instead.
+ * debian/xapian-doc.doc-base.xapian-intro: Section "Apps/Programming" is no
+ longer valid - use section "Programming" instead.
+
+ -- Olly Betts <olly@survex.com> Wed, 23 Jul 2008 10:30:49 +0100
+
+xapian-core (1.0.5-1) unstable; urgency=low
+
+ * New upstream release.
+ + Fixes compilation with latest GCC 4.3 snapshot. Closes: #455151
+ + No longer installs ".map" files with documentation, which fixes lintian
+ warning about an empty file in the documentation.
+ * debian/rules: Look for "CODENAME" and "debian/codename" rather than
+ "COMPONENT" and "debian/component".
+ * debian/control.in: Standards-Version: 3.7.3 (no changes required).
+ * debian/control.in: The "Homepage:" header is now official, so convert
+ "Homepage:" pseudo-headers.
+
+ -- Olly Betts <olly@survex.com> Sat, 22 Dec 2007 21:37:09 +0000
+
+xapian-core (1.0.4-1) unstable; urgency=low
+
+ * New upstream release. Closes: #444858
+ + Fixes compilation with latest GCC 4.3 snapshot. Closes: #441618
+ * debian/control.in,debian/rules: Use "${binary:Version}" instead of
+ "${Source-Version}" (except on sarge and dapper which predate
+ "${binary:Version}").
+
+ -- Olly Betts <olly@survex.com> Fri, 2 Nov 2007 03:15:23 +0000
+
+xapian-core (1.0.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Olly Betts <olly@survex.com> Thu, 5 Jul 2007 01:06:06 +0100
+
+xapian-core (1.0.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Olly Betts <olly@survex.com> Mon, 11 Jun 2007 16:51:38 +0100
+
+xapian-core (1.0.0-1) unstable; urgency=low
+
+ * New upstream release.
+ + Now builds with GCC 4.3 snapshot. Closes: #417778
+ * debian/rules: Generate control from control.in robustly - don't risk
+ leaving a partially generated destination file.
+ * debian/patch: Changes included upstream so remove.
+ * debian/xapian-tools.install: Package new xapian-check tool and its manpage.
+ * debian/control.in: Mention new xapian-check and previously overlooked
+ xapian-progsrv. Make it clear that quartzXXX is for quartz-format
+ databases.
+ * debian/copyright: Update.
+ * debian/rules: We don't need to pass --mandir or --infodir to configure
+ as the values we explicitly set are the defaults anyway (and we don't
+ have any documentation in "info" format).
+ * debian/control.in: Add "zlib1g-dev" to "Build-Depends:".
+
+ -- Olly Betts <olly@survex.com> Tue, 29 May 2007 16:37:31 +0100
+
+xapian-core (0.9.9-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/xapian-tools.install: Install xapian-progsrv.1 man page.
+ * debian/patch: Fix WritableDatabase::replace_document() bug where replacing
+ a document with itself with unmodified postings loses all positional
+ information for that document.
+
+ -- Olly Betts <olly@survex.com> Wed, 15 Nov 2006 01:03:02 +0000
+
+xapian-core (0.9.8-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/xapian-doc.doc-base.apidocs: The printable API documentation is now
+ a PDF rather than PostScript.
+
+ -- Olly Betts <olly@survex.com> Sat, 4 Nov 2006 12:27:01 +0000
+
+xapian-core (0.9.7-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/xapian-tools.install: Install /usr/bin/xapian-progsrv.
+ * debian/copyright: Add Richard Boulton.
+
+ -- Olly Betts <olly@survex.com> Wed, 11 Oct 2006 17:44:47 +0100
+
+xapian-core (0.9.6-5) unstable; urgency=low
+
+ * debian/control.in: Remove "designed to be" from the package description at
+ Wookey's suggestion.
+ * debian/control.in: Add extra space before "Homepage:" as is recommended
+ by the Debian Developer's Reference.
+
+ -- Olly Betts <olly@survex.com> Sun, 9 Jul 2006 02:03:19 +0100
+
+xapian-core (0.9.6-4) unstable; urgency=low
+
+ * debian/copyright: Update with a thorough list of copyrights and licences.
+
+ -- Olly Betts <olly@survex.com> Mon, 26 Jun 2006 16:00:12 +0100
+
+xapian-core (0.9.6-3) unstable; urgency=low
+
+ * debian/control: Updated description:
+ + The queryparser is no longer a separate library.
+ + The claimed scalability was overly modest - we can certainly handle
+ "hundreds of millions of documents".
+ + Add a link to the homepage.
+
+ -- Olly Betts <olly@survex.com> Thu, 15 Jun 2006 04:14:49 +0100
+
+xapian-core (0.9.6-2) unstable; urgency=low
+
+ * dh_strip handles nostrip in DEB_BUILD_OPTIONS for us, so there's no
+ need to check by hand.
+ * configure with --disable-dependency-tracking which will save us some
+ diskspace and a little time during the build.
+
+ -- Olly Betts <olly@survex.com> Fri, 9 Jun 2006 02:29:10 +0100
+
+xapian-core (0.9.6-1) unstable; urgency=low
+
+ * New upstream release.
+ * "Standards-Version: 3.7.2" - no changes required.
+
+ -- Olly Betts <olly@survex.com> Mon, 15 May 2006 21:20:07 +0100
+
+xapian-core (0.9.5-3) unstable; urgency=low
+
+ * Create xapian-examples package.
+
+ -- Olly Betts <olly@survex.com> Wed, 12 Apr 2006 04:14:51 +0100
+
+xapian-core (0.9.5-2) unstable; urgency=low
+
+ * Use debian/compat instead of setting DH_COMPAT.
+ * dh_install with --fail-missing intead of just --list-missing.
+ * dh_install now explicitly excludes the simple* examples.
+
+ -- Olly Betts <olly@survex.com> Sun, 9 Apr 2006 21:17:32 +0100
+
+xapian-core (0.9.5-1) unstable; urgency=low
+
+ * New upstream release.
+ + All installed binaries now have man pages.
+ * "Standards-Version: 3.6.2" - no changes required.
+ * debian/copyright: Update FSF address and give download URL for releases
+ instead of obsolete CVS location.
+ * debian/control.in: copydatabase and xapian-compact are packaged in
+ xapian-tools, so add them to the list of tools in the package description.
+ * debian/rules: Increase DH_COMPAT from 3 to 4.
+ * debian/TODO: Updated.
+ * New maintainer.
+
+ -- Olly Betts <olly@survex.com> Sun, 9 Apr 2006 00:41:22 +0100
+
+xapian-core (0.9.4-3) unstable; urgency=low
+
+ * Add new header "deprecated.h"
+
+ -- Richard Boulton <richard@tartarus.org> Fri, 3 Mar 2006 02:59:10 +0000
+
+xapian-core (0.9.4-2) unstable; urgency=low
+
+ * Fix invalid date line in previous changelog entry.
+
+ -- Richard Boulton <richard@tartarus.org> Fri, 3 Mar 2006 02:33:08 +0000
+
+xapian-core (0.9.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * A couple of small, but important, fixes.
+
+ -- Richard Boulton <richard@tartarus.org> Fri, 3 Mar 2006 02:31:23 +0000
+
+xapian-core (0.9.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * API additions: some new functions to get version information, useful
+ when using a shared library of Xapian.
+ * Query parser bug fix with "+" terms when default op is AND.
+ * Query parser supports "AND NOT" as a synonym for "NOT".
+ * Various bug fixes - some errors threw unhelpful exception types.
+ * Use updated versions of automake and libtool.
+ * Various documentation, debug and packaging updates.
+
+ -- Richard Boulton <richard@tartarus.org> Thu, 16 Feb 2006 12:59:27 +0000
+
+xapian-core (0.9.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * API modifications to queryparser.
+ * "flint" database backend now claimed to be functional.
+ * Many bug-fixes.
+
+ -- Richard Boulton <richard@tartarus.org> Fri, 15 Jul 2005 12:56:43 +0100
+
+xapian-core (0.9.1-2) unstable; urgency=low
+
+ * Add new header xapian/dbfactory.h
+ * Add delve and quest to xapian-tools package.
+
+ -- Richard Boulton <richard@tartarus.org> Wed, 15 Jun 2005 10:45:17 +0100
+
+xapian-core (0.9.1-1) unstable; urgency=low
+
+ * New upstream release. (Version 0.9.0 never got packaged.)
+ * Various API changes - see NEWS file for details.
+ * No longer Build-Depend on bison - we now use lemon, and use the copy
+ of lemon in the Xapian source tree.
+
+ -- Richard Boulton <richard@tartarus.org> Tue, 7 Jun 2005 07:31:29 +0100
+
+xapian-core (0.8.5-1) unstable; urgency=low
+
+ * New upstream release.
+ * xapian-config: --libs output fixed to not include libxapian.la
+ * quartzcompact: Added --no-full / -n option to disable full compaction,
+ fix largefile support, slight increase in compaction efficiency, slight
+ change in statistics reporting formatting.
+
+ -- Richard Boulton <richard@tartarus.org> Wed, 5 Jan 2005 11:42:51 +0000
+
+xapian-core (0.8.4-1) unstable; urgency=low
+
+ * New upstream release.
+ * API changes:
+ - Added constructors to Database and WritableDatabase.
+ Auto::open() is now deprecated.
+ - Removed the ability to write a Xapian object to an ostream directly.
+ - Renamed BM25 parameters to match standard naming in papers and elsewhere.
+ * Library version number increased from 3 to 5 due to interface changes.
+ * Some bug and portability fixes.
+
+ -- Richard Boulton <richard@tartarus.org> Thu, 9 Dec 2004 17:30:31 +0000
+
+xapian-core (0.8.3-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixed bug which caused a segmentation fault or odd "Document not found"
+ exceptions when new check_at_least parameter to Enquire::get_mset() was
+ used and there weren't many matches (regression test checkatleast1).
+ * omtcpsrv renamed to xapian-tcpsrv.
+
+ -- Richard Boulton <richard@tartarus.org> Tue, 21 Sep 2004 13:30:17 +0100
+
+xapian-core (0.8.2-3) unstable; urgency=low
+
+ * Make libxapian3 conflict with libxapian2, because libxapian2 version
+ 0.8.1-1 actually contained libxapian.so.3 (which was a bug).
+
+ -- Richard Boulton <richard@tartarus.org> Tue, 14 Sep 2004 17:34:43 +0100
+
+xapian-core (0.8.2-2) unstable; urgency=low
+
+ * Oops - library version number should be 3. Changed it back,
+ so we now have libxapian3.
+ (I was confused between the interface number and the version number.)
+
+ -- Richard Boulton <richard@tartarus.org> Tue, 14 Sep 2004 16:44:37 +0100
+
+xapian-core (0.8.2-1) unstable; urgency=low
+
+ * New upstream release (0.8.2).
+ * library version number increased to 4 (from 2).
+ (Xapian::Database::get_lastdocid added; QueryParser tries
+ reparsing after stripping punctuation; several unused
+ Error subclasses removed; assorted Iterator changes,
+ Xapian::ESet::back and many other methods added).
+
+ -- Richard Boulton <richard@tartarus.org> Tue, 14 Sep 2004 01:03:49 +0100
+
+xapian-core (0.8.1-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Richard Boulton <richard@tartarus.org> Wed, 30 Jun 2004 20:10:05 +0100
+
+xapian-core (0.8.0-9) unstable; urgency=low
+
+ * Remove build dependencies on tools which aren't required if not using
+ maintainer mode.
+
+ -- Richard Boulton <richard@tartarus.org> Thu, 27 May 2004 00:37:02 +0100
+
+xapian-core (0.8.0-8) unstable; urgency=low
+
+ * Fix minor bugs in debian/rules (trailing backslashes, and missing -p
+ from mkdir)
+
+ -- Richard Boulton <richard@tartarus.org> Wed, 19 May 2004 13:33:02 +0100
+
+xapian-core (0.8.0-7) unstable; urgency=low
+
+ * Perform build in a subdirectory. This is neater, and will also make it
+ easier to perform a differently configured build to produce a debug
+ version.
+
+ -- Richard Boulton <richard@tartarus.org> Wed, 19 May 2004 12:13:45 +0100
+
+xapian-core (0.8.0-6) unstable; urgency=low
+
+ * debian/rules,debian/control.in: Remove queryparser packages - merge
+ them into the main library package.
+
+ -- Richard Boulton <richard@tartarus.org> Wed, 19 May 2004 01:44:58 +0100
+
+xapian-core (0.8.0-5) unstable; urgency=low
+
+ * debian/rules: Add --list-missing back to dh_install.
+ * debian/control.in: Remove build depend on graphviz, and add TODO item
+ to sort this out properly.
+ Also, build depend on debhelper >= 4.1.22, since this is needed for
+ --list-missing.
+
+ -- Richard Boulton <richard@tartarus.org> Wed, 12 May 2004 11:59:42 +0100
+
+xapian-core (0.8.0-4) unstable; urgency=low
+
+ * xapian-doc: Correct Recommends field to point to libxapian-dev, not
+ libxapian2-dev, and to libxapian-queryparser-dev not
+ libxapian-queryparser1-dev.
+
+ -- Richard Boulton <richard@tartarus.org> Wed, 12 May 2004 10:36:16 +0100
+
+xapian-core (0.8.0-3) unstable; urgency=low
+
+ * Remove empty maintainer scripts, allowing debhelper to make them.
+ * Add rules to make symlinks to config.guess and config.sub, and added
+ Build-Depends on autotools-dev. Remove Build-Depends on automake,
+ autoconf and libtool (these will be run before the source package is
+ generated).
+ * Add some more items to TODO list.
+
+ -- Richard Boulton <richard@tartarus.org> Wed, 12 May 2004 09:48:34 +0100
+
+xapian-core (0.8.0-2) unstable; urgency=low
+
+ * Fixed postinst, postrm, and prerm scripts to have a #!/bin/sh line, so
+ they actually work.
+ * Various tweaks to debian/rules suggested by looking at dh_make output.
+
+ -- Richard Boulton <richard@tartarus.org> Tue, 11 May 2004 17:00:03 +0100
+
+xapian-core (0.8.0-1) unstable; urgency=low
+
+ * Initial release, from upstream source snapshot.
+
+ -- Richard Boulton <richard@tartarus.org> Sun, 9 May 2004 16:28:37 +0100

debian.control Added

@@ -0,0 +1,121 @@
+Source: xapian-core
+Section: libs
+Priority: optional
+Maintainer: Olly Betts <olly@survex.com>
+Standards-Version: 3.9.5
+Build-Depends: debhelper (>= 7), automake, autotools-dev, zlib1g-dev, uuid-dev
+Homepage: http://xapian.org/
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/xapian-core.git
+Vcs-git: git://anonscm.debian.org/collab-maint/xapian-core.git
+
+Package: libxapian22
+Architecture: any
+Section: libs
+Priority: optional
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Suggests: xapian-tools
+Description: Search engine library
+ This package contains the core Xapian runtime library.
+ .
+ The Xapian search engine library is a highly adaptable toolkit which allows
+ developers to easily add advanced indexing and search facilities to their own
+ applications. It implements the probabilistic model of information retrieval,
+ and provides facilities for performing ranked free-text searches, relevance
+ feedback, phrase searching, boolean searching, stemming, and simultaneous
+ update and searching. It is highly scalable, and is capable of working with
+ collections containing hundreds of millions of documents.
+
+Package: libxapian22-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: libxapian22 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Suggests: libc6-dbg, libgcc1-dbg, zlib1g-dbg, libstdc++6-4.6-dbg
+Description: Debugging symbols for the Xapian Search engine library
+ This package contains debugging symbols for the core Xapian library.
+ .
+ The Xapian search engine library is a highly adaptable toolkit which allows
+ developers to easily add advanced indexing and search facilities to their own
+ applications. It implements the probabilistic model of information retrieval,
+ and provides facilities for performing ranked free-text searches, relevance
+ feedback, phrase searching, boolean searching, stemming, and simultaneous
+ update and searching. It is highly scalable, and is capable of working with
+ collections containing hundreds of millions of documents.
+
+Package: libxapian-dev
+Architecture: any
+Section: libdevel
+Depends: libxapian22 (= ${binary:Version}), libc6-dev | libc-dev, ${misc:Depends}
+Suggests: xapian-doc (= ${binary:Version}), xapian-examples (= ${binary:Version})
+Description: Development files for Xapian search engine library
+ This package contains development libraries and headers for the core Xapian
+ library.
+ .
+ The Xapian search engine library is a highly adaptable toolkit which allows
+ developers to easily add advanced indexing and search facilities to their own
+ applications. It implements the probabilistic model of information retrieval,
+ and provides facilities for performing ranked free-text searches, relevance
+ feedback, phrase searching, boolean searching, stemming, and simultaneous
+ update and searching. It is highly scalable, and is capable of working with
+ collections containing hundreds of millions of documents.
+
+Package: xapian-tools
+Architecture: any
+Section: utils
+Depends: libxapian22 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: Basic tools for Xapian search engine library
+ This package contains several tools related to Xapian.
+ - copydatabase: Copy one or more Xapian databases.
+ - delve: Inspect the contents of a Xapian database.
+ - quartzcheck: Check the validity of a quartz-format Xapian database.
+ - quartzcompact: Compact a quartz database, or merge and compact several.
+ - quartzdump: Dump (part of) a quartz-format Xapian database.
+ - quest: Command line search of a Xapian database.
+ - xapian-check: Check the validity of a Xapian database.
+ - xapian-compact: Compact a quartz database, or merge and compact several.
+ - xapian-progsrv: stdin/stdout based server, for searching databases remotely.
+ - xapian-tcpsrv: TCP based server, used for searching databases remotely.
+ .
+ The Xapian search engine library is a highly adaptable toolkit which allows
+ developers to easily add advanced indexing and search facilities to their own
+ applications. It implements the probabilistic model of information retrieval,
+ and provides facilities for performing ranked free-text searches, relevance
+ feedback, phrase searching, boolean searching, stemming, and simultaneous
+ update and searching. It is highly scalable, and is capable of working with
+ collections containing hundreds of millions of documents.
+
+Package: xapian-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}
+Recommends: libxapian-dev (= ${binary:Version})
+Description: Core Xapian documentation
+ This package contains general documentation about Xapian, and more detailed
+ API documentation.
+ .
+ The Xapian search engine library is a highly adaptable toolkit which allows
+ developers to easily add advanced indexing and search facilities to their own
+ applications. It implements the probabilistic model of information retrieval,
+ and provides facilities for performing ranked free-text searches, relevance
+ feedback, phrase searching, boolean searching, stemming, and simultaneous
+ update and searching. It is highly scalable, and is capable of working with
+ collections containing hundreds of millions of documents.
+
+Package: xapian-examples
+Architecture: any
+Section: doc
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: libxapian-dev (= ${binary:Version})
+Description: Xapian simple example programs
+ This package contains source code for some example programs which use the
+ Xapian library. The three "simple" examples are also included in binary
+ form; binaries for the other examples can be found in the xapian-tools
+ package (since they're useful tools in their own right).
+ .
+ The Xapian search engine library is a highly adaptable toolkit which allows
+ developers to easily add advanced indexing and search facilities to their own
+ applications. It implements the probabilistic model of information retrieval,
+ and provides facilities for performing ranked free-text searches, relevance
+ feedback, phrase searching, boolean searching, stemming, and simultaneous
+ update and searching. It is highly scalable, and is capable of working with
+ collections containing hundreds of millions of documents.

debian.rules Added

@@ -0,0 +1,256 @@
+#!/usr/bin/make -f
+#
+# Copyright (C) 2004,2005,2006 Lemur Consulting Ltd
+# Copyright (C) 2006,2007,2008,2009,2010,2011,2012,2013 Olly Betts
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to
+# deal in the Software without restriction, including without limitation the
+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# sell copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+# IN THE SOFTWARE.
+
+# Codename we're building packages for.  For backported packages, put the
+# codename (e.g. lenny or jaunty) in debian/codename.  If that file doesn't
+# exist, the default is sid.
+# CODENAME := $(shell cat debian/codename 2>/dev/null||echo sid)
+
+# The soversion number needs to match that generated by libtool.  The following
+# lines should read configure.ac to get the current interface number and
+# subtract it from the interface age, to get the oldest interface number
+# supported by the library. This should correspond to the soversion assigned
+# to the library by libtool.  (This isn't documented, and is system dependent,
+# so we need to check it doesn't break with future versions of libtool.)
+libxapian_soversion:=$(shell awk -F'[=:]' '($$1 == "LIBRARY_VERSION_INFO") {print $$2 - $$4}' configure.ac)
+
+# For now, we don't support installation of development files for multiple
+# versions concurrently.  Incompatible ABI changes should be rare, so this
+# seems reasonable.
+libxapian_dev_soversion=
+
+export DH_OPTIONS
+
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+confflags := --prefix=/usr --sysconfdir=/etc
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+    confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+    confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+    # Disable the testsuite when cross-compiling.
+    DEB_BUILD_OPTIONS += nocheck
+endif
+
+# For i386 and *-i386.
+ifeq ($(patsubst %-i386,i386,$(DEB_HOST_ARCH)), i386)
+    XAPIAN_BUILD_SSE := 1
+endif
+
+CFLAGS := `dpkg-buildflags --get CFLAGS`
+CXXFLAGS := `dpkg-buildflags --get CXXFLAGS`
+LDFLAGS := `dpkg-buildflags --get LDFLAGS`
+CPPFLAGS := `dpkg-buildflags --get CPPFLAGS`
+
+# Fallback for suites which don't have dpkg-buildflags.
+ifeq (,$(CFLAGS))
+    CFLAGS :=
+    CXXFLAGS := -g
+ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
+    CFLAGS += -O2
+    CXXFLAGS += -O2
+endif
+endif
+
+# Handle other DEB_BUILD_OPTIONS.  Note that dh_strip handles nostrip for us,
+# and dpkg-buildflags handles noopt with newer dpkg.
+
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    MAKEFLAGS += -j$(NUMJOBS)
+endif
+ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+    MAKE_CHECK := :
+else
+    MAKE_CHECK := $(MAKE) check VALGRIND=
+endif
+
+confflags += CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)"
+
+# With GCC3 and later this won't make a huge difference, but it'll save
+# a bit of time and diskspace while building.
+confflags += --disable-dependency-tracking
+
+maint: \
+	debian/control \
+	debian/libxapian$(libxapian_soversion).install \
+	debian/libxapian$(libxapian_dev_soversion)-dev.install
+
+maintclean: clean
+	rm -f debian/control
+	rm -f debian/libxapian$(libxapian_soversion).install
+	rm -f debian/libxapian$(libxapian_dev_soversion)-dev.install
+	rm -rf debian/libxapian$(libxapian_soversion)
+	rm -rf debian/libxapian$(libxapian_dev_soversion)-dev
+	rm -rf debian/xapian-doc
+	rm -rf debian/xapian-tools
+	rm -rf debian/tmp debian/tmp-sse2
+
+debian/control: debian/rules debian/control.in debian/compat
+	rm -f debian/control.tmp
+	sed -e 's/@LIBXAPIAN_SOVERSION@/$(libxapian_soversion)/g' \
+	    -e 's/@LIBXAPIAN_DEV_SOVERSION@/$(libxapian_dev_soversion)/g' \
+	    -e 's/@BUILD_DEPS@/debhelper (>= $(shell cat debian/compat)),/g' \
+	     debian/control.in > debian/control.tmp
+	mv debian/control.tmp debian/control
+
+debian/libxapian$(libxapian_soversion).install: debian/rules debian/libxapianVERSION.install
+	cp -f debian/libxapianVERSION.install debian/libxapian$(libxapian_soversion).install
+
+debian/libxapian$(libxapian_dev_soversion)-dev.install: debian/rules debian/libxapianVERSION-dev.install
+	cp -f debian/libxapianVERSION-dev.install debian/libxapian$(libxapian_dev_soversion)-dev.install
+
+configure: configure-stamp
+configure-stamp: debian/control
+	dh_testdir
+
+	# Use the latest config.sub and config.guess from the autotools-dev
+	# package.
+	rm -f config.sub config.guess
+	ln -s /usr/share/misc/config.sub config.sub
+	ln -s /usr/share/misc/config.guess config.guess
+
+	aclocal -I m4
+	automake --add-missing
+	autoreconf -v
+
+	# Report kernel and compiler version so upstream PLATFORMS file can be
+	# updated from buildd logs.
+	-uname -a
+	-g++ --version
+
+	# Configure in a subdirectory, for neatness.
+	mkdir -p build
+ifdef XAPIAN_BUILD_SSE
+	cd build && ../configure $(confflags) --disable-sse
+	mkdir -p build-sse2
+	cd build-sse2 && ../configure $(confflags) --disable-static
+else
+	cd build && ../configure $(confflags)
+endif
+
+	# Touch the stamp file, to avoid repeating the configure step.
+	touch $@
+
+build: build-arch build-indep
+build-arch: build-stamp
+build-indep: build-stamp
+build-stamp: configure-stamp
+	dh_testdir
+	$(MAKE) -C build
+ifdef XAPIAN_BUILD_SSE
+	$(MAKE) -C build-sse2
+	$(MAKE_CHECK) -C build-sse2
+else
+	$(MAKE_CHECK) -C build
+endif
+	touch $@
+
+install: DH_OPTIONS=
+install: install-stamp
+install-stamp: build-stamp \
+	 debian/libxapian$(libxapian_soversion).install \
+	 debian/libxapian$(libxapian_dev_soversion)-dev.install
+	dh_testdir
+	dh_testroot
+	dh_prep
+	dh_installdirs
+
+	# Install the files into debian/tmp
+	$(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install
+
+ifdef XAPIAN_BUILD_SSE
+	$(MAKE) -C build-sse2 DESTDIR=$(CURDIR)/debian/tmp-sse2 install
+	mkdir -p $(CURDIR)/debian/libxapian$(libxapian_soversion)/usr/lib/sse2
+	mv $(CURDIR)/debian/tmp-sse2/usr/lib/libxapian*.so.* $(CURDIR)/debian/libxapian$(libxapian_soversion)/usr/lib/sse2
+	rm -rf $(CURDIR)/debian/tmp-sse2
+endif
+
+	# Empty dependency_libs to placate luddite release goal.
+	sed -i 's/^$dependency_libs=$.*/\1/' $(CURDIR)/debian/tmp/usr/lib/libxapian.la
+
+	# Install the example source code
+	mkdir -p debian/tmp/usr/share/doc/xapian-examples/examples
+	cp examples/*.cc debian/tmp/usr/share/doc/xapian-examples/examples
+	ln -s ../../../../lib/xapian-examples/examples debian/tmp/usr/share/doc/xapian-examples/examples/built
+
+	# Fix up link to the internal sourcedocs to point to those on the
+	# Xapian website since we don't build and package them.
+	sed -i 's,sourcedoc/html/annotated.html,http://xapian.org/docs/&,' debian/tmp/usr/share/doc/xapian-core/internals.html
+
+	# Reads the *.install files to decide where to install everything
+	dh_install --sourcedir=debian/tmp --fail-missing
+	touch $@
+
+binary: binary-arch binary-indep
+binary-indep: DH_OPTIONS=-i
+binary-indep: build-indep install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+	dh_installman
+	dh_installchangelogs ChangeLog
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary-arch: DH_OPTIONS=-a
+binary-arch: build-arch install
+	dh_testdir
+	dh_testroot
+	dh_installdocs
+	dh_installexamples
+	dh_installmenu
+	dh_installman
+	dh_installchangelogs ChangeLog
+	:
+	dh_strip --dbg-package=libxapian$(libxapian_soversion)-dbg
+	# Only keep debug symbols for the shared library.
+	rm -rf debian/libxapian$(libxapian_soversion)-dbg/usr/lib/debug/usr/lib/xapian-examples
+	rm -rf debian/libxapian$(libxapian_soversion)-dbg/usr/lib/debug/usr/bin
+	:
+	dh_link
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps -L libxapian$(libxapian_soversion) -ldebian/libxapian$(libxapian_soversion)/usr/lib
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+clean: debian/control
+	dh_testdir
+	dh_testroot
+	rm -rf build build-sse2
+	rm -f config.sub config.guess
+	dh_clean
+
+.PHONY: maint maintclean configure build build-arch build-indep install binary binary-arch binary-indep clean

debian.series Added

debian.tar.gz Added

xapian-core-1.2.16.tar.gz Added

xapian-core.dsc Added

Build Results
RPM Lint

Refresh

Comments for request 736 0

Request History

vanmeeuwen created request over 9 years ago

vanmeeuwen accepted request over 9 years ago

Please add a comment