error.h   error.h 
/** @file error.h /** @file error.h
* @brief Hierarchy of classes which Xapian can throw as exceptions. * @brief Hierarchy of classes which Xapian can throw as exceptions.
*/ */
/* Warning: This file is generated by /data/home/olly/tmp/xapian-git-snapsh ot/tags/v1.2.20/xapian/xapian-core/generate-exceptions - do not modify dire ctly! */ /* Warning: This file is generated by /data/home/olly/tmp/xapian-git-snapsh ot/tags/v1.2.21/xapian/xapian-core/generate-exceptions - do not modify dire ctly! */
/* Copyright (C) 2003,2004,2006,2007,2009 Olly Betts /* Copyright (C) 2003,2004,2006,2007,2009 Olly Betts
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of the * published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version. * License, or (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 queryparser.h   queryparser.h 
skipping to change at line 392 skipping to change at line 392
/// Enum of feature flags. /// Enum of feature flags.
typedef enum { typedef enum {
/// Support AND, OR, etc and bracketed subexpressions. /// Support AND, OR, etc and bracketed subexpressions.
FLAG_BOOLEAN = 1, FLAG_BOOLEAN = 1,
/// Support quoted phrases. /// Support quoted phrases.
FLAG_PHRASE = 2, FLAG_PHRASE = 2,
/// Support + and -. /// Support + and -.
FLAG_LOVEHATE = 4, FLAG_LOVEHATE = 4,
/// Support AND, OR, etc even if they aren't in ALLCAPS. /// Support AND, OR, etc even if they aren't in ALLCAPS.
FLAG_BOOLEAN_ANY_CASE = 8, FLAG_BOOLEAN_ANY_CASE = 8,
/** Support right truncation (e.g. Xap*). /** Support wildcards.
*
* At present only right truncation (e.g. Xap*) is supported.
* *
* Currently you can't use wildcards with boolean filter prefixes, * Currently you can't use wildcards with boolean filter prefixes,
* or in a phrase (either an explicitly quoted one, or one implicit ly * or in a phrase (either an explicitly quoted one, or one implicit ly
* generated by hyphens or other punctuation). * generated by hyphens or other punctuation).
* *
* NB: You need to tell the QueryParser object which database to * NB: You need to tell the QueryParser object which database to
* expand wildcards from by calling set_database. * expand wildcards from by calling set_database.
*/ */
FLAG_WILDCARD = 16, FLAG_WILDCARD = 16,
/** Allow queries such as 'NOT apples'. /** Allow queries such as 'NOT apples'.
skipping to change at line 577 skipping to change at line 579
* multiple values with bitwise-or (|) (default FLAG_DEFAULT). * multiple values with bitwise-or (|) (default FLAG_DEFAULT).
* @param default_prefix The default term prefix to use (default none) . * @param default_prefix The default term prefix to use (default none) .
* For example, you can pass "A" when parsing an "Author" field . * For example, you can pass "A" when parsing an "Author" field .
* *
* @exception If the query string can't be parsed, then * @exception If the query string can't be parsed, then
* Xapian::QueryParserError is thrown. You can get an Engli sh * Xapian::QueryParserError is thrown. You can get an Engli sh
* error message to report to the user by catching it and * error message to report to the user by catching it and
* calling get_msg() on the caught exception. The current * calling get_msg() on the caught exception. The current
* possible values (in case you want to translate them) are: * possible values (in case you want to translate them) are:
* *
* @li Unknown range operation * @li Unknown range operation
* @li parse error * @li parse error
* @li Syntax: <expression> AND <expression&gt * @li Syntax: <expression> AND <expression>
; * @li Syntax: <expression> AND NOT <expression>
* @li Syntax: <expression> AND NOT <expressio * @li Syntax: <expression> NOT <expression>
n> * @li Syntax: <expression> OR <expression>
* @li Syntax: <expression> NOT <expression&gt * @li Syntax: <expression> XOR <expression>
;
* @li Syntax: <expression> OR <expression>
* @li Syntax: <expression> XOR <expression&gt
;
*/ */
Query parse_query(const std::string &query_string, Query parse_query(const std::string &query_string,
unsigned flags = FLAG_DEFAULT, unsigned flags = FLAG_DEFAULT,
const std::string &default_prefix = std::string()); const std::string &default_prefix = std::string());
/** Add a probabilistic term prefix. /** Add a probabilistic term prefix.
* *
* For example: * For example:
* *
* @code * @code
 End of changes. 2 change blocks. 
12 lines changed or deleted 10 lines changed or added


 version.h   version.h 
/** @file version.h /** @file version.h
* @brief Define preprocessor symbols for the library version * @brief Define preprocessor symbols for the library version
*/ */
// Copyright (C) 2002,2004,2005,2006,2007,2008,2009,2010 Olly Betts // Copyright (C) 2002,2004,2005,2006,2007,2008,2009,2010,2015 Olly Betts
// //
// This program is free software; you can redistribute it and/or // This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License as // modify it under the terms of the GNU General Public License as
// published by the Free Software Foundation; either version 2 of the // published by the Free Software Foundation; either version 2 of the
// License, or (at your option) any later version. // License, or (at your option) any later version.
// //
// This program is distributed in the hope that it will be useful // This program is distributed in the hope that it will be useful
// but WITHOUT ANY WARRANTY; without even the implied warranty of // but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details. // GNU General Public License for more details.
skipping to change at line 28 skipping to change at line 28
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#ifndef XAPIAN_INCLUDED_VERSION_H #ifndef XAPIAN_INCLUDED_VERSION_H
#define XAPIAN_INCLUDED_VERSION_H #define XAPIAN_INCLUDED_VERSION_H
#ifdef __GNUC__ #ifdef __GNUC__
#if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ == 0) #if __GNUC__ < 3 || (__GNUC__ == 3 && __GNUC_MINOR__ == 0)
#error Xapian no longer supports GCC < 3.1 #error Xapian no longer supports GCC < 3.1
#else #else
#if !defined(__GXX_ABI_VERSION) || __GXX_ABI_VERSION != 1002 #if !defined(__GXX_ABI_VERSION) || __GXX_ABI_VERSION != 1002
#if defined __GXX_ABI_VERSION && __GXX_ABI_VERSION >= 1002
#warning The C++ ABI version of compiler you are using does not exactly mat
ch
#warning that of the compiler used to build the library. If linking fails
#warning due to missing symbols, this is probably the reason why.
#warning The Xapian library was built with g++ 4.6.1
#else
#error The C++ ABI version of compiler you are using does not match #error The C++ ABI version of compiler you are using does not match
#error that of the compiler used to build the library. The versions #error that of the compiler used to build the library. The versions
#error must match or your program will not work correctly. #error must match or your program will not work correctly.
#error The Xapian library was built with g++ 4.6.1 #error The Xapian library was built with g++ 4.6.1
#endif #endif
#endif
#ifdef _GLIBCXX_DEBUG #ifdef _GLIBCXX_DEBUG
#error You are compiling with _GLIBCXX_DEBUG defined, but the library #error You are compiling with _GLIBCXX_DEBUG defined, but the library
#error was not compiled with this flag. The settings must match or your #error was not compiled with this flag. The settings must match or your
#error program will not work correctly. #error program will not work correctly.
#endif #endif
#endif #endif
#endif #endif
/// The library was compiled with GCC's -fvisibility=hidden option. /// The library was compiled with GCC's -fvisibility=hidden option.
#define XAPIAN_ENABLE_VISIBILITY #define XAPIAN_ENABLE_VISIBILITY
/// The version of Xapian as a C string literal. /// The version of Xapian as a C string literal.
#define XAPIAN_VERSION "1.2.20" #define XAPIAN_VERSION "1.2.21"
/** The major component of the Xapian version. /** The major component of the Xapian version.
* E.g. for Xapian 1.0.14 this would be: 1 * E.g. for Xapian 1.0.14 this would be: 1
*/ */
#define XAPIAN_MAJOR_VERSION 1 #define XAPIAN_MAJOR_VERSION 1
/** The minor component of the Xapian version. /** The minor component of the Xapian version.
* E.g. for Xapian 1.0.14 this would be: 0 * E.g. for Xapian 1.0.14 this would be: 0
*/ */
#define XAPIAN_MINOR_VERSION 2 #define XAPIAN_MINOR_VERSION 2
/** The revision component of the Xapian version. /** The revision component of the Xapian version.
* E.g. for Xapian 1.0.14 this would be: 14 * E.g. for Xapian 1.0.14 this would be: 14
*/ */
#define XAPIAN_REVISION 20 #define XAPIAN_REVISION 21
/// XAPIAN_HAS_BRASS_BACKEND Defined if the brass backend is enabled. /// XAPIAN_HAS_BRASS_BACKEND Defined if the brass backend is enabled.
#define XAPIAN_HAS_BRASS_BACKEND 1 #define XAPIAN_HAS_BRASS_BACKEND 1
/// XAPIAN_HAS_CHERT_BACKEND Defined if the chert backend is enabled. /// XAPIAN_HAS_CHERT_BACKEND Defined if the chert backend is enabled.
#define XAPIAN_HAS_CHERT_BACKEND 1 #define XAPIAN_HAS_CHERT_BACKEND 1
/// XAPIAN_HAS_FLINT_BACKEND Defined if the flint backend is enabled. /// XAPIAN_HAS_FLINT_BACKEND Defined if the flint backend is enabled.
#define XAPIAN_HAS_FLINT_BACKEND 1 #define XAPIAN_HAS_FLINT_BACKEND 1
 End of changes. 5 change blocks. 
3 lines changed or deleted 11 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/