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

kio: use right ipath for preview

Browse Source
This commit is contained in:
dockes 2008-12-15 15:04:53 +00:00
parent c0689dd1cf
commit 58d859e82e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/kde/kioslave/recoll/htmlif.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: htmlif.cpp,v 1.9 2008-12-08 17:43:32 dockes Exp $ (C) 2005 J.F.Dockes"; static char rcsid[] = "@(#$Id: htmlif.cpp,v 1.10 2008-12-15 15:04:53 dockes Exp $ (C) 2005 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
@ -100,7 +100,7 @@ const string& RecollKioPager::parFormat()
"<a href=\"" << escurl << "&cmd=pv&dn=%N\">Preview</a>&nbsp;&nbsp;" << "<a href=\"" << escurl << "&cmd=pv&dn=%N\">Preview</a>&nbsp;&nbsp;" <<
"<a href=\"%U\">Open</a><br>" << "<a href=\"%U\">Open</a><br>" <<
"<b>%T</b><br>" "<b>%T</b><br>"
"%M&nbsp;%D&nbsp;&nbsp; <i>%U</i><br>" "%M&nbsp;%D&nbsp;&nbsp; <i>%U</i>&nbsp;&nbsp;%i<br>"
"%A %K"; "%A %K";
return parformat = str.str(); return parformat = str.str();
} }
@ -250,8 +250,8 @@ void RecollProtocol::showPreview(const Rcl::Doc& doc)
o_rclconfig->setKeyDir(path_getfather(fn)); o_rclconfig->setKeyDir(path_getfather(fn));
FileInterner interner(fn, &st, o_rclconfig, tmpdir, &doc.mimetype); FileInterner interner(fn, &st, o_rclconfig, tmpdir, &doc.mimetype);
Rcl::Doc fdoc; Rcl::Doc fdoc;
string ipath = doc.ipath;
if (!interner.internfile(fdoc, fdoc.ipath)) { if (!interner.internfile(fdoc, ipath)) {
wipedir(tmpdir); wipedir(tmpdir);
rmdir(tmpdir.c_str()); rmdir(tmpdir.c_str());
error(KIO::ERR_SLAVE_DEFINED, "Cannot convert file to internal format"); error(KIO::ERR_SLAVE_DEFINED, "Cannot convert file to internal format");

3
src/query/reslistpager.cpp
View File

@ -1,5 +1,5 @@
#ifndef lint #ifndef lint
static char rcsid[] = "@(#$Id: reslistpager.cpp,v 1.5 2008-12-04 11:49:59 dockes Exp $ (C) 2007 J.F.Dockes"; static char rcsid[] = "@(#$Id: reslistpager.cpp,v 1.6 2008-12-15 15:04:53 dockes Exp $ (C) 2007 J.F.Dockes";
#endif #endif
#include <stdio.h> #include <stdio.h>
@ -247,6 +247,7 @@ void ResListPager::displayPage()
subs['A'] = !richabst.empty() ? richabst + "<br>" : ""; subs['A'] = !richabst.empty() ? richabst + "<br>" : "";
subs['D'] = datebuf; subs['D'] = datebuf;
subs['I'] = iconpath; subs['I'] = iconpath;
subs['i'] = doc.ipath;
subs['K'] = !doc.meta[Rcl::Doc::keykw].empty() ? subs['K'] = !doc.meta[Rcl::Doc::keykw].empty() ?
escapeHtml(doc.meta[Rcl::Doc::keykw]) + "<br>" : ""; escapeHtml(doc.meta[Rcl::Doc::keykw]) + "<br>" : "";
subs['L'] = linksbuf; subs['L'] = linksbuf;