Switch to unified view

a/src/rcldb/searchdata.h b/src/rcldb/searchdata.h
...
...
14
 *   Free Software Foundation, Inc.,
14
 *   Free Software Foundation, Inc.,
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
15
 *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16
 */
16
 */
17
#ifndef _SEARCHDATA_H_INCLUDED_
17
#ifndef _SEARCHDATA_H_INCLUDED_
18
#define _SEARCHDATA_H_INCLUDED_
18
#define _SEARCHDATA_H_INCLUDED_
19
/* @(#$Id: searchdata.h,v 1.10 2007-02-13 10:58:32 dockes Exp $  (C) 2004 J.F.Dockes */
19
/* @(#$Id: searchdata.h,v 1.11 2008-01-16 11:14:38 dockes Exp $  (C) 2004 J.F.Dockes */
20
20
21
/** 
21
/** 
22
 * Structures to hold data coming almost directly from the gui
22
 * Structures to hold data coming almost directly from the gui
23
 * search fields and handle its translation to Xapian queries. 
23
 * search fields and handle its translation to Xapian queries. 
24
 * This is not generic code, it reflects the choices made for the user 
24
 * This is not generic code, it reflects the choices made for the user 
...
...
220
    virtual bool toNativeQuery(Rcl::Db &db, void *, const string& stemlang);
220
    virtual bool toNativeQuery(Rcl::Db &db, void *, const string& stemlang);
221
221
222
    // m_slack is declared in SearchDataClauseSimple
222
    // m_slack is declared in SearchDataClauseSimple
223
};
223
};
224
224
225
#ifdef NOTNOW
226
/** Future pointer to subquery ? */
225
/** Future pointer to subquery ? */
227
class SearchDataClauseSub : public SearchDataClause {
226
class SearchDataClauseSub : public SearchDataClause {
228
public:
227
public:
228
    // Note that we take charge of the SearchData * and will delete it.
229
    SearchDataClauseSub(SClType tp, SClType stp) 
229
    SearchDataClauseSub(SClType tp, SearchData *sub) 
230
    : SearchDataClause(tp), m_sub(stp) {}
230
    : SearchDataClause(tp), m_sub(sub) {}
231
    virtual ~SearchDataClauseSub() {}
231
    virtual ~SearchDataClauseSub() {delete m_sub; m_sub = 0;}
232
    virtual bool toNativeQuery(Rcl::Db &db, void *, const string& stemlang);
232
    virtual bool toNativeQuery(Rcl::Db &db, void *, const string& stemlang);
233
233
234
protected:
234
protected:
235
    SearchData m_sub;
235
    SearchData *m_sub;
236
};
236
};
237
#endif // NOTNOW
238
237
239
} // Namespace Rcl
238
} // Namespace Rcl
240
#endif /* _SEARCHDATA_H_INCLUDED_ */
239
#endif /* _SEARCHDATA_H_INCLUDED_ */