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.19/xapian/xapian-core/generate-exceptions - do not modify direc tly! */ /* 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! */
/* 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
skipping to change at line 64 skipping to change at line 64
const char * type; const char * type;
/** Optional value of 'errno' associated with this error. /** Optional value of 'errno' associated with this error.
* *
* If no value is associated, this member variable will be 0. * If no value is associated, this member variable will be 0.
* *
* On UNIX, if this value is < 0, it's a negated h_errno value (giving * On UNIX, if this value is < 0, it's a negated h_errno value (giving
* an error from gethostbyname() or similar). * an error from gethostbyname() or similar).
* *
* On Windows, if this value is < 0, it's a negated Windows error code * On Windows, if this value is < 0, it's a negated Windows error code
* (as given by GetLastError() or WSAGetLastError()). * (as given by GetLastError()), while if it is >= WSABASEERR then it
is a
* WinSock error code (as given by WSAGetLastError()). Prior to Xapia
n
* 1.2.20 and 1.3.3, WSAGetLastError() codes were also negated.
* *
* NB We don't just call this member "errno" to avoid problems on * NB We don't just call this member "errno" to avoid problems on
* platforms where errno is a preprocessor macro. * platforms where errno is a preprocessor macro.
*/ */
int my_errno; int my_errno;
/** The error string derived from my_errno. /** The error string derived from my_errno.
* *
* This string is generated from my_errno lazily. * This string is generated from my_errno lazily.
*/ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 6 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.19" #define XAPIAN_VERSION "1.2.20"
/** 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 19 #define XAPIAN_REVISION 20
/// 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


 weight.h   weight.h 
/** @file weight.h /** @file weight.h
* @brief Weighting scheme API. * @brief Weighting scheme API.
*/ */
/* Copyright (C) 2007,2008,2009,2010,2011,2012 Olly Betts /* Copyright (C) 2007,2008,2009,2010,2011,2012,2014 Olly Betts
* Copyright (C) 2009 Lemur Consulting Ltd * Copyright (C) 2009 Lemur Consulting Ltd
* *
* 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
skipping to change at line 37 skipping to change at line 37
#include <xapian/types.h> #include <xapian/types.h>
#include <xapian/visibility.h> #include <xapian/visibility.h>
namespace Xapian { namespace Xapian {
/** Abstract base class for weighting schemes. */ /** Abstract base class for weighting schemes. */
class XAPIAN_VISIBILITY_DEFAULT Weight { class XAPIAN_VISIBILITY_DEFAULT Weight {
protected: protected:
/// Stats which the weighting scheme can use (see @a need_stat()). /// Stats which the weighting scheme can use (see @a need_stat()).
typedef enum { typedef enum {
/// Number of documents in the collection.
COLLECTION_SIZE = 1, COLLECTION_SIZE = 1,
/// Number of documents in the RSet.
RSET_SIZE = 2, RSET_SIZE = 2,
/// Average length of documents in the collection.
AVERAGE_LENGTH = 4, AVERAGE_LENGTH = 4,
/// How many documents the current term is in.
TERMFREQ = 8, TERMFREQ = 8,
/// How many documents in the RSet the current term is in.
RELTERMFREQ = 16, RELTERMFREQ = 16,
/// Sum of wqf for terms in the query.
QUERY_LENGTH = 32, QUERY_LENGTH = 32,
/// Within-query-frequency of the current term.
WQF = 64, WQF = 64,
/// Within-document-frequency of the current term in the current doc ument.
WDF = 128, WDF = 128,
/// Length of the current document (sum wdf).
DOC_LENGTH = 256, DOC_LENGTH = 256,
/// Lower bound on (non-zero) document lengths.
DOC_LENGTH_MIN = 512, DOC_LENGTH_MIN = 512,
/// Upper bound on document lengths.
DOC_LENGTH_MAX = 1024, DOC_LENGTH_MAX = 1024,
/// Upper bound on wdf.
WDF_MAX = 2048 WDF_MAX = 2048
} stat_flags; } stat_flags;
/** Tell Xapian that your subclass will want a particular statistic. /** Tell Xapian that your subclass will want a particular statistic.
* *
* Some of the statistics can be costly to fetch or calculate, so * Some of the statistics can be costly to fetch or calculate, so
* Xapian needs to know which are actually going to be used. You * Xapian needs to know which are actually going to be used. You
* should call need_stat() from your constructor for each such * should call need_stat() from your constructor for each such
* statistic. * statistic.
* *
 End of changes. 13 change blocks. 
1 lines changed or deleted 13 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/