From d8b2533102fc3a24b944a09f767c1b0e02950a1d Mon Sep 17 00:00:00 2001 From: dockes Date: Tue, 1 Feb 2005 17:52:06 +0000 Subject: [PATCH] *** empty log message *** --- src/internfile/mimehandler.cpp | 4 ++-- src/qtgui/recollmain.ui | 6 ++++++ src/qtgui/recollmain.ui.h | 4 ++-- src/rcldb/rcldb.cpp | 21 +++++++++++---------- 4 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/internfile/mimehandler.cpp b/src/internfile/mimehandler.cpp index c1e1609d..19e4f173 100644 --- a/src/internfile/mimehandler.cpp +++ b/src/internfile/mimehandler.cpp @@ -1,5 +1,5 @@ #ifndef lint -static char rcsid[] = "@(#$Id: mimehandler.cpp,v 1.5 2005-02-01 17:20:05 dockes Exp $ (C) 2004 J.F.Dockes"; +static char rcsid[] = "@(#$Id: mimehandler.cpp,v 1.6 2005-02-01 17:52:06 dockes Exp $ (C) 2004 J.F.Dockes"; #endif #include @@ -79,7 +79,7 @@ bool MimeHandlerExec::worker(RclConfig *conf, const string &fn, ExecCmd exec; int status = exec.doexec(cmd, myparams, 0, &html); if (status) { - LOGDEB(("MimeHandlerExec: command status 0x%x: %s\n", + LOGERR(("MimeHandlerExec: command status 0x%x: %s\n", status, cmd.c_str())); return false; } diff --git a/src/qtgui/recollmain.ui b/src/qtgui/recollmain.ui index 2ea476b0..3212bfea 100644 --- a/src/qtgui/recollmain.ui +++ b/src/qtgui/recollmain.ui @@ -125,6 +125,9 @@ true + + false + @@ -159,6 +162,9 @@ true + + false + diff --git a/src/qtgui/recollmain.ui.h b/src/qtgui/recollmain.ui.h index db121e9b..cc4e1322 100644 --- a/src/qtgui/recollmain.ui.h +++ b/src/qtgui/recollmain.ui.h @@ -57,6 +57,7 @@ static string plaintorich(const string &in) for (unsigned int i = 0; i < in.length() ; i++) { if (in[i] == '\n') { out += "
"; + // out += '\n'; } else { out += in[i]; } @@ -135,7 +136,7 @@ void RecollMain::reslistTE_clicked(int par, int car) int reldocnum = par - 1; reslist_current = reldocnum; previewTextEdit->clear(); - + LOGDEB(("Cleared preview\n")); if (!rcldb->getDoc(reslist_winfirst + reldocnum, doc, 0)) { QMessageBox::warning(0, "Recoll", QString("Can't retrieve document from database")); @@ -185,7 +186,6 @@ void RecollMain::reslistTE_clicked(int par, int car) #endif QString str = QString::fromUtf8(rich.c_str(), rich.length()); - previewTextEdit->setTextFormat(RichText); previewTextEdit->setText(str); } diff --git a/src/rcldb/rcldb.cpp b/src/rcldb/rcldb.cpp index ba0c4b88..2af366d4 100644 --- a/src/rcldb/rcldb.cpp +++ b/src/rcldb/rcldb.cpp @@ -1,5 +1,5 @@ #ifndef lint -static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.16 2005-02-01 17:20:05 dockes Exp $ (C) 2004 J.F.Dockes"; +static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.17 2005-02-01 17:52:06 dockes Exp $ (C) 2004 J.F.Dockes"; #endif #include @@ -49,7 +49,7 @@ Rcl::Db::Db() Rcl::Db::~Db() { - LOGDEB(("Rcl::Db::~Db\n")); + LOGDEB1(("Rcl::Db::~Db\n")); if (pdata == 0) return; Native *ndb = (Native *)pdata; @@ -142,7 +142,7 @@ bool Rcl::Db::close() try { if (ndb->iswritable == true) { ndb->wdb.flush(); - LOGDEB(("Called xapian flush\n")); + LOGDEB(("Rcl:Db: Called xapian flush\n")); } delete ndb; pdata = new Native; @@ -196,7 +196,7 @@ static bool splitCb(void *cdata, const std::string &term, int pos) data->curpos = pos; data->doc.add_posting(term, data->basepos + data->curpos, 1); } catch (...) { - LOGERR(("Error occurred during add_posting\n")); + LOGERR(("Rcl::Db: Error occurred during xapian add_posting\n")); return false; } return true; @@ -213,7 +213,7 @@ bool dumb_string(const string &in, string &out) if (in.empty()) return true; if (!unac_cpp(in, inter)) { - LOGERR(("unac_cpp failed for %s\n", in.c_str())); + LOGERR(("dumb_string: unac_cpp failed for %s\n", in.c_str())); return false; } out.reserve(inter.length()); @@ -266,7 +266,7 @@ truncate_to_word(string & input, string::size_type maxlen) bool Rcl::Db::add(const string &fn, const Rcl::Doc &idoc) { - LOGDEB(("Rcl::Db::add: fn %s %s\n", fn.c_str(), idoc.text.c_str())); + LOGDEB(("Rcl::Db::add: fn %s\n", fn.c_str())); if (pdata == 0) return false; Native *ndb = (Native *)pdata; @@ -331,7 +331,7 @@ bool Rcl::Db::add(const string &fn, const Rcl::Doc &idoc) record += "\nkeywords=" + doc.keywords; record += "\nabstract=" + doc.abstract; record += "\n"; - LOGDEB(("Newdocument data: %s\n", record.c_str())); + LOGDEB1(("Newdocument data: %s\n", record.c_str())); newdocument.set_data(record); @@ -355,14 +355,15 @@ bool Rcl::Db::add(const string &fn, const Rcl::Doc &idoc) ndb->wdb.replace_document(pathterm, newdocument); if (did < ndb->updated.size()) { ndb->updated[did] = true; - LOGDEB(("docid %d updated [%s]\n", did, fnc)); + LOGDEB(("Rcl::Db::add: docid %d updated [%s]\n", did, fnc)); } else { - LOGDEB(("docid %d added [%s]\n", did, fnc)); + LOGDEB(("Rcl::Db::add: docid %d added [%s]\n", did, fnc)); } } catch (...) { // FIXME: is this ever actually needed? ndb->wdb.add_document(newdocument); - LOGDEB(("%s added (failed re-seek for duplicate).\n", fnc)); + LOGDEB(("Rcl::Db::add: %s added (failed re-seek for duplicate)\n", + fnc)); } return true; }