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

Add recollq and Python API options to collapse duplicate results

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-11-12 09:30:29 +01:00
parent 9c7886e2df
commit 10b6069f0d
4 changed files with 66 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/doc/user/usermanual.html
View File

@ -6872,7 +6872,8 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r
</dd> </dd>
<dt><span class= <dt><span class=
"term">Query.execute(query_string, stemming=1, "term">Query.execute(query_string, stemming=1,
stemlang="english", fetchtext=False)</span></dt> stemlang="english", fetchtext=False,
collapseduplicates=False)</span></dt>
<dd> <dd>
<p>Starts a search for <em class= <p>Starts a search for <em class=
"replaceable"><code>query_string</code></em>, a "replaceable"><code>query_string</code></em>, a
@ -6885,7 +6886,8 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r
</dd> </dd>
<dt><span class= <dt><span class=
"term">Query.executesd(SearchData, "term">Query.executesd(SearchData,
fetchtext=False)</span></dt> fetchtext=False,
collapseduplicates=False)</span></dt>
<dd> <dd>
<p>Starts a search for the query defined by the <p>Starts a search for the query defined by the
SearchData object. If the index stores the SearchData object. If the index stores the

4
src/doc/user/usermanual.xml
View File

@ -5271,7 +5271,7 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>Query.execute(query_string, stemming=1, stemlang="english", fetchtext=False)</term> <term>Query.execute(query_string, stemming=1, stemlang="english", fetchtext=False, collapseduplicates=False)</term>
<listitem><para>Starts a search <listitem><para>Starts a search
for <replaceable>query_string</replaceable>, a &RCL; for <replaceable>query_string</replaceable>, a &RCL;
search language string. If the index stores the document search language string. If the index stores the document
@ -5281,7 +5281,7 @@ text/html [file:///Users/uncrypted-dockes/projets/bateaux/ilur/factEtCie/r
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term>Query.executesd(SearchData, fetchtext=False)</term> <term>Query.executesd(SearchData, fetchtext=False, collapseduplicates=False)</term>
<listitem><para>Starts a search for the query defined by <listitem><para>Starts a search for the query defined by
the SearchData object. If the index stores the document the SearchData object. If the index stores the document
texts and <literal>fetchtext</literal> is True, store the texts and <literal>fetchtext</literal> is True, store the

29
src/python/recoll/pyrecoll.cpp
View File

@ -958,15 +958,16 @@ Query_execute(recoll_QueryObject* self, PyObject *args, PyObject *kwargs)
{ {
LOGDEB0("Query_execute\n"); LOGDEB0("Query_execute\n");
static const char *kwlist[] = {"query_string", "stemming", "stemlang", static const char *kwlist[] = {"query_string", "stemming", "stemlang",
"fetchtext", NULL}; "fetchtext", "collapseduplicates", NULL};
char *sutf8 = 0; // needs freeing char *sutf8 = 0; // needs freeing
char *sstemlang = 0; char *sstemlang = 0;
PyObject *dostemobj = 0; PyObject *dostemobj = 0;
PyObject *fetchtextobj = 0; PyObject *fetchtextobj = 0;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "es|OesO:Query_execute", PyObject *collapseobj = 0;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "es|OesOO:Query_execute",
(char**)kwlist, "utf-8", &sutf8, (char**)kwlist, "utf-8", &sutf8,
&dostemobj, &dostemobj, "utf-8", &sstemlang,
"utf-8", &sstemlang, &fetchtextobj)) { &fetchtextobj, &collapseobj)) {
return 0; return 0;
} }
@ -995,6 +996,12 @@ Query_execute(recoll_QueryObject* self, PyObject *args, PyObject *kwargs)
return 0; return 0;
} }
if (collapseobj != 0 && PyObject_IsTrue(collapseobj)) {
self->query->setCollapseDuplicates(true);
} else {
self->query->setCollapseDuplicates(false);
}
// SearchData defaults to stemming in english // SearchData defaults to stemming in english
// Use default for now but need to add way to specify language // Use default for now but need to add way to specify language
string reason; string reason;
@ -1025,12 +1032,14 @@ static PyObject *
Query_executesd(recoll_QueryObject* self, PyObject *args, PyObject *kwargs) Query_executesd(recoll_QueryObject* self, PyObject *args, PyObject *kwargs)
{ {
LOGDEB0("Query_executeSD\n"); LOGDEB0("Query_executeSD\n");
static const char *kwlist[] = {"searchdata", "fetchtext", NULL}; static const char *kwlist[] = {"searchdata", "fetchtext",
"collapseduplicates", NULL};
recoll_SearchDataObject *pysd = 0; recoll_SearchDataObject *pysd = 0;
PyObject *fetchtextobj = 0; PyObject *fetchtextobj = 0;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!|O:Query_execute", PyObject *collapseobj = 0;
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!|OO:Query_execute",
(char **)kwlist, &recoll_SearchDataType, (char **)kwlist, &recoll_SearchDataType,
&pysd, &fetchtextobj)) { &pysd, &fetchtextobj, &collapseobj)) {
return 0; return 0;
} }
if (pysd == 0 || self->query == 0) { if (pysd == 0 || self->query == 0) {
@ -1042,6 +1051,12 @@ Query_executesd(recoll_QueryObject* self, PyObject *args, PyObject *kwargs)
} else { } else {
self->fetchtext = false; self->fetchtext = false;
} }
if (collapseobj != 0 && PyObject_IsTrue(collapseobj)) {
self->query->setCollapseDuplicates(true);
} else {
self->query->setCollapseDuplicates(false);
}
self->query->setSortBy(*self->sortfield, self->ascending); self->query->setSortBy(*self->sortfield, self->ascending);
self->query->setQuery(pysd->sd); self->query->setQuery(pysd->sd);
int cnt = self->query->getResCnt(); int cnt = self->query->getResCnt();

