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

use and_maybe in adv search

Browse Source
This commit is contained in:
dockes 2005-11-16 17:29:38 +00:00
parent 9f52e4ce90
commit 615a52ec81
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mk/localdefs
View File

@ -5,5 +5,5 @@ XAPIANCXXFLAGS=-I/usr/local/include
LIBICONV=-L/usr/local/lib -liconv LIBICONV=-L/usr/local/lib -liconv
INCICONV=-I/usr/local/include INCICONV=-I/usr/local/include
LOCALCXXFLAGS = $(INCICONV) $(CXXFLAGSXAPIAN) LOCALCXXFLAGS = $(INCICONV) $(XAPIANCXXFLAGS)

4
src/rcldb/rcldb.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.36 2005-11-14 09:56:49 dockes Exp $ (C) 2004 J.F.Dockes"; static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.37 2005-11-16 17:29:38 dockes Exp $ (C) 2004 J.F.Dockes";
#endif #endif
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -880,7 +880,7 @@ bool Rcl::Db::setQuery(AdvSearchData &sdata, QueryOpts opts,
nq = Xapian::Query(Xapian::Query::OP_OR, pqueries.begin(), nq = Xapian::Query(Xapian::Query::OP_OR, pqueries.begin(),
pqueries.end()); pqueries.end());
xq = xq.empty() ? nq : xq = xq.empty() ? nq :
Xapian::Query(Xapian::Query::OP_AND, xq, nq); Xapian::Query(Xapian::Query::OP_AND_MAYBE, xq, nq);
pqueries.clear(); pqueries.clear();
} }
} }