Add possibility to display a list of sub-documents for a given result

src/qtgui/rclmain_w.cpp

@@ -70,6 +70,7 @@ using std::pair;
 #include "internfile.h"
 #include "docseqdb.h"
 #include "docseqhist.h"
+#include "docseqdocs.h"
 #include "confguiindex.h"
 #include "restable.h"
 #include "listdialog.h"
@@ -87,7 +88,6 @@ using namespace confgui;
 #include "rclhelp.h"
 #include "moc_rclmain_w.cpp"
 
-extern "C" int XFlush(void *);
 QString g_stringAllStem, g_stringNoStem;
 static const QKeySequence quitKeySeq("Ctrl+q");
 
@@ -274,7 +274,7 @@ void RclMain::init()
     connect(toggleFullScreenAction, SIGNAL(activated()), 
             this, SLOT(toggleFullScreen()));
     connect(actionShowQueryDetails, SIGNAL(activated()),
-	    this, SLOT(showQueryDetails()));
+	    reslist, SLOT(showQueryDetails()));
     connect(periodictimer, SIGNAL(timeout()), 
 	    this, SLOT(periodic100()));
     connect(this, SIGNAL(docSourceChanged(RefCntr<DocSequence>)),
@@ -329,6 +329,8 @@ void RclMain::init()
 	    this, SLOT(enablePrevPage(bool)));
     connect(reslist, SIGNAL(docEditClicked(Rcl::Doc)), 
 	    this, SLOT(startNativeViewer(Rcl::Doc)));
+    connect(reslist, SIGNAL(showSubDocs(Rcl::Doc)), 
+	    this, SLOT(showSubDocs(Rcl::Doc)));
     connect(reslist, SIGNAL(docSaveToFileClicked(Rcl::Doc)), 
 	    this, SLOT(saveDocToFile(Rcl::Doc)));
     connect(reslist, SIGNAL(editRequested(Rcl::Doc)), 
@@ -337,8 +339,6 @@ void RclMain::init()
 	    this, SLOT(startPreview(int, Rcl::Doc, int)));
     connect(reslist, SIGNAL(previewRequested(Rcl::Doc)), 
 	    this, SLOT(startPreview(Rcl::Doc)));
-    connect(reslist, SIGNAL(headerClicked()), 
-	    this, SLOT(showQueryDetails()));
 
     if (prefs.keepSort && prefs.sortActive) {
 	m_sortspec.field = (const char *)prefs.sortField.toUtf8();
@@ -1541,6 +1541,34 @@ static bool lookForHtmlBrowser(string &exefile)
     return false;
 }
 
+void RclMain::showSubDocs(Rcl::Doc doc)
+{
+    LOGDEB(("RclMain::showSubDocs\n"));
+    string reason;
+    if (!maybeOpenDb(reason)) {
+	QMessageBox::critical(0, "Recoll", QString(reason.c_str()));
+	return;
+    }
+    vector<Rcl::Doc> docs;
+    if (!rcldb->getSubDocs(doc, docs)) {
+	QMessageBox::warning(0, "Recoll", QString("Can't get subdocs"));
+	return;
+    }	
+    DocSequenceDocs *src = 
+	new DocSequenceDocs(rcldb, docs,
+			    qs2utf8s(tr("Sub-documents and attachments")));
+    src->setDescription(qs2utf8s(tr("Sub-documents and attachments")));
+    RefCntr<DocSequence> 
+	source(new DocSource(theconfig, RefCntr<DocSequence>(src)));
+
+    ResList *res = new ResList();
+    res->setRclMain(this);
+    res->setIsMainList(0);
+    res->setDocSource(source);
+    res->readDocSource();
+    res->show();
+}
+
 void RclMain::startNativeViewer(Rcl::Doc doc, int pagenum, QString term)
 {
     string apptag;
@@ -1935,19 +1963,6 @@ QString RclMain::getQueryDescription()
     return QString::fromUtf8(m_source->getDescription().c_str());
 }
 
