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

added getmeta() method to Rcl::Doc and use in misc places

Browse Source
This commit is contained in:
Jean-Francois Dockes
2012-01-20 14:48:50 +01:00
parent dc3aa5d564
commit 036937e8bf
5 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/internfile/internfile.cpp
+6 -10
View File
@@ -369,7 +369,7 @@ void FileInterner::initcommon(RclConfig *cnf, int flags)
m_targetMType = cstr_textplain;
}
// We used a single beagle cache object to access beagle data. We protect it
// We use a single beagle cache object to access beagle data. We protect it
// against multiple thread access.
static PTMutexInit o_beagler_mutex;
@@ -391,9 +391,7 @@ FileInterner::FileInterner(const Rcl::Doc& idoc, RclConfig *cnf,
// and use some kind of backstore object factory next time we add a
// backend (if ever).
string backend;
map<string, string>::const_iterator it;
if ((it = idoc.meta.find(Rcl::Doc::keybcknd)) != idoc.meta.end())
backend = it->second;
idoc.getmeta(Rcl::Doc::keybcknd, &backend);
if (backend.empty() || !backend.compare("FS")) {
// Filesystem document. Intern from file.
@@ -412,16 +410,14 @@ FileInterner::FileInterner(const Rcl::Doc& idoc, RclConfig *cnf,
}
init(fn, &st, cnf, flags, &idoc.mimetype);
} else if (!backend.compare("BGL")) {
string data;
Rcl::Doc dotdoc;
map<string,string>::const_iterator it =
idoc.meta.find(Rcl::Doc::keyudi);
if (it == idoc.meta.end() || it->second.empty()) {
string udi;
if (!idoc.getmeta(Rcl::Doc::keyudi, &udi) || udi.empty()) {
LOGERR(("FileInterner:: no udi in idoc\n"));
return;
}
string udi = it->second;
string data;
Rcl::Doc dotdoc;
{
PTMutexLocker locker(o_beagler_mutex);
// Retrieve from our webcache (beagle data). The beagler