Switch to unified view

a/src/query/wasastringtoquery.h b/src/query/wasastringtoquery.h
...
...
46
 * ignored during the translation to a native Recoll query in wasaToRcl
46
 * ignored during the translation to a native Recoll query in wasaToRcl
47
 */
47
 */
48
class WasaQuery {
48
class WasaQuery {
49
public:
49
public:
50
    /** Type of this element: leaf or AND/OR chain */
50
    /** Type of this element: leaf or AND/OR chain */
51
    enum Op {OP_NULL, OP_LEAF, OP_EXCL, OP_OR, OP_AND};
51
    enum Op {OP_NULL, OP_LEAF, OP_OR, OP_AND};
52
    /** Relation to be searched between field and value. Recoll actually only
52
    /** Relation to be searched between field and value. Recoll actually only
53
    supports "contain" except for a size field */
53
    supports "contain" except for a size field */
54
    enum Rel {REL_NULL, REL_EQUALS, REL_CONTAINS, REL_LT, REL_LTE, 
54
    enum Rel {REL_NULL, REL_EQUALS, REL_CONTAINS, REL_LT, REL_LTE, 
55
          REL_GT, REL_GTE};
55
          REL_GT, REL_GTE};
56
    /** Modifiers for term handling: case/diacritics handling,
56
    /** Modifiers for term handling: case/diacritics handling,
...
...
61
           WQM_FUZZY = 0x200};
61
           WQM_FUZZY = 0x200};
62
62
63
    typedef vector<WasaQuery*> subqlist_t;
63
    typedef vector<WasaQuery*> subqlist_t;
64
64
65
    WasaQuery() 
65
    WasaQuery() 
66
  : m_op(OP_NULL), m_rel(REL_NULL), m_exclude(false), 
66
    : m_op(OP_NULL), m_modifiers(0), m_slack(0), m_weight(1.0)
67
      m_modifiers(0), m_slack(0), m_weight(1.0)
67
    {}
68
    {}
68
69
69
    ~WasaQuery();
70
    ~WasaQuery();
70
71
71
    /** Get string describing the query tree from this point */
72
    /** Get string describing the query tree from this point */
...
...
76
77
77
    /** Field specification if any (ie: title, author ...) Only OPT_LEAF */
78
    /** Field specification if any (ie: title, author ...) Only OPT_LEAF */
78
    string             m_fieldspec;
79
    string             m_fieldspec;
79
    /** Relation between field and value: =, :, <,>,<=, >= */
80
    /** Relation between field and value: =, :, <,>,<=, >= */
80
    WasaQuery::Rel     m_rel;
81
    WasaQuery::Rel     m_rel;
82
83
    /* Negating flag */
84
    bool             m_exclude;
81
85
82
    /* String value. Valid for op == OP_LEAF or EXCL */
86
    /* String value. Valid for op == OP_LEAF or EXCL */
83
    string             m_value;
87
    string             m_value;
84
88
85
    /** Subqueries. Valid for conjunctions */
89
    /** Subqueries. Valid for conjunctions */