Switch to unified view

a/src/rcldb/rclquery_p.h b/src/rcldb/rclquery_p.h
...
...
18
    /** The query I belong to */
18
    /** The query I belong to */
19
    Query                *m_q;
19
    Query                *m_q;
20
    /** query descriptor: terms and subqueries joined by operators
20
    /** query descriptor: terms and subqueries joined by operators
21
     * (or/and etc...)
21
     * (or/and etc...)
22
     */
22
     */
23
    Xapian::Query    query; 
23
    Xapian::Query    xquery; 
24
24
25
    /** In case there is a postq filter: sequence of db indices that match */
25
    /** In case there is a postq filter: sequence of db indices that match */
26
    vector<int> m_dbindices; 
26
    vector<int> m_dbindices; 
27
27
28
    // Filtering results on location. There are 2 possible approaches
28
    // Filtering results on location. There are 2 possible approaches
...
...
45
    // preprocessor directive.
45
    // preprocessor directive.
46
#define XAPIAN_FILTERING 1
46
#define XAPIAN_FILTERING 1
47
    Xapian::MatchDecider *decider;   // Xapian does the filtering
47
    Xapian::MatchDecider *decider;   // Xapian does the filtering
48
    Xapian::MatchDecider *postfilter; // Result filtering done by Recoll
48
    Xapian::MatchDecider *postfilter; // Result filtering done by Recoll
49
49
50
    Xapian::Enquire      *enquire; // Open query descriptor.
50
    Xapian::Enquire      *xenquire; // Open query descriptor.
51
    Xapian::MSet          mset;    // Partial result set
51
    Xapian::MSet          xmset;    // Partial result set
52
    // Term frequencies for current query. See makeAbstract, setQuery
52
    // Term frequencies for current query. See makeAbstract, setQuery
53
    map<string, double>  termfreqs; 
53
    map<string, double>  termfreqs; 
54
54
55
    Native(Query *q)
55
    Native(Query *q)
56
    : m_q(q), decider(0), postfilter(0), enquire(0)
56
    : m_q(q), decider(0), postfilter(0), xenquire(0)
57
    { }
57
    { }
58
    ~Native() {
58
    ~Native() {
59
    clear();
59
    clear();
60
    }
60
    }
61
    void clear() {
61
    void clear() {
62
    m_dbindices.clear();
62
    m_dbindices.clear();
63
    delete decider; decider = 0;
63
    delete decider; decider = 0;
64
    delete postfilter; postfilter = 0;
64
    delete postfilter; postfilter = 0;
65
    delete enquire; enquire = 0;
65
    delete xenquire; xenquire = 0;
66
    termfreqs.clear();
66
    termfreqs.clear();
67
    }
67
    }
68
};
68
};
69
69
70
}
70
}