| queryparser.h | | queryparser.h | |
| | | | |
| skipping to change at line 95 | | skipping to change at line 95 | |
| }; | | }; | |
| | | | |
| /// Base class for value range processors. | | /// Base class for value range processors. | |
| struct XAPIAN_VISIBILITY_DEFAULT ValueRangeProcessor { | | struct XAPIAN_VISIBILITY_DEFAULT ValueRangeProcessor { | |
| /// Destructor. | | /// Destructor. | |
| virtual ~ValueRangeProcessor(); | | virtual ~ValueRangeProcessor(); | |
| | | | |
| /** Check for a valid range of this type. | | /** Check for a valid range of this type. | |
| * | | * | |
| * If this ValueRangeProcessor recognises BEGIN..END it returns the | | * If this ValueRangeProcessor recognises BEGIN..END it returns the | |
|
| * value number of range filter on. Otherwise it returns | | * value number to range filter on. Otherwise it returns | |
| * Xapian::BAD_VALUENO. | | * Xapian::BAD_VALUENO. | |
| */ | | */ | |
| virtual Xapian::valueno operator()(std::string &begin, std::string &end
) = 0; | | virtual Xapian::valueno operator()(std::string &begin, std::string &end
) = 0; | |
| }; | | }; | |
| | | | |
| /** Handle a string range. | | /** Handle a string range. | |
| * | | * | |
| * The end points can be any strings. | | * The end points can be any strings. | |
| */ | | */ | |
| class XAPIAN_VISIBILITY_DEFAULT StringValueRangeProcessor : public ValueRan
geProcessor { | | class XAPIAN_VISIBILITY_DEFAULT StringValueRangeProcessor : public ValueRan
geProcessor { | |
| | | | |
| skipping to change at line 395 | | skipping to change at line 395 | |
| * OP_NEAR and OP_PHRASE can also be useful. | | * OP_NEAR and OP_PHRASE can also be useful. | |
| * | | * | |
| * So for example, 'weather forecast' is parsed as if it were 'weather
OR | | * So for example, 'weather forecast' is parsed as if it were 'weather
OR | |
| * forecast' by default. | | * forecast' by default. | |
| */ | | */ | |
| void set_default_op(Query::op default_op); | | void set_default_op(Query::op default_op); | |
| | | | |
| /** Get the current default operator. */ | | /** Get the current default operator. */ | |
| Query::op get_default_op() const; | | Query::op get_default_op() const; | |
| | | | |
|
| /// Specify the database being searched. | | /** Specify the database being searched. | |
| | | * | |
| | | * The database is used for wildcard expansion (FLAG_WILDCARD and | |
| | | * FLAG_PARTIAL), spelling correction (FLAG_SPELLING_CORRECTION), and | |
| | | * synonyms (FLAG_SYNONYM, FLAG_AUTO_SYNONYMS, and | |
| | | * FLAG_AUTO_MULTIWORD_SYNONYMS). | |
| | | */ | |
| void set_database(const Database &db); | | void set_database(const Database &db); | |
| | | | |
| /** Parse a query. | | /** Parse a query. | |
| * | | * | |
| * @param query_string A free-text query as entered by a user | | * @param query_string A free-text query as entered by a user | |
| * @param flags Zero or more Query::feature_flag specifying | | * @param flags Zero or more Query::feature_flag specifying | |
| * what features the QueryParser should support. Combine | | * what features the QueryParser should support. Combine | |
| * multiple values with bitwise-or (|) (default FLAG_DEFAULT). | | * multiple values with bitwise-or (|) (default FLAG_DEFAULT). | |
| * @param default_prefix The default term prefix to use (default none)
. | | * @param default_prefix The default term prefix to use (default none)
. | |
| * For example, you can pass "A" when parsing an "Author" field
. | | * For example, you can pass "A" when parsing an "Author" field
. | |
| * | | * | |
| * @exception If the query string can't be parsed, then | | * @exception If the query string can't be parsed, then | |
| * Xapian::QueryParserError is thrown. You can get an Engli
sh | | * Xapian::QueryParserError is thrown. You can get an Engli
sh | |
| * error message to report to the user by catching it and | | * error message to report to the user by catching it and | |
| * calling get_msg() on the caught exception. The current | | * calling get_msg() on the caught exception. The current | |
| * possible values (in case you want to translate them) are: | | * possible values (in case you want to translate them) are: | |
| * | | * | |
|
| * * Unknown range operation | | * @li Unknown range operation | |
| * * parse error | | * @li parse error | |
| * * Syntax: <expression> AND <expression> | | * @li Syntax: <expression> AND <expression> | |
| * * Syntax: <expression> AND NOT <expression> | | * @li Syntax: <expression> AND NOT <expression> | |
| * * Syntax: <expression> NOT <expression> | | * @li Syntax: <expression> NOT <expression> | |
| * * Syntax: <expression> OR <expression> | | * @li Syntax: <expression> OR <expression> | |
| * * Syntax: <expression> XOR <expression> | | * @li Syntax: <expression> XOR <expression> | |
| */ | | */ | |
| Query parse_query(const std::string &query_string, | | Query parse_query(const std::string &query_string, | |
| unsigned flags = FLAG_PHRASE|FLAG_BOOLEAN|FLAG_LOVEHAT
E, | | unsigned flags = FLAG_PHRASE|FLAG_BOOLEAN|FLAG_LOVEHAT
E, | |
| const std::string &default_prefix = ""); | | const std::string &default_prefix = ""); | |
| | | | |
| /** Add a probabilistic term prefix. | | /** Add a probabilistic term prefix. | |
| * | | * | |
| * For example: | | * For example: | |
| * | | * | |
| * @code | | * @code | |
| | | | |
End of changes. 3 change blocks. |
| 9 lines changed or deleted | | 15 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.20" | | #define XAPIAN_VERSION "1.0.21" | |
| | | | |
| /** 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 20 | | #define XAPIAN_REVISION 21 | |
| | | | |
| /// 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 | |
|