database.h | database.h | |||
---|---|---|---|---|
skipping to change at line 169 | skipping to change at line 169 | |||
return TermIterator(NULL); | return TermIterator(NULL); | |||
} | } | |||
/** An iterator which runs across all terms with a given prefix. | /** An iterator which runs across all terms with a given prefix. | |||
* | * | |||
* This is functionally similar to getting an iterator with | * This is functionally similar to getting an iterator with | |||
* allterms_begin() and then calling skip_to(prefix) on that iterat or | * allterms_begin() and then calling skip_to(prefix) on that iterat or | |||
* to move to the start of the prefix, but is more convenient (beca use | * to move to the start of the prefix, but is more convenient (beca use | |||
* it detects the end of the prefixed terms), and may be more | * it detects the end of the prefixed terms), and may be more | |||
* efficient than simply calling skip_to() after opening the iterat or, | * efficient than simply calling skip_to() after opening the iterat or, | |||
* particularly for network databases. | * particularly for remote databases. | |||
* | * | |||
* @param prefix The prefix to restrict the returned terms to. | * @param prefix The prefix to restrict the returned terms to. | |||
*/ | */ | |||
TermIterator allterms_begin(const std::string & prefix) const; | TermIterator allterms_begin(const std::string & prefix) const; | |||
/** Corresponding end iterator to allterms_begin(prefix). | /** Corresponding end iterator to allterms_begin(prefix). | |||
*/ | */ | |||
TermIterator allterms_end(const std::string &) const { | TermIterator allterms_end(const std::string &) const { | |||
return TermIterator(NULL); | return TermIterator(NULL); | |||
} | } | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
positioniterator.h | positioniterator.h | |||
---|---|---|---|---|
skipping to change at line 96 | skipping to change at line 96 | |||
Xapian::termpos operator *() const; | Xapian::termpos operator *() const; | |||
PositionIterator & operator++(); | PositionIterator & operator++(); | |||
TermPosWrapper operator++(int) { | TermPosWrapper operator++(int) { | |||
Xapian::termpos tmp = **this; | Xapian::termpos tmp = **this; | |||
operator++(); | operator++(); | |||
return TermPosWrapper(tmp); | return TermPosWrapper(tmp); | |||
} | } | |||
// extra method, not required for an input_iterator | /** Advance the iterator to the specified termpos. | |||
* | ||||
* If the specified termpos isn't in the list, position ourselves o | ||||
n the | ||||
* first termpos after it (or at_end() if no greater term positions | ||||
are | ||||
* present). | ||||
*/ | ||||
void skip_to(Xapian::termpos pos); | void skip_to(Xapian::termpos pos); | |||
/// Return a string describing this object. | /// Return a string describing this object. | |||
std::string get_description() const; | std::string get_description() const; | |||
// Allow use as an STL iterator | // Allow use as an STL iterator | |||
typedef std::input_iterator_tag iterator_category; | typedef std::input_iterator_tag iterator_category; | |||
typedef Xapian::termpos value_type; | typedef Xapian::termpos value_type; | |||
typedef Xapian::termpos_diff difference_type; // "om_termposcount" | typedef Xapian::termpos_diff difference_type; // "om_termposcount" | |||
typedef Xapian::termpos * pointer; | typedef Xapian::termpos * pointer; | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 8 lines changed or added | |||
postingiterator.h | postingiterator.h | |||
---|---|---|---|---|
skipping to change at line 91 | skipping to change at line 91 | |||
void operator=(const PostingIterator &other); | void operator=(const PostingIterator &other); | |||
PostingIterator & operator++(); | PostingIterator & operator++(); | |||
DocIDWrapper operator++(int) { | DocIDWrapper operator++(int) { | |||
Xapian::docid tmp = **this; | Xapian::docid tmp = **this; | |||
operator++(); | operator++(); | |||
return DocIDWrapper(tmp); | return DocIDWrapper(tmp); | |||
} | } | |||
/** Skip the iterator to document did, or the first document after d | /** Advance the iterator to the specified docid. | |||
id | * | |||
* if did isn't in the list of documents being iterated. | * If the specified docid isn't in the list, position ourselves on | |||
the | ||||
* first document after it (or at_end() if no greater docids are | ||||
* present). | ||||
*/ | */ | |||
void skip_to(Xapian::docid did); | void skip_to(Xapian::docid did); | |||
// Get the weight of the posting at the current position: will | // Get the weight of the posting at the current position: will | |||
// need to set a weight object for this to work. | // need to set a weight object for this to work. | |||
// Xapian::weight get_weight() const; | // Xapian::weight get_weight() const; | |||
/// Get the document id at the current position in the postlist. | /// Get the document id at the current position in the postlist. | |||
Xapian::docid operator *() const; | Xapian::docid operator *() const; | |||
End of changes. 1 change blocks. | ||||
3 lines changed or deleted | 6 lines changed or added | |||
termiterator.h | termiterator.h | |||
---|---|---|---|---|
skipping to change at line 88 | skipping to change at line 88 | |||
std::string operator *() const; | std::string operator *() const; | |||
TermIterator & operator++(); | TermIterator & operator++(); | |||
TermNameWrapper operator++(int) { | TermNameWrapper operator++(int) { | |||
std::string tmp = **this; | std::string tmp = **this; | |||
operator++(); | operator++(); | |||
return TermNameWrapper(tmp); | return TermNameWrapper(tmp); | |||
} | } | |||
/** Skip the iterator to term tname, or the first term after tname | /** Advance the iterator to the specified term. | |||
* if tname isn't in the list of terms being iterated. | * | |||
* 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 | ||||
). | ||||
*/ | */ | |||
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 occurences | |||
* of a term in a particular document. | * of a term in a particular document. | |||
*/ | */ | |||
Xapian::termcount get_wdf() const; | Xapian::termcount get_wdf() const; | |||
End of changes. 1 change blocks. | ||||
2 lines changed or deleted | 6 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.22" | #define XAPIAN_VERSION "1.0.23" | |||
/** 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 22 | #define XAPIAN_REVISION 23 | |||
/// 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 | |||