diff --git a/src/index/fetcher.cpp b/src/index/fetcher.cpp index 3f3a0723..d6106480 100644 --- a/src/index/fetcher.cpp +++ b/src/index/fetcher.cpp @@ -28,7 +28,7 @@ DocFetcher *docFetcherMake(const Rcl::Doc& idoc) { if (idoc.url.empty()) { LOGERR(("docFetcherMakeg:: no url in doc!\n")); - return false; + return 0; } string backend; idoc.getmeta(Rcl::Doc::keybcknd, &backend); diff --git a/src/kde/kioslave/kio_recoll/htmlif.cpp b/src/kde/kioslave/kio_recoll/htmlif.cpp index d31cd62c..84595e8a 100644 --- a/src/kde/kioslave/kio_recoll/htmlif.cpp +++ b/src/kde/kioslave/kio_recoll/htmlif.cpp @@ -43,6 +43,7 @@ using namespace std; #include "plaintorich.h" #include "internfile.h" #include "wipedir.h" +#include "hldata.h" using namespace KIO; @@ -260,9 +261,9 @@ void RecollProtocol::showPreview(const Rcl::Doc& idoc) PlainToRichKio ptr(fname); ptr.set_inputhtml(!fdoc.mimetype.compare("text/html")); list otextlist; - HiliteData hdata; + HighlightData hdata; if (!m_source.isNull()) - m_source->getTerms(hdata.terms, hdata.groups, hdata.gslks); + m_source->getTerms(hdata); ptr.plaintorich(fdoc.text, otextlist, hdata); QByteArray array; diff --git a/src/kde/kioslave/kio_recoll/kio_recoll.cpp b/src/kde/kioslave/kio_recoll/kio_recoll.cpp index 6c7fe4fe..8c07225c 100644 --- a/src/kde/kioslave/kio_recoll/kio_recoll.cpp +++ b/src/kde/kioslave/kio_recoll/kio_recoll.cpp @@ -323,11 +323,11 @@ bool RecollProtocol::doSearch(const QueryDesc& qd) Rcl::SCLT_OR : Rcl::SCLT_AND, qs); } - sd = new Rcl::SearchData(Rcl::SCLT_OR); + sd = new Rcl::SearchData(Rcl::SCLT_OR, "english"); if (sd && clp) sd->addClause(clp); } else { - sd = wasaStringToRcl(o_rclconfig, qs, m_reason); + sd = wasaStringToRcl(o_rclconfig, "english", qs, m_reason); } if (!sd) { m_reason = "Internal Error: cant build search"; @@ -336,7 +336,6 @@ bool RecollProtocol::doSearch(const QueryDesc& qd) } RefCntr sdata(sd); - sdata->setStemlang("english"); RefCntrquery(new Rcl::Query(m_rcldb)); query->setCollapseDuplicates(prefs.collapseDuplicates); if (!query->setQuery(sdata)) { diff --git a/src/qtgui/guiutils.cpp b/src/qtgui/guiutils.cpp index a5672211..6b13cbb3 100644 --- a/src/qtgui/guiutils.cpp +++ b/src/qtgui/guiutils.cpp @@ -33,6 +33,7 @@ RclDynConf *g_dynconf; AdvSearchHist *g_advshistory; +RclConfig *theconfig; // The table should not be necessary, but I found no css way to get // qt 4.6 qtextedit to clear the margins after the float img without diff --git a/src/qtgui/main.cpp b/src/qtgui/main.cpp index 88252020..40cc3c2e 100644 --- a/src/qtgui/main.cpp +++ b/src/qtgui/main.cpp @@ -49,7 +49,7 @@ #include "recollq.h" -RclConfig *theconfig; +extern RclConfig *theconfig; RclConfig *thestableconfig; PTMutexInit thestableconfiglock; diff --git a/src/query/dynconf.h b/src/query/dynconf.h index 8ac4dd4d..e6885b79 100644 --- a/src/query/dynconf.h +++ b/src/query/dynconf.h @@ -49,6 +49,7 @@ /** Interface for a stored object. */ class DynConfEntry { public: + virtual ~DynConfEntry() {} /** Decode object-as-string coming out from storage */ virtual bool decode(const std::string &value) = 0; /** Encode object state into state for storing */ @@ -63,6 +64,7 @@ class RclSListEntry : public DynConfEntry { RclSListEntry() { } + virtual ~RclSListEntry() {} RclSListEntry(const std::string& v) : value(v) { diff --git a/src/rcldb/stemdb.h b/src/rcldb/stemdb.h index 4b8d938a..d5f4e986 100644 --- a/src/rcldb/stemdb.h +++ b/src/rcldb/stemdb.h @@ -66,6 +66,7 @@ public: : m_stemmer(lang), m_lang(lang) { } + virtual ~SynTermTransStem() {} virtual std::string operator()(const std::string& in) { string out = m_stemmer(in); diff --git a/website/download.html b/website/download.html index 911bb776..2d06bc66 100644 --- a/website/download.html +++ b/website/download.html @@ -39,7 +39,7 @@ Source - Rpm/deb packages + Packages (.rpm and .deb) Known bugs Mac ports Filters @@ -60,11 +60,16 @@

Recoll Installation / building manual.

-

The indexing filters for some document types may need +

The indexing filters used for some document types may need external packages not installed on your system by default, and not installed automatically with Recoll: take a look at the list and - decide what you need to install.

+ decide what you need to + install. Also new or updated + filters sometimes become available after a release. As a + rule, all filters are compatible with all Recoll + versions. Any compatibility problem will be explicitely + mentionned.

The Recoll term explorer tool in phonetic mode (marginally useful and optional) uses the aspell package, version @@ -93,20 +98,6 @@ the changes file), there is probably no necessity to upgrade anyway.

