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

allow recoll to be used as a recollq driver

Browse Source
This commit is contained in:
dockes 2007-11-08 09:35:47 +00:00
parent 9935f7b3e4
commit 29b38f21e9
7 changed files with 123 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/Makefile
View File

@ -8,8 +8,8 @@ LIBS = librcl.a
all: $(LIBS)
OBJS = rclaspell.o rclconfig.o rclinit.o textsplit.o unacpp.o csguess.o indexer.o mimetype.o htmlparse.o myhtmlparse.o mimehandler.o internfile.o mh_exec.o mh_html.o mh_mail.o mh_mbox.o mh_text.o docseq.o docseqdb.o docseqhist.o history.o sortseq.o wasastringtoquery.o wasatorcl.o pathhash.o rcldb.o searchdata.o stemdb.o stoplist.o base64.o conftree.o copyfile.o debuglog.o execmd.o fstreewalk.o idfile.o md5.o mimeparse.o pathut.o readfile.o smallut.o transcode.o wipedir.o x11mon.o
DEPS = rclaspell.dep.stamp rclconfig.dep.stamp rclinit.dep.stamp textsplit.dep.stamp unacpp.dep.stamp csguess.dep.stamp indexer.dep.stamp mimetype.dep.stamp htmlparse.dep.stamp myhtmlparse.dep.stamp mimehandler.dep.stamp internfile.dep.stamp mh_exec.dep.stamp mh_html.dep.stamp mh_mail.dep.stamp mh_mbox.dep.stamp mh_text.dep.stamp docseq.dep.stamp docseqdb.dep.stamp docseqhist.dep.stamp history.dep.stamp sortseq.dep.stamp wasastringtoquery.dep.stamp wasatorcl.dep.stamp pathhash.dep.stamp rcldb.dep.stamp searchdata.dep.stamp stemdb.dep.stamp stoplist.dep.stamp base64.dep.stamp conftree.dep.stamp copyfile.dep.stamp debuglog.dep.stamp execmd.dep.stamp fstreewalk.dep.stamp idfile.dep.stamp md5.dep.stamp mimeparse.dep.stamp pathut.dep.stamp readfile.dep.stamp smallut.dep.stamp transcode.dep.stamp wipedir.dep.stamp x11mon.dep.stamp
OBJS = rclaspell.o rclconfig.o rclinit.o textsplit.o unacpp.o csguess.o indexer.o mimetype.o htmlparse.o myhtmlparse.o mimehandler.o internfile.o mh_exec.o mh_html.o mh_mail.o mh_mbox.o mh_text.o docseq.o docseqdb.o docseqhist.o history.o recollq.o sortseq.o wasastringtoquery.o wasatorcl.o pathhash.o rcldb.o searchdata.o stemdb.o stoplist.o base64.o conftree.o copyfile.o debuglog.o execmd.o fstreewalk.o idfile.o md5.o mimeparse.o pathut.o readfile.o smallut.o transcode.o wipedir.o x11mon.o
DEPS = rclaspell.dep.stamp rclconfig.dep.stamp rclinit.dep.stamp textsplit.dep.stamp unacpp.dep.stamp csguess.dep.stamp indexer.dep.stamp mimetype.dep.stamp htmlparse.dep.stamp myhtmlparse.dep.stamp mimehandler.dep.stamp internfile.dep.stamp mh_exec.dep.stamp mh_html.dep.stamp mh_mail.dep.stamp mh_mbox.dep.stamp mh_text.dep.stamp docseq.dep.stamp docseqdb.dep.stamp docseqhist.dep.stamp history.dep.stamp recollq.dep.stamp sortseq.dep.stamp wasastringtoquery.dep.stamp wasatorcl.dep.stamp pathhash.dep.stamp rcldb.dep.stamp searchdata.dep.stamp stemdb.dep.stamp stoplist.dep.stamp base64.dep.stamp conftree.dep.stamp copyfile.dep.stamp debuglog.dep.stamp execmd.dep.stamp fstreewalk.dep.stamp idfile.dep.stamp md5.dep.stamp mimeparse.dep.stamp pathut.dep.stamp readfile.dep.stamp smallut.dep.stamp transcode.dep.stamp wipedir.dep.stamp x11mon.dep.stamp
librcl.a : $(DEPS) $(OBJS) unac.o
ar ru librcl.a $(OBJS) unac.o
@ -59,6 +59,8 @@ docseqhist.o : ../query/docseqhist.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../query/docseqhist.cpp
history.o : ../query/history.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../query/history.cpp
recollq.o : ../query/recollq.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../query/recollq.cpp
sortseq.o : ../query/sortseq.cpp
$(CXX) $(ALL_CXXFLAGS) -c ../query/sortseq.cpp
wasastringtoquery.o : ../query/wasastringtoquery.cpp
@ -174,6 +176,9 @@ docseqhist.dep.stamp : ../query/docseqhist.cpp
history.dep.stamp : ../query/history.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../query/history.cpp > history.dep
touch history.dep.stamp
recollq.dep.stamp : ../query/recollq.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../query/recollq.cpp > recollq.dep
touch recollq.dep.stamp
sortseq.dep.stamp : ../query/sortseq.cpp
$(CXX) -M $(ALL_CXXFLAGS) ../query/sortseq.cpp > sortseq.dep
touch sortseq.dep.stamp
@ -264,6 +269,7 @@ include docseq.dep
include docseqdb.dep
include docseqhist.dep
include history.dep
include recollq.dep
include sortseq.dep
include wasastringtoquery.dep
include wasatorcl.dep