-/** Show detailed expansion of a query */
-void RclMain::showQueryDetails()
-{
-    if (m_source.isNull())
-	return;
-    string oq = breakIntoLines(m_source->getDescription(), 100, 50);
-    QString str;
-    QString desc = tr("Result count (est.)") + ": " + 
-	str.setNum(m_source->getResCnt()) + "<br>";
-    desc += tr("Query details") + ": " + QString::fromUtf8(oq.c_str());
-    QMessageBox::information(this, tr("Query details"), desc);
-}
-
 // User pressed a category button: set filter params in reslist
 void RclMain::catgFilter(int id)
 {

src/qtgui/rclmain_w.h

@@ -118,6 +118,7 @@ public slots:
     virtual void enableNextPage(bool);
     virtual void enablePrevPage(bool);
     virtual void docExpand(Rcl::Doc);
+    virtual void showSubDocs(Rcl::Doc);
     virtual void startPreview(int docnum, Rcl::Doc doc, int keymods);
     virtual void startPreview(Rcl::Doc);
     virtual void startNativeViewer(Rcl::Doc, int pagenum = -1, 
@@ -140,7 +141,6 @@ public slots:
     virtual void on_actionShowResultsAsTable_toggled(bool on);
     virtual void onSortDataChanged(DocSeqSortSpec);
     virtual void resultCount(int);
-    virtual void showQueryDetails();
     virtual void applyStyleSheet();
 
 signals:

src/qtgui/reslist.cpp

@@ -72,7 +72,7 @@ static const QKeySequence closeKeySeq("Ctrl+w");
 class QtGuiResListPager : public ResListPager {
 public:
     QtGuiResListPager(ResList *p, int ps) 
-	: ResListPager(ps), m_parent(p) 
+	: ResListPager(ps), m_reslist(p) 
     {}
     virtual bool append(const string& data);
     virtual bool append(const string& data, int idx, const Rcl::Doc& doc);
@@ -88,7 +88,7 @@ public:
     virtual string absSep() {return (const char *)(prefs.abssep.toUtf8());}
     virtual string iconUrl(RclConfig *, Rcl::Doc& doc);
 private:
-    ResList *m_parent;
+    ResList *m_reslist;
 };
 
 #if 0
@@ -110,7 +110,7 @@ bool QtGuiResListPager::append(const string& data)
 {
     LOGDEB2(("QtGuiReslistPager::appendString   : %s\n", data.c_str()));
     logdata(data.c_str());
-    m_parent->append(QString::fromUtf8(data.c_str()));
+    m_reslist->append(QString::fromUtf8(data.c_str()));
     return true;
 }
 
@@ -118,24 +118,24 @@ bool QtGuiResListPager::append(const string& data, int docnum,
 			       const Rcl::Doc&)
 {
     LOGDEB2(("QtGuiReslistPager::appendDoc: blockCount %d, %s\n",
-	    m_parent->document()->blockCount(), data.c_str()));
+	    m_reslist->document()->blockCount(), data.c_str()));
     logdata(data.c_str());
 #ifdef RESLIST_TEXTBROWSER
-    int blkcnt0 = m_parent->document()->blockCount();
-    m_parent->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor);
-    m_parent->textCursor().insertBlock();
-    m_parent->insertHtml(QString::fromUtf8(data.c_str()));
-    m_parent->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor);
-    m_parent->ensureCursorVisible();
-    int blkcnt1 = m_parent->document()->blockCount();
+    int blkcnt0 = m_reslist->document()->blockCount();
+    m_reslist->moveCursor(QTextCursor::End, QTextCursor::MoveAnchor);
+    m_reslist->textCursor().insertBlock();
+    m_reslist->insertHtml(QString::fromUtf8(data.c_str()));
+    m_reslist->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor);
+    m_reslist->ensureCursorVisible();
+    int blkcnt1 = m_reslist->document()->blockCount();
     for (int block = blkcnt0; block < blkcnt1; block++) {
-	m_parent->m_pageParaToReldocnums[block] = docnum;
+	m_reslist->m_pageParaToReldocnums[block] = docnum;
     }
 #else
     QString sdoc = QString("<div class=\"rclresult\" rcldocnum=\"%1\">").arg(docnum);
-    m_parent->append(sdoc);
-    m_parent->append(QString::fromUtf8(data.c_str()));
-    m_parent->append("</div>");
+    m_reslist->append(sdoc);
+    m_reslist->append(QString::fromUtf8(data.c_str()));
+    m_reslist->append("</div>");
 #endif
     return true;
 }
