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

improve add_document error message printing

Browse Source
This commit is contained in:
dockes 2007-05-30 12:30:38 +00:00
parent fca75ed7b2
commit 4d3b9621b6
1 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/rcldb/rcldb.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.109 2007-05-22 07:40:00 dockes Exp $ (C) 2004 J.F.Dockes"; static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.110 2007-05-30 12:30:38 dockes Exp $ (C) 2004 J.F.Dockes";
#endif #endif
/* /*
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
@ -1017,6 +1017,8 @@ bool Db::add(const string &fn, const Doc &idoc,
newdocument.set_data(record); newdocument.set_data(record);
const char *fnc = fn.c_str(); const char *fnc = fn.c_str();
string ermsg;
// Add db entry or update existing entry: // Add db entry or update existing entry:
try { try {
Xapian::docid did = Xapian::docid did =
@ -1029,25 +1031,58 @@ bool Db::add(const string &fn, const Doc &idoc,
LOGDEB(("Db::add: docid %d added [%s , %s]\n", did, fnc, LOGDEB(("Db::add: docid %d added [%s , %s]\n", did, fnc,
doc.ipath.c_str())); doc.ipath.c_str()));
} }
} catch (const Xapian::Error &e) {
ermsg = e.get_msg();
if (ermsg.empty())
ermsg = "Empty error message";
} catch (...) { } catch (...) {
ermsg= "Unknown error";
}
if (!ermsg.empty()) {
LOGERR(("Db::add: replace_document failed: %s\n", ermsg.c_str()));
ermsg.erase();
// FIXME: is this ever actually needed? // FIXME: is this ever actually needed?
try { try {
m_ndb->wdb.add_document(newdocument); m_ndb->wdb.add_document(newdocument);
LOGDEB(("Db::add: %s added (failed re-seek for duplicate)\n", LOGDEB(("Db::add: %s added (failed re-seek for duplicate)\n",
fnc)); fnc));
} catch (const Xapian::Error &e) {
ermsg = e.get_msg();
if (ermsg.empty())
ermsg = "Empty error message";
} catch (...) { } catch (...) {
LOGERR(("Db::add: failed again after replace_document\n")); ermsg= "Unknown error";
}
if (!ermsg.empty()) {
LOGERR(("Db::add: add_document failed: %s\n", ermsg.c_str()));
return false; return false;
} }
} }
// Test if we're over the flush threshold (limit memory usage):
if (m_flushmb > 0) { if (m_flushmb > 0) {
m_curtxtsz += doc.text.length(); m_curtxtsz += doc.text.length();
if (m_curtxtsz / (1024*1024) >= m_flushmb) { if (m_curtxtsz / (1024*1024) >= m_flushmb) {
ermsg.erase();
LOGDEB(("Db::add: text size >= %d Mb, flushing\n", m_flushmb)); LOGDEB(("Db::add: text size >= %d Mb, flushing\n", m_flushmb));
m_ndb->wdb.flush(); try {
m_ndb->wdb.flush();
} catch (const Xapian::Error &e) {
ermsg = e.get_msg();
if (ermsg.empty())
ermsg = "Empty error message";
} catch (...) {
ermsg= "Unknown error";
}
if (!ermsg.empty()) {
LOGERR(("Db::add: flush() failed: %s\n", ermsg.c_str()));
return false;
}
m_curtxtsz = 0; m_curtxtsz = 0;
} }
} }
return true; return true;
} }