|
a/src/query/docseq.cpp |
|
b/src/query/docseq.cpp |
|
... |
|
... |
| 36 |
return ret;
|
36 |
return ret;
|
| 37 |
}
|
37 |
}
|
| 38 |
|
38 |
|
| 39 |
bool DocSequence::getEnclosing(Rcl::Doc& doc, Rcl::Doc& pdoc)
|
39 |
bool DocSequence::getEnclosing(Rcl::Doc& doc, Rcl::Doc& pdoc)
|
| 40 |
{
|
40 |
{
|
| 41 |
// Note: no need for setQuery here, we're just passing through a
|
41 |
Rcl::Db *db = getDb();
|
| 42 |
// query-independant request
|
42 |
if (db == 0) {
|
|
|
43 |
LOGERR(("DocSequence::getEnclosing: no db\n"));
|
|
|
44 |
return false;
|
|
|
45 |
}
|
|
|
46 |
string udi;
|
|
|
47 |
if (!FileInterner::getEnclosingUDI(doc, udi))
|
|
|
48 |
return false;
|
| 43 |
|
49 |
|
| 44 |
string udi;
|
|
|
| 45 |
if (!FileInterner::getEnclosing(doc.url, doc.ipath, pdoc.url, pdoc.ipath,
|
|
|
| 46 |
udi))
|
|
|
| 47 |
return false;
|
|
|
| 48 |
bool dbret = getDb()->getDoc(udi, pdoc);
|
50 |
bool dbret = db->getDoc(udi, doc, pdoc);
|
| 49 |
return dbret && pdoc.pc != -1;
|
51 |
return dbret && pdoc.pc != -1;
|
| 50 |
}
|
52 |
}
|
| 51 |
|
53 |
|
| 52 |
// Remove stacked modifying sources (sort, filter) until we get to a real one
|
54 |
// Remove stacked modifying sources (sort, filter) until we get to a real one
|
| 53 |
void DocSource::stripStack()
|
55 |
void DocSource::stripStack()
|