Switch to unified view

a/src/rcldb/searchdata.h b/src/rcldb/searchdata.h
...
...
70
70
71
 */
71
 */
72
class SearchData {
72
class SearchData {
73
public:
73
public:
74
    SearchData(SClType tp) 
74
    SearchData(SClType tp) 
75
        : m_tp(tp), m_haveDates(false), m_haveWildCards(false) 
75
        : m_tp(tp), m_topdirexcl(false), m_haveDates(false), 
76
    m_haveWildCards(false) 
76
    {
77
    {
77
    if (m_tp != SCLT_OR && m_tp != SCLT_AND) 
78
    if (m_tp != SCLT_OR && m_tp != SCLT_AND) 
78
        m_tp = SCLT_OR;
79
        m_tp = SCLT_OR;
79
    }
80
    }
80
    ~SearchData() {erase();}
81
    ~SearchData() {erase();}
...
...
100
    before toNativeQuery().
101
    before toNativeQuery().
101
    */
102
    */
102
    bool maybeAddAutoPhrase();
103
    bool maybeAddAutoPhrase();
103
104
104
    /** Set/get top subdirectory for filtering results */
105
    /** Set/get top subdirectory for filtering results */
105
    void setTopdir(const string& t) {m_topdir = t;}
106
    void setTopdir(const string& t, bool excl = false) 
106
    string getTopdir() {return m_topdir;}
107
    {
108
  m_topdir = t;
109
  m_topdirexcl = excl;
110
    }
107
111
108
    /** Set date span for filtering results */
112
    /** Set date span for filtering results */
109
    void setDateSpan(DateInterval *dip) {m_dates = *dip; m_haveDates = true;}
113
    void setDateSpan(DateInterval *dip) {m_dates = *dip; m_haveDates = true;}
110
114
111
    /** Add file type for filtering results */
115
    /** Add file type for filtering results */
...
...
136
private:
140
private:
137
    SClType                   m_tp; // Only SCLT_AND or SCLT_OR here
141
    SClType                   m_tp; // Only SCLT_AND or SCLT_OR here
138
    vector<SearchDataClause*> m_query;
142
    vector<SearchDataClause*> m_query;
139
    vector<string>            m_filetypes; // Restrict to filetypes if set.
143
    vector<string>            m_filetypes; // Restrict to filetypes if set.
140
    string                    m_topdir; // Restrict to subtree.
144
    string                    m_topdir; // Restrict to subtree.
145
    bool                      m_topdirexcl; // Invert meaning
141
    bool                      m_haveDates;
146
    bool                      m_haveDates;
142
    DateInterval              m_dates; // Restrict to date interval
147
    DateInterval              m_dates; // Restrict to date interval
143
    // Printable expanded version of the complete query, retrieved/set
148
    // Printable expanded version of the complete query, retrieved/set
144
    // from rcldb after the Xapian::setQuery() call
149
    // from rcldb after the Xapian::setQuery() call
145
    string m_description; 
150
    string m_description;