@@ -276,7 +276,8 @@ static PlainToRichQtReslist g_hiliter;
 /////////////////////////////////////
 
 ResList::ResList(QWidget* parent, const char* name)
-    : RESLIST_PARENTCLASS(parent), m_parent(0)
+    : RESLIST_PARENTCLASS(parent), m_curPvDoc(-1), m_lstClckMod(0), 
+      m_listId(0), m_rclmain(0), m_ismainlist(true), m_coninit(false)
 {
     if (!name)
 	setObjectName("resList");
@@ -299,6 +300,7 @@ ResList::ResList(QWidget* parent, const char* name)
     page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks);
     settings()->setAttribute(QWebSettings::JavascriptEnabled, true);
 #endif
+
     setFont();
     languageChange();
 
@@ -311,13 +313,11 @@ ResList::ResList(QWidget* parent, const char* name)
     connect(this, SIGNAL(highlighted(const QString &)), 
 	    this, SLOT(highlighted(const QString &)));
 #endif
+
     setContextMenuPolicy(Qt::CustomContextMenu);
     connect(this, SIGNAL(customContextMenuRequested(const QPoint&)),
 	    this, SLOT(createPopupMenu(const QPoint&)));
 
-    m_curPvDoc = -1;
-    m_lstClckMod = 0;
-    m_listId = 0;
     m_pager = new QtGuiResListPager(this, prefs.respagesize);
     m_pager->setHighLighter(&g_hiliter);
 }
@@ -379,6 +379,17 @@ void ResList::setDocSource(RefCntr<DocSequence> nsource)
 {
     LOGDEB(("ResList::setDocSource()\n"));
     m_source = RefCntr<DocSequence>(new DocSource(theconfig, nsource));
+    if (!m_ismainlist && !m_coninit) {
+	m_coninit = true;
+	connect(new QShortcut(closeKeySeq, this), SIGNAL (activated()), 
+		this, SLOT (close()));
+	connect(new QShortcut(quitKeySeq, this), SIGNAL (activated()), 
+		m_rclmain, SLOT (fileExit()));
+	connect(this, SIGNAL(previewRequested(Rcl::Doc)), 
+		m_rclmain, SLOT(startPreview(Rcl::Doc)));
+	connect(this, SIGNAL(docEditClicked(Rcl::Doc)), 
+		m_rclmain, SLOT(startNativeViewer(Rcl::Doc)));
+    }
 }
 
 // A query was executed, or the filtering/sorting parameters changed,
@@ -715,7 +726,6 @@ void ResList::displayPage()
 
     // Possibly color paragraph of current preview if any
     previewExposed(m_curPvDoc);
-
 }
 
 // Color paragraph (if any) of currently visible preview
@@ -804,11 +814,11 @@ void ResList::mouseDoubleClickEvent(QMouseEvent *event)
 void ResList::newSnippetsW(const Rcl::Doc& doc)
 {
     SnippetsW *sp = new SnippetsW(doc, m_source);
-    if (m_parent) {
+    if (m_rclmain) {
 	connect(sp, SIGNAL(startNativeViewer(Rcl::Doc, int, QString)),
-		m_parent, SLOT(startNativeViewer(Rcl::Doc, int, QString)));
+		m_rclmain, SLOT(startNativeViewer(Rcl::Doc, int, QString)));
 	connect(new QShortcut(quitKeySeq, sp), SIGNAL (activated()), 
-		m_parent, SLOT (fileExit()));
+		m_rclmain, SLOT (fileExit()));
     }
     connect(new QShortcut(closeKeySeq, sp), SIGNAL (activated()), 
 	    sp, SLOT (close()));
@@ -841,6 +851,18 @@ void ResList::newDupsW(const Rcl::Doc&, const vector<Rcl::Doc>& dups)
     dialog.exec();
 }
 
+void ResList::showQueryDetails()
+{
+    if (m_source.isNull())
+	return;
+    string oq = breakIntoLines(m_source->getDescription(), 100, 50);
+    QString str;
+    QString desc = tr("Result count (est.)") + ": " + 
+	str.setNum(m_source->getResCnt()) + "<br>";
+    desc += tr("Query details") + ": " + QString::fromUtf8(oq.c_str());
+    QMessageBox::information(this, tr("Query details"), desc);
+}
+
 void ResList::linkWasClicked(const QUrl &url)
 {
     string ascurl = (const char *)url.toString().toAscii();;
@@ -885,7 +907,7 @@ void ResList::linkWasClicked(const QUrl &url)
     // Show query details
     case 'H': 
     {
-	emit headerClicked(); 
+	showQueryDetails();
 	break;
     }
 
@@ -899,10 +921,15 @@ void ResList::linkWasClicked(const QUrl &url)
 	    LOGERR(("ResList::linkWasClicked: can't get doc for %d\n", i));
 	    return;
 	}
