Commit 4a7cfc03 authored by Jean-Francois Dockes's avatar Jean-Francois Dockes
Browse files

fix a few issues in patch transported from 1.22 + VERSION=1.21.5

--HG--
branch : RECOLL_1_21_MAINT
parent da1d1055
......@@ -29,7 +29,7 @@ static void addSubQuery(WasaParserDriver *d,
{
if (sd && sq)
sd->addClause(
new Rcl::SearchDataClauseSub(STD_SHARED_PTR<Rcl::SearchData>(sq)));
new Rcl::SearchDataClauseSub(RefCntr<Rcl::SearchData>(sq)));
}
%}
......
......@@ -291,6 +291,20 @@ void SearchData::getTerms(HighlightData &hld) const
return;
}
static const char * tpToString(SClType t)
{
switch (t) {
case SCLT_AND: return "AND";
case SCLT_OR: return "OR";
case SCLT_FILENAME: return "FILENAME";
case SCLT_PHRASE: return "PHRASE";
case SCLT_NEAR: return "NEAR";
case SCLT_PATH: return "PATH";
case SCLT_SUB: return "SUB";
default: return "UNKNOWN";
}
}
static string dumptabs;
void SearchData::dump(ostream& o) const
......@@ -360,7 +374,7 @@ void SearchDataClauseSub::dump(ostream& o) const
{
o << "ClauseSub {\n";
dumptabs += '\t';
m_sub->dump(o);
m_sub.getconstptr()->dump(o);
dumptabs.erase(dumptabs.size()- 1);
o << dumptabs << "}";
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment