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

command line query: add option -N to print field names between values when -F is used. Interpret [-F ""] as print all fields

Browse Source
This commit is contained in:
Jean-Francois Dockes 2014-04-30 10:01:03 +02:00
parent 0145234b60
commit 0ded457258
1 changed files with 49 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/query/recollq.cpp
View File

@ -58,9 +58,15 @@ bool dump_contents(RclConfig *rclconfig, Rcl::Doc& idoc)
return true; return true;
} }
void output_fields(const vector<string>fields, Rcl::Doc& doc, void output_fields(vector<string> fields, Rcl::Doc& doc,
Rcl::Query& query, Rcl::Db& rcldb) Rcl::Query& query, Rcl::Db& rcldb, bool printnames)
{ {
if (fields.empty()) {
map<string,string>::const_iterator it;
for (it = doc.meta.begin();it != doc.meta.end(); it++) {
fields.push_back(it->first);
}
}
for (vector<string>::const_iterator it = fields.begin(); for (vector<string>::const_iterator it = fields.begin();
it != fields.end(); it++) { it != fields.end(); it++) {
string out; string out;
@ -71,8 +77,15 @@ void output_fields(const vector<string>fields, Rcl::Doc& doc,
} else { } else {
base64_encode(doc.meta[*it], out); base64_encode(doc.meta[*it], out);
} }
// Before printnames existed, recollq printed a single blank for empty
// fields. This is a problem when printing names and using strtok, but
// have to keep the old behaviour when printnames is not set.
if (!(out.empty() && printnames)) {
if (printnames)
cout << *it << " ";
cout << out << " "; cout << out << " ";
} }
}
cout << endl; cout << endl;
} }
@ -82,10 +95,10 @@ static char usage [] =
" [-o|-a|-f] [-q] <query string>\n" " [-o|-a|-f] [-q] <query string>\n"
" Runs a recoll query and displays result lines. \n" " Runs a recoll query and displays result lines. \n"
" Default: will interpret the argument(s) as a xesam query string\n" " Default: will interpret the argument(s) as a xesam query string\n"
" query may be like: \n" " Query elements: \n"
" implicit AND, Exclusion, field spec: t1 -t2 title:t3\n" " * Implicit AND, exclusion, field spec: t1 -t2 title:t3\n"
" OR has priority: t1 OR t2 t3 OR t4 means (t1 OR t2) AND (t3 OR t4)\n" " * OR has priority: t1 OR t2 t3 OR t4 means (t1 OR t2) AND (t3 OR t4)\n"
" Phrase: \"t1 t2\" (needs additional quoting on cmd line)\n" " * Phrase: \"t1 t2\" (needs additional quoting on cmd line)\n"
" -o Emulate the GUI simple search in ANY TERM mode\n" " -o Emulate the GUI simple search in ANY TERM mode\n"
" -a Emulate the GUI simple search in ALL TERMS mode\n" " -a Emulate the GUI simple search in ALL TERMS mode\n"
" -f Emulate the GUI simple search in filename mode\n" " -f Emulate the GUI simple search in filename mode\n"
@ -101,16 +114,18 @@ static char usage [] =
" -m : dump the whole document meta[] array for each result\n" " -m : dump the whole document meta[] array for each result\n"
" -A : output the document abstracts\n" " -A : output the document abstracts\n"
" -S fld : sort by field <fld>\n" " -S fld : sort by field <fld>\n"
" -D : sort descending\n"
" -s stemlang : set stemming language to use (must exist in index...)\n" " -s stemlang : set stemming language to use (must exist in index...)\n"
" Use -s \"\" to turn off stem expansion\n" " Use -s \"\" to turn off stem expansion\n"
" -D : sort descending\n"
" -i <dbdir> : additional index, several can be given\n" " -i <dbdir> : additional index, several can be given\n"
" -e use url encoding (%xx) for urls\n" " -e use url encoding (%xx) for urls\n"
" -F <field name list> : output exactly these fields for each result.\n" " -F <field name list> : output exactly these fields for each result.\n"
" The field values are encoded in base64, output in one line and \n" " The field values are encoded in base64, output in one line and \n"
" separated by one space character. This is the recommended format \n" " separated by one space character. This is the recommended format \n"
" for use by other programs. Use a normal query with option -m to \n" " for use by other programs. Use a normal query with option -m to \n"
" see the field names.\n" " see the field names. Use -F '' to output all fields, but you probably\n"
" also want option -N in this case\n"
" -N : with -F, print the (plain text) field names before the field values\n"
; ;
static void static void
Usage(void) Usage(void)
@ -145,6 +160,7 @@ static int op_flags;
#define OPT_t 0x20000 #define OPT_t 0x20000
#define OPT_e 0x40000 #define OPT_e 0x40000
#define OPT_F 0x80000 #define OPT_F 0x80000
#define OPT_N 0x100000
int recollq(RclConfig **cfp, int argc, char **argv) int recollq(RclConfig **cfp, int argc, char **argv)
{ {
@ -190,6 +206,7 @@ int recollq(RclConfig **cfp, int argc, char **argv)
argc--; goto b1; argc--; goto b1;
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; break;
case 'n': op_flags |= OPT_n; if (argc < 2) Usage(); case 'n': op_flags |= OPT_n; if (argc < 2) Usage();
{ {
string rescnt = *(++argv); string rescnt = *(++argv);
@ -354,7 +371,7 @@ endopts:
break; break;
if (op_flags & OPT_F) { if (op_flags & OPT_F) {
output_fields(fields, doc, query, rcldb); output_fields(fields, doc, query, rcldb, op_flags & OPT_N);
continue; continue;
} }