-	if (what == 'P')
-	    emit docPreviewClicked(i, doc, m_lstClckMod);
-	else
+	if (what == 'P') {
+	    if (m_ismainlist) {
+		emit docPreviewClicked(i, doc, m_lstClckMod);
+	    } else {
+		emit previewRequested(doc);
+	    }
+	} else {
 	    emit docEditClicked(doc);
+	}
     }
     break;
 
@@ -967,7 +994,8 @@ void ResList::createPopupMenu(const QPoint& pos)
     if (havedoc)
 	doc.getmeta(Rcl::Doc::keyapptg, &apptag);
 
-    if (havedoc && !theconfig->getMimeViewerDef(doc.mimetype, apptag, 0).empty()) {
+    if (havedoc && 
+	!theconfig->getMimeViewerDef(doc.mimetype, apptag, 0).empty()) {
 	popup->addAction(tr("&Open"), this, SLOT(menuEdit()));
     }
     popup->addAction(tr("Copy &File Name"), this, SLOT(menuCopyFN()));
@@ -990,6 +1018,10 @@ void ResList::createPopupMenu(const QPoint& pos)
 	popup->addAction(tr("Open &Snippets window"), 
 			 this, SLOT(menuOpenSnippets()));
 
+    if (havedoc && rcldb && rcldb->hasSubDocs(doc)) 
+	popup->addAction(tr("Show subdocuments / attachments"), 
+			 this, SLOT(menuShowSubDocs()));
+
     popup->popup(mapToGlobal(pos));
 }
 
@@ -1051,6 +1083,13 @@ void ResList::menuOpenSnippets()
     newSnippetsW(doc);
 }
 
+void ResList::menuShowSubDocs()
+{
+    Rcl::Doc doc;
+    if (getDoc(m_popDoc, doc)) 
+	emit showSubDocs(doc);
+}
+
 void ResList::menuEdit()
 {
     Rcl::Doc doc;

src/qtgui/reslist.h

@@ -69,7 +69,11 @@ class ResList : public RESLIST_PARENTCLASS
     void setFont();
     void setRclMain(RclMain *m) 
     {
-	m_parent = m;
+	m_rclmain = m;
+    }
+    void setIsMainList(bool onoff)
+    {
+	m_ismainlist = onoff;
     }
  public slots:
     virtual void setDocSource(RefCntr<DocSequence> nsource);
@@ -89,11 +93,13 @@ class ResList : public RESLIST_PARENTCLASS
     virtual void menuPreviewParent();
     virtual void menuOpenParent();
     virtual void menuOpenSnippets();
+    virtual void menuShowSubDocs();
     virtual void previewExposed(int);
     virtual void append(const QString &text);
     virtual void readDocSource();
     virtual void highlighted(const QString& link);
     virtual void createPopupMenu(const QPoint& pos);
+    virtual void showQueryDetails();
 	
  signals:
     void nextPageAvailable(bool);
@@ -102,8 +108,8 @@ class ResList : public RESLIST_PARENTCLASS
     void docPreviewClicked(int, Rcl::Doc, int);
     void docSaveToFileClicked(Rcl::Doc);
     void previewRequested(Rcl::Doc);
+    void showSubDocs(Rcl::Doc);
     void editRequested(Rcl::Doc);
-    void headerClicked();
     void docExpand(Rcl::Doc);
     void wordSelect(QString);
     void wordReplace(const QString&, const QString&);
@@ -137,7 +143,9 @@ class ResList : public RESLIST_PARENTCLASS
     // so we store the page and display it when done.
     QString    m_text; 
 #endif
-    RclMain   *m_parent;
+    RclMain   *m_rclmain;
+    bool m_ismainlist;
+    bool m_coninit;
 
     virtual void displayPage(); // Display current page
     static int newListId();