-

Updated filters

- -

New and updated filters are sometimes - available before the next - Recoll release. As far as I know, all current filters are - fully compatible with older Recoll releases (from 1.13), so - you can install new or updated filters on - older Recoll packages and gain new file type support without - destabilizing your search setup.

- -

You may be interested by the new XML and TAR filters, and an - updated Open Office filter that appeared after the 1.17.3 - release.

-

Source

Current release distribution: 1.17.3:

@@ -165,15 +156,6 @@ -

KDE3 kicker applet:

-

the applet can start a Recoll search - from the KDE3 toolbar. It is in a separate source file. - recoll_applet-1.10.0.tgz. - This is a very slightly modified version of the - - find_applet. It will work with any recoll version after - 1.10. KDE 3 only.

-

Source repository:

The Recoll source repository is hosted on @@ -204,7 +186,7 @@ 1.0.16.

-

Packages

+

Packages

Packages or ports for Recoll are available in the standard repositories for many distributions.

@@ -225,22 +207,21 @@

Ubuntu

There are Personal Package Archives on launchpad.net for - - Xapian, Recoll, kio-recoll and recoll-lens. These were built from the - latest versions, for a set of Ubuntu series.

- -

Ubuntu 10.04 (lucid) and later versions just need the Recoll - PPA.

- -

I am not producing packages for older versions any more, - but some are still stored on Launchpad, and you'll find some - instructions to install them in - the older download page. -

+ latest versions, for a set of Ubuntu series. starting at + Lucid. The installation is very simple: + 

+          sudo add-apt-repository ppa:recoll-backports/recoll-1.15-on
+          sudo apt-get update
+          sudo apt-get install recoll
+
+

Mint Linux

+

The Ubuntu PPA works perfectly for Mint 13 (and probably + other releases too). Just follow the instructions for Ubuntu.

+

RPMS

Some Fedora and Mandriva packages unfortunately think that they diff --git a/website/filters/filters.html b/website/filters/filters.html index 67fc7666..e0894eeb 100644 --- a/website/filters/filters.html +++ b/website/filters/filters.html @@ -65,14 +65,10 @@ mimeview

-

There is a new rclepub filter for EPUB ebooks. It new for +

There is a new rclepub filter for EPUB ebooks. It is new for all recoll versions before 1.18.0.

rclchm needs to be updated for all Recoll versions up to and including 1.17.1.

-

All filters are up to date in Recoll 1.16.2, except - rclchm, and the new ones for gnumeric and Okular annotations.

-

Recoll 1.15 may benefit from some of the newer - filters linked below.

If you are running an older Recoll version, you really should upgrade.