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

fixed inocuous but nasty bad string value test

Browse Source
This commit is contained in:
dockes 2008-07-30 13:16:13 +00:00
parent 269efce55e
commit f96787aa35
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/rcldb/stemdb.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: stemdb.cpp,v 1.11 2007-11-08 09:34:17 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: stemdb.cpp,v 1.12 2008-07-30 13:16:13 dockes Exp $ (C) 2005 J.F.Dockes";
#endif #endif
/** /**
@ -141,23 +141,23 @@ bool createDb(Xapian::Database& xdb, const string& dbdir, const string& lang)
// We want to get rid of the db dir in case of error. This gets disarmed // We want to get rid of the db dir in case of error. This gets disarmed
// just before success return. // just before success return.
DirWiper wiper(stemdbdir); DirWiper wiper(stemdbdir);
const char *ermsg = "NOERROR"; string ermsg;
Xapian::WritableDatabase sdb; Xapian::WritableDatabase sdb;
try { try {
sdb = Xapian::WritableDatabase(stemdbdir, sdb = Xapian::WritableDatabase(stemdbdir,
Xapian::DB_CREATE_OR_OVERWRITE); Xapian::DB_CREATE_OR_OVERWRITE);
} catch (const Xapian::Error &e) { } catch (const Xapian::Error &e) {
ermsg = e.get_msg().c_str(); ermsg = e.get_msg();
} catch (const string &s) { } catch (const string &s) {
ermsg = s.c_str(); ermsg = s;
} catch (const char *s) { } catch (const char *s) {
ermsg = s; ermsg = s;
} catch (...) { } catch (...) {
ermsg = "Caught unknown exception"; ermsg = "Caught unknown exception";
} }
if (ermsg != "NOERROR") { if (!ermsg.empty()) {
LOGERR(("Db::createstemdb: exception while opening [%s]: %s\n", LOGERR(("Db::createstemdb: exception while opening [%s]: %s\n",
stemdbdir.c_str(), ermsg)); stemdbdir.c_str(), ermsg.c_str()));
return false; return false;
} }