enquire.h   enquire.h 
skipping to change at line 907 skipping to change at line 907
* *
* Note that with the default BM25 weighting scheme parameters, * Note that with the default BM25 weighting scheme parameters,
* non-identical documents will rarely have the same weight, so * non-identical documents will rarely have the same weight, so
* this setting will give very similar results to * this setting will give very similar results to
* set_sort_by_relevance(). It becomes more useful with particular * set_sort_by_relevance(). It becomes more useful with particular
* BM25 parameter settings (e.g. BM25Weight(1,0,1,0,0)) or custom * BM25 parameter settings (e.g. BM25Weight(1,0,1,0,0)) or custom
* weighting schemes. * weighting schemes.
* *
* @param sort_key value number to sort on. * @param sort_key value number to sort on.
* *
* @param reverse If true, reverses the sort order. * @param reverse If true, reverses the sort order of sort_key.
*/ */
void set_sort_by_relevance_then_value(Xapian::valueno sort_key, void set_sort_by_relevance_then_value(Xapian::valueno sort_key,
bool reverse); bool reverse);
XAPIAN_DEPRECATED(void set_sort_by_relevance_then_value(Xapian::valu eno sort_key)); XAPIAN_DEPRECATED(void set_sort_by_relevance_then_value(Xapian::valu eno sort_key));
/** Set the sorting to be by relevance, then by keys generated from /** Set the sorting to be by relevance, then by keys generated from
* values. * values.
* *
* Note that with the default BM25 weighting scheme parameters, * Note that with the default BM25 weighting scheme parameters,
* non-identical documents will rarely have the same weight, so * non-identical documents will rarely have the same weight, so
* this setting will give very similar results to * this setting will give very similar results to
* set_sort_by_relevance(). It becomes more useful with particular * set_sort_by_relevance(). It becomes more useful with particular
* BM25 parameter settings (e.g. BM25Weight(1,0,1,0,0)) or custom * BM25 parameter settings (e.g. BM25Weight(1,0,1,0,0)) or custom
* weighting schemes. * weighting schemes.
* *
* @param sorter The functor to use for generating keys. * @param sorter The functor to use for generating keys.
* *
* @param reverse If true, reverses the sort order. * @param reverse If true, reverses the sort order of the generate
d
* keys.
*/ */
void set_sort_by_relevance_then_key(Xapian::KeyMaker * sorter, void set_sort_by_relevance_then_key(Xapian::KeyMaker * sorter,
bool reverse); bool reverse);
XAPIAN_DEPRECATED(void set_sort_by_relevance_then_key(Xapian::KeyMak er * sorter)); XAPIAN_DEPRECATED(void set_sort_by_relevance_then_key(Xapian::KeyMak er * sorter));
/** Get (a portion of) the match set for the current query. /** Get (a portion of) the match set for the current query.
* *
* @param first the first item in the result set to return. * @param first the first item in the result set to return.
* A value of zero corresponds to the first item * A value of zero corresponds to the first item
 End of changes. 2 change blocks. 
2 lines changed or deleted 4 lines changed or added


 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-svn-snapsh ot/tags/1.2.12/xapian/xapian-core/generate-exceptions - do not modify direc tly! */ /* Warning: This file is generated by /data/home/olly/tmp/xapian-svn-snapsh ot/tags/1.2.13/xapian/xapian-core/generate-exceptions - do not modify direc tly! */
