|
a/src/rcldb/searchdataxml.cpp |
|
b/src/rcldb/searchdataxml.cpp |
|
... |
|
... |
36 |
static string tpToString(SClType tp)
|
36 |
static string tpToString(SClType tp)
|
37 |
{
|
37 |
{
|
38 |
switch (tp) {
|
38 |
switch (tp) {
|
39 |
case SCLT_AND: return "AND";
|
39 |
case SCLT_AND: return "AND";
|
40 |
case SCLT_OR: return "OR";
|
40 |
case SCLT_OR: return "OR";
|
41 |
case SCLT_EXCL: return "EX";
|
|
|
42 |
case SCLT_FILENAME: return "FN";
|
41 |
case SCLT_FILENAME: return "FN";
|
43 |
case SCLT_PHRASE: return "PH";
|
42 |
case SCLT_PHRASE: return "PH";
|
44 |
case SCLT_NEAR: return "NE";
|
43 |
case SCLT_NEAR: return "NE";
|
45 |
case SCLT_SUB: return "SU"; // Unsupported actually
|
44 |
case SCLT_SUB: return "SU"; // Unsupported actually
|
46 |
default: return "UN";
|
45 |
default: return "UN";
|
|
... |
|
... |
63 |
SearchDataClause *c = m_query[i];
|
62 |
SearchDataClause *c = m_query[i];
|
64 |
if (c->getTp() == SCLT_SUB) {
|
63 |
if (c->getTp() == SCLT_SUB) {
|
65 |
LOGERR(("SearchData::asXML: can't do subclauses !\n"));
|
64 |
LOGERR(("SearchData::asXML: can't do subclauses !\n"));
|
66 |
continue;
|
65 |
continue;
|
67 |
}
|
66 |
}
|
68 |
//if (c->getexclude())
|
67 |
if (c->getexclude())
|
69 |
// os << "<NEG/>" << endl;
|
68 |
os << "<NEG/>" << endl;
|
70 |
if (c->getTp() == SCLT_PATH) {
|
69 |
if (c->getTp() == SCLT_PATH) {
|
71 |
// Keep these apart, for compat with the older history format
|
70 |
// Keep these apart, for compat with the older history format
|
72 |
SearchDataClausePath *cl =
|
71 |
SearchDataClausePath *cl =
|
73 |
dynamic_cast<SearchDataClausePath*>(c);
|
72 |
dynamic_cast<SearchDataClausePath*>(c);
|
74 |
if (cl->getexclude()) {
|
73 |
if (cl->getexclude()) {
|