62
src/query/recollq.cpp
View File

@ -107,6 +107,7 @@ static char usage [] =
" -q is just ignored (compatibility with the recoll GUI command line).\n" " -q is just ignored (compatibility with the recoll GUI command line).\n"
"Common options:\n" "Common options:\n"
" -c <configdir> : specify config directory, overriding $RECOLL_CONFDIR.\n" " -c <configdir> : specify config directory, overriding $RECOLL_CONFDIR.\n"
" -C : collapse duplicates\n"
" -d also dump file contents.\n" " -d also dump file contents.\n"
" -n [first-]<cnt> define the result slice. The default value for [first]\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" " is 0. Without the option, the default max count is 2000.\n"
@ -137,34 +138,43 @@ Usage(void)
exit(1); exit(1);
} }
// BEWARE COMPATIBILITy WITH recoll OPTIONS letters // BEWARE COMPATIBILITY WITH recoll OPTIONS letters
// -q, -t and -l are accepted and ignored
// -a/f/o -c have the same meaning
// -h and -v -> Usage()
static int op_flags; static int op_flags;
#define OPT_A 0x1 #define OPT_A 0x1
// gui: -a same
#define OPT_a 0x2 #define OPT_a 0x2
#define OPT_b 0x4 #define OPT_b 0x4
#define OPT_c 0x8 #define OPT_C 0x8
#define OPT_D 0x10 // gui: -c same
#define OPT_d 0x20 #define OPT_c 0x10
#define OPT_e 0x40 #define OPT_D 0x20
#define OPT_F 0x80 #define OPT_d 0x40
#define OPT_f 0x100 #define OPT_e 0x80
#define OPT_i 0x200 #define OPT_F 0x100
#define OPT_l 0x400 // gui: -f same
#define OPT_m 0x800 #define OPT_f 0x200
#define OPT_N 0x1000 // gui uses -h for help. us: usage
#define OPT_n 0x2000 #define OPT_i 0x400
#define OPT_o 0x4000 // gui uses -L to set language of messages
#define OPT_P 0x8000 // gui: -l same
#define OPT_Q 0x10000 #define OPT_l 0x800
#define OPT_q 0x20000 #define OPT_m 0x1000
#define OPT_S 0x40000 #define OPT_N 0x2000
#define OPT_s 0x80000 #define OPT_n 0x4000
#define OPT_T 0x100000 // gui: -o same
#define OPT_t 0x200000 #define OPT_o 0x8000
#define OPT_P 0x10000
#define OPT_Q 0x20000
// gui: -q same
#define OPT_q 0x40000
#define OPT_S 0x80000
#define OPT_s 0x100000
#define OPT_T 0x200000
// gui: -t use command line, us: ignored
#define OPT_t 0x400000
// gui uses -v : show version. Us: usage
// gui uses -w : open minimized
int recollq(RclConfig **cfp, int argc, char **argv) int recollq(RclConfig **cfp, int argc, char **argv)
{ {
@ -196,6 +206,7 @@ int recollq(RclConfig **cfp, int argc, char **argv)
case 'A': op_flags |= OPT_A; break; case 'A': op_flags |= OPT_A; break;
case 'a': op_flags |= OPT_a; break; case 'a': op_flags |= OPT_a; break;
case 'b': op_flags |= OPT_b; break; case 'b': op_flags |= OPT_b; break;
case 'C': op_flags |= OPT_C; break;
case 'c': op_flags |= OPT_c; if (argc < 2) Usage(); case 'c': op_flags |= OPT_c; if (argc < 2) Usage();
a_config = *(++argv); a_config = *(++argv);
argc--; goto b1; argc--; goto b1;
@ -344,6 +355,9 @@ endopts:
std::shared_ptr<Rcl::SearchData> rq(sd); std::shared_ptr<Rcl::SearchData> rq(sd);
Rcl::Query query(&rcldb); Rcl::Query query(&rcldb);
if (op_flags & OPT_C) {
query.setCollapseDuplicates(true);
}
if (op_flags & OPT_S) { if (op_flags & OPT_S) {
query.setSortBy(sortfield, (op_flags & OPT_D) ? false : true); query.setSortBy(sortfield, (op_flags & OPT_D) ? false : true);
} }