/* 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 224 skipping to change at line 224
* For example, if str_ is "created:" and prefix_ is true, and the ran ge * For example, if str_ is "created:" and prefix_ is true, and the ran ge
* processor has been added to the queryparser, the queryparser will * processor has been added to the queryparser, the queryparser will
* accept "created:1/1/2000..31/12/2001". * accept "created:1/1/2000..31/12/2001".
*/ */
DateValueRangeProcessor(Xapian::valueno slot_, const std::string &str_, DateValueRangeProcessor(Xapian::valueno slot_, const std::string &str_,
bool prefix_ = true, bool prefix_ = true,
bool prefer_mdy_ = false, int epoch_year_ = 1970 ) bool prefer_mdy_ = false, int epoch_year_ = 1970 )
: StringValueRangeProcessor(slot_, str_, prefix_), : StringValueRangeProcessor(slot_, str_, prefix_),
prefer_mdy(prefer_mdy_), epoch_year(epoch_year_) { } prefer_mdy(prefer_mdy_), epoch_year(epoch_year_) { }
#ifndef SWIG
/** Constructor.
*
* This is like the previous version, but with const char * instead of
* std::string - we need this overload as otherwise
* DateValueRangeProcessor(1, "date:") quietly interprets the second
* argument as a boolean in preference to std::string. If you want to
* be compatible with 1.2.12 and earlier, then explicitly convert to
* std::string, i.e.: DateValueRangeProcessor(1, std::string("date:"))
*
* @param slot_ The value number to return from operator().
*
* @param str_ A string to look for to recognise values as belongi
ng
* to this date range.
*
* @param prefix_ Whether to look for the string at the start or end
of
* the values. If true, the string is a prefix; if
* false, the string is a suffix (default: true).
*
* @param prefer_mdy_ Should ambiguous dates be interpreted as
* month/day/year rather than day/month/year?
* (default: false)
*
* @param epoch_year_ Year to use as the epoch for dates with 2 digit
* years (default: 1970, so 1/1/69 is 2069 while
* 1/1/70 is 1970).
*
* The string supplied in str_ is used by @a operator() to decide whet
her
* the pair of strings supplied to it constitute a valid range. If
* prefix_ is true, the first value in a range must begin with str_ (a
nd
* the second value may optionally begin with str_);
* if prefix_ is false, the second value in a range must end with str_
* (and the first value may optionally end with str_).
*
* If str_ is empty, the setting of prefix_ is irrelevant, and no spec
ial
* strings are required at the start or end of the strings defining th
e
* range.
*
* The remainder of both strings defining the endpoints must be valid
* dates.
*
* For example, if str_ is "created:" and prefix_ is true, and the ran
ge
* processor has been added to the queryparser, the queryparser will
* accept "created:1/1/2000..31/12/2001".
*/
DateValueRangeProcessor(Xapian::valueno slot_, const char * str_,
bool prefix_ = true,
bool prefer_mdy_ = false, int epoch_year_ = 1970
)
: StringValueRangeProcessor(slot_, str_, prefix_),
prefer_mdy(prefer_mdy_), epoch_year(epoch_year_) { }
#endif
/** Check for a valid date range. /** Check for a valid date range.
* *
* @param[in,out] begin The start of the range as specified in the * @param[in,out] begin The start of the range as specified in the
* query string by the user. This parameter is a * query string by the user. This parameter is a
* non-const reference so the ValueRangeProcess or * non-const reference so the ValueRangeProcess or
* can modify it to return the value to start t he * can modify it to return the value to start t he
* range with. * range with.
* @param[in,out] end The end of the range. This is also a non-co nst * @param[in,out] end The end of the range. This is also a non-co nst
* reference so it can be modified. * reference so it can be modified.
* *
 End of changes. 1 change blocks. 
0 lines changed or deleted 60 lines changed or added


 termgenerator.h   termgenerator.h 
/** @file termgenerator.h /** @file termgenerator.h
* @brief parse free text and generate terms * @brief parse free text and generate terms
*/ */
/* Copyright (C) 2007,2009,2011 Olly Betts /* Copyright (C) 2007,2009,2011,2012 Olly Betts
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or * the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version. * (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 123 skipping to change at line 123
* @param strategy The strategy to use - possible values are: * @param strategy The strategy to use - possible values are:
* - STEM_NONE: Don't perform any stemming - only unstemmed terms * - STEM_NONE: Don't perform any stemming - only unstemmed terms
* are generated. * are generated.
* - STEM_SOME: Generate both stemmed (with a "Z" prefix) and unstem med * - STEM_SOME: Generate both stemmed (with a "Z" prefix) and unstem med
* terms. This is the default strategy. * terms. This is the default strategy.
* - STEM_ALL: Generate only stemmed terms (but without a "Z" prefi x). * - STEM_ALL: Generate only stemmed terms (but without a "Z" prefi x).
* - STEM_ALL_Z: Generate only stemmed terms (with a "Z" prefix). * - STEM_ALL_Z: Generate only stemmed terms (with a "Z" prefix).
*/ */
void set_stemming_strategy(stem_strategy strategy); void set_stemming_strategy(stem_strategy strategy);
/** Set the maximum length word to index.
*
* The limit is on the length of a word prior to stemming and prior to
* adding any term prefix.
*
* The backends mostly impose a limit on the length of terms (often of
* about 240 bytes), but it's generally useful to have a lower limit t
o
* help prevent the index being bloated by useless junk terms from try
ing
* to indexing things like binary data, uuencoded data, ASCII art, etc
.
*
* This method was new in Xapian 1.3.1.
*
* @param max_word_length The maximum length word to index, in bytes i
n
* UTF-8 representation. Default is 64.
*/
void set_max_word_length(unsigned max_word_length);
/** Index some text. /** Index some text.
* *
* @param itor Utf8Iterator pointing to the text to index. * @param itor Utf8Iterator pointing to the text to index.
* @param wdf_inc The wdf increment (default 1). * @param wdf_inc The wdf increment (default 1).
* @param prefix The term prefix to use (default is no prefix). * @param prefix The term prefix to use (default is no prefix).
*/ */
void index_text(const Xapian::Utf8Iterator & itor, void index_text(const Xapian::Utf8Iterator & itor,
Xapian::termcount wdf_inc = 1, Xapian::termcount wdf_inc = 1,
const std::string & prefix = std::string()); const std::string & prefix = std::string());
 End of changes. 2 change blocks. 
