tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add direct qstring to rcl function

Browse Source
This commit is contained in:
dockes 2007-01-19 10:22:06 +00:00
parent af8bfb3fe7
commit 9b2db79f97
2 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/query/wasatorcl.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: wasatorcl.cpp,v 1.4 2007-01-17 14:06:22 dockes Exp $ (C) 2006 J.F.Dockes";
static char rcsid[] = "@(#$Id: wasatorcl.cpp,v 1.5 2007-01-19 10:22:06 dockes Exp $ (C) 2006 J.F.Dockes";
#endif
#ifndef TEST_WASATORCL
@ -8,6 +8,20 @@ static char rcsid[] = "@(#$Id: wasatorcl.cpp,v 1.4 2007-01-17 14:06:22 dockes Ex
#include "searchdata.h"
#include "wasatorcl.h"
Rcl::SearchData *wasaStringToRcl(const string &qs, string &reason)
{
StringToWasaQuery parser;
WasaQuery *wq = parser.stringToQuery(qs, reason);
if (wq == 0)
return 0;
Rcl::SearchData *rq = wasaQueryToRcl(wq);
if (rq == 0) {
reason = "Failed translating wasa query structure to recoll";
return 0;
}
return rq;
}
Rcl::SearchData *wasaQueryToRcl(WasaQuery *wasa)
{
if (wasa == 0)
@ -148,14 +162,14 @@ int main(int argc, char **argv)
bool runQuery(Rcl::Db &rcldb, const string &qs)
{
StringToWasaQuery parser;
string reason;
WasaQuery *wq = parser.stringToQuery(qs, reason);
RefCntr<Rcl::SearchData> rq(wasaQueryToRcl(wq));
if (!rq.getptr())
RefCntr<Rcl::SearchData> rq(wasaStringToRcl(qs, reason));
if (!rq.getptr()) {
cerr << "Query string interpretation failed: " << reason << endl;
return false;
}
rcldb.setQuery(rq);
rcldb.setQuery(rq, Rcl::Db::QO_STEM);
int offset = 0;
int limit = 100;
cout << "Recoll query: " << rq->getDescription() << endl;

4
src/query/wasatorcl.h
View File

@ -1,6 +1,6 @@
#ifndef _WASATORCL_H_INCLUDED_
#define _WASATORCL_H_INCLUDED_
/* @(#$Id: wasatorcl.h,v 1.3 2006-12-10 17:03:08 dockes Exp $ (C) 2006 J.F.Dockes */
/* @(#$Id: wasatorcl.h,v 1.4 2007-01-19 10:22:06 dockes Exp $ (C) 2006 J.F.Dockes */
#include <string>
using std::string;
@ -8,6 +8,8 @@ using std::string;
#include "rcldb.h"
#include "searchdata.h"
extern Rcl::SearchData *wasaStringToRcl(const string& query, string &reason);
class WasaQuery;
extern Rcl::SearchData *wasaQueryToRcl(WasaQuery *wasa);
#endif /* _WASATORCL_H_INCLUDED_ */