mirror of https://github.com/djcb/mu.git
make OP_WILDCARD non-conditional
Since we require Xapian 1.4 anyway, there's no need to make OP_WILDCARD conditional.
This commit is contained in:
parent
2fd8058443
commit
a76720af42
|
@ -174,7 +174,7 @@ PKG_CHECK_MODULES(XAPIAN,xapian-core >= 1.4,[
|
|||
|
||||
AS_CASE([$xapian_version],
|
||||
[1.[[4-9]].[[0-9]]*],
|
||||
[AC_DEFINE([XAPIAN_HAVE_OP_WILDCARD],[1],[Xapian::Query::OP_WILDCARD?])],
|
||||
[AC_MSG_NOTICE([xapian $xapian_version found.])],
|
||||
[AC_MSG_ERROR([*** xapian version >= 1.4 needed, but version $xapian_version found.])])
|
||||
|
||||
XAPIAN_CXXFLAGS="$($XAPIAN_CONFIG --cxxflags)"
|
||||
|
|
|
@ -56,16 +56,12 @@ xapian_query_op (const Mu::Tree& tree)
|
|||
static Xapian::Query
|
||||
make_query (const Value* val, const std::string& str, bool maybe_wildcard)
|
||||
{
|
||||
#ifndef XAPIAN_HAVE_OP_WILDCARD
|
||||
return Xapian::Query(val->prefix + str);
|
||||
#else
|
||||
const auto vlen{str.length()};
|
||||
if (!maybe_wildcard || vlen <= 1 || str[vlen - 1] != '*')
|
||||
return Xapian::Query(val->prefix + str);
|
||||
else
|
||||
return Xapian::Query(Xapian::Query::OP_WILDCARD,
|
||||
val->prefix + str.substr(0, vlen - 1));
|
||||
#endif/*XAPIAN_HAVE_OP_WILDCARD*/
|
||||
}
|
||||
|
||||
static Xapian::Query
|
||||
|
|
Loading…
Reference in New Issue