1 lines changed or deleted 22 lines changed or added


 unicode.h   unicode.h 
skipping to change at line 247 skipping to change at line 247
/** @internal Extract the delta to use for case conversion of a charact er /** @internal Extract the delta to use for case conversion of a charact er
* from its info. * from its info.
*/ */
inline int get_delta(int info) { inline int get_delta(int info) {
/* It's implementation defined if sign extension happens on right sh ift /* It's implementation defined if sign extension happens on right sh ift
* of a signed int, hence the conditional (hopefully the compiler wi ll * of a signed int, hence the conditional (hopefully the compiler wi ll
* spot this and optimise it to a sign-extending shift on architectu res * spot this and optimise it to a sign-extending shift on architectu res
* with a suitable instruction). * with a suitable instruction).
*/ */
#ifdef __GNUC__
// GCC 4.7.1 doesn't optimise the more complex expression down
// (reported as http://gcc.gnu.org/PR55299), but the documented
// behaviour for GCC is that right shift of a signed integer perform
s
// sign extension:
// http://gcc.gnu.org/onlinedocs/gcc-4.7.2/gcc/Integers-implementati
on.html
return info >> 15;
#else
return (info >= 0) ? (info >> 15) : (~(~info >> 15)); return (info >= 0) ? (info >> 15) : (~(~info >> 15));
#endif
} }
} }
/** Convert a single non-ASCII Unicode character to UTF-8. /** Convert a single non-ASCII Unicode character to UTF-8.
* *
* This is intended mainly as a helper method for to_utf8(). * This is intended mainly as a helper method for to_utf8().
* *
* @param ch The character (which must be > 128) to write to @a buf. * @param ch The character (which must be > 128) to write to @a buf.
* @param buf The buffer to write the character to - it must have * @param buf The buffer to write the character to - it must have
* space for (at least) 4 bytes. * space for (at least) 4 bytes.
 End of changes. 2 change blocks. 
0 lines changed or deleted 11 lines changed or added


 version.h   version.h 
skipping to change at line 46 skipping to change at line 46
#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.12" #define XAPIAN_VERSION "1.2.13"
/** 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 12 #define XAPIAN_REVISION 13
/// 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. 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/