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

recollq: allow selecting a result slice

Browse Source
This commit is contained in:
Jean-Francois Dockes 2012-02-24 08:22:37 +01:00
parent 9ebe8570a6
commit 3fd65ea4cf
1 changed files with 36 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/query/recollq.cpp
View File

@ -94,7 +94,9 @@ static char usage [] =
"Common options:\n" "Common options:\n"
" -c <configdir> : specify config directory, overriding $RECOLL_CONFDIR\n" " -c <configdir> : specify config directory, overriding $RECOLL_CONFDIR\n"
" -d also dump file contents\n" " -d also dump file contents\n"
" -n <cnt> limit the maximum number of results (0->no limit, default 2000)\n" " -n [first-]<cnt> define the result slice. The default value for [first]\n"
" is 0. Without the option, the default max count is 2000.\n"
" Use n=0 for no limit\n"
" -b : basic. Just output urls, no mime types or titles\n" " -b : basic. Just output urls, no mime types or titles\n"
" -Q : no result lines, just the processed query and result count\n" " -Q : no result lines, just the processed query and result count\n"
" -m : dump the whole document meta[] array for each result\n" " -m : dump the whole document meta[] array for each result\n"
@ -152,7 +154,8 @@ int recollq(RclConfig **cfp, int argc, char **argv)
string sf; string sf;
vector<string> fields; vector<string> fields;
int limit = 2000; int firstres = 0;
int maxcount = 2000;
thisprog = argv[0]; thisprog = argv[0];
argc--; argv++; argc--; argv++;
@ -182,9 +185,20 @@ int recollq(RclConfig **cfp, int argc, char **argv)
case 'l': op_flags |= OPT_l; break; case 'l': op_flags |= OPT_l; break;
case 'm': op_flags |= OPT_m; break; case 'm': op_flags |= OPT_m; break;
case 'n': op_flags |= OPT_n; if (argc < 2) Usage(); case 'n': op_flags |= OPT_n; if (argc < 2) Usage();
limit = atoi(*(++argv)); {
if (limit <= 0) limit = INT_MAX; string rescnt = *(++argv);
argc--; goto b1; string::size_type dash = rescnt.find("-");
if (dash != string::npos) {
firstres = atoi(rescnt.substr(0, dash).c_str());
if (dash < rescnt.size()-1) {
maxcount = atoi(rescnt.substr(dash+1).c_str());
}
} else {
maxcount = atoi(rescnt.c_str());
}
if (maxcount <= 0) maxcount = INT_MAX;
}
argc--; goto b1;
case 'o': op_flags |= OPT_o; break; case 'o': op_flags |= OPT_o; break;
case 'P': op_flags |= OPT_P; break; case 'P': op_flags |= OPT_P; break;
case 'q': op_flags |= OPT_q; break; case 'q': op_flags |= OPT_q; break;
@ -308,25 +322,24 @@ int recollq(RclConfig **cfp, int argc, char **argv)
int cnt = query.getResCnt(); int cnt = query.getResCnt();
if (!(op_flags & OPT_b)) { if (!(op_flags & OPT_b)) {
cout << "Recoll query: " << rq->getDescription() << endl; cout << "Recoll query: " << rq->getDescription() << endl;
if (cnt <= limit) if (firstres == 0) {
cout << cnt << " results" << endl; if (cnt <= maxcount)
else cout << cnt << " results" << endl;
cout << cnt << " results (printing " << limit << " max):" << endl; else
cout << cnt << " results (printing " << maxcount << " max):"
<< endl;
} else {
cout << "Printing at most " << cnt - (firstres+maxcount) <<
" results from first " << firstres << endl;
}
} }
if (op_flags & OPT_Q) if (op_flags & OPT_Q)
cout << "Query setup took " << chron.millis() << " mS" << endl; cout << "Query setup took " << chron.millis() << " mS" << endl;
TempDir tmpdir;
if (!tmpdir.ok()) {
cerr << "Can't create temporary directory: " <<
tmpdir.getreason() << endl;
return(1);
}
if (op_flags & OPT_Q) if (op_flags & OPT_Q)
return(0); return(0);
for (int i = 0; i < limit; i++) { for (int i = firstres; i < firstres + maxcount; i++) {
Rcl::Doc doc; Rcl::Doc doc;
if (!query.getDoc(i, doc)) if (!query.getDoc(i, doc))
break; break;
@ -366,6 +379,12 @@ int recollq(RclConfig **cfp, int argc, char **argv)
} }
} }
if (op_flags & OPT_d) { if (op_flags & OPT_d) {
static TempDir tmpdir;
if (!tmpdir.ok()) {
cerr << "Can't create temporary directory: " <<
tmpdir.getreason() << endl;
return(1);
}
dump_contents(rclconfig, tmpdir, doc); dump_contents(rclconfig, tmpdir, doc);
} }
} }