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

recollq: add synonyms use option

Browse Source
This commit is contained in:
Jean-Francois Dockes 2015-11-21 12:52:41 +01:00
parent a724c76967
commit 15110701cc
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/query/recollq.cpp
View File

@ -119,6 +119,7 @@ static char usage [] =
" -D : sort descending\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"
" -T <synonyms file>: use the parameter (Thesaurus) for word expansion"
" -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"
@ -148,21 +149,22 @@ static int op_flags;
#define OPT_c 0x8 #define OPT_c 0x8
#define OPT_D 0x10 #define OPT_D 0x10
#define OPT_d 0x20 #define OPT_d 0x20
#define OPT_f 0x40 #define OPT_e 0x40
#define OPT_i 0x80 #define OPT_F 0x80
#define OPT_l 0x100 #define OPT_f 0x100
#define OPT_m 0x200 #define OPT_i 0x200
#define OPT_n 0x400 #define OPT_l 0x400
#define OPT_o 0x800 #define OPT_m 0x800
#define OPT_P 0x1000 #define OPT_N 0x1000
#define OPT_Q 0x2000 #define OPT_n 0x2000
#define OPT_q 0x4000 #define OPT_o 0x4000
#define OPT_S 0x8000 #define OPT_P 0x8000
#define OPT_s 0x10000 #define OPT_Q 0x10000
#define OPT_t 0x20000 #define OPT_q 0x20000
#define OPT_e 0x40000 #define OPT_S 0x40000
#define OPT_F 0x80000 #define OPT_s 0x80000
#define OPT_N 0x100000 #define OPT_T 0x100000
#define OPT_t 0x200000
int recollq(RclConfig **cfp, int argc, char **argv) int recollq(RclConfig **cfp, int argc, char **argv)
{ {
@ -172,6 +174,7 @@ int recollq(RclConfig **cfp, int argc, char **argv)
list<string> extra_dbs; list<string> extra_dbs;
string sf; string sf;
vector<string> fields; vector<string> fields;
string syngroupsfn;
int firstres = 0; int firstres = 0;
int maxcount = 2000; int maxcount = 2000;
@ -235,6 +238,9 @@ int recollq(RclConfig **cfp, int argc, char **argv)
stemlang = *(++argv); stemlang = *(++argv);
argc--; goto b1; argc--; goto b1;
case 't': op_flags |= OPT_t; break; case 't': op_flags |= OPT_t; break;
case 'T': op_flags |= OPT_T; if (argc < 2) Usage();
syngroupsfn = *(++argv);
argc--; goto b1;
default: Usage(); break; default: Usage(); break;
} }
b1: argc--; argv++; b1: argc--; argv++;
@ -267,6 +273,12 @@ endopts:
} }
} }
} }
if (!syngroupsfn.empty()) {
if (!rcldb.setSynGroupsFile(syngroupsfn)) {
cerr << "Can't use synonyms file: " << syngroupsfn << endl;
exit(1);
}
}
if (!rcldb.open(Rcl::Db::DbRO)) { if (!rcldb.open(Rcl::Db::DbRO)) {
cerr << "Cant open database in " << rclconfig->getDbDir() << cerr << "Cant open database in " << rclconfig->getDbDir() <<