database.h   database.h 
skipping to change at line 895 skipping to change at line 895
}; };
/** Open for read/write; create if no db exists. */ /** Open for read/write; create if no db exists. */
const int DB_CREATE_OR_OPEN = 1; const int DB_CREATE_OR_OPEN = 1;
/** Create a new database; fail if db exists. */ /** Create a new database; fail if db exists. */
const int DB_CREATE = 2; const int DB_CREATE = 2;
/** Overwrite existing db; create if none exists. */ /** Overwrite existing db; create if none exists. */
const int DB_CREATE_OR_OVERWRITE = 3; const int DB_CREATE_OR_OVERWRITE = 3;
/** Open for read/write; fail if no db exists. */ /** Open for read/write; fail if no db exists. */
const int DB_OPEN = 4; const int DB_OPEN = 4;
// Can't see any sensible use for this one
// const int DB_OVERWRITE = XXX;
} }
#endif /* XAPIAN_INCLUDED_DATABASE_H */ #endif /* XAPIAN_INCLUDED_DATABASE_H */
 End of changes. 1 change blocks. 
2 lines changed or deleted 0 lines changed or added


 enquire.h   enquire.h 
/** \file enquire.h /** \file enquire.h
* \brief API for running queries * \brief API for running queries
*/ */
/* Copyright 1999,2000,2001 BrightStation PLC /* Copyright 1999,2000,2001 BrightStation PLC
* Copyright 2001,2002 Ananova Ltd * Copyright 2001,2002 Ananova Ltd
* Copyright 2002,2003,2004,2005,2006,2007,2008,2009 Olly Betts * Copyright 2002,2003,2004,2005,2006,2007,2008,2009,2011 Olly Betts
* Copyright 2009 Lemur Consulting Ltd * Copyright 2009 Lemur Consulting Ltd
* Copyright 2011 Action Without Borders
* *
* 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 968 skipping to change at line 969
* be applied in a lazier fashion. * be applied in a lazier fashion.
* *
* @deprecated this parameter is deprecated - use the * @deprecated this parameter is deprecated - use the
* newer MatchSpy class and add_matchspy() method * newer MatchSpy class and add_matchspy() method
* instead. * instead.
* *
* @return A Xapian::MSet object containing the results of the * @return A Xapian::MSet object containing the results of the
* query. * query.
* *
* @exception Xapian::InvalidArgumentError See class documentation . * @exception Xapian::InvalidArgumentError See class documentation .
*
* @{
*/ */
MSet get_mset(Xapian::doccount first, Xapian::doccount maxitems, MSet get_mset(Xapian::doccount first, Xapian::doccount maxitems,
Xapian::doccount checkatleast = 0, Xapian::doccount checkatleast = 0,
const RSet * omrset = 0, const RSet * omrset = 0,
const MatchDecider * mdecider = 0) const; const MatchDecider * mdecider = 0) const;
XAPIAN_DEPRECATED( XAPIAN_DEPRECATED(
MSet get_mset(Xapian::doccount first, Xapian::doccount maxitems, MSet get_mset(Xapian::doccount first, Xapian::doccount maxitems,
Xapian::doccount checkatleast, Xapian::doccount checkatleast,
const RSet * omrset, const RSet * omrset,
const MatchDecider * mdecider, const MatchDecider * mdecider,
const MatchDecider * matchspy) const); const MatchDecider * matchspy) const);
MSet get_mset(Xapian::doccount first, Xapian::doccount maxitems, MSet get_mset(Xapian::doccount first, Xapian::doccount maxitems,
const RSet * omrset, const RSet * omrset,
const MatchDecider * mdecider = 0) const { const MatchDecider * mdecider = 0) const {
return get_mset(first, maxitems, 0, omrset, mdecider); return get_mset(first, maxitems, 0, omrset, mdecider);
} }
/** @} */
static const int INCLUDE_QUERY_TERMS = 1; static const int INCLUDE_QUERY_TERMS = 1;
static const int USE_EXACT_TERMFREQ = 2; static const int USE_EXACT_TERMFREQ = 2;
/** Get the expand set for the given rset. /** Get the expand set for the given rset.
* *
* @param maxitems the maximum number of items to return. * @param maxitems the maximum number of items to return.
* @param omrset the relevance set to use when performing * @param omrset the relevance set to use when performing
* the expand operation. * the expand operation.
* @param flags zero or more of these values |-ed together: * @param flags zero or more of these values |-ed together:
skipping to change at line 1005 skipping to change at line 1009
* terms may be returned from expand * terms may be returned from expand
* - Xapian::Enquire::USE_EXACT_TERMFREQ for mult i * - Xapian::Enquire::USE_EXACT_TERMFREQ for mult i
* dbs, calculate the exact termfreq; otherwise an * dbs, calculate the exact termfreq; otherwise an
* approximation is used which can greatly impr ove * approximation is used which can greatly impr ove
* efficiency, but still returns good results. * efficiency, but still returns good results.
* @param k the parameter k in the query expansion algorith m * @param k the parameter k in the query expansion algorith m
* (default is 1.0) * (default is 1.0)
* @param edecider a decision functor to use to decide whether a * @param edecider a decision functor to use to decide whether a
* given term should be put in the ESet * given term should be put in the ESet
* *
* @param min_wt the minimum weight for included terms
*
* @return An ESet object containing the results of the * @return An ESet object containing the results of the
* expand. * expand.
* *
* @exception Xapian::InvalidArgumentError See class documentation . * @exception Xapian::InvalidArgumentError See class documentation .
*/ */
ESet get_eset(Xapian::termcount maxitems, ESet get_eset(Xapian::termcount maxitems,
const RSet & omrset, const RSet & omrset,
int flags = 0, int flags = 0,
double k = 1.0, double k = 1.0,
const Xapian::ExpandDecider * edecider = 0) const; const Xapian::ExpandDecider * edecider = 0) const;
skipping to change at line 1034 skipping to change at line 1040
* @return An ESet object containing the results of the * @return An ESet object containing the results of the
* expand. * expand.
* *
* @exception Xapian::InvalidArgumentError See class documentation . * @exception Xapian::InvalidArgumentError See class documentation .
*/ */
inline ESet get_eset(Xapian::termcount maxitems, const RSet & omrset , inline ESet get_eset(Xapian::termcount maxitems, const RSet & omrset ,
const Xapian::ExpandDecider * edecider) const { const Xapian::ExpandDecider * edecider) const {
return get_eset(maxitems, omrset, 0, 1.0, edecider); return get_eset(maxitems, omrset, 0, 1.0, edecider);
} }
/** Get the expand set for the given rset.
*
* @param maxitems the maximum number of items to return.
* @param omrset the relevance set to use when performing
* the expand operation.
* @param flags zero or more of these values |-ed together:
* - Xapian::Enquire::INCLUDE_QUERY_TERMS query
* terms may be returned from expand
* - Xapian::Enquire::USE_EXACT_TERMFREQ for mult
i
* dbs, calculate the exact termfreq; otherwise
an
* approximation is used which can greatly impr
ove
* efficiency, but still returns good results.
* @param k the parameter k in the query expansion algorith
m
* (default is 1.0)
* @param edecider a decision functor to use to decide whether a
* given term should be put in the ESet
*
* @param min_wt the minimum weight for included terms
*
* @return An ESet object containing the results of the
* expand.
*
* @exception Xapian::InvalidArgumentError See class documentation
.
*/
ESet get_eset(Xapian::termcount maxitems,
const RSet & omrset,
int flags,
double k,
const Xapian::ExpandDecider * edecider,
Xapian::weight min_wt) const;
/** Get terms which match a given document, by document id. /** Get terms which match a given document, by document id.
* *
* This method returns the terms in the current query which match * This method returns the terms in the current query which match
* the given document. * the given document.
* *
* It is possible for the document to have been removed from the * It is possible for the document to have been removed from the
* database between the time it is returned in an MSet, and the * database between the time it is returned in an MSet, and the
* time that this call is made. If possible, you should specify * time that this call is made. If possible, you should specify
* an MSetIterator instead of a Xapian::docid, since this will enab le * an MSetIterator instead of a Xapian::docid, since this will enab le
* database backends with suitable support to prevent this * database backends with suitable support to prevent this
 End of changes. 6 change blocks. 
1 lines changed or deleted 43 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.4/xapian/xapian-core/generate-exceptions - do not modify direct ly! */ /* Warning: This file is generated by /data/home/olly/tmp/xapian-svn-snapsh ot/tags/1.2.5/xapian/xapian-core/generate-exceptions - do not modify direct ly! */
/* 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


 termiterator.h   termiterator.h 
skipping to change at line 87 skipping to change at line 87
/** Advance the iterator to the specified term. /** Advance the iterator to the specified term.
* *
* If the specified term isn't in the list, position ourselves on t he * If the specified term isn't in the list, position ourselves on t he
* first term after it (or at_end() if no greater terms are present ). * first term after it (or at_end() if no greater terms are present ).
*/ */
void skip_to(const std::string & tname); void skip_to(const std::string & tname);
/** Return the wdf of the current term (if meaningful). /** Return the wdf of the current term (if meaningful).
* *
* The wdf (within document frequency) is the number of occurences * The wdf (within document frequency) is the number of occurrences
* of a term in a particular document. * of a term in a particular document.
*/ */
Xapian::termcount get_wdf() const; Xapian::termcount get_wdf() const;
/** Return the term frequency of the current term (if meaningful). /** Return the term frequency of the current term (if meaningful).
* *
* The term frequency is the number of documents which a term index es. * The term frequency is the number of documents which a term index es.
*/ */
Xapian::doccount get_termfreq() const; Xapian::doccount get_termfreq() const;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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.4" #define XAPIAN_VERSION "1.2.5"
/** 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 4 #define XAPIAN_REVISION 5
/// 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/