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

simplified db open by getting rid of the illusion that we could have several writeable dbs per config

Browse Source
This commit is contained in:
dockes
2008-12-17 08:01:40 +00:00
parent befebb7371
commit b9cc5fb1e0
8 changed files with 70 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/index/indexer.cpp
+8 -8
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: indexer.cpp,v 1.70 2008-10-08 16:15:22 dockes Exp $ (C) 2004 J.F.Dockes";
static char rcsid[] = "@(#$Id: indexer.cpp,v 1.71 2008-12-17 08:01:40 dockes Exp $ (C) 2004 J.F.Dockes";
#endif
/*
* This program is free software; you can redistribute it and/or modify
@@ -93,7 +93,7 @@ bool DbIndexer::indexDb(bool resetbefore, list<string> *topdirs)
for (list<string>::const_iterator it = topdirs->begin();
it != topdirs->end(); it++) {
LOGDEB(("DbIndexer::index: Indexing %s into %s\n", it->c_str(),
m_dbdir.c_str()));
getDbDir().c_str()));
// Set the current directory in config so that subsequent
// getConfParams() will get local values
@@ -143,7 +143,7 @@ bool DbIndexer::indexDb(bool resetbefore, list<string> *topdirs)
}
if (!m_db.close()) {
LOGERR(("DbIndexer::index: error closing database in %s\n",
m_dbdir.c_str()));
getDbDir().c_str()));
return false;
}
string missing;
@@ -197,8 +197,8 @@ bool DbIndexer::init(bool resetbefore, bool rdonly)
}
Rcl::Db::OpenMode mode = rdonly ? Rcl::Db::DbRO :
resetbefore ? Rcl::Db::DbTrunc : Rcl::Db::DbUpd;
if (!m_db.open(m_dbdir, m_config->getStopfile(), mode)) {
LOGERR(("DbIndexer: error opening database in %s\n", m_dbdir.c_str()));
if (!m_db.open(mode)) {
LOGERR(("DbIndexer: error opening database %s\n", getDbDir().c_str()));
return false;
}
@@ -250,7 +250,7 @@ bool DbIndexer::createAspellDict()
// The close would be done in our destructor, but we want status here
if (!m_db.close()) {
LOGERR(("DbIndexer::indexfiles: error closing database in %s\n",
m_dbdir.c_str()));
getDbDir().c_str()));
noaspell = true;
return false;
}
@@ -322,7 +322,7 @@ bool DbIndexer::indexFiles(const list<string> &filenames)
// The close would be done in our destructor, but we want status here
if (!m_db.close()) {
LOGERR(("DbIndexer::indexfiles: error closing database in %s\n",
m_dbdir.c_str()));
getDbDir().c_str()));
return false;
}
return true;
@@ -348,7 +348,7 @@ bool DbIndexer::purgeFiles(const list<string> &filenames)
// The close would be done in our destructor, but we want status here
if (!m_db.close()) {
LOGERR(("DbIndexer::purgefiles: error closing database in %s\n",
m_dbdir.c_str()));
getDbDir().c_str()));
return false;
}
return true;
src/index/indexer.h
+13 -10
View File
@@ -16,7 +16,7 @@
*/
#ifndef _INDEXER_H_INCLUDED_
#define _INDEXER_H_INCLUDED_
/* @(#$Id: indexer.h,v 1.26 2008-10-08 16:15:22 dockes Exp $ (C) 2004 J.F.Dockes */
/* @(#$Id: indexer.h,v 1.27 2008-12-17 08:01:40 dockes Exp $ (C) 2004 J.F.Dockes */
#include <string>
#include <list>
@@ -56,11 +56,14 @@ class DbIxStatusUpdater {
/**
The top level indexing object. Processes the configuration, then invokes
file system walking to populate/update the database(s).
Multiple top-level directories can be listed in the
configuration. Each can be indexed to a different
database. Directories are first grouped by database, then an
internal class (DbIndexer) is used to process each group.
Fiction:
Multiple top-level directories can be listed in the
configuration. Each can be indexed to a different
database. Directories are first grouped by database, then an
internal class (DbIndexer) is used to process each group.
Fact: we've had one db per config forever. The multidb/config code has been
kept around for no good reason, this fiction only affects indexer.cpp
*/
class ConfIndexer {
public:
@@ -93,10 +96,11 @@ class DbIndexer : public FsTreeWalkerCB {
public:
/** Constructor does nothing but store parameters */
DbIndexer(RclConfig *cnf, // Configuration data
const string &dbd, // Place where the db lives
// Db dir not used anymore, rcl::db gets it from the cfg
const string &,
DbIxStatusUpdater *updfunc = 0 // status updater callback
)
: m_config(cnf), m_dbdir(dbd), m_updater(updfunc)
: m_config(cnf), m_db(cnf), m_updater(updfunc)
{}
virtual ~DbIndexer();
@@ -134,7 +138,7 @@ class DbIndexer : public FsTreeWalkerCB {
FsTreeWalker::CbFlag);
/** Return my db dir */
string getDbDir() {return m_dbdir;}
string getDbDir() {return m_config->getDbDir();}
/** List possible stemmer names */
static list<string> getStemmerNames();
@@ -142,7 +146,6 @@ class DbIndexer : public FsTreeWalkerCB {
private:
FsTreeWalker m_walker;
RclConfig *m_config;
string m_dbdir;
Rcl::Db m_db;
string m_tmpdir;
DbIxStatusUpdater *m_updater;