alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib/query,parser: update to use mu-message-fields

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2022-03-04 00:06:31 +02:00
parent 7c185590e4
commit 0df7a6959a
8 changed files with 229 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/mu-data.hh
View File

@ -24,6 +24,7 @@
#include <iostream>
#include <regex>
#include <mu-message.hh>
#include <utils/mu-utils.hh>
namespace Mu {
@ -34,13 +35,14 @@ struct Data {
enum class Type { Value, Range };
virtual ~Data() = default;
Type type; /**< type of data */
std::string field; /**< full name of the field */
std::string prefix; /**< Xapian prefix for thef field */
unsigned id; /**< Xapian value no for the field */
Type type; /**< type of data */
std::string field; /**< full name of the field */
std::string prefix; /**< Xapian prefix for thef field */
Message::Field::Id id; /**< Xapian value no for the field */
protected:
Data(Type _type, const std::string& _field, const std::string& _prefix, unsigned _id)
Data(Type _type, const std::string& _field, const std::string& _prefix,
Message::Field::Id _id)
: type(_type), field(_field), prefix(_prefix), id(_id)
{
}
@ -80,7 +82,7 @@ struct Range : public Data {
*/
Range(const std::string& _field,
const std::string& _prefix,
unsigned _id,
Message::Field::Id _id,
const std::string& _lower,
const std::string& _upper)
:
@ -103,12 +105,12 @@ struct Value : public Data {
*
* @param _field the field
* @param _prefix the xapian prefix
* @param _id xapian value number
* @param _id field id
* @param _value the value
*/
Value(const std::string& _field,
const std::string& _prefix,
unsigned _id,
Message::Field::Id _id,
const std::string& _value,
bool _phrase = false)
: Data(Value::Type::Value, _field, _prefix, _id), value(_value), phrase(_phrase)