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

turn-off abst. build for fname search (no terms) + prototype query expansion (xapian e-set on chosen doc) + dbl-click in preview adds term to ssearch

Browse Source
This commit is contained in:
dockes
2006-04-22 06:27:37 +00:00
parent f15b278194
commit 57cdece639
12 changed files with 133 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qtgui/main.cpp
+8 -5
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: main.cpp,v 1.42 2006-04-19 08:26:08 dockes Exp $ (C) 2005 J.F.Dockes";
static char rcsid[] = "@(#$Id: main.cpp,v 1.43 2006-04-22 06:27:37 dockes Exp $ (C) 2005 J.F.Dockes";
#endif
/*
* This program is free software; you can redistribute it and/or modify
@@ -80,11 +80,14 @@ bool maybeOpenDb(string &reason, bool force)
return false;
}
int qopts = 0;
if (prefs.queryBuildAbstract)
int qopts = Rcl::Db::QO_NONE;
if (prefs.queryBuildAbstract) {
qopts |= Rcl::Db::QO_BUILD_ABSTRACT;
if (prefs.queryReplaceAbstract)
qopts |= Rcl::Db::QO_REPLACE_ABSTRACT;
if (prefs.queryReplaceAbstract)
qopts |= Rcl::Db::QO_REPLACE_ABSTRACT;
}
if (prefs.queryStemLang.length() > 0)
qopts |= Rcl::Db::QO_STEM;
if (force)
rcldb->close();
rcldb->rmQueryDb("");
src/qtgui/preview/preview.ui
+3
View File
@@ -196,9 +196,11 @@
<variable>bool dynSearchActive;</variable>
<variable>bool canBeep;</variable>
<variable>void *tabData;</variable>
<variable>QWidget *currentW;</variable>
</variables>
<signals>
<signal>previewClosed(QWidget *)</signal>
<signal>wordSelect(QString)</signal>
</signals>
<slots>
<slot>searchTextLine_textChanged( const QString &amp; text )</slot>
@@ -208,6 +210,7 @@
<slot>currentChanged( QWidget * tw )</slot>
<slot>closeCurrentTab()</slot>
<slot>setCurTabProps( const string &amp; fn, const Rcl::Doc &amp; doc )</slot>
<slot>textDoubleClicked(int, int)</slot>
</slots>
<functions>
<function access="private" specifier="non virtual">init()</function>
src/qtgui/preview/preview.ui.h
+16
View File
@@ -71,6 +71,7 @@ void Preview::init()
canBeep = true;
tabData = new list<TabData>;
TABDATA->push_back(TabData(pvTab->currentPage()));
currentW = 0;
}
void Preview::destroy()
@@ -223,6 +224,7 @@ void Preview::prevPressed()
void Preview::currentChanged(QWidget * tw)
{
QWidget *edit = (QWidget *)tw->child("pvEdit");
currentW = tw;
LOGDEB1(("Preview::currentChanged(). Editor: %p\n", edit));
if (edit == 0) {
@@ -231,9 +233,23 @@ void Preview::currentChanged(QWidget * tw)
tw->installEventFilter(this);
edit->installEventFilter(this);
edit->setFocus();
connect(edit, SIGNAL(doubleClicked(int, int)),
this, SLOT(textDoubleClicked(int, int)));
}
}
void Preview::textDoubleClicked(int, int)
{
if (!currentW)
return;
QTextEdit *edit = (QTextEdit *)currentW->child("pvEdit");
if (edit == 0) {
LOGERR(("Editor child not found\n"));
return;
}
if (edit->hasSelectedText())
emit(wordSelect(edit->selectedText()));
}
void Preview::closeCurrentTab()
{
src/qtgui/rclmain.cpp
+39 -6
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: rclmain.cpp,v 1.23 2006-04-20 09:20:09 dockes Exp $ (C) 2005 J.F.Dockes";
static char rcsid[] = "@(#$Id: rclmain.cpp,v 1.24 2006-04-22 06:27:37 dockes Exp $ (C) 2005 J.F.Dockes";
#endif
/*
* This program is free software; you can redistribute it and/or modify
@@ -95,8 +95,8 @@ void RclMain::init()
m_history = new RclDHistory(historyfile);
connect(sSearch, SIGNAL(startSearch(Rcl::AdvSearchData)),
this, SLOT(startAdvSearch(Rcl::AdvSearchData)));
connect(sSearch, SIGNAL(clearSearch()),
resList, SLOT(resetSearch()));
connect(sSearch, SIGNAL(clearSearch()), resList, SLOT(resetSearch()));
connect(resList, SIGNAL(docExpand(int)), this, SLOT(docExpand(int)));
nextPageAction->setIconSet(createIconSet("nextpage.png"));
prevPageAction->setIconSet(createIconSet("prevpage.png"));
@@ -289,9 +289,16 @@ void RclMain::startAdvSearch(Rcl::AdvSearchData sdata)
resList->resetSearch();
if (!rcldb->setQuery(sdata, prefs.queryStemLang.length() > 0 ?
Rcl::Db::QO_STEM : Rcl::Db::QO_NONE,
prefs.queryStemLang.ascii()))
int qopts = 0;
if (prefs.queryBuildAbstract && !sdata.fileNameOnly()) {
qopts |= Rcl::Db::QO_BUILD_ABSTRACT;
if (prefs.queryReplaceAbstract)
qopts |= Rcl::Db::QO_REPLACE_ABSTRACT;
}
if (!prefs.queryStemLang.length() == 0)
qopts |= Rcl::Db::QO_STEM;
if (!rcldb->setQuery(sdata, qopts, prefs.queryStemLang.ascii()))
return;
curPreview = 0;
@@ -409,6 +416,8 @@ void RclMain::startPreview(int docnum)
curPreview->setCaption(resList->getDescription());
connect(curPreview, SIGNAL(previewClosed(QWidget *)),
this, SLOT(previewClosed(QWidget *)));
connect(curPreview, SIGNAL(wordSelect(QString)),
this, SLOT(ssearchAddTerm(QString)));
curPreview->show();
} else {
if (curPreview->makeDocCurrent(fn, doc)) {
@@ -422,6 +431,13 @@ void RclMain::startPreview(int docnum)
curPreview->closeCurrentTab();
}
void RclMain::ssearchAddTerm(QString term)
{
QString text = sSearch->queryText->text();
text += QString::fromLatin1(" ") + term;
sSearch->queryText->setText(text);
}
void RclMain::startNativeViewer(int docnum)
{
Rcl::Doc doc;
@@ -495,6 +511,23 @@ void RclMain::startManual()
startHelpBrowser();
}
void RclMain::docExpand(int docnum)
{
Rcl::Doc doc;
if (!resList->getDoc(docnum, doc))
return;
list<string> terms;
terms = rcldb->expand(doc);
QString text = sSearch->queryText->text();
for (list<string>::iterator it = terms.begin(); it != terms.end(); it++) {
text += QString::fromLatin1(" \"") +
QString::fromUtf8((*it).c_str()) + QString::fromLatin1("\"");
}
sSearch->queryText->setText(text);
sSearch->setAnyTermMode();
sSearch->startSimpleSearch();
}
void RclMain::showDocHistory()
{
LOGDEB(("RclMain::showDocHistory\n"));
src/qtgui/rclmain.h
+2
View File
@@ -60,6 +60,8 @@ public slots:
virtual void setUIPrefs();
virtual void enableNextPage(bool);
virtual void enablePrevPage(bool);
virtual void docExpand(int);
virtual void ssearchAddTerm(QString);
protected:
Preview *curPreview;
advsearch *asearchform;
src/qtgui/rclreslist.cpp
+10 -2
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: rclreslist.cpp,v 1.13 2006-04-20 09:20:09 dockes Exp $ (C) 2005 J.F.Dockes";
static char rcsid[] = "@(#$Id: rclreslist.cpp,v 1.14 2006-04-22 06:27:37 dockes Exp $ (C) 2005 J.F.Dockes";
#endif
#include <time.h>
@@ -294,7 +294,7 @@ void RclResList::showResultPage()
if (!doc.fbytes.empty())
fsize = atol(doc.fbytes.c_str());
string sizebuf;
if (dsize >= 0) {
if (dsize > 0) {
sizebuf = displayableBytes(dsize);
if (fsize > 10 * dsize && fsize - dsize > 1000)
sizebuf += string(" / ") + displayableBytes(fsize);
@@ -438,6 +438,7 @@ QPopupMenu *RclResList::createPopupMenu(const QPoint& pos)
popup->insertItem(tr("&Edit"), this, SLOT(menuEdit()));
popup->insertItem(tr("&Copy File Name"), this, SLOT(menuCopyFN()));
popup->insertItem(tr("Copy &Url"), this, SLOT(menuCopyURL()));
popup->insertItem(tr("&More like this"), this, SLOT(menuExpand()));
return popup;
}
@@ -467,6 +468,13 @@ void RclResList::menuCopyURL()
QClipboard::Selection);
}
}
void RclResList::menuExpand()
{
Rcl::Doc doc;
if (rcldb && getDoc(m_docnum, doc)) {
emit docExpand(m_docnum);
}
}
QString RclResList::getDescription()
{
src/qtgui/rclreslist.h
+3 -1
View File
@@ -1,6 +1,6 @@
#ifndef _RCLRESLIST_H_INCLUDED_
#define _RCLRESLIST_H_INCLUDED_
/* @(#$Id: rclreslist.h,v 1.6 2006-04-20 09:20:10 dockes Exp $ (C) 2005 J.F.Dockes */
/* @(#$Id: rclreslist.h,v 1.7 2006-04-22 06:27:37 dockes Exp $ (C) 2005 J.F.Dockes */
#include <qtextbrowser.h>
#include <qpopupmenu.h>
@@ -33,6 +33,7 @@ class RclResList : public QTextBrowser
virtual void menuEdit();
virtual void menuCopyFN();
virtual void menuCopyURL();
virtual void menuExpand();
signals:
void nextPageAvailable(bool);
@@ -40,6 +41,7 @@ class RclResList : public QTextBrowser
void docEditClicked(int);
void docPreviewClicked(int);
void headerClicked();
void docExpand(int);
protected:
void keyPressEvent(QKeyEvent *e);
src/qtgui/ssearchb.ui
+1
View File
@@ -147,6 +147,7 @@
<function>init()</function>
<function>completion()</function>
<function returnType="bool">event( QEvent * evt )</function>
<function>setAnyTermMode()</function>
</functions>
<layoutdefaults spacing="6" margin="0"/>
</UI>
src/qtgui/ssearchb.ui.h
+4
View File
@@ -75,6 +75,10 @@ void SSearchBase::startSimpleSearch()
emit startSearch(sdata);
}
void SSearchBase::setAnyTermMode()
{
searchTypCMB->setCurrentItem(0);
}
// Complete last word in input by querying db for all possible terms.
void SSearchBase::completion()