1
src/lib/mkMake
View File

@ -25,6 +25,7 @@ ${depth}/query/docseq.cpp \
${depth}/query/docseqdb.cpp \
${depth}/query/docseqhist.cpp \
${depth}/query/history.cpp \
${depth}/query/recollq.cpp \
${depth}/query/sortseq.cpp \
${depth}/query/wasastringtoquery.cpp \
${depth}/query/wasatorcl.cpp \

55
src/qtgui/main.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: main.cpp,v 1.62 2007-10-05 08:03:01 dockes Exp $ (C) 2005 J.F.Dockes";
static char rcsid[] = "@(#$Id: main.cpp,v 1.63 2007-11-08 09:35:47 dockes Exp $ (C) 2005 J.F.Dockes";
#endif
/*
* This program is free software; you can redistribute it and/or modify
@ -58,6 +58,7 @@ static char rcsid[] = "@(#$Id: main.cpp,v 1.62 2007-10-05 08:03:01 dockes Exp $
#include "rclaspell.h"
#endif
#include "smallut.h"
#include "recollq.h"
#ifdef WITH_KDE
static const char description[] =
@ -144,27 +145,35 @@ static void sigcleanup(int)
extern void qInitImages_recoll();
static const char *thisprog;
// ATTENTION A LA COMPATIBILITE AVEC LES OPTIONS DE recollq
static int op_flags;
#define OPT_MOINS 0x1
#define OPT_h 0x4
#define OPT_c 0x20
#define OPT_q 0x40
#define OPT_O 0x80
#define OPT_L 0x100
#define OPT_F 0x200
#define OPT_o 0x80
#define OPT_l 0x100
#define OPT_f 0x200
#define OPT_a 0x400
#define OPT_t 0x800
static const char usage [] =
"\n"
"recoll [-h] [-c <configdir>]\n"
"recoll [-h] [-c <configdir>] [-q options]\n"
" -h : Print help and exit\n"
" -c <configdir> : specify config directory, overriding $RECOLL_CONFDIR\n"
" -q 'query' [-o|l|f]: search query to be executed on startup as if entered\n"
" into simple search. The default mode is AND (but see modifier options)\n"
" [-o|l|f|a] [-t] -q 'query' : search query to be executed as if entered\n"
" into simple search. The default is to interpret the argument as a \n"
" query language string (but see modifier options)\n"
" In most cases, the query string should be quoted with single-quotes to\n"
" avoid shell interpretation\n"
" -L : the query will be interpreted as a query language string\n"
" -O : the query will be interpreted as an OR query\n"
" -F : the query will be interpreted as a filename search\n"
" -a : the query will be interpreted as an AND query.\n"
" -o : the query will be interpreted as an OR query.\n"
" -f : the query will be interpreted as a filename search\n"
" -l : the query will be interpreted as a query language string (default)\n"
" -t : terminal display: no gui. Results go to stdout. MUST be given\n"
" explicitely as -t (not ie, -at), and -q <query> MUST\n"
" be last on the command line if this is used.\n"
;
static void
Usage(void)
@ -176,6 +185,12 @@ Usage(void)
int main(int argc, char **argv)
{
for (int i = 0; i < argc; i++) {
if (!strcmp(argv[i], "-t")) {
exit(recollq(&rclconfig, argc, argv));
}
}
#ifdef WITH_KDE
KAboutData about("recoll", I18N_NOOP("Recoll"), rclversion, description,
KAboutData::License_GPL, "(C) 2006 Jean-Francois Dockes", 0, 0, "jean-francois.dockes@wanadoo.fr");
@ -201,16 +216,18 @@ int main(int argc, char **argv)
Usage();
while (**argv)
switch (*(*argv)++) {
case 'a': op_flags |= OPT_a; break;
case 'c': op_flags |= OPT_c; if (argc < 2) Usage();
a_config = *(++argv);
argc--; goto b1;
case 'F': op_flags |= OPT_F; break;
case 'f': op_flags |= OPT_f; break;
case 'h': op_flags |= OPT_h; Usage();break;
case 'L': op_flags |= OPT_L; break;
case 'O': op_flags |= OPT_O; break;
case 'l': op_flags |= OPT_l; break;
case 'o': op_flags |= OPT_o; break;
case 'q': op_flags |= OPT_q; if (argc < 2) Usage();
qstring = *(++argv);
argc--; goto b1;
case 't': op_flags |= OPT_t; break;
}
b1: argc--; argv++;
}
@ -348,14 +365,14 @@ int main(int argc, char **argv)
start_idxthread(*rclconfig);
if (op_flags & OPT_q) {
SSearch::SSearchType stype;
if (op_flags & OPT_O) {
if (op_flags & OPT_o) {
stype = SSearch::SST_ANY;
} else if (op_flags & OPT_F) {
} else if (op_flags & OPT_f) {
stype = SSearch::SST_FNM;
} else if (op_flags & OPT_L) {
stype = SSearch::SST_LANG;
} else {
} else if (op_flags & OPT_a) {
stype = SSearch::SST_ALL;
} else {
stype = SSearch::SST_LANG;
}
mainWindow->sSearch->searchTypCMB->setCurrentItem(int(stype));
mainWindow->

2
src/qtgui/recoll.pro.in
View File

@ -86,6 +86,6 @@ TRANSLATIONS = i18n/recoll_de.ts \
i18n/recoll_fr.ts \
i18n/recoll_it.ts \
i18n/recoll_ru.ts \
i18n/recoll_.ts \
i18n/recoll_tr.ts \
i18n/recoll_uk.ts \
i18n/recoll_xx.ts

2
src/query/Makefile
View File

@ -19,7 +19,7 @@ recollq : $(RECOLLQ_OBJS)
$(CXX) $(ALL_CXXFLAGS) -o recollq $(RECOLLQ_OBJS) \
$(LIBICONV) $(LIBXAPIAN) $(LIBSYS)
recollq.o : recollq.cpp
$(CXX) $(ALL_CXXFLAGS) -c recollq.cpp
$(CXX) $(ALL_CXXFLAGS) -DTEST_RECOLLQ -c recollq.cpp
HISTORY_OBJS= trhist.o $(BIGLIB) $(MIMELIB)
trhist : $(HISTORY_OBJS)

99
src/query/recollq.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: recollq.cpp,v 1.9 2007-11-08 07:54:45 dockes Exp $ (C) 2006 J.F.Dockes";
static char rcsid[] = "@(#$Id: recollq.cpp,v 1.10 2007-11-08 09:35:47 dockes Exp $ (C) 2006 J.F.Dockes";
#endif
/*
* This program is free software; you can redistribute it and/or modify
@ -17,9 +17,9 @@ static char rcsid[] = "@(#$Id: recollq.cpp,v 1.9 2007-11-08 07:54:45 dockes Exp
* Free Software Foundation, Inc.,
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
// Takes a query and run it, no gui, results to stdout
// Takes a query expressed in wasabi/recoll simple language and run it
#ifndef TEST_RECOLLQ
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@ -42,7 +42,7 @@ using namespace std;
static char *thisprog;
static char usage [] =
" [-o|-a] <query string>\n"
" [-o|-a|-f] <query string>\n"
" Runs a recoll query and displays result lines. \n"
" Default: will interpret the argument(s) as a wasabi query string\n"
" query may be like: \n"
@ -51,6 +51,7 @@ static char usage [] =
" Phrase: \"t1 t2\" (needs additional quoting on cmd line)\n"
" -o Emulate the gui simple search in ANY TERM mode\n"
" -a Emulate the gui simple search in ALL TERMS mode\n"
" -f Emulate the gui simple search in filename mode\n"
"Common options:\n"
" -c <configdir> : specify config directory, overriding $RECOLL_CONFDIR\n"
" -d also dump file contents\n"
@ -60,26 +61,25 @@ static char usage [] =
static void
Usage(void)
{
fprintf(stderr, "%s: usage:\n%s", thisprog, usage);
cerr << thisprog << ": usage:" << endl << usage;
exit(1);
}
// ATTENTION A LA COMPATIBILITE AVEC LES OPTIONS DE recoll
// OPT_q and OPT_t are ignored
static int op_flags;
#define OPT_MOINS 0x1
#define OPT_o 0x2
#define OPT_a 0x4
#define OPT_c 0x8
#define OPT_d 0x10
#define OPT_n 0x20
#define OPT_b 0x40
#define OPT_f 0x80
#define OPT_l 0x100
#define OPT_q 0x200
#define OPT_t 0x400
static RclConfig *rclconfig;
RclConfig *RclConfig::getMainConfig()
{
return rclconfig;
}
int main(int argc, char **argv)
int recollq(RclConfig **cfp, int argc, char **argv)
{
string a_config;
int limit = 2000;
@ -99,11 +99,15 @@ int main(int argc, char **argv)
a_config = *(++argv);
argc--; goto b1;
case 'd': op_flags |= OPT_d; break;
case 'f': op_flags |= OPT_f; break;
case 'l': op_flags |= OPT_l; break;
case 'n': op_flags |= OPT_n; if (argc < 2) Usage();
limit = atoi(*(++argv));
if (limit <= 0) limit = INT_MAX;
argc--; goto b1;
case 'o': op_flags |= OPT_o; break;
case 'q': op_flags |= OPT_q; break;
case 't': op_flags |= OPT_t; break;
default: Usage(); break;
}
b1: argc--; argv++;
@ -120,8 +124,8 @@ int main(int argc, char **argv)
Rcl::Db rcldb;
string dbdir;
string reason;
rclconfig = recollinit(0, 0, reason, &a_config);
*cfp = recollinit(0, 0, reason, &a_config);
RclConfig *rclconfig = *cfp;
if (!rclconfig || !rclconfig->ok()) {
fprintf(stderr, "Recoll init failed: %s\n", reason.c_str());
exit(1);
@ -132,17 +136,23 @@ int main(int argc, char **argv)
Rcl::SearchData *sd = 0;
if ((op_flags & OPT_a) || (op_flags & OPT_o)) {
if (op_flags & (OPT_a|OPT_o|OPT_f)) {
sd = new Rcl::SearchData(Rcl::SCLT_OR);
// If there is no white space inside the query, then the user
// certainly means it as a phrase.
bool isreallyaphrase = false;
if (qs.find_first_of(" \t") == string::npos)
isreallyaphrase = true;
Rcl::SearchDataClause *clp = isreallyaphrase ?
new Rcl::SearchDataClauseDist(Rcl::SCLT_PHRASE, qs, 0) :
new Rcl::SearchDataClauseSimple((op_flags & OPT_o)?
Rcl::SCLT_OR : Rcl::SCLT_AND, qs);
Rcl::SearchDataClause *clp = 0;
if (op_flags & OPT_f) {
clp = new Rcl::SearchDataClauseFilename(qs);
} else {
// If there is no white space inside the query, then the user
// certainly means it as a phrase.
bool isreallyaphrase = false;
if (qs.find_first_of(" \t") == string::npos)
isreallyaphrase = true;
clp = isreallyaphrase ?
new Rcl::SearchDataClauseDist(Rcl::SCLT_PHRASE, qs, 0) :
new Rcl::SearchDataClauseSimple((op_flags & OPT_o)?
Rcl::SCLT_OR : Rcl::SCLT_AND,
qs);
}
if (sd)
sd->addClause(clp);
} else {
@ -156,12 +166,15 @@ int main(int argc, char **argv)
RefCntr<Rcl::SearchData> rq(sd);
rcldb.setQuery(rq, Rcl::Db::QO_STEM);
cout << "Recoll query: " << rq->getDescription() << endl;
int cnt = rcldb.getResCnt();
if (cnt <= limit)
cout << cnt << " results:" << endl;
else
cout << cnt << " results (printing " << limit << " max):" << endl;
if (!(op_flags & OPT_b)) {
cout << "Recoll query: " << rq->getDescription() << endl;
if (cnt <= limit)
cout << cnt << " results:" << endl;
else
cout << cnt << " results (printing " << limit << " max):" << endl;
}
string tmpdir;
for (int i = 0; i < limit; i++) {
int pc;
@ -191,8 +204,8 @@ int main(int argc, char **argv)
if (tmpdir.empty() || access(tmpdir.c_str(), 0) < 0) {
string reason;
if (!maketmpdir(tmpdir, reason)) {
fprintf(stderr, "cannot create temporary directory: %s\n",
reason.c_str());
cerr << "Cannot create temporary directory: "
<< reason << endl;
return 1;
}
}
@ -211,9 +224,29 @@ int main(int argc, char **argv)
if (tmpdir.length()) {
wipedir(tmpdir);
if (rmdir(tmpdir.c_str()) < 0) {
fprintf(stderr, "cannot clear temp dir %s\n", tmpdir.c_str());
cerr << "Cannot clear temp dir " << tmpdir << endl;
}
}
return 0;
}
#else // TEST_RECOLLQ The test driver is actually the useful program...
#include <stdlib.h>
#include "rclconfig.h"
#include "recollq.h"
static RclConfig *rclconfig;
RclConfig *RclConfig::getMainConfig()
{
return rclconfig;
}
int main(int argc, char **argv)
{
exit(recollq(&rclconfig, argc, argv));
}
#endif // TEST_RECOLLQ

10
src/query/recollq.h Normal file
View File

@ -0,0 +1,10 @@
#ifndef _recollq_h_included_
#define _recollq_h_included_
/* @(#$Id: recollq.h,v 1.1 2007-11-08 09:35:47 dockes Exp $ (C) 2007 J.F.Dockes */
/// Execute query, print results to stdout. This is just an api to the
/// recollq command line program.
class RclConfig;
extern int recollq(RclConfig **cfp, int argc, char **argv);
#endif /* _recollq_h_included_ */