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

Merge branch 'master' of https://opensourceprojects.eu/git/p/recoll1/code

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-10-09 15:19:48 +02:00
commit 0d3dc0fada
3 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qtgui/confgui/confguiindex.cpp
View File

@ -166,7 +166,7 @@ static MyConfLinkFactRCL conflinkfactory;
void ConfIndexW::showPrefs(bool modal) void ConfIndexW::showPrefs(bool modal)
{ {
delete m_conf; delete m_conf;
if (((m_conf = m_rclconf->cloneMainConfig()) == 0)) { if ((m_conf = m_rclconf->cloneMainConfig()) == 0) {
return; return;
} }
m_conf->holdWrites(true); m_conf->holdWrites(true);

22
src/query/docseq.h
View File

@ -184,7 +184,8 @@ public:
{} {}
virtual ~DocSeqModifier() {} virtual ~DocSeqModifier() {}
virtual bool getAbstract(Rcl::Doc& doc, std::vector<std::string>& abs) { virtual bool getAbstract(Rcl::Doc& doc, std::vector<std::string>& abs)
override{
if (!m_seq) if (!m_seq)
return false; return false;
return m_seq->getAbstract(doc, abs); return m_seq->getAbstract(doc, abs);
@ -196,46 +197,47 @@ public:
return m_seq->getAbstract(doc, abs, maxlen, bypage); return m_seq->getAbstract(doc, abs, maxlen, bypage);
} }
/** Get duplicates. */ /** Get duplicates. */
virtual bool docDups(const Rcl::Doc& doc, std::vector<Rcl::Doc>& dups) { virtual bool docDups(const Rcl::Doc& doc, std::vector<Rcl::Doc>& dups)
override {
if (!m_seq) if (!m_seq)
return false; return false;
return m_seq->docDups(doc, dups); return m_seq->docDups(doc, dups);
} }
virtual bool snippetsCapable() { virtual bool snippetsCapable() override {
if (!m_seq) if (!m_seq)
return false; return false;
return m_seq->snippetsCapable(); return m_seq->snippetsCapable();
} }
virtual std::string getDescription() { virtual std::string getDescription() override {
if (!m_seq) if (!m_seq)
return ""; return "";
return m_seq->getDescription(); return m_seq->getDescription();
} }
virtual void getTerms(HighlightData& hld) { virtual void getTerms(HighlightData& hld) override {
if (!m_seq) if (!m_seq)
return; return;
m_seq->getTerms(hld); m_seq->getTerms(hld);
} }
virtual bool getEnclosing(Rcl::Doc& doc, Rcl::Doc& pdoc) { virtual bool getEnclosing(Rcl::Doc& doc, Rcl::Doc& pdoc) override {
if (!m_seq) if (!m_seq)
return false; return false;
return m_seq->getEnclosing(doc, pdoc); return m_seq->getEnclosing(doc, pdoc);
} }
virtual std::string getReason() { virtual std::string getReason() override {
if (!m_seq) if (!m_seq)
return string(); return string();
return m_seq->getReason(); return m_seq->getReason();
} }
virtual std::string title() { virtual std::string title() override {
return m_seq->title(); return m_seq->title();
} }
virtual std::shared_ptr<DocSequence> getSourceSeq() { virtual std::shared_ptr<DocSequence> getSourceSeq() override {
return m_seq; return m_seq;
} }
protected: protected:
virtual std::shared_ptr<Rcl::Db> getDb() { virtual std::shared_ptr<Rcl::Db> getDb() override {
if (!m_seq) if (!m_seq)
return 0; return 0;
return m_seq->getDb(); return m_seq->getDb();

35
src/query/docseqdb.h
View File

@ -30,38 +30,37 @@ class DocSequenceDb : public DocSequence {
std::shared_ptr<Rcl::Query> q, const std::string &t, std::shared_ptr<Rcl::Query> q, const std::string &t,
std::shared_ptr<Rcl::SearchData> sdata); std::shared_ptr<Rcl::SearchData> sdata);
virtual ~DocSequenceDb() {} virtual ~DocSequenceDb() {}
virtual bool getDoc(int num, Rcl::Doc &doc, std::string * = 0); virtual bool getDoc(int num, Rcl::Doc &doc, std::string * = 0) override;
virtual int getResCnt(); virtual int getResCnt() override;
virtual void getTerms(HighlightData& hld); virtual void getTerms(HighlightData& hld) override;
// Called to fill-up the snippets window. Ignoers // Called to fill-up the snippets window. Ignoers
// buildabstract/replaceabstract and syntabslen // buildabstract/replaceabstract and syntabslen
virtual bool getAbstract(Rcl::Doc &doc, std::vector<Rcl::Snippet>&, virtual bool getAbstract(Rcl::Doc &doc, std::vector<Rcl::Snippet>&,
int maxlen, bool sortbypage) override; int maxlen, bool sortbypage) override;
virtual bool getAbstract(Rcl::Doc &doc, std::vector<std::string>&); virtual bool getAbstract(Rcl::Doc &doc, std::vector<std::string>&) override;
virtual int getFirstMatchPage(Rcl::Doc&, std::string& term); virtual int getFirstMatchPage(Rcl::Doc&, std::string& term) override;
virtual bool docDups(const Rcl::Doc& doc, std::vector<Rcl::Doc>& dups); virtual bool docDups(const Rcl::Doc& doc, std::vector<Rcl::Doc>& dups)
virtual std::string getDescription(); override;
virtual std::list<std::string> expand(Rcl::Doc &doc); virtual std::string getDescription() override;
virtual bool canFilter() {return true;} virtual std::list<std::string> expand(Rcl::Doc &doc) override;
virtual bool setFiltSpec(const DocSeqFiltSpec &filtspec); virtual bool canFilter() override {return true;}
virtual bool canSort() {return true;} virtual bool setFiltSpec(const DocSeqFiltSpec &filtspec) override;
virtual bool setSortSpec(const DocSeqSortSpec &sortspec); virtual bool canSort() override {return true;}
virtual void setAbstractParams(bool qba, bool qra) virtual bool setSortSpec(const DocSeqSortSpec &sortspec) override;
{ virtual void setAbstractParams(bool qba, bool qra) {
m_queryBuildAbstract = qba; m_queryBuildAbstract = qba;
m_queryReplaceAbstract = qra; m_queryReplaceAbstract = qra;
} }
virtual bool snippetsCapable() virtual bool snippetsCapable() override {
{
return true; return true;
} }
virtual std::string title(); virtual std::string title() override;
protected: protected:
virtual std::shared_ptr<Rcl::Db> getDb() { virtual std::shared_ptr<Rcl::Db> getDb() override {
return m_db; return m_db;
} }
private: private: