document.h   document.h 
skipping to change at line 224 skipping to change at line 224
/// Equivalent end iterator for values_begin(). /// Equivalent end iterator for values_begin().
ValueIterator values_end() const; ValueIterator values_end() const;
/** Get the document id which is associated with this document (if a ny). /** Get the document id which is associated with this document (if a ny).
* *
* NB If multiple databases are being searched together, then this * NB If multiple databases are being searched together, then this
* will be the document id in the individual database, not the merg ed * will be the document id in the individual database, not the merg ed
* database! * database!
* *
* @return If this document came from a database, return the docume nt * @return If this document came from a database, return the docume nt
* id in that database. Otherwise, return 0. * id in that database. Otherwise, return 0 (in Xapian
* 1.0.22/1.2.4 or later; prior to this the returned value
was
* uninitialised).
*/ */
docid get_docid() const; docid get_docid() const;
/// Return a string describing this object. /// Return a string describing this object.
std::string get_description() const; std::string get_description() const;
}; };
} }
#endif // XAPIAN_INCLUDED_DOCUMENT_H #endif // XAPIAN_INCLUDED_DOCUMENT_H
 End of changes. 1 change blocks. 
1 lines changed or deleted 4 lines changed or added


 queryparser.h   queryparser.h 
skipping to change at line 266 skipping to change at line 266
/// 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 right truncation (e.g. Xap*).
* *
* Currently you can't use wildcards with boolean filter prefixes,
* or in a phrase (either an explicitly quoted one, or one implicit
ly
* 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'.
* *
* These require the use of a list of all documents in the database * These require the use of a list of all documents in the database
* which is potentially expensive, so this feature isn't enabled by * which is potentially expensive, so this feature isn't enabled by
* default. * default.
*/ */
FLAG_PURE_NOT = 32, FLAG_PURE_NOT = 32,
/** Enable partial matching. /** Enable partial matching.
* *
* Partial matching causes the parser to treat the query as a * Partial matching causes the parser to treat the query as a
* "partially entered" search. This will automatically treat the * "partially entered" search. This will automatically treat the
* final word as a wildcarded match, unless it is followed by * final word as a wildcarded match, unless it is followed by
* whitespace, to produce more stable results from interactive * whitespace, to produce more stable results from interactive
* searches. * searches.
* *
* Currently FLAG_PARTIAL doesn't do anything if the final word
* in the query has a boolean filter prefix, or if it is in a phras
e
* (either an explicitly quoted one, or one implicitly generated by
* hyphens or other punctuation). It also doesn't do anything if
* if the final word is part of a value range.
*
* 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_PARTIAL = 64, FLAG_PARTIAL = 64,
/** Enable spelling correction. /** Enable spelling correction.
* *
* For each word in the query which doesn't exist as a term in the * For each word in the query which doesn't exist as a term in the
* database, Database::get_spelling_suggestion() will be called and if * database, Database::get_spelling_suggestion() will be called and if
* a suggestion is returned, a corrected version of the query strin g * a suggestion is returned, a corrected version of the query strin g
 End of changes. 2 change blocks. 
0 lines changed or deleted 12 lines changed or added


 types.h   types.h 
/** @file xapian/types.h /** @file xapian/types.h
* @brief typedefs for Xapian * @brief typedefs for Xapian
*/ */
/* Copyright (C) 2007 Olly Betts /* Copyright (C) 2007,2010 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 81 skipping to change at line 81
*/ */
typedef unsigned termpos; typedef unsigned termpos;
/** A signed difference between two term positions. /** A signed difference between two term positions.
* *
* This is used by the Xapian classes which are STL containers of position s * This is used by the Xapian classes which are STL containers of position s
* for "difference_type". * for "difference_type".
*/ */
typedef int termpos_diff; /* FIXME: can overflow. */ typedef int termpos_diff; /* FIXME: can overflow. */
/** A timeout value in microseconds. /** A timeout value in milliseconds.
* *
* There are 1 million microseconds in a second, so for example, to set a * There are 1000 milliseconds in a second, so for example, to set a
* timeout of 5 seconds use 5000000. * timeout of 5 seconds use 5000.
*/ */
typedef unsigned timeout; typedef unsigned timeout;
/** The number for a value slot in a document. /** The number for a value slot in a document.
* *
* Any value slot number except Xapian::BAD_VALUENO is valid. * Any value slot number except Xapian::BAD_VALUENO is valid.
*/ */
typedef unsigned valueno; typedef unsigned valueno;
/** A signed difference between two value slot numbers. /** A signed difference between two value slot numbers.
 End of changes. 3 change blocks. 
4 lines changed or deleted 4 lines changed or added


 version.h   version.h 
skipping to change at line 39 skipping to change at line 39
#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
/// The version of Xapian as a C string literal. /// The version of Xapian as a C string literal.
#define XAPIAN_VERSION "1.0.21" #define XAPIAN_VERSION "1.0.22"
/** 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 0 #define XAPIAN_MINOR_VERSION 0
/** 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 21 #define XAPIAN_REVISION 22
/// 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
/// XAPIAN_HAS_QUARTZ_BACKEND Defined if the quartz backend is enabled. /// XAPIAN_HAS_QUARTZ_BACKEND Defined if the quartz backend is enabled.
#define XAPIAN_HAS_QUARTZ_BACKEND 1 #define XAPIAN_HAS_QUARTZ_BACKEND 1
/// XAPIAN_HAS_INMEMORY_BACKEND Defined if the inmemory backend is enabled. /// XAPIAN_HAS_INMEMORY_BACKEND Defined if the inmemory backend is enabled.
#define XAPIAN_HAS_INMEMORY_BACKEND 1 #define XAPIAN_HAS_INMEMORY_BACKEND 1
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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/