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

*** empty log message ***

Browse Source
This commit is contained in:
dockes 2005-02-01 17:52:06 +00:00
parent d0aaf92220
commit d8b2533102
4 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/internfile/mimehandler.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #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 #endif
#include <iostream> #include <iostream>
@ -79,7 +79,7 @@ bool MimeHandlerExec::worker(RclConfig *conf, const string &fn,
ExecCmd exec; ExecCmd exec;
int status = exec.doexec(cmd, myparams, 0, &html); int status = exec.doexec(cmd, myparams, 0, &html);
if (status) { if (status) {
LOGDEB(("MimeHandlerExec: command status 0x%x: %s\n", LOGERR(("MimeHandlerExec: command status 0x%x: %s\n",
status, cmd.c_str())); status, cmd.c_str()));
return false; return false;
} }

6
src/qtgui/recollmain.ui
View File

@ -125,6 +125,9 @@
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="undoRedoEnabled">
<bool>false</bool>
</property>
</widget> </widget>
<widget class="QSplitter"> <widget class="QSplitter">
<property name="name"> <property name="name">
@ -159,6 +162,9 @@
<property name="readOnly"> <property name="readOnly">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="undoRedoEnabled">
<bool>false</bool>
</property>
</widget> </widget>
<widget class="QTextEdit"> <widget class="QTextEdit">
<property name="name"> <property name="name">

4
src/qtgui/recollmain.ui.h
View File

@ -57,6 +57,7 @@ static string plaintorich(const string &in)
for (unsigned int i = 0; i < in.length() ; i++) { for (unsigned int i = 0; i < in.length() ; i++) {
if (in[i] == '\n') { if (in[i] == '\n') {
out += "<br>"; out += "<br>";
// out += '\n';
} else { } else {
out += in[i]; out += in[i];
} }
@ -135,7 +136,7 @@ void RecollMain::reslistTE_clicked(int par, int car)
int reldocnum = par - 1; int reldocnum = par - 1;
reslist_current = reldocnum; reslist_current = reldocnum;
previewTextEdit->clear(); previewTextEdit->clear();
LOGDEB(("Cleared preview\n"));
if (!rcldb->getDoc(reslist_winfirst + reldocnum, doc, 0)) { if (!rcldb->getDoc(reslist_winfirst + reldocnum, doc, 0)) {
QMessageBox::warning(0, "Recoll", QMessageBox::warning(0, "Recoll",
QString("Can't retrieve document from database")); QString("Can't retrieve document from database"));
@ -185,7 +186,6 @@ void RecollMain::reslistTE_clicked(int par, int car)
#endif #endif
QString str = QString::fromUtf8(rich.c_str(), rich.length()); QString str = QString::fromUtf8(rich.c_str(), rich.length());
previewTextEdit->setTextFormat(RichText);
previewTextEdit->setText(str); previewTextEdit->setText(str);
} }

21
src/rcldb/rcldb.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #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 #endif
#include <sys/stat.h> #include <sys/stat.h>
@ -49,7 +49,7 @@ Rcl::Db::Db()
Rcl::Db::~Db() Rcl::Db::~Db()
{ {
LOGDEB(("Rcl::Db::~Db\n")); LOGDEB1(("Rcl::Db::~Db\n"));
if (pdata == 0) if (pdata == 0)
return; return;
Native *ndb = (Native *)pdata; Native *ndb = (Native *)pdata;
@ -142,7 +142,7 @@ bool Rcl::Db::close()
try { try {
if (ndb->iswritable == true) { if (ndb->iswritable == true) {
ndb->wdb.flush(); ndb->wdb.flush();
LOGDEB(("Called xapian flush\n")); LOGDEB(("Rcl:Db: Called xapian flush\n"));
} }
delete ndb; delete ndb;
pdata = new Native; pdata = new Native;
@ -196,7 +196,7 @@ static bool splitCb(void *cdata, const std::string &term, int pos)
data->curpos = pos; data->curpos = pos;
data->doc.add_posting(term, data->basepos + data->curpos, 1); data->doc.add_posting(term, data->basepos + data->curpos, 1);
} catch (...) { } catch (...) {
LOGERR(("Error occurred during add_posting\n")); LOGERR(("Rcl::Db: Error occurred during xapian add_posting\n"));
return false; return false;
} }
return true; return true;
@ -213,7 +213,7 @@ bool dumb_string(const string &in, string &out)
if (in.empty()) if (in.empty())
return true; return true;
if (!unac_cpp(in, inter)) { 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; return false;
} }
out.reserve(inter.length()); 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) 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) if (pdata == 0)
return false; return false;
Native *ndb = (Native *)pdata; Native *ndb = (Native *)pdata;
@ -331,7 +331,7 @@ bool Rcl::Db::add(const string &fn, const Rcl::Doc &idoc)
record += "\nkeywords=" + doc.keywords; record += "\nkeywords=" + doc.keywords;
record += "\nabstract=" + doc.abstract; record += "\nabstract=" + doc.abstract;
record += "\n"; record += "\n";
LOGDEB(("Newdocument data: %s\n", record.c_str())); LOGDEB1(("Newdocument data: %s\n", record.c_str()));
newdocument.set_data(record); 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); ndb->wdb.replace_document(pathterm, newdocument);
if (did < ndb->updated.size()) { if (did < ndb->updated.size()) {
ndb->updated[did] = true; ndb->updated[did] = true;
LOGDEB(("docid %d updated [%s]\n", did, fnc)); LOGDEB(("Rcl::Db::add: docid %d updated [%s]\n", did, fnc));
} else { } else {
LOGDEB(("docid %d added [%s]\n", did, fnc)); LOGDEB(("Rcl::Db::add: docid %d added [%s]\n", did, fnc));
} }
} catch (...) { } catch (...) {
// FIXME: is this ever actually needed? // FIXME: is this ever actually needed?
ndb->wdb.add_document(newdocument); 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; return true;
} }