yetangitu/recoll
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

from 1.18 branch: Adjust things for using the new Firefox plugin: remove visible Beagle references + fix 1.18 web queue indexing bugs

Browse source
This commit is contained in:
Jean-Francois Dockes 2012-11-01 11:30:39 +01:00
parent 3da5158e9f
commit 3f768cf977
25 changed files with 1420 additions and 1167 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/index/beaglequeue.cpp
View file

@ -19,6 +19,7 @@
#include <unistd.h>
#include <sys/types.h>
#include <string.h>
#include <errno.h>
#include "cstr.h"
#include "pathut.h"
@ -179,8 +180,8 @@ BeagleQueueIndexer::BeagleQueueIndexer(RclConfig *cnf, Rcl::Db *db,
: m_config(cnf), m_db(db), m_cache(0), m_updater(updfunc),
m_nocacheindex(false)
{
if (!m_config->getConfParam("beaglequeuedir", m_queuedir))
m_queuedir = "~/.beagle/ToIndex/";
if (!m_config->getConfParam("webqueuedir", m_queuedir))
m_queuedir = "~/.recollweb/ToIndex/";
m_queuedir = path_tildexpand(m_queuedir);
path_catslash(m_queuedir);
@ -269,6 +270,11 @@ bool BeagleQueueIndexer::index()
return false;
LOGDEB(("BeagleQueueIndexer::processqueue: [%s]\n", m_queuedir.c_str()));
m_config->setKeyDir(m_queuedir);
if (!makepath(m_queuedir)) {
LOGERR(("BeagleQueueIndexer:: can't create queuedir [%s] errno %d\n",
m_queuedir.c_str(), errno));
return false;
}
if (!m_cache || !m_cache->cc()) {
LOGERR(("BeagleQueueIndexer: cache initialization failed\n"));
return false;