query(new Rcl::Query(m_rcldb));
- if (!query->setQuery(sdata)) {
- m_reason = "Internal Error: setQuery failed";
- outputError(m_reason.c_str());
- finished();
- return;
+ os << "" << endl;
+ os << "" << "Recoll query details" << "\n" << endl;
+ os << "" << endl;
+ os << "Query details:
" << endl;
+ os << "" << m_pager.queryDescription().c_str() <<"
"<< endl;
+ os << "Return to results" << endl;
+ os << "" << endl;
+ data(array);
+ finished();
+ return;
+ } else {
+ // Unknown //command/???
+ finished(); return;
+ }
+ } else {
+ // Unknown 'host' //??? value
+ finished(); return;
}
- string explain = sdata->getDescription();
+ m_pager.displayPage();
- QByteArray output;
- QTextStream os(&output, QIODevice::ReadWrite);
-
- os << "" << endl;
- os << "
" << endl;
- os << "" << endl;
- os << "" << endl;
- os << "Recoll: query results" << endl;
- os << "" << endl;
-
- os << "Actual query performed: " << endl;
- os << explain.c_str() << "
";
-
- Rcl::Doc doc;
- int cnt = query->getResCnt();
- for (int i = 0; i < cnt; i++) {
- string sh;
- doc.erase();
-
- if (!query->getDoc(i, doc)) {
- // This may very well happen for history if the doc has
- // been removed since. So don't treat it as fatal.
- doc.meta[Rcl::Doc::keykw] = string("Unavailable document");
- }
-
- string iconname = m_rclconfig->getMimeIconName(doc.mimetype);
- if (iconname.empty())
- iconname = "document";
- string imgfile = iconsdir + "/" + iconname + ".png";
-
- string result;
- if (!sh.empty())
- result += string("") + sh + "
\n";
- else
- result = "
";
-
- char perbuf[10];
- sprintf(perbuf, "%3d%%", doc.pc);
- if (doc.meta[Rcl::Doc::keytt].empty())
- doc.meta[Rcl::Doc::keytt] = path_getsimple(doc.url);
- char datebuf[100];
- datebuf[0] = 0;
- if (!doc.dmtime.empty() || !doc.fmtime.empty()) {
- time_t mtime = doc.dmtime.empty() ?
- atol(doc.fmtime.c_str()) : atol(doc.dmtime.c_str());
- struct tm *tm = localtime(&mtime);
- strftime(datebuf, 99,
- "Modified: %Y-%m-%d %H:%M:%S", tm);
- }
- result += "" +
- "![](\"file://")
" + "";
- string abst = escapeHtml(doc.meta[Rcl::Doc::keyabs]);
- result += string(perbuf) + " " + doc.meta[Rcl::Doc::keytt] + "
" +
- doc.mimetype + " " +
- (datebuf[0] ? string(datebuf) + "
" : string("
")) +
- (!abst.empty() ? abst + "
" : string("")) +
- (!doc.meta[Rcl::Doc::keytt].empty() ? doc.meta[Rcl::Doc::keykw] +
- "
" : string("")) +
- "" + doc.url + "
\n";
-
- QString str = QString::fromUtf8(result.c_str(), result.length());
- os << str;
- }
-
- os << "";
-
- data(output);
kDebug() << "call finished" << endl;
finished();
}
@@ -221,6 +333,8 @@ void RecollProtocol::outputError(const QString& errmsg)
data(array);
}
+
+
// Note: KDE_EXPORT is actually needed on Unix when building with
// cmake. Says something like __attribute__(visibility(defautl))
// (cmake apparently sets all symbols to not exported)
@@ -228,9 +342,6 @@ extern "C" {KDE_EXPORT int kdemain(int argc, char **argv);}
int kdemain(int argc, char **argv)
{
- FILE*mf = fopen("/tmp/toto","w");
- fprintf(mf, "KIORECOLL\n");
- fclose(mf);
#ifdef KDE_VERSION_3
KInstance instance("kio_recoll");
#else
diff --git a/src/kde/kioslave/recoll/kio_recoll.h b/src/kde/kioslave/recoll/kio_recoll.h
index 1ec47034..6c1e7a70 100644
--- a/src/kde/kioslave/recoll/kio_recoll.h
+++ b/src/kde/kioslave/recoll/kio_recoll.h
@@ -1,5 +1,5 @@
#ifndef _RECOLL_H
-/* @(#$Id: kio_recoll.h,v 1.5 2008-11-17 14:51:38 dockes Exp $ (C) 2005 J.F.Dockes */
+/* @(#$Id: kio_recoll.h,v 1.6 2008-11-20 13:10:23 dockes Exp $ (C) 2005 J.F.Dockes */
#define _RECOLL_H
#include
@@ -17,6 +17,25 @@ using std::string;
#include
#include
+#include "reslistpager.h"
+
+class RecollProtocol;
+
+class RecollKioPager : public ResListPager {
+public:
+ RecollKioPager() : m_parent(0) {}
+ void setParent(RecollProtocol *proto) {m_parent = proto;}
+
+ virtual bool append(const string& data);
+ virtual string detailsLink();
+ virtual const string &parFormat();
+ virtual string nextUrl();
+ virtual string prevUrl();
+ virtual string pageTop();
+private:
+ RecollProtocol *m_parent;
+};
+
class RecollProtocol : public KIO::SlaveBase {
public:
RecollProtocol(const QByteArray &pool, const QByteArray &app );
@@ -25,13 +44,18 @@ class RecollProtocol : public KIO::SlaveBase {
virtual void get(const KUrl & url );
private:
- bool m_initok;
- RclConfig *m_rclconfig;
- Rcl::Db *m_rcldb;
- std::string m_dbdir;
- std::string m_reason;
bool maybeOpenDb(string &reason);
void outputError(const QString& errmsg);
+ void doSearch(const QString& q, char opt = 'l');
+ void welcomePage();
+
+ bool m_initok;
+ RclConfig *m_rclconfig;
+ Rcl::Db *m_rcldb;
+ std::string m_dbdir;
+ std::string m_reason;
+ RecollKioPager m_pager;
+
};
extern "C" {int kdemain(int, char**);}
diff --git a/src/query/reslistpager.cpp b/src/query/reslistpager.cpp
index c06bf07f..1b1668df 100644
--- a/src/query/reslistpager.cpp
+++ b/src/query/reslistpager.cpp
@@ -1,7 +1,11 @@
#ifndef lint
-static char rcsid[] = "@(#$Id: reslistpager.cpp,v 1.1 2008-11-19 12:19:40 dockes Exp $ (C) 2007 J.F.Dockes";
+static char rcsid[] = "@(#$Id: reslistpager.cpp,v 1.2 2008-11-20 13:10:23 dockes Exp $ (C) 2007 J.F.Dockes";
#endif
+#include
+#include
+#include
+
#include "reslistpager.h"
#include "debuglog.h"
#include "rclconfig.h"
@@ -63,31 +67,9 @@ void ResListPager::resultPageNext()
m_respage = npage;
}
-bool ResListPager::append(const string& data)
-{
- fprintf(stderr, "%s", data.c_str());
- return true;
-}
-
-string ResListPager::tr(const string& in)
-{
- return in;
-}
-
void ResListPager::displayPage()
{
string chunk;
- if (pageEmpty()) {
- chunk = ""
- "";
- chunk += m_docSource->title();
- chunk += "";
- chunk += "";
- chunk += tr("Show query details");
- chunk += "
";
- append(chunk);
- return;
- }
// Display list header
// We could use a
but the textedit doesnt display
@@ -97,8 +79,12 @@ void ResListPager::displayPage()
// gets confused. Hence the use of the 'chunk' text
// accumulator
// Also note that there can be results beyond the estimated resCnt.
- chunk = "<qt><head></head><body><p>"
- "<font size=+1><b>";
+ chunk = "<html><head>"
+ "<meta http-equiv=\"content-type\""
+ "content=\"text/html; charset=utf-8\">"
+ "</head><body>";
+ chunk += pageTop();
+ chunk += "<p><font size=+1><b>";
chunk += m_docSource->title();
chunk += "</b></font>"
" ";
@@ -121,9 +107,21 @@ void ResListPager::displayPage()
chunk += buf;
}
}
- chunk += "<a href=\"H-1\">";
- chunk += tr("(show query)");
- chunk += "</a></p>";
+ chunk += detailsLink();
+ if (hasPrev() || hasNext()) {
+ chunk += " ";
+ if (hasPrev()) {
+ chunk += "<a href=\"" + prevUrl() + "\"><b>";
+ chunk += tr("Previous");
+ chunk += "</b></a> ";
+ }
+ if (hasNext()) {
+ chunk += "<a href=\""+ nextUrl() + "\"><b>";
+ chunk += tr("Next");
+ chunk += "</b></a>";
+ }
+ }
+ chunk += "</p>";
append(chunk);
if (pageEmpty())
@@ -154,6 +152,7 @@ void ResListPager::displayPage()
// Determine icon to display if any
string iconpath;
RclConfig::getMainConfig()->getMimeIconName(doc.mimetype, &iconpath);
+ iconpath = string("file://") + iconpath;
// Printable url: either utf-8 if transcoding succeeds, or url-encoded
string url;
@@ -249,7 +248,7 @@ void ResListPager::displayPage()
subs['U'] = url;
string formatted;
- pcSubst(m_parformat, formatted, subs);
+ pcSubst(parFormat(), formatted, subs);
chunk += formatted;
chunk += "</p>\n";
@@ -262,12 +261,12 @@ void ResListPager::displayPage()
chunk = "<p align=\"center\">";
if (hasPrev() || hasNext()) {
if (hasPrev()) {
- chunk += "<a href=\"p-1\"><b>";
+ chunk += "<a href=\"" + prevUrl() + "\"><b>";
chunk += tr("Previous");
chunk += "</b></a> ";
}
if (hasNext()) {
- chunk += "<a href=\"n-1\"><b>";
+ chunk += "<a href=\""+ nextUrl() + "\"><b>";
chunk += tr("Next");
chunk += "</b></a>";
}
@@ -276,3 +275,41 @@ void ResListPager::displayPage()
chunk += "</body></html>\n";
append(chunk);
}
+
+string ResListPager::nextUrl()
+{
+ return "n-1";
+}
+string ResListPager::prevUrl()
+{
+ return "p-1";
+}
+
+// Default implementations for things that should be re-implemented by our user.
+bool ResListPager::append(const string& data)
+{
+ fprintf(stderr, "%s", data.c_str());
+ return true;
+}
+
+string ResListPager::tr(const string& in)
+{
+ return in;
+}
+
+string ResListPager::detailsLink()
+{
+ string chunk = "<a href=\"H-1\">";
+ chunk += tr("(show query)") + "</a>";
+ return chunk;
+}
+
+const string &ResListPager::parFormat()
+{
+ const static string format("<img src=\"%I\" align=\"left\">"
+ "%R %S %L <b>%T</b><br>"
+ "%M %D <i>%U</i><br>"
+ "%A %K");
+ return format;
+}
+
diff --git a/src/query/reslistpager.h b/src/query/reslistpager.h
index 98f479ce..4811028b 100644
--- a/src/query/reslistpager.h
+++ b/src/query/reslistpager.h
@@ -1,6 +1,6 @@
#ifndef _reslistpager_h_included_
#define _reslistpager_h_included_
-/* @(#$Id: reslistpager.h,v 1.1 2008-11-19 12:19:40 dockes Exp $ (C) 2007 J.F.Dockes */
+/* @(#$Id: reslistpager.h,v 1.2 2008-11-20 13:10:23 dockes Exp $ (C) 2007 J.F.Dockes */
#include <vector>
using std::vector;
@@ -13,12 +13,25 @@ using std::vector;
*/
class ResListPager {
public:
- ResListPager(RefCntr<DocSequence> src, int pagesize,
- const string& parformat)
- : m_docSource(src), m_pagesize(pagesize), m_parformat(parformat),
- m_hasNext(false)
+ ResListPager() : m_pagesize(10), m_hasNext(false) {}
+ void setDocSource(RefCntr<DocSequence> src)
+ {
+ m_winfirst = -1;
+ m_docSource = src;
+ m_hasNext = false;
+ m_respage.clear();
+ }
+ ResListPager(RefCntr<DocSequence> src, int pagesize)
+ : m_winfirst(-1), m_docSource(src), m_pagesize(pagesize),
+ m_hasNext(false)
{}
virtual ~ResListPager() {}
+ int pageNumber()
+ {
+ if (m_winfirst < 0 || m_pagesize <= 0)
+ return -1;
+ return m_winfirst / m_pagesize;
+ }
void pageNext();
bool hasNext() {return m_hasNext;}
bool hasPrev() {return m_winfirst > 0;}
@@ -35,14 +48,24 @@ public:
void resultPageNext();
void displayPage();
bool pageEmpty() {return m_respage.size() == 0;}
+
+ string queryDescription() {return m_docSource.isNull() ? "" :
+ m_docSource->getDescription();}
+
+ // Things that need to be reimplemented in the subclass:
virtual bool append(const string& data);
virtual string tr(const string& in);
+ virtual string detailsLink();
+ virtual const string &parFormat();
+ virtual string nextUrl();
+ virtual string prevUrl();
+ virtual string pageTop() {return string();}
+
private:
// First docnum (from docseq) in current page
int m_winfirst;
RefCntr<DocSequence> m_docSource;
int m_pagesize;
- string m_parformat;
bool m_hasNext;
vector<ResListEntry> m_respage;