Use recursive mutex on log calls because some call arguments can themselves call the log. Caused actual deadlocks in recoll 1.23 GUI with high verbosity

fix typo in mimeview (TB opens eml not emf files)

.hgignore

@@ -1,102 +1,97 @@
 syntax: glob
-*.o 
 *.dep
 *.dep.stamp
+*.o 
+.libs
+*.la
+stamp-h1
+.dirstamp
+libtool
+.deps
+*.lo
 *~
 \#*
-src/Makefile
+*.obj
-src/autom4te.cache
+*.sdf
-src/bincimapmime/alldeps
+*.tlog
-src/common/autoconfig.h
+*.lib
-src/common/rclversion.h
+*.idb
+*.log
+*.pdb
+.vs
+*.exe
+*.ilk
+ptrans
+src/aclocal.m4
+src/compile
+src/config.guess
+src/config.sub
+src/depcomp
+src/install-sh
+src/Makefile.in
+src/ltmain.sh
+src/m4/libtool.m4
+src/m4/ltoptions.m4
+src/m4/ltsugar.m4
+src/m4/ltversion.m4
+src/m4/lt~obsolete.m4
+src/missing
 src/config.log
 src/config.status
-src/desktop/unity-lens-recoll/Makefile
+src/configure
-src/desktop/unity-lens-recoll/autom4te.cache
+src/Makefile
-src/desktop/unity-lens-recoll/bin/unity-recoll-daemon
+src/autom4te.cache
-src/desktop/unity-lens-recoll/config.log
+src/common/autoconfig.h
-src/desktop/unity-lens-recoll/config.status
+src/common/rclversion.h
-src/desktop/unity-lens-recoll/data/recoll.lens
+src/doc/user/webhelp/docs/*
-src/desktop/unity-lens-recoll/data/unity-lens-recoll.service
-src/doc/user/HTML.manifest
-src/doc/user/index.html
-src/doc/user/rcl.indexing.beaglequeue.html
-src/doc/user/rcl.indexing.config.html
-src/doc/user/rcl.indexing.html
-src/doc/user/rcl.indexing.monitor.html
-src/doc/user/rcl.indexing.periodic.html
-src/doc/user/rcl.indexing.storage.html
-src/doc/user/rcl.install.building.html
-src/doc/user/rcl.install.config.html
-src/doc/user/rcl.install.external.html
-src/doc/user/rcl.install.html
-src/doc/user/rcl.introduction.html
-src/doc/user/rcl.introduction.recoll.html
-src/doc/user/rcl.introduction.search.html
-src/doc/user/rcl.kicker-applet.html
-src/doc/user/rcl.program.api.html
-src/doc/user/rcl.program.fields.html
-src/doc/user/rcl.program.html
-src/doc/user/rcl.search.anchorwild.html
-src/doc/user/rcl.search.commandline.html
-src/doc/user/rcl.search.complex.html
-src/doc/user/rcl.search.custom.html
-src/doc/user/rcl.search.desktop.html
-src/doc/user/rcl.search.history.html
-src/doc/user/rcl.search.html
-src/doc/user/rcl.search.lang.html
-src/doc/user/rcl.search.multidb.html
-src/doc/user/rcl.search.preview.html
-src/doc/user/rcl.search.reslist.html
-src/doc/user/rcl.search.sort.html
-src/doc/user/rcl.search.termexplorer.html
-src/doc/user/rcl.search.tips.html
-src/doc/user/rcl.search.wildcards.html
-src/doc/user/rcl.searchkcl.html
-src/doc/user/rcl.searchkio.html
-src/doc/user/rcl.searchkio.searchabledocs.html
-src/doc/user/usermanual.aux
-src/doc/user/usermanual.html
-src/doc/user/usermanual.html-text
-src/doc/user/usermanual.log
-src/doc/user/usermanual.out
 src/doc/user/usermanual.pdf
-src/doc/user/usermanual.tex-pdf
-src/doc/user/usermanual.tex-pdf-tmp
-src/doc/user/usermanual.txt
 src/filters/rclexecm.pyc
 src/filters/rcllatinclass.pyc
-src/index/alldeps
+src/recollindex
-src/index/alldeps.stamp
-src/index/recollindex
 src/kde/kioslave/kio_recoll/builddir
-src/lib/alldeps
+src/python/recoll/Makefile
-src/lib/librcl.a
-src/mk/localdefs
-src/mk/sysconf
 src/python/recoll/build
+src/python/recoll/recoll/__init__.pyc
 src/python/recoll/setup.py
+src/python/samples/recollgui/rclmain.py
+src/python/samples/recollgui/rclmain.pyc
+src/recollq
+src/xadump
 src/qtgui/.moc/*
 src/qtgui/.obj/*
 src/qtgui/.ui/*
 src/qtgui/Makefile
-src/qtgui/i18n/*.qm
 src/qtgui/qrc_recoll.cpp
 src/qtgui/recoll
-src/qtgui/recoll.app
 src/qtgui/recoll.pro
-src/query/alldeps
+src/qtgui/recoll.app
-src/query/recollq
-src/query/xadump
-src/recollinstall
 src/sampleconf/rclmon.sh
 src/sampleconf/recoll.conf
+tests/casediac/aspdict.en.rws
+tests/casediac/idxstatus.txt
+tests/casediac/index.pid
+tests/casediac/mimeview
+tests/casediac/missing
+tests/casediac/recoll.conf
+tests/casediac/xapiandb
 tests/config/aspdict.en.rws
 tests/config/history
 tests/config/idxstatus.txt
 tests/config/index.pid
 tests/config/missing
 tests/config/xapiandb
+tests/indexedmimetypes/aspdict.en.rws
 tests/indexedmimetypes/idxstatus.txt
 tests/indexedmimetypes/index.pid 
+tests/indexedmimetypes/mimeview
+tests/indexedmimetypes/missing
+tests/indexedmimetypes/recoll.conf
+tests/indexedmimetypes/xapiandb
+tests/xattr/mimeview
 website/usermanual/*
+website/idxthreads/forkingRecoll.html
+website/idxthreads/xapDocCopyCrash.html
+website/pages/recoll-mingw.html
+website/pages/recoll-webui-install-wsgi.html
+website/pages/recoll-windows.html
+website/pages/recoll-windows-faq.html

packaging/FreeBSD/recoll/pkg-plist

@@ -55,6 +55,7 @@ share/pixmaps/recoll.png
 %%DATADIR%%/filters/rclwpd
 %%DATADIR%%/filters/rclxls
 %%DATADIR%%/filters/rclzip
+%%DATADIR%%/filters/rcl7z
 %%DATADIR%%/filters/xdg-open
 %%DATADIR%%/images/aptosid-book.png
 %%DATADIR%%/images/aptosid-manual.png

packaging/debian/buildppa.sh

@@ -4,29 +4,57 @@
 # For the kio: (and kdesdk?)
 # sudo apt-get install pkg-kde-tools  cdbs
 
-RCLVERS=1.17.1
+RCLVERS=1.22.4
-LENSVERS=1.17.1.2654
+LENSVERS=1.19.10.3543
+SCOPEVERS=1.20.2.4
 PPAVERS=1
 
+# 
+RCLSRC=/y/home/dockes/projets/fulltext/recoll/src
+SCOPESRC=/y/home/dockes/projets/fulltext/unity-scope-recoll
+RCLDOWNLOAD=/y/home/dockes/projets/lesbonscomptes/recoll
+
 case $RCLVERS in
     [23]*) PPANAME=recollexp-ppa;;
     1.14*) PPANAME=recoll-ppa;;
     *)     PPANAME=recoll15-ppa;;
 esac
 #PPANAME=recollexp-ppa
-
 echo "PPA: $PPANAME. Type CR if Ok, else ^C"
 read rep
 
-####### QT4
+fatal()
-debdir=debianrclqt4
+{
-series4="lucid maverick natty oneiric precise"
+    echo $*; exit 1
-series4="natty oneiric precise"
+}
 
+check_recoll_orig()
+{
+    if test ! -f recoll_${RCLVERS}.orig.tar.gz ; then 
+        cp -p $RCLDOWNLOAD/recoll-${RCLVERS}.tar.gz \
+            recoll_${RCLVERS}.orig.tar.gz || \
+            fatal "Can find neither recoll_${RCLVERS}.orig.tar.gz nor " \
+            "recoll-${RCLVERS}.tar.gz"
+    fi
+}
+
+# Note: recoll 1.22+ builds on precise fail. precise stays at 1.21
+
+####### QT
+debdir=debian
+# Note: no new releases for lucid: no webkit. Or use old debianrclqt4 dir.
+series="trusty xenial yakkety"
+series=
+
+if test "X$series" != X ; then
+    check_recoll_orig
+    test -d recoll-${RCLVERS} || tar xvzf recoll_${RCLVERS}.orig.tar.gz
+fi
+
+for series in $series ; do
 
-for series in $series4 ; do
   rm -rf recoll-${RCLVERS}/debian
-  cp -rp ${debdir}/ recoll-${RCLVERS}/debian
+  cp -rp ${debdir}/ recoll-${RCLVERS}/debian || exit 1
 
   if test -f $debdir/control-$series ; then
       cp -f -p $debdir/control-$series recoll-${RCLVERS}/debian/control
@@ -44,43 +72,121 @@ for series in $series4 ; do
 done
 
 ### KIO
-seriesk="lucid maverick natty oneiric precise"
+series="trusty xenial yakkety"
-seriesk=""
+series="xenial yakkety"
 
 debdir=debiankio
+topdir=kio-recoll-${RCLVERS}
+if test "X$series" != X ; then
+    check_recoll_orig
+    if test ! -f kio-recoll_${RCLVERS}.orig.tar.gz ; then
+        cp -p recoll_${RCLVERS}.orig.tar.gz \
+            kio-recoll_${RCLVERS}.orig.tar.gz || exit 1
+    fi
+    if test ! -d $topdir ; then 
+        mkdir temp
+        cd temp
+        tar xvzf ../recoll_${RCLVERS}.orig.tar.gz || exit 1
+        mv recoll-${RCLVERS} ../$topdir || exit 1
+        cd ..
+    fi
+fi
+for svers in $series ; do
 
-for series in $seriesk ; do
+  rm -rf $topdir/debian
+  cp -rp ${debdir}/ $topdir/debian || exit 1
 
-  rm -rf recoll-${RCLVERS}/debian
+  sed -e s/SERIES/$svers/g \
-  cp -rp ${debdir}/ recoll-${RCLVERS}/debian
-
-  sed -e s/SERIES/$series/g \
       -e s/PPAVERS/${PPAVERS}/g \
-          < ${debdir}/changelog > recoll-${RCLVERS}/debian/changelog ;
+          < ${debdir}/changelog > $topdir/debian/changelog ;
+  if test $svers = "trusty" ; then
+      mv -f $topdir/debian/control-4 $topdir/debian/control
+      mv -f $topdir/debian/rules-4 $topdir/debian/rules
+  else
+      rm -f $topdir/debian/control-4 $topdir/debian/rules-4
+  fi
+  (cd $topdir;debuild -S -sa) || exit 1
 
-  (cd recoll-${RCLVERS};debuild -S -sa) || break
+  dput $PPANAME kio-recoll_${RCLVERS}-0~ppa${PPAVERS}~${svers}1_source.changes
-
-  dput $PPANAME kio-recoll_${RCLVERS}-0~ppa${PPAVERS}~${series}1_source.changes
 
 done
 
 ### Unity Lens
-seriesl="natty oneiric precise"
+series="precise"
-#seriesl="oneiric"
+series=
 
 debdir=debianunitylens
+topdir=recoll-lens-${LENSVERS}
+if test "X$series" != X ; then
+    if test ! -f recoll-lens_${LENSVERS}.orig.tar.gz ; then 
+        if test -f recoll-lens-${LENSVERS}.tar.gz ; then
+            mv recoll-lens-${LENSVERS}.tar.gz \
+                recoll-lens_${LENSVERS}.orig.tar.gz
+        else
+            fatal "Can find neither recoll-lens_${LENSVERS}.orig.tar.gz nor " \
+                "recoll-lens-${LENSVERS}.tar.gz"
+        fi
+    fi
+    test -d $topdir ||  tar xvzf recoll-lens_${LENSVERS}.orig.tar.gz || exit 1
+fi
 
-for series in $seriesl ; do
+for series in $series ; do
 
-   rm -rf recoll-lens-${LENSVERS}/debian
+   rm -rf $topdir/debian
-   cp -rp ${debdir}/ recoll-lens-${LENSVERS}/debian
+   cp -rp ${debdir}/ $topdir/debian || exit 1
 
   sed -e s/SERIES/$series/g \
       -e s/PPAVERS/${PPAVERS}/g \
-          < ${debdir}/changelog > recoll-lens-${LENSVERS}/debian/changelog ;
+          < ${debdir}/changelog > $topdir/debian/changelog ;
 
-  (cd recoll-lens-${LENSVERS};debuild -S -sa) || break
+  (cd $topdir;debuild -S -sa) || break
 
-  dput $PPANAME recoll-lens_${LENSVERS}-1~ppa${PPAVERS}~${series}1_source.changes
+  dput $PPANAME \
+      recoll-lens_${LENSVERS}-1~ppa${PPAVERS}~${series}1_source.changes
+
+done
+
+### Unity Scope
+series="trusty xenial yakkety"
+series=
+
+debdir=debianunityscope
+if test ! -d ${debdir}/ ; then
+    rm -f ${debdir}
+    ln -s ${SCOPESRC}/debian $debdir
+fi
+topdir=unity-scope-recoll-${SCOPEVERS}
+if test "X$series" != X ; then
+    if test ! -f unity-scope-recoll_${SCOPEVERS}.orig.tar.gz ; then 
+        if test -f unity-scope-recoll-${SCOPEVERS}.tar.gz ; then
+            mv unity-scope-recoll-${SCOPEVERS}.tar.gz \
+                unity-scope-recoll_${SCOPEVERS}.orig.tar.gz
+        else
+            if test -f $RCLDOWNLOAD/unity-scope-recoll-${SCOPEVERS}.tar.gz;then
+                cp -p $RCLDOWNLOAD/unity-scope-recoll-${SCOPEVERS}.tar.gz \
+                   unity-scope-recoll_${SCOPEVERS}.orig.tar.gz || fatal copy
+            else
+                fatal "Can find neither " \
+                      "unity-scope-recoll_${SCOPEVERS}.orig.tar.gz nor " \
+                      "$RCLDOWNLOAD/unity-scope-recoll-${SCOPEVERS}.tar.gz"
+            fi
+        fi
+    fi
+    test -d $topdir ||  tar xvzf unity-scope-recoll_${SCOPEVERS}.orig.tar.gz \
+        || exit 1
+fi
+for series in $series ; do
+
+   rm -rf $topdir/debian
+   cp -rp ${debdir}/ $topdir/debian || exit 1
+
+  sed -e s/SERIES/$series/g \
+      -e s/PPAVERS/${PPAVERS}/g \
+          < ${debdir}/changelog > $topdir/debian/changelog ;
+
+  (cd $topdir;debuild -S -sa) || break
+
+  dput $PPANAME \
+      unity-scope-recoll_${SCOPEVERS}-1~ppa${PPAVERS}~${series}1_source.changes
 
 done

packaging/debian/debian/README.Debian

@@ -0,0 +1,23 @@
+README for Debian
+-----------------
+
+ Installing over an older version: 1.18 introduces significant index formats
+ changes to support optional character case and diacritics sensitivity, and it
+ will be advisable to reset the index in most cases. This will be best done by
+ destroying the index directory (rm -rf ~/.recoll/xapiandb).
+
+ If 1.18 is not configured for case and diacritics sensitivity, it is mostly
+ compatible with 1.17 indexes.
+
+ -- Kartik Mistry <kartik@debian.org>  Tue, 13 Nov 2012 12:33:00 +0530
+
+ Installing over an older version: 1.16 is mostly compatible with 1.15 indexes,
+ except for a few differences for weird terms containing punctuation signs.
+ Perform a full index pass if installing over an older version. The simplest
+ way to do this is to quit all recoll programs and just delete the index
+ directory (rm -rf ~/.recoll/xapiandb), then start recoll or recollindex.
+ recollindex -z will do the same in most cases.
+
+ Also, using the anchored search feature requires a full reindex.
+
+ -- Kartik Mistry <kartik@debian.org>  Thu, 22 Sep 2011 21:30:05 +0530

packaging/debian/debian/changelog

@@ -0,0 +1,639 @@
+recoll (1.22.4-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * Fix advanced search 'start search' not doing anything with qt5
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 25 Nov 2016 11:38:00 +0100
+
+recoll (1.22.3-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * 
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 21 Jun 2016 15:11:00 +0200
+
+recoll (1.22.2-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * Packaging fixes.
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Thu, 16 Jun 2016 09:11:00 +0200
+
+recoll (1.22.1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * Fixed two GUI crashes
+  * Small other fixes
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 14 Jun 2016 17:31:00 +0200
+
+recoll (1.22.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * New build based on autotools
+  * Synonyms
+  * Windows port
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 05 Apr 2016 16:01:00 +0200
+
+recoll (1.21.5-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * Fix query language parser for multiple mime or rclcat entries
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Fri, 29 Jan 2016 14:48:00 +0200
+
+recoll (1.21.4-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * Show confirmation dialog when opening temp files + small bug fixes
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 12 Jan 2016 16:19:00 +0200
+
+recoll (1.21.3-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * Fix webcache size being capped at 1 GB
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Sat, 31 Oct 2015 09:26:00 +0200
+
+recoll (1.21.2-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * New special indexing dialog in GUI
+  * Fix advanced search dialog "Any Clause" mode
+  * Fixed a few bounds issues catched by Windows VC++
+  * Miscellaneous other minor fixes
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 01 Oct 2015 09:40:00 +0200
+
+recoll (1.21.0-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * New bison-based query parser.
+  * Improves filter execution performance
+  * Save/reload queries
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 16 Jun 2015 18:10:00 +0200
+
+recoll (1.20.6-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * Fix some decompression issues with serious performance and
+    system load consequences in some cases (depending on data): minimum
+    checking that enough temp space is available before uncompressing, no
+    need to uncompress tar.gz files, set a default of 20 MBs for
+    maxcompressedfilekbs.
+  * rclscribus fixes.
+  * GUI messages: Danish translation and fix 2 dialogs which were not
+    translated improvements.
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Sat, 25 Apr 2015 14:36:00 +0200
+
+recoll (1.20.4-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * Should have been in 1.20.3: skip compressed fs image files like xxx.img.gz
+    by default (mimemap:recoll_noindex).
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Mon, 30 Mar 2015 10:06:00 +0200
+
+recoll (1.20.3-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * fixes a bug where the real time indexer did not process the web queue
+  * miscellaneous usability improvements in the GUI.
+  * Copy sample fragbuts.xml file if it does not exist
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Sat, 28 Mar 2015 09:40:00 +0200
+
+recoll (1.20.1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * 1.20.1 brings improved indexing of compound words like email addresses
+    and miscellaneous usability improvements in the GUI.
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Fri, 19 Dec 2014 08:14:00 +0200
+
+recoll (1.19.14p2-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * 1.19.14p2 fixes Bengali diacritics processing, a memory leak in the
+    Python module, and a few minor issues in the filters.
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Thu, 11 Sep 2014 07:47:00 +0200
+
+recoll (1.19.14p1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * 1.19.14p1 fixes a descriptor and memory leak in the Python module. The
+    main programs and library are unchanged.
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Thu, 26 Jun 2014 13:14:00 +0200
+
+recoll (1.19.14-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * 1.19.14 fixes two relatively minor but ennoying issues in indexing:
+
+   - The use of a separate readonly Database object for querying the index
+     while indexing would trigger Xapian errors, (bad block reads), and
+     subsequent up-to-date check failures (leading to unnecessary
+     reindexing). The jury is out as to the cause, but using the same
+     object for reading and writing seems to eliminate the problem.
+
+   - A spurious log message in the child process between forking and
+     executing the filter could block on a mutex, and lead to a 20 mn
+     timeout for the affected father process thread (happened only in
+     multithread mode).
+  
+ -- Jean-Francois Dockes <jf@dockes.org>  Sat, 07 Jun 2014 18:56:00 +0200
+
+recoll (1.19.13-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * 1.19.13 hopefully fixes the multithreaded indexing crashes and silences
+    the noisy ppt extractor failures.
+  
+ -- Jean-Francois Dockes <jf@dockes.org>  Thu, 06 May 2014 14:22:00 +0200
+
+recoll (1.19.12p2-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+                
+  * 1.19.12 p1 + restable doubleclick
+  
+ -- Jean-Francois Dockes <jf@dockes.org>  Sun, 07 Apr 2014 16:17:00 +0200
+
+recoll (1.19.12p1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * 1.19.12 install forgot the xls filter 
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Sun, 06 Apr 2014 06:57:00 +0200
+
+recoll (1.19.12-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * Minor fixes to 1.19.11. Make metadata stored length a parameter. 
+  * New xls dumper based on mso-dumper removes catdoc dependancy
+  * Move out the code for the Ubuntu Unity lens and scope
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Mon, 02 Apr 2014 15:12:00 +0200
+
+recoll (1.19.11p1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * minor fixes to 1.19.10
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Mon, 27 Nov 2013 09:54:00 +0200
+
+recoll (1.19.10-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * Support for saucy in 1.19. Separate python and python3 packages
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Sat, 23 Nov 2013 16:01:46 +0100
+
+recoll (1.18.1-1) experimental; urgency=low
+
+  * New upstream version:
+    + Please read README.Debian for changes in index db format.
+  * debian/patches/txtcsvopen.diff:
+    + Dropped. Merged upstream.
+  * debian/patches/fix-manpage-typos.patch:
+    + Added patch to fix manpage typos and groff errors.
+  * debian/control:
+    + Added VCS-* fields.
+
+ -- Kartik Mistry <kartik@debian.org>  Tue, 13 Nov 2012 12:29:46 +0530
+
+recoll (1.17.3-2) unstable; urgency=medium
+
+  * debian/rules:
+    + Call dh_python2 for python-recoll. (Closes: #681586)
+  * debian/control:
+    + Added X-Python-Version field for correct Python version dependency.
+
+ -- Kartik Mistry <kartik@debian.org>  Sat, 14 Jul 2012 20:20:56 +0530
+
+recoll (1.17.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/txtcsvopen.diff:
+    + Added patch to fix opening of compressed text-files with gnumeric.
+      (Closes: #674756)
+
+ -- Kartik Mistry <kartik@debian.org>  Fri, 08 Jun 2012 11:46:57 +0530
+
+recoll (1.17.2-1) unstable; urgency=low
+
+  * New upstream release:
+    + Dropped patches: fix-kFreeBSD-ftbfs.patch, recoll_ionice_getpid.patch.
+      These are merged with upstream.
+    + Refreshed patch: fix-python-install.patch.
+  * debian/rules, debian/control:
+    + Added hardening support.
+  * debian/copyright:
+    + Fixed duplicate Copyright sections.
+
+ -- Kartik Mistry <kartik@debian.org>  Fri, 18 May 2012 10:59:21 +0530
+
+recoll (1.17.1-2) unstable; urgency=low
+
+  * debian/patches:
+    + fix-kFreeBSD-ftbfs.patch: Added patch to fix FTBFS on kFreeBSD from
+      upstream (Closes: #667083)
+    + recoll_ionice_getpid.patch: Added patch to fix FTBFS with gcc-4.7 from
+      upstream (Closes: #667352)
+
+ -- Kartik Mistry <kartik@debian.org>  Wed, 04 Apr 2012 12:16:48 +0530
+
+recoll (1.17.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * Enable Python module resulting into new binary: python-recoll.
+  * debian/control:
+    + Updated Build-Deps: libqtwebkit-dev, python-all-dev.
+    + Added python-recoll binary.
+    + Updated Standards-Version to 3.9.3
+  * debian/rules:
+    + Build Python module by default.
+  * debian/recoll.menu, debian/python-recoll.install, debian/recoll.install:
+    + Changes for new binary package.
+  * debian/copyright:
+    + Updated to copyright-format 1.0
+    + Updated upstream and Debian copyright.
+    + Fixed unicode.org/copyright.html URL.
+
+ -- Kartik Mistry <kartik@debian.org>  Tue, 27 Mar 2012 12:15:51 +0530
+
+recoll (1.16.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/copyright:
+    + Updated as per DEP-5 format, simplying copyright file.
+  * debian/control:
+    + Dropped: flac, vorbis-tools and libid3-tools from Suggests, as
+      python-mutagen handles audio now.
+    + Dropped: lyx from Suggests, as it will be too heavy for most of users as
+      discussed with upstream.
+  * debian/rules:
+    + Use STRIP variable to strip during install phase. This makes patch
+      01_nostrip_final_binaries_437901.diff obsolete, removed this patch.
+
+ -- Kartik Mistry <kartik@debian.org>  Wed, 09 Nov 2011 20:35:16 +0530
+
+recoll (1.16.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/copyright:
+    + Added missing GPL-3 URL in debian/* copyright section.
+
+ -- Kartik Mistry <kartik@debian.org>  Thu, 29 Sep 2011 10:06:54 +0530
+
+recoll (1.16.0-1) unstable; urgency=low
+
+  * New upstream release:
+    + See README.Debian for upgrade note and information.
+  * debian/copyright:
+    + Updated as per latest DEP-5 format.
+  * debian/control:
+    + Recommends: xdg-utils now.
+  * debian/rules:
+    + Added recommends build targets.
+
+ -- Kartik Mistry <kartik@debian.org>  Thu, 22 Sep 2011 21:30:25 +0530
+
+recoll (1.15.9-1) unstable; urgency=low
+
+  * New upstream release:
+    + Dropped patch 02_recoll_staticfix_626882.diff, merged upstream
+
+ -- Kartik Mistry <kartik@debian.org>  Wed, 15 Jun 2011 09:20:20 +0530
+
+recoll (1.15.8-2) unstable; urgency=low
+
+  * debian/patches/02_recoll_staticfix_626882.diff:
+    + Added patch to fix segfault in 1.15.8. Patch from Jean-Francois Dockes
+      <jf@dockes.org> (Closes: #626882)
+
+ -- Kartik Mistry <kartik@debian.org>  Tue, 17 May 2011 09:57:50 +0530
+
+recoll (1.15.8-1) unstable; urgency=low
+
+  * New upstream release.
+  * debian/patches/02_kfreebsd-ftbfs.diff:
+    + Removed. Merged with upstream.
+  * debian/control:
+    + Updated to Standards-Version 3.9.2 (no changes needed)
+
+ -- Kartik Mistry <kartik@debian.org>  Thu, 12 May 2011 09:47:21 +0530
+
+recoll (1.15.7-2) unstable; urgency=low
+
+  * Applied patch 02_kfreebsd-ftbfs.diff from upstream to fix FTBFS
+    on kFreeBSD-* (Closes: #618796)
+  * debian/copyright:
+    + Updated to latest DEP-5 specification
+
+ -- Kartik Mistry <kartik@debian.org>  Fri, 15 Apr 2011 18:38:54 +0530
+
+recoll (1.15.7-1) unstable; urgency=low
+
+  * New upstream release:
+    + Fixed: Segmentation fault when file type radio button clicked.
+      (Closes: #617353)
+  * debian/patches/02_manpage_fix.diff:
+    + Removed. Merged with upstream.
+
+ -- Kartik Mistry <kartik@debian.org>  Sun, 13 Mar 2011 09:07:57 +0530
+
+recoll (1.15.2-1) unstable; urgency=low
+
+  * Upload to unstable
+  * New upstream release
+  * debian/patches:
+    + Refreshed 01_nostrip_final_binaries_437901.diff
+    + Added 02_manpage_fix.diff to fix manpage groff issues
+
+ -- Kartik Mistry <kartik@debian.org>  Tue, 15 Feb 2011 11:25:58 +0530
+
+recoll (1.14.4-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/copyright:
+    + Updated for DEP-5 format specification
+
+ -- Kartik Mistry <kartik@debian.org>  Thu, 02 Dec 2010 00:29:06 +0530
+
+recoll (1.14.2-1) experimental; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + Added xlstproc as Recommends (Closes: #587684)
+    + Added python-mutagen as Suggests
+  * debian/patches:
+    + Refreshed 01_nostrip_final_binaries_437901.diff
+    + Removed 02_recoll-prepare-for-xapian-1.2.diff, merged with upstream
+
+ -- Kartik Mistry <kartik@debian.org>  Mon, 27 Sep 2010 17:52:17 +0530
+
+recoll (1.13.04-3) unstable; urgency=low
+
+  * Added patch for xapian 1.2 compatibility from Olly Betts <olly@survex.com>
+    (Closes: #579929)
+
+ -- Kartik Mistry <kartik@debian.org>  Mon, 03 May 2010 09:47:16 +0530
+
+recoll (1.13.04-2) unstable; urgency=low
+
+  * debian/control:
+    + Added missing packages to Suggests: flac, libid3-tools, lyx, pstotext,
+      python-chm, untex, vorbis-tools Thanks to Ivan Vilata i Balaguer
+      <ivan@selidor.net> (Closes: #578441)
+
+ -- Kartik Mistry <kartik@debian.org>  Fri, 23 Apr 2010 11:07:00 +0530
+
+recoll (1.13.04-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Kartik Mistry <kartik@debian.org>  Fri, 16 Apr 2010 10:39:02 +0530
+
+recoll (1.13.02-2) unstable; urgency=low
+
+  * debian/control:
+    + Don't suggest xpdf (Closes: #569333)
+  * debian/copyright:
+    + Updated Debian package copyright year
+  * Removed unused README.source file
+
+ -- Kartik Mistry <kartik@debian.org>  Fri, 19 Feb 2010 10:42:53 +0530
+
+recoll (1.13.02-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + Updated to Standards-Version 3.8.4 (no changes needed)
+
+ -- Kartik Mistry <kartik@debian.org>  Wed, 03 Feb 2010 11:00:53 +0530
+
+recoll (1.13.01-1) unstable; urgency=low
+
+  * New upstream release
+    + Fixed bug that causes field values ignored for Capitalized words and
+      phrases
+
+ -- Kartik Mistry <kartik@debian.org>  Fri, 08 Jan 2010 10:09:15 +0530
+
+recoll (1.13.00-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + Fixed package descriptions, replaced QT->Qt (Closes: #563725)
+  * debian/patches/01_nostrip_final_binaries_437901.diff:
+    + Refreshed patch for upstream changes
+  * Converted package to new source format '3.0 (quilt)'
+
+ -- Kartik Mistry <kartik@debian.org>  Tue, 05 Jan 2010 23:23:30 +0530
+
+recoll (1.12.4-1) unstable; urgency=low
+
+  * New upstream release:
+    + Fixed FTBFS with binutils-gold (Closes: #556315)
+
+ -- Kartik Mistry <kartik@debian.org>  Fri, 11 Dec 2009 00:08:37 +0530
+
+recoll (1.12.3-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + Updated Build-Depends on libqt4-dev as we are building Qt4 ui now
+  * debian/rules:
+    + Make sure that we call qmake-qt4
+
+ -- Kartik Mistry <kartik@debian.org>  Thu, 29 Oct 2009 22:44:50 +0530
+
+recoll (1.12.2-1) unstable; urgency=low
+
+  * New upstream release:
+    + Dropped patch 02_manpage_fixes.diff, merged with upstream
+  * Added debian/README.source file to confirm with latest policy
+  * Removed debian/docs, we are using dh_installdocs in debian/rules
+  * debian/control:
+    + Wrapped up Build-Depends
+    + Depends on quilt, since patch system is using quilt now
+    + Updated to Standards-Version 3.8.3
+    + Updated dependency on libxapian-dev (>= 1.0.15)
+  * debian/rules:
+    + Changes for quilt migration
+
+ -- Kartik Mistry <kartik@debian.org>  Fri, 23 Oct 2009 10:14:05 +0530
+
+recoll (1.12.1-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + Updated to Standards-Version 3.8.2 (no changes needed)
+  * debian/copyright:
+    + [Lintian] Removed licenses URL links to symlink
+
+ -- Kartik Mistry <kartik@debian.org>  Sat, 27 Jun 2009 20:08:28 +0530
+
+recoll (1.12.0-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/copyright:
+    + [Lintian] Updated for use of correct copyright symbol © instead of (C)
+    + Updated Debian packaging copyright year
+  * debian/rules:
+    + Used dh_prep instead of deprecated dh_clean -k
+  * debian/control:
+    + Updated debhelper dependency to 7
+  * debian/patches:
+    + Dropped 02_gcc-snapshot-missing-headers-fix.dpatch, merged with upstream
+    + Added patch 02_manpage_fixes.dpatch for groff warnings
+
+ -- Kartik Mistry <kartik@debian.org>  Sat, 28 Feb 2009 14:33:53 +0530
+
+recoll (1.11.0-2) unstable; urgency=low
+
+  * debian/control:
+    + Added versioned build-dep on libxapian-dev, Thanks to Brad Sawatzky
+      <brad+debian@swatter.net> for catch (Closes: #507473)
+    + Add libimage-exiftool-perl as Suggests in which I forgot in
+      previous upload
+  * debian/changelog:
+    + Fixed typo from previous upload entry
+
+ -- Kartik Mistry <kartik@debian.org>  Wed, 03 Dec 2008 15:05:55 +0530
+
+recoll (1.11.0-1) unstable; urgency=low
+
+  * New upstream release:
+    + Remembers missing filters in first run (Closes: #500690)
+  * debian/control:
+    + Added libimage-exiftool-perl as Suggests (Closes: #502427)
+    + Added Python as recommaded due to filters/rclpython script
+      although, its not necessary as it will be installed only
+      when Python is present
+  * debian/patches:
+    + Refreshed patch for gcc 4.4 FTBFS (Closes: #505376)
+  * debian/copyright:
+    + Updated for newly added filter and image files
+
+ -- Kartik Mistry <kartik@debian.org>  Thu, 13 Nov 2008 21:18:15 +0530
+
+recoll (1.10.6-1) unstable; urgency=low
+
+  * New upstream release
+    + Fixed typo in tooltip in indexing configuration (Closes: #486689)
+    + Dropped patch 03_manpage_fixes.dpatch, merged with upstream
+  * debian/control:
+    + Updated to Standards-Version 3.8.0 (no changes needed)
+    + Updated my maintainer email address
+  * debian/copyright:
+    + Updated my maintainer email address
+    + Updated license text to proposed license format
+    + Updated upstream copyright year
+
+ -- Kartik Mistry <kartik@debian.org>  Thu, 11 Sep 2008 16:06:48 +0530
+
+recoll (1.10.2-1) unstable; urgency=low
+
+  * New upstream release
+    + Updated patch debian/patches/02_gcc-snapshot-missing-headers-fix.dpatch
+      Some portions are now merged with upstream
+  * debian/copyright:
+    + Fixed indentation to 80 characters
+    + Updated Debian package copyright year
+
+ -- Kartik Mistry <kartik.mistry@gmail.com>  Thu, 29 May 2008 23:25:40 +0530
+
+recoll (1.10.1-1) unstable; urgency=low
+
+  * New upstream release
+    + Updated debian/patches/02_gcc-snapshot-missing-headers-fix.dpatch
+      Some portions are merged with upstream
+  * debian/control:
+    + Fixed short description, Thanks to Mohammed Adnène Trojette
+      <adn+deb@diwi.org>
+  * debian/patches/03_manpage_fixes.dpatch:
+    + Added patch to fix manpage groff warnings
+
+ -- Kartik Mistry <kartik.mistry@gmail.com>  Wed, 27 Feb 2008 18:41:25 +0530
+
+recoll (1.10.0-5) unstable; urgency=low
+
+  * debian/patches/02_gcc-snapshot-missing-headers-fix.dpatch:
+    + Really fixed the FTBFS with gcc-4.3/g++-4.3 (Closes: #455652)
+
+ -- Kartik Mistry <kartik.mistry@gmail.com>  Sun, 27 Jan 2008 14:37:53 +0530
+
+recoll (1.10.0-4) unstable; urgency=low
+
+  * debian/patches/02_gcc-snapshot-missing-headers-fix.dpatch:
+    + Updated patch to fix missing include header in qtgui/main.cpp
+      (Closes: #455652)
+  * debian/copyright:
+    + Updated missing license for qtgui/q3richtext_p.h
+    + Moved other copyright holders for GPL above license
+      to make it readable
+
+ -- Kartik Mistry <kartik.mistry@gmail.com>  Wed, 23 Jan 2008 10:42:20 +0530
+
+recoll (1.10.0-3) unstable; urgency=low
+
+  * debian/control:
+    + Added external helper programs and utilities to Suggests field
+     (Closes: #441629, #457033)
+
+ -- Kartik Mistry <kartik.mistry@gmail.com>  Fri, 28 Dec 2007 08:12:52 +0530
+
+recoll (1.10.0-2) unstable; urgency=low
+
+  * debian/control:
+    + Updated Standards-Version to 3.7.3
+  * debian/patches/02_gcc-snapshot-missing-headers-fix.dpatch:
+    + Added patch to fix compilation with gcc-snapshot due to
+      missing headers (Closes: #455652)
+  * debian/rules:
+    + Fixed clean target
+
+ -- Kartik Mistry <kartik.mistry@gmail.com>  Tue, 11 Dec 2007 14:42:47 +0530
+
+recoll (1.10.0-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control:
+    + Moved Homepage: entry to control field
+    + Dropped unnecessary dependency on qt3-dev-tools
+
+ -- Kartik Mistry <kartik.mistry@gmail.com>  Wed, 28 Nov 2007 19:54:58 +0530
+
+recoll (1.9.0-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/patches: dropped 02_desktop_entry_fixes.dpatch, merged with
+    upstream, rewrote 01_nostrip_final_binary_437901.dpatch after upstream
+    changes
+  * debian/menu: used Data Management since it is better and appropriate
+  * debian/copyright: added missing copyright from index/csguess.cpp
+
+ -- Kartik Mistry <kartik.mistry@gmail.com>  Wed, 12 Sep 2007 14:05:39 +0530
+
+recoll (1.8.2-3) unstable; urgency=low
+
+  * debian/rules: added better clean target, better configure flags,
+    separated LDFLAGS
+  * Added dpatch support
+  * debian/patches/01_nostrip_final_binary_437901.dpatch: added patch to not
+    strip binary from upstream (Closes: #437901)
+  * debian/patches/02_desktop_entry_fixes.dpatch: added patch to fix desktop
+    menu entry according to freedesktop standards
+  * debian/menu: fixed according to latest menu policy, changed subsection to
+    Tools from Databases (hint taken from beagle)
+  * debian/copyright: moved copyright out of license section, adjusted
+    copyrights portions under proper license
+
+ -- Kartik Mistry <kartik.mistry@gmail.com>  Sat, 18 Aug 2007 20:28:49 +0530
+
+recoll (1.8.2-2) unstable; urgency=low
+
+  * debian/rules: xapian is dynamically linked now, Thanks to
+    Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr> (Closes: #427783)
+  * Fixed debian/watch file, Thanks to Vincent Fourmond <fourmond@debian.org>
+
+ -- Kartik Mistry <kartik.mistry@gmail.com>  Fri, 08 Jun 2007 10:51:01 +0530
+
+recoll (1.8.2-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/watch: fixed now
+  * debian/control: fixed long descriptions
+
+ -- Kartik Mistry <kartik.mistry@gmail.com>  Tue, 22 May 2007 15:24:54 +0530
+
+recoll (1.8.1-1) unstable; urgency=low
+
+  * Initial release (Closes: #422039)
+  * Based on package prepared by Jean-Francois Dockes <jean-francois.dockes@wanadoo.fr>
+
+ -- Kartik Mistry <kartik.mistry@gmail.com>  Thu,  3 May 2007 12:15:02 +0530

packaging/debian/debian/control

@@ -0,0 +1,85 @@
+Source: recoll
+Section: x11
+Priority: optional
+Maintainer: Jean-Francois Dockes <jfd@recoll.org>
+Build-Depends: autotools-dev,
+               debhelper (>= 7),
+               dh-python,
+               bison,
+               libqt4-dev,
+               libqtwebkit-dev,
+               libx11-dev,
+               libxapian-dev (>= 1.2.0),
+               libz-dev,
+               python-all-dev (>= 2.6.6-3~),
+               python3-all-dev,
+Standards-Version: 3.9.6
+X-Python-Version: >= 2.7
+Homepage: http://www.lesbonscomptes.com/recoll
+Vcs-Git: git://anonscm.debian.org/collab-maint/recoll.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/recoll.git;a=summary
+
+Package: recoll
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, python
+Recommends: python-recoll, aspell, xdg-utils, xsltproc,
+            python-libxml2, python-libxslt1
+Suggests: antiword,
+          ghostscript,
+          libimage-exiftool-perl,
+          poppler-utils,
+          pstotext,
+          python-chm,
+          python-mutagen,
+          unrtf,
+          untex
+Description: Personal full text search package with a Qt GUI
+ This package is a personal full text search package is based on a very strong
+ backend (Xapian), for which it provides an easy to use and feature-rich
+ interface.
+ .
+ Features:
+  * Qt-based GUI
+  * Supports the following document types (and their compressed versions)
+   - Natively: text, html, OpenOffice files, maildir and mailbox (Mozilla and
+     IceDove mail) with attachments, pidgin log files
+   - With external helpers:  pdf (pdftotext), postscript (ghostscript), msword
+     (antiword), excel, ppt (catdoc), rtf (unrtf)
+  * Powerful query facilities, with boolean searches, phrases, filter on file
+    types and directory tree
+  * Support for multiple charsets, Internal processing and storage uses Unicode
+    UTF-8
+  * Stemming performed at query time (can switch stemming language after
+    indexing)
+  * Easy installation. No database daemon, web server or exotic language
+    necessary
+  * An indexer which runs either as a thread inside the GUI or as an external,
+    cron'able program
+
+Package: python-recoll
+Architecture: any
+Section: python
+Depends: recoll (= ${binary:Version}),
+         ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends}
+Description: Python extension for recoll
+ Personal full text search package which is based on a very strong backend
+ (Xapian), for which it provides an easy to use and feature-rich interface.
+ .
+ This package provides Python extension module for recoll which can be use to
+ extend recoll such as an Ubuntu Unity Lens.
+
+Package: python3-recoll
+Architecture: any
+Section: python
+Depends: recoll (= ${binary:Version}),
+         ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends}
+Description: Python extension for recoll
+ Personal full text search package which is based on a very strong backend
+ (Xapian), for which it provides an easy to use and feature-rich interface.
+ .
+ This package provides Python extension module for recoll which can be use to
+ extend recoll such as an Ubuntu Unity Lens.

packaging/debian/debian/copyright

@@ -21,9 +21,9 @@ Copyright: J\xfcrgen Hermann, Mike Brown, Christopher Arndt
 License: GPL-2+
 
 Files: internfile/htmlparse.cpp mh_html.cpp
-Copyright: 1999-2001, BrightStation PLC
+Copyright: 1999-2001, BrightStation PLC,
-Copyright: 2001, Ananova Ltd
+           2001, Ananova Ltd,
-Copyright: 2002-2004, Olly Betts
+           2002-2004, Olly Betts.
 License: GPL-2+
 
 Files: unac/*
@@ -83,42 +83,11 @@ License: LGPL-2+
  can be found in `/usr/share/common-licenses/LGPL-2' and
  `/usr/share/common-licenses/LGPL-2.1' and `/usr/share/common-licenses/LGPL-3'.
 
-Files: qtgui/q3richtext_p.h
-Copyright: 1992-2007, Trolltech ASA. All rights reserved
-License:
- This file is part of the Qt3Support module of the Qt Toolkit.
- .
- This file may be used under the terms of the GNU General Public License
- version 2.0 as published by the Free Software Foundation and appearing in the
- file LICENSE.GPL included in the packaging of this file.  Please review the
- following information to ensure GNU General Public Licensing requirements will
- be met: http://trolltech.com/products/qt/licenses/licensing/opensource/
- .
- If you are unsure which license is appropriate for your use, please review the
- following information:
- http://trolltech.com/products/qt/licenses/licensing/licensingoverview
- or contact the sales department at sales@trolltech.com.
- .
- In addition, as a special exception, Trolltech gives you certain additional
- rights. These rights are described in the Trolltech GPL Exception version 1.0,
- which can be found at http://www.trolltech.com/products/qt/gplexception/ and
- in the file GPL_EXCEPTION.txt in this package.
- .
- In addition, as a special exception, Trolltech, as the sole copyright
- holder for Qt Designer, grants users of the Qt/Eclipse Integration
- plug-in the right for the Qt/Eclipse Integration to link to
- functionality provided by Qt Designer and its related libraries.
- .
- Trolltech reserves all rights not expressly granted herein.
- .
- Trolltech ASA (c) 2007
- .
- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
 Files: common/uproplist.h
 Copyright: 1991-2006, Unicode, Inc.
-License:
+License: Unicode
+
+License: Unicode
  All rights reserved. Distributed under the Terms of Use in
  http://www.unicode.org/copyright.html
  .
@@ -153,7 +122,9 @@ License:
 
 Files: utils/md5.*
 Copyright: 1991-1992, RSA Data Security, Inc. All rights reserved.
-License:
+License: RSA
+
+License:RSA
  MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
  .
  License to copy and use this software is granted provided that it is
@@ -175,8 +146,10 @@ License:
 
 Files: desktop/xdg-utils-1.0.1/*
 Copyright: 2006, Kevin Krammer <kevin.krammer@gmx.at>,
-                 Jeremy White <jwhite@codeweavers.com>
+                 Jeremy White <jwhite@codeweavers.com>.
-License:
+License: MIT
+
+License: MIT
  Permission is hereby granted, free of charge, to any person obtaining a copy
  of this software and associated documentation files (the "Software"), to deal
  in the Software without restriction, including without limitation the rights
@@ -197,6 +170,8 @@ License:
 
 Files: index/csguess.cpp
 Copyright: 2000-2004, Mikio Hirabayashi
+License: LGPL-2.1+
+
 License: LGPL-2.1+
  This file is part of QDBM, Quick Database Manager.
  .

packaging/debian/debian/python-recoll.install

@@ -0,0 +1,2 @@
+usr/lib/python2*/*-packages/*.egg-info
+usr/lib/python2*/*-packages/recoll/*

packaging/debian/debian/python3-recoll.install

@@ -0,0 +1,2 @@
+usr/lib/python3*/*-packages/*.egg-info
+usr/lib/python3*/*-packages/recoll/*

packaging/debian/debian/recoll.install

@@ -0,0 +1,12 @@
+usr/bin
+usr/lib/recoll
+usr/share/applications
+usr/share/icons
+usr/share/man
+usr/share/pixmaps
+usr/share/recoll/doc
+usr/share/recoll/examples
+usr/share/recoll/filters
+usr/share/recoll/filters
+usr/share/recoll/images
+usr/share/recoll/translations

packaging/debian/debian/recoll.menu

@@ -0,0 +1,2 @@
+?package(recoll):needs="X11" section="Applications/Data Management" \
+  title="Personal Search Tool" command="/usr/bin/recoll"

packaging/debian/debian/rules

@@ -3,11 +3,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
+
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
-CFLAGS = -Wall -g
+CFLAGS += -Wall -g
-#LDFLAGS = -Wl,-z,defs
+#LDFLAGS += -Wl,-z,defs
 
 #build qt4 UI only
 export QMAKE=qmake-qt4
@@ -31,7 +34,7 @@ build-arch: build-stamp
 build-indep: build-stamp
 build-stamp: config.status
 	dh_testdir
-	$(MAKE)
+	$(MAKE) -j 5
 	touch $@
 
 clean:
@@ -46,11 +49,18 @@ install:
 	dh_testroot
 	dh_prep
 	dh_installdirs
-
+	$(MAKE) prefix=$(CURDIR)/debian/tmp/usr install
-	$(MAKE) STRIP=ls prefix=$(CURDIR)/debian/tmp/usr install
+	chmod a+x $(CURDIR)/debian/tmp/usr/share/recoll/examples/rclmon.sh
+	chmod a-x $(CURDIR)/debian/tmp/usr/share/recoll/filters/rclxslt.py
+	chmod a-x $(CURDIR)/debian/tmp/usr/share/recoll/filters/rclexec1.py
+	chmod a-x $(CURDIR)/debian/tmp/usr/share/recoll/filters/rclexec1.py
+	rm -f $(CURDIR)/debian/tmp/usr/lib/recoll/librecoll.la
 	(cd python/recoll; python setup.py install \
 	                                   --install-layout=deb \
 	                                   --prefix=$(CURDIR)/debian/tmp/usr )
+	(cd python/recoll; python3 setup.py install \
+	                                   --install-layout=deb \
+	                                   --prefix=$(CURDIR)/debian/tmp/usr )
 
 binary-arch: build install
 	dh_testdir
@@ -60,6 +70,9 @@ binary-arch: build install
 	dh_installmenu
 	dh_installman
 	dh_install --sourcedir=debian/tmp
+	dh_makeshlibs
+	dh_python2 -p python-recoll
+	dh_python3 -p python3-recoll
 	dh_link
 	dh_strip
 	dh_compress

packaging/debian/debian/watch

@@ -0,0 +1,2 @@
+version=3
+http://www.lesbonscomptes.com/recoll/download.html recoll-(.*)\.tar\.gz

packaging/debian/debiankio/changelog

@@ -1,3 +1,65 @@
+kio-recoll (1.22.4-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * Switch to kf5 for appropriate series. Update to 1.22.4 (same as .3)
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Sat, 26 Nov 2016 09:46:00 +0100
+
+kio-recoll (1.22.3-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * No changes specific to the KIO, just use the 1.22 lib. Update to .3
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Fri, 25 Nov 2016 10:59:00 +0100
+
+kio-recoll (1.22.2-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * No changes specific to the KIO, just use the 1.22 lib.
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 15 Jun 2016 09:57:00 +0200
+
+kio-recoll (1.21.0-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * No changes specific to the KIO, just use the 1.21 lib.
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 16 Jun 2015 18:21:00 +0200
+
+kio-recoll (1.20.6-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+
+  * Increase the default maximum number of entries displayed in a directory
+    window (can be adjusted with the kio_max_direntries configuration
+    variable). 
+  * Display entries incrementally instead of sending the whole
+    list at once.
+
+ -- Jean-Francois Dockes <jf@dockes.org>  Sat, 25 Apr 2015 14:47:00 +0200
+
+kio-recoll (1.20.1-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+  * Updated package to version 1.20.1
+ -- Jean-Francois Dockes <jf@dockes.org>  Fri, 19 Dec 2014 08:14:00 +0200
+
+kio-recoll (1.19.14p2-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+  * No changes, build for Ubuntu Utopic
+ -- Jean-Francois Dockes <jf@dockes.org>  Sat, 06 Dec 2014 08:44:00 +0200
+
+kio-recoll (1.19.12-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+  * Updated package to recoll version 1.19.12
+ -- Jean-Francois Dockes <jf@dockes.org>  Wed, 02 Apr 2014 15:50:00 +0200
+
+kio-recoll (1.19.10-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+  * Updated package to recoll version 1.19.10
+ -- Jean-Francois Dockes <jf@dockes.org>  Sat, 25 Nov 2013 18:00:00 +0100
+
+kio-recoll (1.19.2-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+  * Updated package to recoll version 1.19.2
+ -- Jean-Francois Dockes <jf@dockes.org>  Mon, 13 May 2013 12:09:00 +0100
+
+kio-recoll (1.18.2-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+  * Updated package to recoll version 1.18.2
+ -- Jean-Francois Dockes <jf@dockes.org>  Mon, 18 Apr 2013 18:05:00 +0100
+
+kio-recoll (1.18.1-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
+  * Updated package to recoll version 1.18.1
+ -- Jean-Francois Dockes <jf@dockes.org>  Mon, 05 Nov 2012 13:25:00 +0100
+
 kio-recoll (1.17.0-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
   * Updated package to recoll version 1.17.0
  -- Jean-Francois Dockes <jf@dockes.org>  Sun, 25 Mar 2012 18:05:00 +0200

packaging/debian/debiankio/control

@@ -2,15 +2,26 @@ Source: kio-recoll
 Section: kde
 Priority: extra
 Maintainer: Jean-Francois Dockes <jfd@recoll.org>
-Build-Depends: cdbs, cmake, debhelper (>= 7), kdelibs5-dev (>= 4:4.2.2), pkg-kde-tools (>= 0.4.0), libxapian-dev, libz-dev
+Build-Depends: cdbs, 
-Standards-Version: 3.8.1
+               cmake,
+               libtool,
+               debhelper (>= 7), 
+               bison,
+               kdelibs5-dev (>= 4:4.2.2),
+               qtbase5-dev,
+               extra-cmake-modules,
+               kio-dev,
+               pkg-kde-tools (>= 0.4.0), 
+               libxapian-dev, 
+               libz-dev
+Standards-Version: 3.9.7
 Homepage: http://www.recoll.org/
 
 Package: kio-recoll
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}, recoll
-Description: A Recoll KIO slave for KDE 4
+Description: Recoll KIO slave for KDE 4
- A Recoll KIO slave for KDE 4, allows performing a Recoll search by
+ Recoll KIO slave for KDE 4, allows performing a Recoll search by
  entering an appropriate URL in a KDE open dialog, or with an HTML-based
  interface displayed in Konqueror.  
  The HTML-based interface is similar to the Recoll GUI QT-based interface,

packaging/debian/debiankio/control-4

@@ -0,0 +1,33 @@
+Source: kio-recoll
+Section: kde
+Priority: extra
+Maintainer: Jean-Francois Dockes <jfd@recoll.org>
+Build-Depends: cdbs, 
+               cmake,
+               libtool,
+               debhelper (>= 7), 
+               bison,
+               kdelibs5-dev (>= 4:4.2.2), 
+               pkg-kde-tools (>= 0.4.0), 
+               libxapian-dev, 
+               libz-dev
+Standards-Version: 3.9.5
+Homepage: http://www.recoll.org/
+
+Package: kio-recoll
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, recoll
+Description: A Recoll KIO slave for KDE 4
+ A Recoll KIO slave for KDE 4, allows performing a Recoll search by
+ entering an appropriate URL in a KDE open dialog, or with an HTML-based
+ interface displayed in Konqueror.  
+ The HTML-based interface is similar to the Recoll GUI QT-based interface,
+ slightly less powerful. It allows performing a search while staying fully
+ within the KDE framework: drag and drop from the result list works
+ normally and you have your normal choice of applications for opening files. 
+ An alternative interface uses a directory view of search results. Due to
+ limitations in the current KIO slave interface, it is currently not
+ obviously useful.
+ The interface is described in more detail inside a help file which you can
+ access by entering recoll:/ inside the konqueror URL line (this works only
+ if the recoll KIO slave has been previously installed). 

packaging/debian/debiankio/copyright

@@ -54,7 +54,7 @@ Copyright (c) 1991-2004 Unicode, Inc.
 
   COPYRIGHT AND PERMISSION NOTICE
   
-  Copyright © 1991-2006 Unicode, Inc. All rights reserved. Distributed under
+  Copyright © 1991-2006 Unicode, Inc. All rights reserved. Distributed under
   the Terms of Use in http://www.unicode.org/copyright.html. 
   
   Permission is hereby granted, free of charge, to any person obtaining a

packaging/debian/debiankio/rules-4

@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
+
+DEB_SRCDIR = kde/kioslave/kio_recoll-kde4

packaging/debian/debiankio/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

packaging/debian/debianrclqt3/changelog

@@ -1,59 +0,0 @@
-recoll (1.14.3-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.14.3
- -- Jean-Francois Dockes <jf@dockes.org>  Thu, 25 Nov 2010 10:25:00 +0200
-
-recoll (1.14.2-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.14.2
- -- Jean-Francois Dockes <jf@dockes.org>  Sat, 25 Sep 2010 09:37:20 +0200
-
-recoll (1.13.04-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.13.04
- -- Jean-Francois Dockes <jf@dockes.org>  Thu, 14 Apr 2010 13:42:00 +0200
-
-recoll (1.13.00-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.13.00
- -- Jean-Francois Dockes <jf@dockes.org>  Tue, 05 Jan 2010 09:52:20 +0100
-
-recoll (1.12.4-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.12.4
- -- Jean-Francois Dockes <jf@dockes.org>  Wed, 28 Oct 2009 17:16:20 +0200
-
-recoll (1.12.3-0~ppa3~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.12.3
- -- Jean-Francois Dockes <jf@dockes.org>  Wed, 28 Oct 2009 17:16:20 +0200
-
-recoll (1.12.2-0~ppa3~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.12.2
- -- Jean-Francois Dockes <jf@dockes.org>  Mon, 19 Oct 2009 16:17:46 +0200
-
-recoll (1.11.0-0ubuntu1) dapper; urgency=low
-  * Updated package to recoll version 1.11.0
- -- Jean-Francois Dockes <jfd@recoll.org>  Sun, 19 Oct 2008 09:57:13 +0200
-
-recoll (1.10.6-0ubuntu1) dapper; urgency=low
-  * Updated package to recoll version 1.10.6
- -- Jean-Francois Dockes <jfd@recoll.org>  Fri, 12 Sep 2008 10:14:20 +0200
-
-recoll (1.10.4-0ubuntu1) hardy; urgency=low
-  * Updated package to recoll version 1.10.4
- -- Jean-Francois Dockes <jfd@recoll.org>  Fri, 29 Aug 2008 15:39:40 +0200
-
-recoll (1.10.1-0ubuntu1) gutsy; urgency=low
-  * Updated package to recoll version 1.10.1
- -- Jean-Francois Dockes <jfd@recoll.org>  Fri, 01 Feb 2008 11:30:01 +0100
-
-recoll (1.10.0-0ubuntu1) gutsy; urgency=low
-  * Updated package to recoll version 1.10.0
- -- Jean-Francois Dockes <jfd@recoll.org>  Wed, 11 Nov 2007 15:34:51 +0200
-
-recoll (1.9.0-0ubuntu1) gutsy; urgency=low
-  * Updated package to recoll version 1.9.0
- -- Jean-Francois Dockes <jfd@recoll.org>  Fri,  7 Sep 2007 15:34:51 +0200
-
-recoll (1.8.1-0ubuntu1) gutsy; urgency=low
-  * Updated package to recoll version 1.8.1
- -- Jean-Francois Dockes <jfd@recoll.org>  Wed,  7 Mar 2007 09:08:05 +0100
-
-recoll (1.7.5-0ubuntu1) feisty; urgency=low
-  * Initial release 
- -- Jean-Francois Dockes <jfd@recoll.org>  Wed, 10 Jan 2007 16:04:13 +0100

packaging/debian/debianrclqt3/control

@@ -1,35 +0,0 @@
-Source: recoll
-Section: x11
-Priority: optional
-Maintainer: Jean-Francois Dockes <jf@dockes.org>
-Build-Depends: debhelper (>= 5), libqt3-headers, libqt3-mt-dev, qt3-dev-tools, libxapian-dev 
-Standards-Version: 3.7.2
-
-Package: recoll
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: aspell
-Description: a personal full text search package with a QT GUI
- The Recoll personal full text search package is based on a very strong 
- backend (Xapian), for which it provides an easy to use and feature-rich 
- interface.
- .
- Features:
-    * QT-based GUI.
-    * Supports the following document types (and their compressed versions): 
-      - Natively: text, html, OpenOffice files, maildir and mailbox 
-        (Mozilla and Thunderbird mail ok) with attachments, gaim log files.
-      - With external helpers:  pdf (pdftotext), postscript (ghostscript),
-        msword (antiword), excel, ppt (catdoc), rtf (unrtf), 
-    * Powerful query facilities, with boolean searches, phrases, filter on
-      file types and directory tree. 
-    * Support for multiple charsets. Internal processing and storage uses
-      Unicode UTF-8. 
-    * Stemming performed at query time (can switch stemming language after
-      indexing) 
-    * Easy installation. No database daemon, web server or exotic language
-      necessary. 
-    * An indexer which runs either as a thread inside the GUI or as an
-      external, cron'able program. 
- .
-  Homepage: <http://www.lesbonscomptes.com/recoll>

packaging/debian/debianrclqt3/copyright

@@ -1,113 +0,0 @@
-This package was debianized by Jean-Francois Dockes <jfd@recoll.org> on
-Wed, 10 Jan 2007 16:04:13 +0100.
-
-It was downloaded from http://www.recoll.org
-
-Upstream Author: Jean-Francois Dockes <jfd@recoll.org>
-
-Copyright: (C) 2005,2006, Jean-Francois Dockes <jfd@recoll.org>
-
-License:
-
-   This package is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This package is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this package; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
-The Debian packaging is (C) 2007, Jean-Francois Dockes <jfd@recoll.org> and
-is licensed under the GPL, see above.
-
-Portions of the software are:
-
-Copyright (C) 2001-2002 by Kevin Atkinson under the GNU LGPL:
-/* This file is part of The New Aspell
- * Copyright (C) 2001-2002 by Kevin Atkinson under the GNU LGPL
- * license version 2.0 or 2.1.  You should have received a copy of the
- * LGPL license along with this library if you did not you can find it
- * at http://www.gnu.org/.    
-
-On Debian systems, the complete text of the GNU LGPL
-can be found in `/usr/share/common-licenses/LGPL-2'.
-
-
-Copyright 2002-2005 Andreas Aardal Hanssen
-Copyright (C) 2000-2004 Mikio Hirabayashi
-Copyright 1999,2000,2001 BrightStation PLC
-Copyright 2001 Ananova Ltd
-Copyright 2002 Olly Betts
-Copyright (C) 2000, 2001, 2002 Loic Dachary <loic@senga.org>
- - GPL V2 or later, same license text as above
-
-Copyright (c) 1991-2004 Unicode, Inc.
-
-  COPYRIGHT AND PERMISSION NOTICE
-  
-  Copyright © 1991-2006 Unicode, Inc. All rights reserved. Distributed under
-  the Terms of Use in http://www.unicode.org/copyright.html. 
-  
-  Permission is hereby granted, free of charge, to any person obtaining a
-  copy of the Unicode data files and any associated documentation (the "Data
-  Files") or Unicode software and any associated documentation (the
-  "Software") to deal in the Data Files or Software without restriction,
-  including without limitation the rights to use, copy, modify, merge,
-  publish, distribute, and/or sell copies of the Data Files or Software, and
-  to permit persons to whom the Data Files or Software are furnished to do
-  so, provided that (a) the above copyright notice(s) and this permission
-  notice appear with all copies of the Data Files or Software, (b) both the
-  above copyright notice(s) and this permission notice appear in associated
-  documentation, and (c) there is clear notice in each modified Data File or
-  in the Software as well as in the documentation associated with the Data
-  File(s) or Software that the data or software has been modified. 
-  
-  THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-  KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
-  THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
-  INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR
-  CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF
-  USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-  PERFORMANCE OF THE DATA FILES OR SOFTWARE. 
-  
-  Except as contained in this notice, the name of a copyright holder shall
-  not be used in advertising or otherwise to promote the sale, use or other
-  dealings in these Data Files or Software without prior written
-  authorization of the copyright holder. 
-
-Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
-/*
- * MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
- *
- * Copyright (C) 1991-2, RSA Data Security, Inc. Created 1991. All
- * rights reserved.
- *
- * License to copy and use this software is granted provided that it
- * is identified as the "RSA Data Security, Inc. MD5 Message-Digest
- * Algorithm" in all material mentioning or referencing this software
- * or this function.
- *
- * License is also granted to make and use derivative works provided
- * that such works are identified as "derived from the RSA Data
- * Security, Inc. MD5 Message-Digest Algorithm" in all material
- * mentioning or referencing the derived work.
- *
- * RSA Data Security, Inc. makes no representations concerning either
- * the merchantability of this software or the suitability of this
- * software for any particular purpose. It is provided "as is"
- * without express or implied warranty of any kind.
- *
- * These notices must be retained in any copies of any part of this
- * documentation and/or software.
- */

packaging/debian/debianrclqt3/docs

@@ -1 +0,0 @@
-README

packaging/debian/debianrclqt3/menu

@@ -1,2 +0,0 @@
-?package(recoll):needs="X11" section="Apps/Databases"\
-  title="Personal Search Tool" command="/usr/bin/recoll"

packaging/debian/debianrclqt3/rules

@@ -1,69 +0,0 @@
-#!/usr/bin/make -f
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-config.status: configure
-	dh_testdir
-	./configure CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" \
-	--host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	--prefix=/usr --mandir=\$${prefix}/share/man
-
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
-	$(MAKE) 
-	touch $@
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
-	-$(MAKE) distclean
-	dh_clean 
-
-install:
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) prefix=$(CURDIR)/debian/recoll/usr install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs ChangeLog
-	dh_installdocs
-	dh_installmenu
-	dh_installman
-	dh_link
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary-indep: build install
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

packaging/debian/debianrclqt3/watch

@@ -1,12 +0,0 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
-version=3
-
-# Uncomment to examine a Webpage 
-# <Webpage URL> <string match>
-http://www.recoll.org/download.html recoll-(.*)\.tar\.gz
-

packaging/debian/debianrclqt4/changelog

@@ -1,118 +0,0 @@
-recoll (1.17.1-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.17.1: unity lens support
- -- Jean-Francois Dockes <jf@dockes.org>  Tue, 27 Mar 2012 16:21:00 +0200
-
-recoll (1.17.0-0~ppaPPAVERS~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.17.0
- -- Jean-Francois Dockes <jf@dockes.org>  Mon, 18 Mar 2012 16:50:00 +0200
-
-recoll (1.16.2-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.16.2
- -- Jean-Francois Dockes <jf@dockes.org>  Mon, 07 Nov 2011 17:50:00 +0200
-
-recoll (1.16.1-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.16.1
- -- Jean-Francois Dockes <jf@dockes.org>  Wed, 28 Sep 2011 15:07:00 +0200
-
-recoll (1.16.0-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.16.0
- -- Jean-Francois Dockes <jf@dockes.org>  Wed, 07 Sep 2011 18:30:00 +0200
-
-recoll (1.15.8-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.15.8
- -- Jean-Francois Dockes <jf@dockes.org>  Mon, 02 May 2011 17:27:00 +0200
-
-recoll (1.15.7-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.15.7
- -- Jean-Francois Dockes <jf@dockes.org>  Thu, 10 Mar 2011 10:54:00 +0200
-
-recoll (1.15.5-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.15.5
- -- Jean-Francois Dockes <jf@dockes.org>  Fri, 04 Mar 2011 13:54:00 +0200
-
-recoll (1.15.2-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.15.2
- -- Jean-Francois Dockes <jf@dockes.org>  Mon, 14 Feb 2011 21:54:00 +0200
-
-recoll (1.15.1-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.15.1 (fixes qt 4.4 build issue on karmic)
- -- Jean-Francois Dockes <jf@dockes.org>  Wed, 02 Feb 2011 15:48:00 +0200
-
-recoll (1.15.0-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.15.0
- -- Jean-Francois Dockes <jf@dockes.org>  Wed, 02 Feb 2011 09:48:00 +0200
-
-recoll (1.14.3-0~ppa1~SERIES1) SERIES; urgency=low
-  * Update to release 1.14.3
- -- Jean-Francois Dockes <jf@dockes.org>  Thu, 25 Nov 2010 10:25:00 +0200
-
-recoll (1.14.2-0~ppa1~SERIES1) SERIES; urgency=low
-  * Update to release 1.14.2
- -- Jean-Francois Dockes <jf@dockes.org>  Sat, 25 Sep 2010 09:37:20 +0200
-
-recoll (1.13.04-0~ppa2~SERIES1) SERIES; urgency=low
-  * Switch to qt4 on Jaunty. 
- -- Jean-Francois Dockes <jf@dockes.org>  Sat, 01 May 2010 12:15:00 +0200
-
-recoll (1.13.04-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.13.04
- -- Jean-Francois Dockes <jf@dockes.org>  Thu, 14 Apr 2010 13:42:00 +0200
-
-recoll (1.13.02-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.13.02
-  * Imported current goodness from debian maintainer control and rules
-    files. Thanks to Kartik Mistry <kartik@debian.org>
-    
- -- Jean-Francois Dockes <jf@dockes.org>  Wed, 03 Feb 2010 16:21:00 +0100
-
-recoll (1.13.01-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.13.01
- -- Jean-Francois Dockes <jf@dockes.org>  Thu, 07 Jan 2010 10:52:00 +0100
-
-recoll (1.13.00-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.13.00
- -- Jean-Francois Dockes <jf@dockes.org>  Tue, 05 Jan 2010 09:52:20 +0100
-
-recoll (1.12.4-0~ppa1~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.12.4
- -- Jean-Francois Dockes <jf@dockes.org>  Wed, 28 Oct 2009 17:16:20 +0200
-
-recoll (1.12.3-0~ppa3~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.12.3
- -- Jean-Francois Dockes <jf@dockes.org>  Wed, 28 Oct 2009 17:16:20 +0200
-
-recoll (1.12.2-0~ppa3~SERIES1) SERIES; urgency=low
-  * Updated package to recoll version 1.12.2
- -- Jean-Francois Dockes <jf@dockes.org>  Mon, 19 Oct 2009 16:17:46 +0200
-
-recoll (1.11.0-0ubuntu1) dapper; urgency=low
-  * Updated package to recoll version 1.11.0
- -- Jean-Francois Dockes <jfd@recoll.org>  Sun, 19 Oct 2008 09:57:13 +0200
-
-recoll (1.10.6-0ubuntu1) dapper; urgency=low
-  * Updated package to recoll version 1.10.6
- -- Jean-Francois Dockes <jfd@recoll.org>  Fri, 12 Sep 2008 10:14:20 +0200
-
-recoll (1.10.4-0ubuntu1) hardy; urgency=low
-  * Updated package to recoll version 1.10.4
- -- Jean-Francois Dockes <jfd@recoll.org>  Fri, 29 Aug 2008 15:39:40 +0200
-
-recoll (1.10.1-0ubuntu1) gutsy; urgency=low
-  * Updated package to recoll version 1.10.1
- -- Jean-Francois Dockes <jfd@recoll.org>  Fri, 01 Feb 2008 11:30:01 +0100
-
-recoll (1.10.0-0ubuntu1) gutsy; urgency=low
-  * Updated package to recoll version 1.10.0
- -- Jean-Francois Dockes <jfd@recoll.org>  Wed, 11 Nov 2007 15:34:51 +0200
-
-recoll (1.9.0-0ubuntu1) gutsy; urgency=low
-  * Updated package to recoll version 1.9.0
- -- Jean-Francois Dockes <jfd@recoll.org>  Fri,  7 Sep 2007 15:34:51 +0200
-
-recoll (1.8.1-0ubuntu1) gutsy; urgency=low
-  * Updated package to recoll version 1.8.1
- -- Jean-Francois Dockes <jfd@recoll.org>  Wed,  7 Mar 2007 09:08:05 +0100
-
-recoll (1.7.5-0ubuntu1) feisty; urgency=low
-  * Initial release 
- -- Jean-Francois Dockes <jfd@recoll.org>  Wed, 10 Jan 2007 16:04:13 +0100

packaging/debian/debianrclqt4/compat

@@ -1 +0,0 @@
-5

packaging/debian/debianrclqt4/control

@@ -1,45 +0,0 @@
-Source: recoll
-Section: x11
-Priority: optional
-Maintainer: Jean-Francois Dockes <jf@dockes.org>
-Build-Depends: debhelper (>= 7), 
-	       autotools-dev,
-	       libqt4-dev,
-               libqtwebkit-dev,
-	       libxapian-dev (>= 1.0.15),
-	       libx11-dev,
-	       libz-dev,
-               python-all-dev (>= 2.6.6-3~),
-               quilt
-Standards-Version: 3.9.3
-
-Package: recoll
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: aspell, python, xdg-utils, xsltproc
-Suggests: antiword, catdoc, ghostscript, libimage-exiftool-perl, poppler-utils,
- pstotext, python-chm, python-mutagen, unrtf, untex
-Description: a personal full text search package with a QT GUI
- The Recoll personal full text search package is based on a very strong 
- backend (Xapian), for which it provides an easy to use and feature-rich 
- interface.
- .
- Features:
-    * QT-based GUI.
-    * Supports the following document types (and their compressed versions): 
-      - Natively: text, html, OpenOffice files, maildir and mailbox 
-        (Mozilla and Thunderbird mail ok) with attachments, gaim log files.
-      - With external helpers:  pdf (pdftotext), postscript (ghostscript),
-        msword (antiword), excel, ppt (catdoc), rtf (unrtf), 
-    * Powerful query facilities, with boolean searches, phrases, filter on
-      file types and directory tree. 
-    * Support for multiple charsets. Internal processing and storage uses
-      Unicode UTF-8. 
-    * Stemming performed at query time (can switch stemming language after
-      indexing) 
-    * Easy installation. No database daemon, web server or exotic language
-      necessary. 
-    * An indexer which runs either as a thread inside the GUI or as an
-      external, cron'able program. 
- .
-  Homepage: <http://www.lesbonscomptes.com/recoll>

packaging/debian/debianrclqt4/control-lucid

@@ -1,43 +0,0 @@
-Source: recoll
-Section: x11
-Priority: optional
-Maintainer: Jean-Francois Dockes <jf@dockes.org>
-Build-Depends: debhelper (>= 7), 
-	       autotools-dev,
-	       libqt4-dev,
-	       libxapian-dev (>= 1.0.15),
-	       libx11-dev,
-	       libz-dev,
-               python-dev,
-               quilt
-Standards-Version: 3.8.3
-
-Package: recoll
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: aspell, python, xsltproc
-Suggests: antiword, catdoc, ghostscript, libimage-exiftool-perl, poppler-utils, unrtf, python-mutagen
-Description: a personal full text search package with a QT GUI
- The Recoll personal full text search package is based on a very strong 
- backend (Xapian), for which it provides an easy to use and feature-rich 
- interface.
- .
- Features:
-    * QT-based GUI.
-    * Supports the following document types (and their compressed versions): 
-      - Natively: text, html, OpenOffice files, maildir and mailbox 
-        (Mozilla and Thunderbird mail ok) with attachments, gaim log files.
-      - With external helpers:  pdf (pdftotext), postscript (ghostscript),
-        msword (antiword), excel, ppt (catdoc), rtf (unrtf), 
-    * Powerful query facilities, with boolean searches, phrases, filter on
-      file types and directory tree. 
-    * Support for multiple charsets. Internal processing and storage uses
-      Unicode UTF-8. 
-    * Stemming performed at query time (can switch stemming language after
-      indexing) 
-    * Easy installation. No database daemon, web server or exotic language
-      necessary. 
-    * An indexer which runs either as a thread inside the GUI or as an
-      external, cron'able program. 
- .
-  Homepage: <http://www.lesbonscomptes.com/recoll>

packaging/debian/debianrclqt4/menu

@@ -1,2 +0,0 @@
-?package(recoll):needs="X11" section="Apps/Databases"\
-  title="Personal Search Tool" command="/usr/bin/recoll"

packaging/debian/debianrclqt4/patches/fix-python-install.patch

@@ -1,15 +0,0 @@
-Description: Fix python module installation
- setup.py --root and --user options interfer with debian wanting a
- dist-packages, not site-packages installation for python modules
-Author: Jean-Francois Dockes <jf@dockes.org>
-Last-Update: 2012-03-26
---- a/recollinstall.in
-+++ b/recollinstall.in
-@@ -139,5 +139,4 @@
-     ${datadir}/recoll/translations/recoll_zh.qm || exit 1
- 
- 
--@NOPYTHON@(cd python/recoll;python setup.py install \
--    --prefix=${REALPREFIX} ${ROOTFORPYTHON})
-+#@NOPYTHON@(cd python/recoll;python setup.py install \
-+#    --prefix=${REALPREFIX} ${ROOTFORPYTHON})

packaging/debian/debianrclqt4/patches/series

@@ -1 +0,0 @@
-fix-python-install.patch

packaging/debian/debianrclqt4/watch

@@ -1,2 +0,0 @@
-version=3
-http://www.recoll.org/download.html recoll-(.*)\.tar\.gz

packaging/debian/debianunitylens/changelog

@@ -1,3 +1,21 @@
+recoll-lens (1.19.10.3543-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+  * Updated lens to release 1.19.10
+ -- Jean-Francois Dockes <jf@dockes.org>  Sat, 23 Nov 2013 18:00:00 +0100
+
+recoll-lens (1.19.2.3328-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+  * Updated lens to release 1.19.2, for consistency, same as 1.19.0 in fact
+ -- Jean-Francois Dockes <jf@dockes.org>  Mon, 14 May 2013 08:22:00 +0100
+
+recoll-lens (1.19.0.3315-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+  * Updated lens to vers. 1.19.0
+ -- Jean-Francois Dockes <jf@dockes.org>  Sun, 12 May 2013 14:43:00 +0100
+
+recoll-lens (1.18.1.2997-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+  * Updated lens to vers. 1.18.1
+ -- Jean-Francois Dockes <jf@dockes.org>  Mon, 05 Nov 2012 13:31:00 +0100
+recoll-lens (1.17.2.2697-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
+  * Updated lens to vers. 1.17.1.2697 : display thumbnails when they exist
+ -- Jean-Francois Dockes <jf@dockes.org>  Tue, 15 May 2012 13:51:00 +0200
 recoll-lens (1.17.1.2654-1~ppaPPAVERS~SERIES1) SERIES; urgency=low
   * Updated lens to vers. 1.17.1.2654 : display/open results for embedded files
  -- Jean-Francois Dockes <jf@dockes.org>  Tue, 27 Mar 2012 16:22:00 +0200

packaging/debian/debianunitylens/control

@@ -5,8 +5,9 @@ Maintainer: Jean-Francois Dockes <jfd@recoll.org>
 Build-Depends: debhelper (>= 7), 
 	       autotools-dev,
                recoll,
+               python-recoll,
                python
-Standards-Version: 3.9.2
+Standards-Version: 3.9.3
 
 Package: recoll-lens
 Architecture: all

packaging/debian/debianunitylens/rules

@@ -39,6 +39,7 @@ binary-indep: build install
 	dh_testroot
 	dh_installchangelogs ChangeLog
 	dh_installdocs README
+	dh_python2
 	dh_link
 	dh_compress
 	dh_fixperms

packaging/homebrew/00README.txt

@@ -0,0 +1,10 @@
+
+
+Package building file for Mac homebrew: http://brew.sh/
+
+Install homebrew following the instructions on the home page, then copy
+recoll.rb to /usr/local/Library/Formula/, then "brew install recoll" should
+just work.
+
+Also see: https://github.com/medoc92/homebrew/tree/recoll
+

packaging/homebrew/recoll.rb

@@ -0,0 +1,35 @@
+require 'formula'
+
+class Recoll < Formula
+  homepage 'http://www.recoll.org'
+  url 'http://www.recoll.org/recoll-1.19.11p1.tar.gz'
+  sha1 'f4259c21faff9f30882d0bf1e8f952c19ed9936b'
+
+  depends_on 'xapian'
+  depends_on 'qt'
+  def patches
+   DATA 
+  end
+  def install
+    system "./configure", "--prefix=#{prefix}"
+    system "make", "install"
+  end
+
+  test do
+    system "#{bin}/recollindex", "-h"
+  end
+end
+
+__END__
+--- a/configure.orig	2014-01-07 12:39:40.606718201 +0100
++++ b/configure	2014-01-07 12:39:58.574599715 +0100
+@@ -5120,7 +5120,7 @@
+   # basically to enable using a Macbook for development
+   if test X$sys = XDarwin ; then
+      # The default is xcode
+-     QMAKE="${QMAKE} -spec macx-g++"
++     QMAKE="${QMAKE}"
+   fi
+
+   # Discriminate qt3/4. Qt3 qmake prints its version on stderr but we don't
+

packaging/macports/textproc/recoll/Portfile

@@ -1,11 +1,11 @@
 # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
+# $Id: Portfile 111989 2013-10-08 17:10:55Z ryandesign@macports.org $
 
 PortSystem          1.0
 PortGroup           app 1.0
 
 name                recoll
-version             1.16.2
+version             1.19.11p1
 categories          textproc
 platforms           darwin
 license             GPL-2+
@@ -18,8 +18,8 @@ long_description    Recoll is a desktop search tool based on Xapian
 homepage            http://www.recoll.org/
 master_sites        ${homepage}
 
-checksums           sha1    40c18a958eeecbb70cbdf14fa7319b54525537fa \
+checksums           rmd160  de98039d80174a5da6e3cdbcc8b7bc0f4407e44a \
-                    rmd160  fb598b9c637cab49734547a41f2e8ec232f89dbe
+                    sha256  8d1d040b8de1f65f01bc0a56053a6df7677360031bf9a6779d3496ced4a61186
 
 depends_lib         port:xapian-core \
                     port:qt4-mac \
@@ -34,8 +34,7 @@ depends_run         port:antiword \
                     port:unrtf \
                     port:unzip
 
-patchfiles          patch-configure.diff \
+patchfiles          patch-sampleconf-mimeview.diff
-                    patch-sampleconf-mimeview.diff
 
 configure.args      --without-x \
                     --disable-x11mon

packaging/macports/textproc/recoll/files/patch-configure.diff

@@ -1,11 +0,0 @@
---- configure.orig	2011-10-11 06:25:31.000000000 -0500
-+++ configure	2011-11-27 20:02:11.000000000 -0600
-@@ -4366,7 +4366,7 @@
- LIBICONV=""
- S_LDFLAGS=$LDFLAGS
- S_CPPFLAGS=$CPPFLAGS
--for dir in ${libdir} /opt/local/lib /usr/local/lib ;do
-+for dir in ${libdir} ;do
-   CPPFLAGS="$S_CPPFLAGS -I$dir/../include"
- 
-   LDFLAGS="$S_LDFLAGS -L$dir"

packaging/macports/textproc/recoll/files/patch-sampleconf-mimeview.diff

@@ -1,134 +1,147 @@
---- sampleconf/mimeview	2011-10-11 08:44:09.000000000 +0200
+--- sampleconf/mimeview	2013-09-30 18:45:06.000000000 +0200
-+++ sampleconf/mimeview.mac	2011-11-27 17:55:42.000000000 +0100
++++ sampleconf/mimeview.mac	2013-09-30 18:45:06.000000000 +0200
 @@ -2,7 +2,8 @@
  
  ## ##########################################
  # External viewers, launched by the recoll GUI when you click on a result
 -# 'edit' link
 +# 'Open' link - MAC version
-+# On the MAC, we basically use "open" for everything...
++# On the MAC, we use "open" for everything...
  
  # Mime types which we should not uncompress if they are found gzipped or
  # bzipped because the native viewer knows how to handle. These would be
-@@ -11,74 +12,71 @@
+@@ -16,20 +17,17 @@
+ #    search string
+ #  - For pages of CHM and EPUB documents where we can choose to open the 
+ #    parent document instead of a temporary html file.
+-xallexcepts = application/pdf application/postscript application/x-dvi \
+- text/html|gnuinfo text/html|chm text/html|epub \
+- application/x-fsdirectory|parentopen inode/directory|parentopen
++#xallexcepts = application/pdf application/postscript application/x-dvi \
++#            text/html|gnuinfo text/html|chm text/html|epub
  
  [view]
  # Pseudo entry used if the 'use desktop' preference is set in the GUI
--application/x-all = xdg-open %f
+-application/x-all = xdg-open %u
 +application/x-all = open %f
  
- application/x-kword = kword %f
+ application/epub+zip = ebook-viewer %f
- application/x-abiword = abiword %f
+-# Open the parent epub document for epub parts instead of opening them as
+-# html documents. This is almost always what we want.
+-text/html|epub = ebook-viewer %F;ignoreipath=1
+-
+-application/x-gnote = gnote %f
++# If you want to open the parent epub document for epub parts instead of
++# opening them as html documents:
++#text/html|epub = ebook-viewer %F;ignoreipath=1
  
--application/pdf  = okular %f
+ application/x-mobipocket-ebook = ebook-viewer %f
--application/postscript = okular %f
--application/x-dvi = okular %f
-+application/pdf  = open %f
-+application/postscript = open %f
-+application/x-dvi = open %f
  
- application/x-lyx = lyx %f
+@@ -76,13 +74,9 @@
- application/x-scribus = scribus %f
+ application/vnd.wordperfect = libreoffice %f
+ text/rtf = libreoffice %f
  
--application/msword = libreoffice %f
++application/x-chm = kchmviewer %f
--application/vnd.ms-excel = libreoffice %f
+ application/x-dia-diagram = dia %f
--application/vnd.ms-powerpoint = libreoffice %f
+-
-+application/msword = open %f
+ application/x-fsdirectory = dolphin %f
-+application/vnd.ms-excel = open %f
+-inode/directory = dolphin %f
-+application/vnd.ms-powerpoint = open %f
+-application/x-fsdirectory|parentopen = dolphin --select %(childurl) %f
- 
+-inode/directory|parentopen = dolphin --select %(childurl) %f
- application/vnd.openxmlformats-officedocument.wordprocessingml.document = \
+-
-- libreoffice %f
-+ open %f
- application/vnd.openxmlformats-officedocument.wordprocessingml.template = \
-- libreoffice %f
-+ open %f
- application/vnd.openxmlformats-officedocument.presentationml.template = \
-- libreoffice %f
-+ open %f
- application/vnd.openxmlformats-officedocument.presentationml.presentation = \
-- libreoffice %f
-+ open %f
- application/vnd.openxmlformats-officedocument.spreadsheetml.sheet = \
-- libreoffice %f
-+ open %f
- application/vnd.openxmlformats-officedocument.spreadsheetml.template =\
-- libreoffice %f
--application/vnd.sun.xml.calc = libreoffice %f
--application/vnd.sun.xml.calc.template = libreoffice %f
--application/vnd.sun.xml.draw = libreoffice %f
--application/vnd.sun.xml.draw.template = libreoffice %f
--application/vnd.sun.xml.impress = libreoffice %f
--application/vnd.sun.xml.impress.template = libreoffice %f
--application/vnd.sun.xml.math = libreoffice %f
--application/vnd.sun.xml.writer = libreoffice %f
--application/vnd.sun.xml.writer.global = libreoffice %f
--application/vnd.sun.xml.writer.template = libreoffice %f
--application/vnd.wordperfect = libreoffice %f
-+ open %f
-+application/vnd.sun.xml.calc = open %f
-+application/vnd.sun.xml.calc.template = open %f
-+application/vnd.sun.xml.draw = open %f
-+application/vnd.sun.xml.draw.template = open %f
-+application/vnd.sun.xml.impress = open %f
-+application/vnd.sun.xml.impress.template = open %f
-+application/vnd.sun.xml.math = open %f
-+application/vnd.sun.xml.writer = open %f
-+application/vnd.sun.xml.writer.global = open %f
-+application/vnd.sun.xml.writer.template = open %f
-+application/vnd.wordperfect = open %f
- 
- application/x-chm = kchmviewer %f
--application/x-fsdirectory = dolphin %f
-+application/x-fsdirectory = open %f
  application/x-gnuinfo = xterm -e "info -f %f"
+ application/x-gnumeric = gnumeric %f
  
--application/x-flac = rhythmbox %f
+@@ -102,11 +96,6 @@
--audio/mpeg = rhythmbox %f
+ image/x-ms-bmp = gwenview %f
--application/ogg = rhythmbox %f
+ image/x-xpmi = gwenview %f
--
+ 
--image/jpeg = gwenview %f
+-# Opening mail messages not always works. 
--image/png = gwenview %f
+-#  - Thunderbird will only open a single-message file if it has an .emf
--image/tiff = gwenview %f
+-#    extension
--image/gif  = gwenview %f
+-#  - "sylpheed %f" seems to work ok as of version 3.3
--image/svg+xml = inkview %f
+-#  - "kmail --view %u" works
--image/vnd.djvu = djview %f
+ message/rfc822 = thunderbird -file %f
--image/x-xcf = gimp %f
+ text/x-mail = thunderbird -file %f
--image/bmp = gwenview %f
+ application/x-mimehtml = thunderbird -file %f
--image/x-ms-bmp = gwenview %f
+@@ -119,11 +108,11 @@
--image/x-xpmi = gwenview %f
+ application/x-tar = ark %f
--
+ application/zip = ark %f
--# Or firefox -remote "openFile(%u)"
+ 
--application/x-tex = emacsclient  %f
+-application/x-awk = emacsclient --no-wait %f
--text/x-tex = emacsclient  %f
+-application/x-perl = emacsclient --no-wait %f
--text/html = firefox %u
+-text/x-perl = emacsclient --no-wait %f
-+application/x-flac = open %f
+-application/x-shellscript = emacsclient --no-wait %f
-+audio/mpeg = open %f
+-text/x-shellscript = emacsclient --no-wait %f
-+application/ogg = open %f
++application/x-awk = emacsclient  %f
-+
++application/x-perl = emacsclient  %f
-+image/jpeg = open %f
++text/x-perl = emacsclient  %f
-+image/png = open %f
++application/x-shellscript = emacsclient  %f
-+image/tiff = open %f
++text/x-shellscript = emacsclient  %f
-+image/gif  = open %f
+ 
-+image/svg+xml = open %f
+ # Or firefox -remote "openFile(%u)"
-+image/vnd.djvu = open %f
+ text/html = firefox %u
-+image/x-xcf = open %f
+@@ -135,41 +124,39 @@
-+image/bmp = open %f
+ 
-+image/x-ms-bmp = open %f
+ application/x-webarchive = konqueror %f
-+image/x-xpmi = open %f
+ text/x-fictionbook = ebook-viewer %f
-+
+-application/x-tex = emacsclient --no-wait  %f
-+application/x-tex = open %f
+-application/xml = emacsclient --no-wait  %f
-+text/x-tex = open %f
+-text/xml = emacsclient --no-wait  %f
-+text/html = open %u
+-text/x-tex = emacsclient --no-wait  %f
- text/html|gnuinfo = rclshowinfo %F %(title)
+-text/plain = emacsclient --no-wait  %f
--text/plain = emacsclient  %f
+-text/x-awk = emacsclient --no-wait  %f
--text/x-c = emacsclient  %f
+-text/x-c = emacsclient --no-wait  %f
--text/x-c+ = emacsclient  %f
+-text/x-c+ = emacsclient --no-wait  %f
--text/x-c++ = emacsclient  %f
+-text/x-c++ = emacsclient --no-wait  %f
--text/x-html-sidux-man = konqueror %f
++application/x-tex = emacsclient  %f
--text/x-html-aptosid-man = iceweasel %f
++application/xml = emacsclient  %f
-+text/plain = open %f
++text/xml = emacsclient  %f
-+text/x-c = open %f
++text/x-tex = emacsclient  %f
-+text/x-c+ = open %f
++text/plain = emacsclient  %f
-+text/x-c++ = open %f
++text/x-awk = emacsclient  %f
++text/x-c = emacsclient  %f
++text/x-c+ = emacsclient  %f
++text/x-c++ = emacsclient  %f
+ text/x-csv = libreoffice %f
+ text/x-html-sidux-man = konqueror %f
+ text/x-html-aptosid-man = iceweasel %f
+ 
+-application/x-chm = kchmviewer %f
+ # Html pages inside a chm have a chm rclaptg set by the filter. Kchmviewer
+ # knows how to use the ipath (which is the internal chm path) to open the
+ # file at the right place
+ text/html|chm = kchmviewer --url %i %F
+ 
+-text/x-ini = emacsclient --no-wait %f
++text/x-ini = emacsclient %f
+ text/x-man = xterm -u8 -e "groff -T ascii -man %f | more"
  text/x-python = idle %f
+-text/x-gaim-log = emacsclient --no-wait  %f
+-text/x-purple-html-log = emacsclient --no-wait  %f
+-text/x-purple-log = emacsclient --no-wait  %f
++text/x-gaim-log = emacsclient  %f
++text/x-purple-html-log = emacsclient  %f
++text/x-purple-log = emacsclient  %f
+ 
+ # The video types will usually be handled by the desktop default, but they
+ # need entries here to get an "Open" link
+-video/3gpp = vlc %f
+-video/mp2p = vlc %f
+-video/mp2t = vlc %f
+-video/mp4 = vlc %f
+-video/mpeg = vlc %f
+-video/quicktime = vlc %f
+-video/x-matroska = vlc %f
+-video/x-ms-asf = vlc %f
+-video/x-msvideo = vlc %f
+-
++video/3gpp = open %f
++video/mp2p = open %f
++video/mp2t = open %f
++video/mp4 = open %f
++video/mpeg = open %f
++video/quicktime = open %f
++video/x-matroska = open %f
++video/x-ms-asf = open %f
++video/x-msvideo = open %f

packaging/rpm/kio_recoll-opensuse.spec

@@ -0,0 +1,85 @@
+#
+# spec file for package kio_recoll
+#
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+%define rname recoll
+
+Name:           kio_recoll
+Version:        1.21.6
+Release:        0
+Summary:        Extended Search
+License:        GPL-2.0+
+Summary:        KIO slave for the Recoll full text search tool
+Group:          Productivity/Text/Utilities
+Url:            http://www.lesbonscomptes.com/recoll/
+Source:         http://www.lesbonscomptes.com/recoll/%{rname}-%{version}.tar.gz
+BuildRequires:  libkde4-devel
+BuildRequires:  kio-devel
+BuildRequires:  libxapian-devel
+BuildRequires:  recoll = %{version}
+Requires:       recoll = %{version}
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+Recoll is a personal full text search tool for Unix/Linux.
+
+This package provides the kio-slave
+
+
+%prep
+%setup -q -n %{rname}-%{version}
+
+%build
+pushd kde/kioslave/kio_recoll
+%cmake_kde4 -d build
+%make_jobs
+popd
+pushd kde/kioslave/kio_recoll-kde4
+%cmake_kde4 -d build
+%make_jobs
+
+%install
+pushd kde/kioslave/kio_recoll
+%kde4_makeinstall -C build
+popd
+pushd kde/kioslave/kio_recoll-kde4
+%kde4_makeinstall -C build
+
+
+%files
+%defattr(-,root,root)
+%{_libdir}/qt5/plugins/kio_recoll.so
+%{_datadir}/kio_recoll/
+%{_datadir}/kservices5/*.protocol
+%{_libdir}/kde4/kio_recoll.so
+%{_datadir}/kde4/apps/kio_recoll/help.html
+%{_datadir}/kde4/apps/kio_recoll/welcome.html
+%{_datadir}/kde4/services/recoll.protocol
+%{_datadir}/kde4/services/recollf.protocol
+
+%changelog
+* Tue Apr 05 2016 Jean-Francois Dockes <jfd@recoll.org> 1.21.6-0
+- Also build kde5 versions: works with Dolphin. Keep kde4 version for
+  Konqueror
+* Sun Mar 18 2012 Jean-Francois Dockes <jfd@recoll.org> 1.17.0-0
+- 1.17.0
+* Mon May 02 2011 Jean-Francois Dockes <jfd@recoll.org> 1.16.2-0
+- 1.16.2
+* Mon May 02 2011 Jean-Francois Dockes <jfd@recoll.org> 1.15.8-0
+- 1.15.8
+* Sun Mar 06 2011 Jean-Francois Dockes <jfd@recoll.org> 1.15.5-0
+- Initial spec file for kio
+

packaging/rpm/recoll-mageia.spec

@@ -0,0 +1,75 @@
+Name:   		recoll
+Version:    	1.19.9
+Release:    	%mkrel 1
+Summary:    	Desktop full text search tool with a Qt GUI
+URL:    		http://www.lesbonscomptes.com/recoll/
+Group:  		Databases
+License:    	GPLv2
+
+Source0:    	http://www.lesbonscomptes.com/recoll/%{name}-%{version}.tar.gz
+
+BuildRequires:	xapian-devel
+BuildRequires:	pkgconfig(QtCore)
+BuildRequires:	pkgconfig(QtWebKit)
+
+Requires:   	xapian
+
+
+%description
+Recoll is a personal full text search package for Linux, FreeBSD and
+other Unix systems. It is based on a very strong backend (Xapian), for
+which it provides an easy to use, feature-rich, easy administration
+interface.
+
+
+%package -n kio-%{name}
+Summary:    	Kioslave for %{name}
+Group:		    Graphical desktop/KDE
+BuildRequires:	cmake
+BuildRequires:	kdelibs4-devel
+Requires:       %{name} = %{version}-%{release}
+Requires:       kdebase4-workspace
+
+%description -n kio-%{name}
+Kioslave for %{name}. Enables to perform querries and extract
+results in konqueror and dolphin.
+
+
+
+%prep
+%setup -q
+
+%build
+%configure2_5x --disable-python-module
+%make
+
+
+%install
+%makeinstall_std
+
+rm lib/librecoll.so*
+pushd kde/kioslave/kio_recoll
+%cmake_kde4
+%make
+%makeinstall_std
+popd
+
+
+%files
+%doc README
+%{_bindir}/*
+%{_datadir}/applications/recoll-searchgui.desktop
+%{_datadir}/icons/hicolor/48x48/apps/recoll.png
+%{_datadir}/pixmaps/recoll.png
+%{_datadir}/%{name}
+%{_mandir}/man1/recoll*
+%{_mandir}/man5/recoll*
+%{_kde_libdir}/%name/librecoll.so.%version
+
+
+%files -n kio-%{name}
+%{_kde_libdir}/kde4/kio_recoll.so
+%{_kde_datadir}/apps/kio_recoll/help.html
+%{_kde_datadir}/apps/kio_recoll/welcome.html
+%{_kde_datadir}/kde4/services/recoll.protocol
+%{_kde_datadir}/kde4/services/recollf.protocol

packaging/rpm/recoll-opensuse.spec

@@ -0,0 +1,123 @@
+#
+# spec file for package recoll
+#
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
+
+Name:           recoll
+Version:        1.21.6
+Release:        0
+Summary:        Extended Search
+License:        GPL-2.0+
+Summary:        Extended Search
+Group:          Productivity/Text/Utilities
+Url:            http://www.lesbonscomptes.com/recoll/
+Source:         http://www.lesbonscomptes.com/recoll/%{name}-%{version}.tar.gz
+BuildRequires:  aspell-devel
+%if 0%{?suse_version} > 1320
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5WebKit)
+BuildRequires:  pkgconfig(Qt5WebKitWidgets)
+BuildRequires:  pkgconfig(Qt5Xml)
+BuildRequires:  pkgconfig(Qt5Network)
+BuildRequires:  pkgconfig(Qt5PrintSupport)
+%else
+BuildRequires:  libQtWebKit-devel
+BuildRequires:  libqt4-devel
+%endif
+BuildRequires:  bison
+BuildRequires:  libxapian-devel
+BuildRequires:  python-devel
+BuildRequires:  update-desktop-files
+# Recommends for the helpers.
+Recommends:     antiword
+Recommends:     poppler-tools
+Recommends:     libwpd-tools
+Recommends:     libxslt
+Recommends:     catdoc
+Recommends:     djvulibre
+Recommends:     python-mutagen
+Recommends:     exiftool
+Recommends:     perl-Image-ExifTool
+Recommends:     python-base
+Recommends:     unrar
+Recommends:     python-rarfile
+Recommends:     python-PyCHM
+Recommends:     unrtf
+Recommends:     pstotext
+# Default requires for recoll itself
+Requires:       sed
+Requires:       awk
+Requires:       aspell
+Requires:       python
+Suggests:       kio_recoll
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+
+%description
+Recoll is a personal full text search tool for Unix/Linux.
+
+It is based on the very strong Xapian back-end, for which it provides a feature-rich yet easy to use front-end with a QT graphical interface.
+
+Recoll is free, open source, and licensed under the GPL. The current version is 1.12.0 .
+Features:
+
+* Easy installation, few dependencies. No database daemon, web server, desktop environment or exotic language necessary.
+* Will run on most unix-based systems
+* Qt-based GUI. Can use either Qt 3 or Qt 4.
+* Searches most common document types, emails and their attachments.
+* Powerful query facilities, with boolean searches, phrases, proximity, wildcards, filter on file types and directory tree.
+* Multi-language and multi-character set with Unicode based internals.
+* (more detail)
+
+%prep
+%setup -q
+
+%build
+%if 0%{?suse_version} > 1320
+export QMAKE=qmake-qt5
+%endif
+%configure --with-inotify
+make %{?_smp_mflags}
+
+%install
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root)
+%dir %{_libdir}/recoll
+%dir %{_datadir}/appdata
+%{_bindir}/recoll
+%{_bindir}/recollindex
+%{_datadir}/recoll
+%{_datadir}/applications/recoll-searchgui.desktop
+%{_datadir}/appdata/recoll.appdata.xml
+%{_datadir}/icons/hicolor
+%{_datadir}/pixmaps/recoll.png
+%{_libdir}/recoll/librecoll.so.%{version}
+%{_libdir}/python2.7/site-packages/recoll
+%{_libdir}/python2.7/site-packages/Recoll-1.0-py2.7.egg-info
+%{_mandir}/man1/recoll.1.gz
+%{_mandir}/man1/recollq.1.gz
+%{_mandir}/man1/recollindex.1.gz
+%{_mandir}/man5/recoll.conf.5.gz
+
+%changelog
+* Tue Apr 05 2016 Jean-Francois Dockes <jfd@recoll.org> 1.21.6-0
+- Recoll 1.21.6, esp. for the kde5 kio
+

packaging/rpm/recoll.spec

@@ -1,131 +1,224 @@
-%define name recoll
+Summary:        Desktop full text search tool with Qt GUI
-%define version 1.17.0
+Name:           recoll
-%define release 0
+Version:        1.20.6
-
+Release:        1%{?dist}
-Name:           %{name}
-Version:        %{version}
-Release:        %{release}
-
-Summary:	Desktop Full Text Search Tool with a QT Gui
-Source0:	http://www.recoll.org/%{name}-%{version}.tar.gz
-URL:            http://www.recoll.org/
 Group:          Applications/Databases
-
+License:        GPLv2+
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+URL:            http://www.lesbonscomptes.com/recoll/
-License:	GPL
+Source0:        http://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz
-
+BuildRequires:  qt-devel
-# libxapian-devel or xapian-core-devel?
+BuildRequires:  qtwebkit-devel
-BuildRequires: libqt4-devel zlib-devel libxapian-devel libuuid-devel python-devel
+BuildRequires:  python-devel
+BuildRequires:  zlib-devel
+BuildRequires:  aspell-devel
+BuildRequires:  xapian-core-devel
+BuildRequires:  desktop-file-utils
+Requires:       xdg-utils
 
 %description
 Recoll is a personal full text search package for Linux, FreeBSD and
 other Unix systems. It is based on a very strong back end (Xapian), for
 which it provides an easy to use, feature-rich, easy administration
 interface.
-
+%global __provides_exclude_from ^%{_libdir}/recoll/librecoll\\.so.*$
-# ---------------------------------------------------------------------------
+%global __requires_exclude      ^librecoll\\.so.*$
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
-
+chmod 0644 utils/{conftree.cpp,conftree.h,debuglog.cpp,debuglog.h}
-# ---------------------------------------------------------------------------
 
 %build
-
+export QMAKE=qmake-qt4
 %configure
 make %{?_smp_mflags}
 
-# ---------------------------------------------------------------------------
-
 %install
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot} STRIP=/bin/true INSTALL='install -p'
-%makeinstall
 
-# ---------------------------------------------------------------------------
+desktop-file-install --delete-original \
+  --dir=%{buildroot}/%{_datadir}/applications \
+  %{buildroot}/%{_datadir}/applications/%{name}-searchgui.desktop
 
-%clean
+# use /usr/bin/xdg-open
-rm -rf $RPM_BUILD_ROOT
+rm -f %{buildroot}/usr/share/recoll/filters/xdg-open
 
-# ---------------------------------------------------------------------------
+# fix perms
+chmod 0755 %{buildroot}/usr/share/recoll/filters/rclexecm.py
+chmod 0755 %{buildroot}%{_libdir}/recoll/librecoll.so.*
+
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+if [ -x %{_bindir}/update-desktop-database ] ; then
+  %{_bindir}/update-desktop-database &> /dev/null
+fi
+exit 0
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor 
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+if [ -x %{_bindir}/update-desktop-database ] ; then
+  %{_bindir}/update-desktop-database &> /dev/null
+fi
+exit 0
 
 %files
-%defattr(-,root,root,-)
+%doc COPYING ChangeLog README
-%{_bindir}/*
+%{_bindir}/%{name}
-%{python_sitearch}/
+%{_bindir}/%{name}index
 %{_datadir}/%{name}
-%{_datadir}/applications/recoll-searchgui.desktop
+%{_datadir}/appdata/%{name}.appdata.xml
-%{_datadir}/icons/hicolor/48x48/apps/recoll.png
+%{_datadir}/applications/%{name}-searchgui.desktop
-%{_datadir}/pixmaps/recoll.png
+%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_mandir}/man1/recoll*
+%{_datadir}/pixmaps/%{name}.png
-%{_mandir}/man5/recoll*
+%{_libdir}/recoll
-%if 0%{?suse_version} > 1120
+%{python_sitearch}/recoll
-%dir %{_datadir}/applications
+%{python_sitearch}/Recoll*.egg-info
-%dir %{_datadir}/pixmaps
+%{_mandir}/man1/%{name}.1*
-%endif
+%{_mandir}/man1/recollq.1*
-%dir %{_datadir}/icons/hicolor/48x48/apps
+%{_mandir}/man1/%{name}index.1*
-%dir %{_datadir}/icons/hicolor/48x48
+%{_mandir}/man5/%{name}.conf.5*
-%dir %{_datadir}/icons/hicolor
-
-# ---------------------------------------------------------------------------
 
 %changelog
-* Sun Mar 18 2012 Jean-Francois Dockes <jfd@recoll.org> 1.17.0-0
+* Sat Apr 25 2015 Jean-Francois Dockes <jf@dockes.org> - 1.20.6-1
-- Update to release 1.17.0
+- 1.20.6
-* Mon Nov 07 2011 Jean-Francois Dockes <jfd@recoll.org> 1.16.2-0
+
-- Update to release 1.16.2
+* Fri Dec 19 2014 Jean-Francois Dockes <jf@dockes.org> - 1.20.1-1
-* Mon May 02 2011 Jean-Francois Dockes <jfd@recoll.org> 1.15.8-0
+- 1.20.1
-- Update to release 1.15.8
+
-* Fri Mar 04 2011 Jean-Francois Dockes <jfd@recoll.org> 1.15.5-0
+* Sun Nov 09 2014 Jean-Francois Dockes <jf@dockes.org> - 1.19.14p2-1
-- Update to release 1.15.2
+- 1.19.14p2
-* Thu Feb 15 2011 Jean-Francois Dockes <jfd@recoll.org> 1.15.2-0
+
-- Update to release 1.15.2
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.19.13-3
-* Thu Feb 2 2011 Jean-Francois Dockes <jfd@recoll.org> 1.15.0-0
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-- Update to release 1.15.0
+
-* Thu Oct 28 2010 Jean-Francois Dockes <jfd@recoll.org> 1.14.3-1
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.19.13-2
-- Update to release 1.14.3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-* Thu Oct 28 2010 Jean-Francois Dockes <jfd@recoll.org> 1.14.2-1
+
-- Rebuilt with a Xapian built with --disable-sse
+* Tue May 06 2014 Terje Rosten <terje.rosten@ntnu.no> - 1.19.13-1
-* Sat Sep 24 2010 Jean-Francois Dockes <jfd@recoll.org> 1.14.2-0
+- 1.19.13
-- Update to release 1.14.2
+
-* Thu Apr 14 2010 Jean-Francois Dockes <jfd@recoll.org> 1.13.04-1
+* Mon Jan 20 2014 Terje Rosten <terje.rosten@ntnu.no> - 1.19.11-1
-- Update to release 1.13.04
+- 1.19.11
+
+* Mon Nov 11 2013 Terje Rosten <terje.rosten@ntnu.no> - 1.19.9-1
+- 1.19.9
+
+* Tue Nov 05 2013 Terje Rosten <terje.rosten@ntnu.no> - 1.19.8-1
+- 1.19.8
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.19.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jun 12 2013 Terje Rosten <terje.rosten@ntnu.no> - 1.19.4-2
+- Fix filter setup
+
+* Mon Jun 10 2013 Terje Rosten <terje.rosten@ntnu.no> - 1.19.4-1
+- 1.19.4
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.18.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Nov 19 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.18.1-1
+- 1.18.1
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed May 30 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.17.3-1
+- 1.17.3
+
+* Sat Mar 31 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.17.1-1
+- 1.17.1
+
+* Sun Mar 25 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.17-1
+- 1.17
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.16.2-3
+- Rebuilt for c++ ABI breakage
+
+* Wed Feb 15 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.16.2-2
+- Add patch to build with gcc 4.7
+
+* Wed Feb 01 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.16.2-1
+- 1.16.2
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.16.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Oct 24 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.16.1-2
+- Add patch to fix crash (bz #747472)
+
+* Tue Oct 18 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.16.1-1
+- 1.16.1
+
+* Tue May 24 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.15.8-2
+- add patch from upstream to fix crash.
+
+* Sun May 08 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.15.8-1
+- 1.15.8
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.14.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jan 28 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.14.4-1
+- 1.14.4
+
+* Mon Nov 15 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.14.2-2
+- Add patch to fix #631704
+
+* Sun Nov  7 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.14.2-1
+- 1.14.2
+
+* Thu Jul 15 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-6
+- add patch to build with xapian 1.2 (from J.F. Dockes, thanks)
+
+* Sat Jul 10 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-5
+- use system xdg-open
+- trim chagenlog
+
+* Fri Jul  9 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-4
+- fix some review comments
+
+* Mon May 10 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-3
+- use version macro in source url
+- don't strip bins, giving non empty debuginfo package
+- more explicit file listing
+- try to preserve timestamps 
+- use proper name for spec file
+- fix changelog
+- license seems to be GPLv2+
+- include some %%doc files
+- add buildroot tag
+- some source add execute bit set
+- explicit enable inotify
+- add aspell-devel to bulldreq
+- make with _smp_mflags seems to work
+- add post scripts
+- add patch to build gui with correct flags (ref: 338791)
+
+* Sun May  9 2010  J.F. Dockes <jfd@recoll.org> 1.13.04-2
+- bumped the release number to issue new rpms for fc10
+
+* Sun May  9 2010  J.F. Dockes 1.13.04
+- updated to recoll release 1.13.04 
+
+* Fri Feb 12 2010 Terry Duell 1.13.02
+- updated to release 1.13.02
+
+* Tue Jan 12 2010 Terry Duell  1.13.01-3
+- updated to fix Fedora desktop-file-install and install icon
+
+* Sun Jan 10 2010 Jean-Francois Dockes <jfd@recoll.org> 1.13.01-2
+- updated for recent fedoras: depend on xapian packages, use qt4
+
 * Thu Jan 07 2010 Jean-Francois Dockes <jfd@recoll.org> 1.13.01-1
-- Update to release 1.13.01
+- update to release 1.13.01
-* Thu Dec 10 2009 Jean-Francois Dockes <jfd@recoll.org> 1.12.4-1
+
-- Update to release 1.12.4
+* Wed Feb  1 2006 Jean-Francois Dockes <jfd@recoll.org> 1.2.0-1
-* Wed Oct 28 2009 Jean-Francois Dockes <jfd@recoll.org> 1.12.3-1
+- initial packaging
-- Update to release 1.12.3
+
-* Tue Sep 20 2009 Jean-Francois Dockes <jfd@recoll.org> 1.12.2-1
-- Update to release 1.12.0
-* Thu Jan 29 2009 Jean-Francois Dockes <jfd@recoll.org> 1.12.0-1
-- Update to release 1.12.0
-* Mon Oct 13 2008 Jean-Francois Dockes <jfd@recoll.org> 1.11.0-1
-- Update to release 1.11.0
-* Thu Sep 11 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.6-1
-- Update to release 1.10.6
-* Thu May 27 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.2-1
-- Update to release 1.10.2
-* Thu Jan 31 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.1-1
-- Update to release 1.10.1
-* Wed Nov 21 2007 Jean-Francois Dockes <jfd@recoll.org> 1.10.0-1
-- Update to release 1.10.0
-* Tue Sep 11 2007 Jean-Francois Dockes <jfd@recoll.org> 1.9.0-1
-- Update to release 1.9.0
-* Tue Mar 6 2007 Jean-Francois Dockes <jfd@recoll.org> 1.8.1-1
-- Update to release 1.8.1
-* Mon Jan 15 2007 Jean-Francois Dockes <jfd@recoll.org> 1.7.5-1
-- Update to release 1.7.5
-* Mon Jan 08 2007 Jean-Francois Dockes <jfd@recoll.org> 1.7.3-1
-- Update to release 1.7.3
-* Tue Nov 28 2006 Jean-Francois Dockes <jfd@recoll.org> 1.6.1-1
-- Update to release 1.6.1
-* Mon Oct 2 2006 Jean-Francois Dockes <jfd@recoll.org> 1.4.3-1
-- Update to release 1.5.3
-* Sun May 7 2006 Jean-Francois Dockes <jfd@recoll.org> 1.4.3-1
-- Update to release 1.4.3
-* Fri Mar 31 2006 Jean-Francois Dockes <jfd@recoll.org> 1.3.3-1
-- Update to release 1.3.3
-* Thu Feb  2 2006 Jean-Francois Dockes <jfd@recoll.org> 1.2.2-1
-- Update to release 1.2.2
-* Thu Jan 10 2006 Jean-Francois Dockes <jfd@recoll.org> 1.1.0-1
-- Initial packaging

packaging/rpm/recollfedora.spec

@@ -1,19 +1,25 @@
+Summary:        Desktop full text search tool with Qt GUI
 Name:           recoll
-Version:        1.14.3
+Version:        1.21.6
 Release:        1%{?dist}
-Summary:        Desktop full text search tool with a qt gui
-
 Group:          Applications/Databases
-License:        GPL
+License:        GPLv2+
-URL:            http://www.recoll.org/
+URL:            http://www.lesbonscomptes.com/recoll/
-Source0:        http://www.recoll.org/recoll-1.14.3.tar.gz 
+Source0:        http://www.lesbonscomptes.com/recoll/recoll-%{version}.tar.gz
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+# Source10:       qmake-qt4.sh
-
+BuildRequires:  aspell-devel
-# Not sure how easy it is to find a xapian-core rpm. Will be easier to
+BuildRequires:  bison
-# build by hand for many. Run time uses a static link to xapian, doesnt
+BuildRequires:  desktop-file-utils
-# depend on libxapian.so
+# kio
-BuildRequires:  qt-devel
+BuildRequires:  kdelibs4-devel
-Requires:       qt
+BuildRequires:  qt5-qtbase-devel
+BuildRequires:  qt5-qtwebkit-devel
+BuildRequires:  extra-cmake-modules
+BuildRequires:  kf5-kio-devel
+BuildRequires:  python2-devel
+BuildRequires:  xapian-core-devel
+BuildRequires:  zlib-devel
+Requires:       xdg-utils
 
 %description
 Recoll is a personal full text search package for Linux, FreeBSD and
@@ -21,73 +27,277 @@ other Unix systems. It is based on a very strong backend (Xapian), for
 which it provides an easy to use, feature-rich, easy administration
 interface.
 
+%package       kio
+Summary:       KIO support for recoll
+Group:         Applications/Databases
+Requires:      %{name} = %{version}-%{release}
+
+%description   kio
+The recoll KIO slave allows performing a recoll search by entering an
+appropriate URL in a KDE open dialog, or with an HTML-based interface
+displayed in Konqueror.
+
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
+chmod 0644 utils/{conftree.cpp,conftree.h,debuglog.cpp,debuglog.h}
 
 %build
-[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
+CFLAGS="%{optflags}"; export CFLAGS
+CXXFLAGS="%{optflags}"; export CXXFLAGS
+LDFLAGS="%{?__global_ldflags}"; export LDFLAGS
+
+# force use of custom/local qmake, to inject proper build flags (above)
+#install -m755 -D %{SOURCE10} qmake-qt4.sh
+export QMAKE=qmake-qt5
+
 %configure
-make %{?_smp_mflags} static
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot} STRIP=/bin/true INSTALL='install -p'
-%makeinstall
 
-%clean
+desktop-file-install --delete-original \
-rm -rf $RPM_BUILD_ROOT
+  --dir=%{buildroot}/%{_datadir}/applications \
+  %{buildroot}/%{_datadir}/applications/%{name}-searchgui.desktop
+
+# use /usr/bin/xdg-open
+rm -f %{buildroot}/usr/share/recoll/filters/xdg-open
+
+# fix perms
+chmod 0755 %{buildroot}/usr/share/recoll/filters/rclexecm.py
+chmod 0755 %{buildroot}%{_libdir}/recoll/librecoll.so.*
+
+# kio_recoll -kde5
+(
+mkdir kde/kioslave/kio_recoll/build && pushd kde/kioslave/kio_recoll/build
+%cmake ..
+make %{?_smp_mflags} VERBOSE=1
+make install DESTDIR=%{buildroot}
+popd
+)
+
+# kio_recoll -kde4
+(
+mkdir kde/kioslave/kio_recoll-kde4/build && \
+      pushd kde/kioslave/kio_recoll-kde4/build
+%cmake ..
+make %{?_smp_mflags} VERBOSE=1
+make install DESTDIR=%{buildroot}
+popd
+)
+
+mkdir -p %{buildroot}%{_sysconfdir}/ld.so.conf.d
+echo "%{_libdir}/recoll" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+if [ -x %{_bindir}/update-desktop-database ] ; then
+  %{_bindir}/update-desktop-database &> /dev/null
+fi
+/sbin/ldconfig
+exit 0
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor 
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+fi
+if [ -x %{_bindir}/update-desktop-database ] ; then
+  %{_bindir}/update-desktop-database &> /dev/null
+fi
+/sbin/ldconfig
+exit 0
 
 %files
-%defattr(-,root,root,-)
+%doc COPYING ChangeLog README
-%{_bindir}/*
+%{_sysconfdir}/ld.so.conf.d/%{name}-%{_arch}.conf
+%{_bindir}/%{name}
+%{_bindir}/%{name}index
 %{_datadir}/%{name}
+%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}-searchgui.desktop
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
 %{_datadir}/pixmaps/%{name}.png
-%{_mandir}/man1/recoll*
+%{_libdir}/recoll
-%{_mandir}/man5/recoll*
+%{python_sitearch}/recoll
-%doc
+%{python_sitearch}/Recoll*.egg-info
+%{_mandir}/man1/%{name}.1*
+%{_mandir}/man1/%{name}q.1*
+%{_mandir}/man1/%{name}index.1*
+%{_mandir}/man5/%{name}.conf.5*
 
+%files kio
+%{_libdir}/kde4/kio_recoll.so
+%{_libdir}/qt5/plugins/kio_recoll.so
+%{_datadir}/kde4/apps/kio_recoll/
+%{_datadir}/kde4/services/recoll.protocol
+%{_datadir}/kde4/services/recollf.protocol
+%{_datadir}/kio_recoll/help.html
+%{_datadir}/kio_recoll/welcome.html
+%{_datadir}/kservices5/recoll.protocol
+%{_datadir}/kservices5/recollf.protocol
 
 %changelog
-* Thu Nov 25 2010 Jean-Francois Dockes <jfd@recoll.org> 1.14.3-1
+* Mon Jan 18 2016 Terje Rosten <terje.rosten@ntnu.no> - 1.21.4-1
-- Update to release 1.14.3
+- 1.21.4
-* Sat Sep 24 2010 Jean-Francois Dockes <jfd@recoll.org> 1.14.2-2
+
-- Rebuilt with xapian 1.0.21 configured with the -disable-sse flag to avoid the "illegal instruction" problem on older CPUs
+* Sat Oct 31 2015 Terje Rosten <terje.rosten@ntnu.no> - 1.21.3-1
-* Sat Sep 24 2010 Jean-Francois Dockes <jfd@recoll.org> 1.14.2-1
+- 1.21.3
-- Update to release 1.14.2
+
-* Thu Apr 14 2010 Jean-Francois Dockes <jfd@recoll.org> 1.13.04-1
+* Sat Oct 03 2015 Terje Rosten <terje.rosten@ntnu.no> - 1.21.2-1
-- Update to release 1.13.04
+- 1.21.2
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.20.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue May 05 2015 Terje Rosten <terje.rosten@ntnu.no> - 1.20.6-1
+- 1.20.6
+- Fixes bz#1218161 and bz#1204464
+
+* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.20.5-3
+- Rebuilt for GCC 5 C++11 ABI change
+
+* Sat Apr 11 2015 Terje Rosten <terje.rosten@ntnu.no> - 1.20.5-2
+- Add KIO subpackage
+
+* Tue Apr 07 2015 Terje Rosten <terje.rosten@ntnu.no> - 1.20.5-1
+- 1.20.5
+- Include kio support (bz#1203257)
+
+* Sat Jan 10 2015 Terje Rosten <terje.rosten@ntnu.no> - 1.20.1-1
+- 1.20.1
+
+* Sun Nov 09 2014 Terje Rosten <terje.rosten@ntnu.no> - 1.19.14p2-1
+- 1.19.14p2
+
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.19.13-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.19.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Tue May 06 2014 Terje Rosten <terje.rosten@ntnu.no> - 1.19.13-1
+- 1.19.13
+
+* Mon Jan 20 2014 Terje Rosten <terje.rosten@ntnu.no> - 1.19.11-1
+- 1.19.11
+
+* Mon Nov 11 2013 Terje Rosten <terje.rosten@ntnu.no> - 1.19.9-1
+- 1.19.9
+
+* Tue Nov 05 2013 Terje Rosten <terje.rosten@ntnu.no> - 1.19.8-1
+- 1.19.8
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.19.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Wed Jun 12 2013 Terje Rosten <terje.rosten@ntnu.no> - 1.19.4-2
+- Fix filter setup
+
+* Mon Jun 10 2013 Terje Rosten <terje.rosten@ntnu.no> - 1.19.4-1
+- 1.19.4
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.18.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Mon Nov 19 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.18.1-1
+- 1.18.1
+
+* Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.17.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Wed May 30 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.17.3-1
+- 1.17.3
+
+* Sat Mar 31 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.17.1-1
+- 1.17.1
+
+* Sun Mar 25 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.17-1
+- 1.17
+
+* Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.16.2-3
+- Rebuilt for c++ ABI breakage
+
+* Wed Feb 15 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.16.2-2
+- Add patch to build with gcc 4.7
+
+* Wed Feb 01 2012 Terje Rosten <terje.rosten@ntnu.no> - 1.16.2-1
+- 1.16.2
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.16.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Oct 24 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.16.1-2
+- Add patch to fix crash (bz #747472)
+
+* Tue Oct 18 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.16.1-1
+- 1.16.1
+
+* Tue May 24 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.15.8-2
+- add patch from upstream to fix crash.
+
+* Sun May 08 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.15.8-1
+- 1.15.8
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.14.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Jan 28 2011 Terje Rosten <terje.rosten@ntnu.no> - 1.14.4-1
+- 1.14.4
+
+* Mon Nov 15 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.14.2-2
+- Add patch to fix #631704
+
+* Sun Nov  7 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.14.2-1
+- 1.14.2
+
+* Thu Jul 15 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-6
+- add patch to build with xapian 1.2 (from J.F. Dockes, thanks)
+
+* Sat Jul 10 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-5
+- use system xdg-open
+- trim chagenlog
+
+* Fri Jul  9 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-4
+- fix some review comments
+
+* Mon May 10 2010 Terje Rosten <terje.rosten@ntnu.no> - 1.13.04-3
+- use version macro in source url
+- don't strip bins, giving non empty debuginfo package
+- more explicit file listing
+- try to preserve timestamps 
+- use proper name for spec file
+- fix changelog
+- license seems to be GPLv2+
+- include some %%doc files
+- add buildroot tag
+- some source add execute bit set
+- explicit enable inotify
+- add aspell-devel to bulldreq
+- make with _smp_mflags seems to work
+- add post scripts
+- add patch to build gui with correct flags (ref: 338791)
+
+* Sun May  9 2010  J.F. Dockes <jfd@recoll.org> 1.13.04-2
+- bumped the release number to issue new rpms for fc10
+
+* Sun May  9 2010  J.F. Dockes 1.13.04
+- updated to recoll release 1.13.04 
+
+* Fri Feb 12 2010 Terry Duell 1.13.02
+- updated to release 1.13.02
+
+* Tue Jan 12 2010 Terry Duell  1.13.01-3
+- updated to fix Fedora desktop-file-install and install icon
+
+* Sun Jan 10 2010 Jean-Francois Dockes <jfd@recoll.org> 1.13.01-2
+- updated for recent fedoras: depend on xapian packages, use qt4
+
 * Thu Jan 07 2010 Jean-Francois Dockes <jfd@recoll.org> 1.13.01-1
-- Update to release 1.13.01
+- update to release 1.13.01
-* Wed Oct 28 2009 Jean-Francois Dockes <jfd@recoll.org> 1.12.3-1
+
-- Update to release 1.12.3
-* Thu Jan 29 2009 Jean-Francois Dockes <jfd@recoll.org> 1.12.0-1
-- Update to release 1.12.0
-* Mon Oct 13 2008 Jean-Francois Dockes <jfd@recoll.org> 1.11.0-1
-- Update to release 1.11.0
-* Fri Sep 12 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.6-1
-- Update to release 1.10.6
-* Thu May 27 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.2-1
-- Update to release 1.10.2
-* Thu Jan 31 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.1-1
-- Update to release 1.10.1
-* Wed Nov 21 2007 Jean-Francois Dockes <jfd@recoll.org> 1.10.0-1
-- Update to release 1.10.0
-* Tue Sep 11 2007 Jean-Francois Dockes <jfd@recoll.org> 1.9.0-1
-- Update to release 1.9.0
-* Tue Mar 6 2007 Jean-Francois Dockes <jfd@recoll.org> 1.8.1-1
-- Update to release 1.8.1
-* Mon Jan 15 2007 Jean-Francois Dockes <jfd@recoll.org> 1.7.5-1
-- Update to release 1.7.5
-* Mon Jan 08 2007 Jean-Francois Dockes <jfd@recoll.org> 1.7.3-1
-- Update to release 1.7.3
-* Tue Nov 28 2006 Jean-Francois Dockes <jfd@recoll.org> 1.6.1-1
-- Update to release 1.6.0
-* Mon Nov 20 2006 Jean-Francois Dockes <jfd@recoll.org> 1.5.11-1
-- Update to release 1.5.11
-* Mon Oct 2 2006 Jean-Francois Dockes <jfd@recoll.org> 1.5.2-1
-- Update to release 1.5.2
-* Fri Mar 31 2006 Jean-Francois Dockes <jfd@recoll.org> 1.3.2-1
-- Update to release 1.3.1
 * Wed Feb  1 2006 Jean-Francois Dockes <jfd@recoll.org> 1.2.0-1
-- Initial packaging
+- initial packaging

packaging/rpm/recollfedora10+.spec

@@ -1,112 +0,0 @@
-Name:           recoll
-Version:        1.17.0
-Release:        1%{?dist}
-Summary:        Desktop full text search tool with a qt gui
-
-Group:          Applications/Databases
-License:        GPLv2
-URL:            http://www.recoll.org/
-Source0:        http://www.recoll.org/recoll-1.17.0.tar.gz 
-
-BuildRequires:  qt-devel qt-webkit-devel xapian-core-devel zlib-devel desktop-file-utils
-
-%description
-Recoll is a personal full text search package for Linux, FreeBSD and
-other Unix systems. It is based on a very strong backend (Xapian), for
-which it provides an easy to use, feature-rich, easy administration
-interface.
-
-%prep
-%setup -q
-
-%build
-QMAKE=qmake-qt4 
-export QMAKE
-%configure
-# No smpflags as the builds fails for some reason if -j is used.
-make
-
-%install
-rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
-
-desktop-file-install --delete-original \
-  --dir=%{buildroot}/%{_datadir}/applications \
-  %{buildroot}/%{_datadir}/applications/%{name}-searchgui.desktop
-
-
-%clean
-rm -rf %{buildroot}
-
-%files
-%defattr(-,root,root,-)
-%{_bindir}/*
-%{_datadir}/%{name}
-%{_datadir}/applications/%{name}-searchgui.desktop
-%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
-%{_datadir}/pixmaps/%{name}.png
-%{_mandir}/man1/recoll*
-%{_mandir}/man5/recoll*
-%doc
-
-%changelog
-* Sun Mar 18 2012  J.F. Dockes <jfd@recoll.org> 1.17.9-1
-- updated to release 1.16.1
-* Wed Sep 28 2011  J.F. Dockes <jfd@recoll.org> 1.16.1-1
-- updated to release 1.16.1
-* Wed Sep 21 2011  J.F. Dockes <jfd@recoll.org> 1.16.0-1
-- updated to release 1.16.0
-* Mon May 02 2011  J.F. Dockes <jfd@recoll.org> 1.15.8-1
-- updated to release 1.15.8
-* Fri Mar 15 2011  J.F. Dockes <jfd@recoll.org> 1.15.5-1
-- updated to release 1.15.5
-* Thu Feb 15 2011  J.F. Dockes <jfd@recoll.org> 1.15.2-1
-- updated to release 1.15.2
-* Wed Feb 02 2011  J.F. Dockes <jfd@recoll.org> 1.15.0-1
-- updated to release 1.15.0
-* Mon Sep 13 2010  J.F. Dockes <jfd@recoll.org> 1.14.0-1
-- updated to release 1.14.0
-* Sun May 9 2010  J.F. Dockes <jfd@recoll.org> 1.13.04-2
-- Bumped the release number to issue new rpms for fc10
-* Sun May 9 2010  J.F. Dockes 1.13.04
-- spec file updated to recoll release 1.13.04. 
-* Fri Feb 12 2010 Terry Duell 1.13.02
-- updated to release 1.13.02
-* Mon Jan 12 2010 Terry Duell 1.13.01-3
-- rpm spec file updated to fix Fedora desktop-file-install and install icon
-* Sun Jan 10 2010 Jean-Francois Dockes <jfd@recoll.org> 1.13.01-2
-- Rpm Spec file updated for recent fedoras: depend on xapian packages, use qt4
-* Thu Jan 07 2010 Jean-Francois Dockes <jfd@recoll.org> 1.13.01-1
-- Update to release 1.13.01
-* Thu Dec 10 2009 Jean-Francois Dockes <jfd@recoll.org> 1.12.4-1
-- Update to release 1.12.4
-* Thu Jan 29 2009 Jean-Francois Dockes <jfd@recoll.org> 1.12.0-1
-- Update to release 1.12.0
-* Mon Oct 13 2008 Jean-Francois Dockes <jfd@recoll.org> 1.11.0-1
-- Update to release 1.11.0
-* Fri Sep 12 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.6-1
-- Update to release 1.10.6
-* Thu May 27 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.2-1
-- Update to release 1.10.2
-* Thu Jan 31 2008 Jean-Francois Dockes <jfd@recoll.org> 1.10.1-1
-- Update to release 1.10.1
-* Wed Nov 21 2007 Jean-Francois Dockes <jfd@recoll.org> 1.10.0-1
-- Update to release 1.10.0
-* Tue Sep 11 2007 Jean-Francois Dockes <jfd@recoll.org> 1.9.0-1
-- Update to release 1.9.0
-* Tue Mar 6 2007 Jean-Francois Dockes <jfd@recoll.org> 1.8.1-1
-- Update to release 1.8.1
-* Mon Jan 15 2007 Jean-Francois Dockes <jfd@recoll.org> 1.7.5-1
-- Update to release 1.7.5
-* Mon Jan 08 2007 Jean-Francois Dockes <jfd@recoll.org> 1.7.3-1
-- Update to release 1.7.3
-* Tue Nov 28 2006 Jean-Francois Dockes <jfd@recoll.org> 1.6.1-1
-- Update to release 1.6.0
-* Mon Nov 20 2006 Jean-Francois Dockes <jfd@recoll.org> 1.5.11-1
-- Update to release 1.5.11
-* Mon Oct 2 2006 Jean-Francois Dockes <jfd@recoll.org> 1.5.2-1
-- Update to release 1.5.2
-* Fri Mar 31 2006 Jean-Francois Dockes <jfd@recoll.org> 1.3.2-1
-- Update to release 1.3.1
-* Wed Feb  1 2006 Jean-Francois Dockes <jfd@recoll.org> 1.2.0-1
-- Initial packaging

packaging/rpm/recollmdk.spec

@@ -1,5 +1,5 @@
 %define name recoll
-%define version 1.17.0
+%define version 1.18.1
 %define release  %mkrel 1
 
 Name:           %{name}
@@ -13,7 +13,10 @@ Group:          Applications/Databases
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 License:	GPL
-Requires:	xapian-core
+BuildRequires:  libqt4-devel
+BuildRequires:  libqtwebkit2.2-devel
+BuildRequires:  libpython-devel
+BuildRequires:  libxapian-devel
 
 %description
 Recoll is a personal full text search package for Linux, FreeBSD and
@@ -55,12 +58,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/%{name}
 %{_mandir}/man1/recoll*
 %{_mandir}/man5/recoll*
+%{python_sitearch}/Recoll*.egg-info
+%{python_sitearch}/recoll.so
 
 # ---------------------------------------------------------------------------
 
 %changelog
-* Sun Mar 18 2012 Jean-Francois Dockes <jfd@recoll.org> 1.17.0-1
+* Mon Nov 05 2012 Jean-Francois Dockes <jfd@recoll.org> 1.18.1-1
-- Update to release 1.17.0
+- Update to release 1.18.1
+* Thu May 17 2012 Jean-Francois Dockes <jfd@recoll.org> 1.17.2-1
+- Update to release 1.17.2
 * Mon Nov 07 2011 Jean-Francois Dockes <jfd@recoll.org> 1.16.2-1
 - Update to release 1.16.2
 * Wed Sep 28 2011 Jean-Francois Dockes <jfd@recoll.org> 1.16.1-1

src/Makefile.am

@@ -0,0 +1,654 @@
+
+CXXFLAGS ?= @CXXFLAGS@
+LIBXAPIAN=@LIBXAPIAN@
+XAPIANCXXFLAGS=@XAPIANCXXFLAGS@
+LIBICONV=@LIBICONV@
+INCICONV=@INCICONV@
+LIBFAM = @LIBFAM@
+RCLLIBVERSION=@RCLLIBVERSION@
+X_CFLAGS=@X_CFLAGS@
+X_PRE_LIBS=@X_PRE_LIBS@
+X_LIBS=@X_LIBS@
+X_EXTRA_LIBS=@X_EXTRA_LIBS@
+X_LIBX11=@X_LIBX11@
+DEFS=@DEFS@
+
+COMMONCPPFLAGS = -I. \
+    -I$(top_srcdir)/aspell \
+    -I$(top_srcdir)/bincimapmime \
+    -I$(top_srcdir)/common \
+    -I$(top_srcdir)/index \
+    -I$(top_srcdir)/internfile \
+    -I$(top_srcdir)/rcldb \
+    -I$(top_srcdir)/unac \
+    -I$(top_srcdir)/utils \
+    -I$(top_srcdir)/xaposix \
+    -DBUILDING_RECOLL
+
+AM_CPPFLAGS = -Wall -Wno-unused -std=c++11 \
+    $(COMMONCPPFLAGS) \
+    $(INCICONV) \
+    $(XAPIANCXXFLAGS) \
+    $(X_CFLAGS) \
+    -DRECOLL_DATADIR=\"${pkgdatadir}\" \
+    -D_GNU_SOURCE \
+    $(DEFS)
+
+ACLOCAL_AMFLAGS = -I m4
+
+if NOTHREADS
+    LIBTHREADS=
+else
+    LIBTHREADS= $(LIBSYSTHREADS)
+endif
+
+librcldir = $(libdir)/recoll
+librcl_LTLIBRARIES = librecoll.la
+
+librecoll_la_SOURCES = \
+aspell/aspell-local.h \
+aspell/rclaspell.cpp \
+aspell/rclaspell.h \
+bincimapmime/config.h \
+bincimapmime/convert.cc \
+bincimapmime/convert.h \
+bincimapmime/mime-inputsource.h \
+bincimapmime/mime-parsefull.cc \
+bincimapmime/mime-parseonlyheader.cc \
+bincimapmime/mime-printbody.cc \
+bincimapmime/mime-utils.h \
+bincimapmime/mime.cc \
+bincimapmime/mime.h \
+common/beaglequeuecache.cpp \
+common/beaglequeuecache.h \
+common/conf_post.h \
+common/cstr.cpp \
+common/cstr.h \
+common/rclconfig.cpp \
+common/rclconfig.h \
+common/rclinit.cpp \
+common/rclinit.h \
+common/syngroups.cpp \
+common/syngroups.h \
+common/textsplit.cpp \
+common/textsplit.h \
+common/unacpp.cpp \
+common/unacpp.h \
+common/uproplist.h \
+common/utf8fn.cpp \
+common/utf8fn.h \
+index/beaglequeue.cpp \
+index/beaglequeue.h \
+index/bglfetcher.cpp \
+index/bglfetcher.h \
+index/checkretryfailed.cpp \
+index/checkretryfailed.h \
+index/exefetcher.cpp \
+index/exefetcher.h \
+index/fetcher.cpp \
+index/fetcher.h \
+index/fsfetcher.cpp \
+index/fsfetcher.h \
+index/fsindexer.cpp \
+index/fsindexer.h \
+index/indexer.cpp \
+index/indexer.h \
+index/mimetype.cpp \
+index/mimetype.h \
+index/rclmon.h \
+index/recollindex.h \
+index/subtreelist.cpp \
+index/subtreelist.h \
+internfile/Filter.h \
+internfile/extrameta.cpp \
+internfile/extrameta.h \
+internfile/htmlparse.cpp \
+internfile/htmlparse.h \
+internfile/indextext.h \
+internfile/internfile.cpp \
+internfile/internfile.h \
+internfile/mh_exec.cpp \
+internfile/mh_exec.h \
+internfile/mh_execm.cpp \
+internfile/mh_execm.h \
+internfile/mh_html.cpp \
+internfile/mh_html.h \
+internfile/mh_mail.cpp \
+internfile/mh_mail.h \
+internfile/mh_mbox.cpp \
+internfile/mh_mbox.h \
+internfile/mh_null.h \
+internfile/mh_symlink.h \
+internfile/mh_text.cpp \
+internfile/mh_text.h \
+internfile/mh_unknown.h \
+internfile/mimehandler.cpp \
+internfile/mimehandler.h \
+internfile/myhtmlparse.cpp \
+internfile/myhtmlparse.h \
+internfile/txtdcode.cpp \
+internfile/uncomp.cpp \
+internfile/uncomp.h \
+query/docseq.cpp \
+query/docseq.h \
+query/docseqdb.cpp \
+query/docseqdb.h \
+query/docseqdocs.h \
+query/docseqhist.cpp \
+query/docseqhist.h \
+query/dynconf.cpp \
+query/dynconf.h \
+query/filtseq.cpp \
+query/filtseq.h \
+query/plaintorich.cpp \
+query/plaintorich.h \
+query/recollq.cpp \
+query/recollq.h \
+query/reslistpager.cpp \
+query/reslistpager.h \
+query/sortseq.cpp \
+query/sortseq.h \
+query/wasaparse.ypp \
+query/wasaparseaux.cpp \
+query/wasaparserdriver.h \
+query/wasatorcl.h \
+rcldb/daterange.cpp \
+rcldb/daterange.h \
+rcldb/expansiondbs.cpp \
+rcldb/expansiondbs.h \
+rcldb/rclabstract.cpp \
+rcldb/rcldb.cpp \
+rcldb/rcldb.h \
+rcldb/rcldb_p.h \
+rcldb/rcldoc.cpp \
+rcldb/rcldoc.h \
+rcldb/rcldups.cpp \
+rcldb/rclquery.cpp \
+rcldb/rclquery.h \
+rcldb/rclquery_p.h \
+rcldb/rclterms.cpp \
+rcldb/searchdata.cpp \
+rcldb/searchdata.h \
+rcldb/searchdatatox.cpp \
+rcldb/searchdataxml.cpp \
+rcldb/stemdb.cpp \
+rcldb/stemdb.h \
+rcldb/stoplist.cpp \
+rcldb/stoplist.h \
+rcldb/synfamily.cpp \
+rcldb/synfamily.h \
+rcldb/termproc.h \
+rcldb/xmacros.h \
+unac/unac.cpp \
+unac/unac.h \
+unac/unac_version.h \
+utils/appformime.cpp \
+utils/appformime.h \
+utils/base64.cpp \
+utils/base64.h \
+utils/cancelcheck.cpp \
+utils/cancelcheck.h \
+utils/chrono.h \
+utils/chrono.cpp \
+utils/circache.cpp \
+utils/circache.h \
+utils/closefrom.cpp \
+utils/closefrom.h \
+utils/conftree.cpp \
+utils/conftree.h \
+utils/copyfile.cpp \
+utils/copyfile.h \
+utils/cpuconf.cpp \
+utils/cpuconf.h \
+utils/ecrontab.cpp \
+utils/ecrontab.h \
+utils/execmd.cpp \
+utils/execmd.h \
+utils/fileudi.cpp \
+utils/fileudi.h \
+utils/fstreewalk.cpp \
+utils/fstreewalk.h \
+utils/hldata.h \
+utils/hldata.cpp \
+utils/idfile.cpp \
+utils/idfile.h \
+utils/listmem.cpp \
+utils/listmem.h \
+utils/log.cpp \
+utils/log.h \
+utils/md5.cpp \
+utils/md5.h \
+utils/md5ut.cpp \
+utils/md5ut.h \
+utils/mimeparse.cpp \
+utils/mimeparse.h \
+utils/netcon.cpp \
+utils/netcon.h \
+utils/pathut.cpp \
+utils/pathut.h \
+utils/pxattr.cpp \
+utils/pxattr.h \
+utils/rclionice.cpp \
+utils/rclionice.h \
+utils/rclutil.h \
+utils/rclutil.cpp \
+utils/readfile.cpp \
+utils/readfile.h \
+utils/refcntr.h \
+utils/smallut.cpp \
+utils/smallut.h \
+utils/strmatcher.cpp \
+utils/strmatcher.h \
+utils/transcode.cpp \
+utils/transcode.h \
+utils/utf8iter.h \
+utils/wipedir.cpp \
+utils/wipedir.h \
+utils/workqueue.h \
+xaposix/safefcntl.h \
+xaposix/safesysstat.h \
+xaposix/safesyswait.h \
+xaposix/safeunistd.h
+
+BUILT_SOURCES = query/wasaparse.cpp
+AM_YFLAGS = -d
+
+# We use -release: the lib is only shared
+# between recoll programs from the same release.
+# -version-info $(VERSION_INFO)
+librecoll_la_LDFLAGS = -release $(VERSION) \
+    -Wl,--no-undefined -Wl,--warn-unresolved-symbols
+
+librecoll_la_LIBADD = $(LIBXAPIAN) $(LIBICONV) $(LIBTHREADS)
+
+# There is probably a better way to do this. The KIO needs to be linked
+# with librecoll, but librecoll is installed into a non-standard place
+# (/usr/lib/recoll). Debian packaging has something against setting an
+# rpath on the kio (cause it's not the same package as the lib), so I don't
+# know how to link it dynamically. The other thing I don't know is how to
+# force automake to build a static lib with the PIC objects. So the
+# following target, which is only used from the KIO build, deletes any .a
+# and .so and rebuilds the .a with the pic objs (the kio build calls
+# configured --disable-static).
+# Of course this is very uncomfortably close to automake/libtool internals
+# and may not work on all systems.
+PicStatic: $(librecoll_la_OBJECTS)
+	rm -f .libs/librecoll.a
+	rm -f .libs/librecoll.so
+	libtool --tag=LD --mode=link gcc -g -O -o librecoll.la \
+		$(librecoll_la_OBJECTS)
+
+bin_PROGRAMS = recollindex
+if MAKECMDLINE
+    bin_PROGRAMS += recollq
+endif
+
+if MAKEXADUMP
+   bin_PROGRAMS += xadump
+endif
+
+recollindex_SOURCES = \
+                    index/recollindex.cpp \
+                    index/rclmonprc.cpp \
+                    index/rclmonrcv.cpp \
+                    utils/x11mon.cpp \
+                    utils/x11mon.h 
+recollindex_LDADD = librecoll.la $(X_LIBX11)
+
+recollq_SOURCES = query/recollqmain.cpp
+recollq_LDADD = librecoll.la
+
+xadump_SOURCES = query/xadump.cpp
+xadump_LDADD = librecoll.la $(LIBXAPIAN) $(LIBICONV)
+
+# Note: I'd prefer the generated query parser files not to be distributed
+# at all, but failed to achieve this
+EXTRA_DIST = \
+bincimapmime/00README.recoll bincimapmime/AUTHORS bincimapmime/COPYING \
+\
+desktop/hotrecoll.py \
+desktop/recoll.appdata.xml \
+desktop/recollindex.desktop \
+desktop/recoll_index_on_ac.sh \
+desktop/recoll-searchgui.desktop \
+desktop/recoll.png desktop/recoll.svg desktop/recoll.xcf \
+\
+doc/man \
+doc/prog \
+doc/user/*.html doc/user/*.css doc/user/*.txt doc/user/*.xml doc/user/Makefile \
+\
+filters \
+\
+index/rclmon.sh \
+\
+kde/kioslave/kio_recoll/00README.txt \
+kde/kioslave/kio_recoll/CMakeLists.txt \
+kde/kioslave/kio_recoll/data/help.html \
+kde/kioslave/kio_recoll/data/searchable.html \
+kde/kioslave/kio_recoll/data/welcome.html \
+kde/kioslave/kio_recoll/dirif.cpp \
+kde/kioslave/kio_recoll/htmlif.cpp \
+kde/kioslave/kio_recoll/kio_recoll.cpp \
+kde/kioslave/kio_recoll/kio_recoll.h \
+kde/kioslave/kio_recoll/recollf.protocol \
+kde/kioslave/kio_recoll/recollnolist.protocol \
+kde/kioslave/kio_recoll/recoll.protocol \
+\
+query/location.hh  query/position.hh  query/stack.hh \
+\
+qtgui/advsearch.ui \
+qtgui/advsearch_w.cpp \
+qtgui/advsearch_w.h \
+qtgui/advshist.cpp \
+qtgui/advshist.h \
+qtgui/confgui/confgui.cpp \
+qtgui/confgui/confgui.h \
+qtgui/confgui/confguiindex.cpp \
+qtgui/confgui/confguiindex.h \
+qtgui/confgui/conflinkrcl.h \
+qtgui/confgui/main.cpp \
+qtgui/crontool.cpp \
+qtgui/crontool.h \
+qtgui/crontool.ui \
+qtgui/firstidx.h \
+qtgui/firstidx.ui \
+qtgui/fragbuts.cpp \
+qtgui/fragbuts.h \
+qtgui/guiutils.cpp \
+qtgui/guiutils.h \
+qtgui/i18n/recoll_cs.qm qtgui/i18n/recoll_cs.ts \
+qtgui/i18n/recoll_da.qm qtgui/i18n/recoll_da.ts \
+qtgui/i18n/recoll_de.qm qtgui/i18n/recoll_de.ts \
+qtgui/i18n/recoll_el.qm qtgui/i18n/recoll_el.ts \
+qtgui/i18n/recoll_es.qm qtgui/i18n/recoll_es.ts \
+qtgui/i18n/recoll_fr.qm qtgui/i18n/recoll_fr.ts \
+qtgui/i18n/recoll_it.qm qtgui/i18n/recoll_it.ts \
+qtgui/i18n/recoll_lt.qm qtgui/i18n/recoll_lt.ts \
+qtgui/i18n/recoll_pl.qm qtgui/i18n/recoll_pl.ts \
+qtgui/i18n/recoll_ru.qm qtgui/i18n/recoll_ru.ts \
+qtgui/i18n/recoll_tr.qm qtgui/i18n/recoll_tr.ts \
+qtgui/i18n/recoll_uk.qm qtgui/i18n/recoll_uk.ts \
+qtgui/i18n/recoll_xx.qm qtgui/i18n/recoll_xx.ts \
+qtgui/i18n/recoll_zh.qm qtgui/i18n/recoll_zh.ts \
+qtgui/i18n/recoll_zh_CN.qm qtgui/i18n/recoll_zh_CN.ts \
+qtgui/idxsched.h \
+qtgui/idxsched.ui \
+qtgui/images/asearch.png \
+qtgui/images/cancel.png \
+qtgui/images/close.png \
+qtgui/images/code-block.png \
+qtgui/images/down.png \
+qtgui/images/firstpage.png \
+qtgui/images/history.png \
+qtgui/images/nextpage.png \
+qtgui/images/prevpage.png \
+qtgui/images/recoll.icns \
+qtgui/images/recoll.png \
+qtgui/images/sortparms.png \
+qtgui/images/spell.png \
+qtgui/images/table.png \
+qtgui/images/up.png \
+qtgui/main.cpp \
+qtgui/mtpics/License_sidux.txt \
+qtgui/mtpics/README \
+qtgui/mtpics/aptosid-book.png \
+qtgui/mtpics/aptosid-manual-copyright.txt \
+qtgui/mtpics/aptosid-manual.png \
+qtgui/mtpics/archive.png \
+qtgui/mtpics/book.png \
+qtgui/mtpics/bookchap.png \
+qtgui/mtpics/document.png \
+qtgui/mtpics/drawing.png \
+qtgui/mtpics/emblem-symbolic-link.png \
+qtgui/mtpics/folder.png \
+qtgui/mtpics/html.png \
+qtgui/mtpics/image.png \
+qtgui/mtpics/message.png \
+qtgui/mtpics/mozilla_doc.png \
+qtgui/mtpics/pdf.png \
+qtgui/mtpics/pidgin.png \
+qtgui/mtpics/postscript.png \
+qtgui/mtpics/presentation.png \
+qtgui/mtpics/sidux-book.png \
+qtgui/mtpics/soffice.png \
+qtgui/mtpics/source.png \
+qtgui/mtpics/sownd.png \
+qtgui/mtpics/spreadsheet.png \
+qtgui/mtpics/text-x-python.png \
+qtgui/mtpics/txt.png \
+qtgui/mtpics/video.png \
+qtgui/mtpics/wordprocessing.png \
+qtgui/multisave.cpp \
+qtgui/multisave.h \
+qtgui/preview_load.cpp \
+qtgui/preview_load.h \
+qtgui/preview_plaintorich.cpp \
+qtgui/preview_plaintorich.h \
+qtgui/preview_w.cpp \
+qtgui/preview_w.h \
+qtgui/ptrans.ui \
+qtgui/ptrans_w.cpp \
+qtgui/ptrans_w.h \
+qtgui/rclhelp.cpp \
+qtgui/rclhelp.h \
+qtgui/rclm_idx.cpp \
+qtgui/rclm_preview.cpp \
+qtgui/rclm_saveload.cpp \
+qtgui/rclm_view.cpp \
+qtgui/rclm_wins.cpp \
+qtgui/rclmain.ui \
+qtgui/rclmain_w.cpp \
+qtgui/rclmain_w.h \
+qtgui/rclzg.cpp \
+qtgui/rclzg.h \
+qtgui/recoll.h \
+qtgui/recoll.pro.in \
+qtgui/recoll.qrc \
+qtgui/reslist.cpp \
+qtgui/reslist.h \
+qtgui/respopup.cpp \
+qtgui/respopup.h \
+qtgui/restable.cpp \
+qtgui/restable.h \
+qtgui/restable.ui \
+qtgui/rtitool.cpp \
+qtgui/rtitool.h \
+qtgui/rtitool.ui \
+qtgui/searchclause_w.cpp \
+qtgui/searchclause_w.h \
+qtgui/snippets.ui \
+qtgui/snippets_w.cpp \
+qtgui/snippets_w.h \
+qtgui/specialindex.h \
+qtgui/specialindex.ui \
+qtgui/spell.ui \
+qtgui/spell_w.cpp \
+qtgui/spell_w.h \
+qtgui/ssearch_w.cpp \
+qtgui/ssearch_w.h \
+qtgui/ssearchb.ui \
+qtgui/systray.cpp \
+qtgui/systray.h \
+qtgui/ui_rclmain.h-4.5 \
+qtgui/uiprefs.ui \
+qtgui/uiprefs_w.cpp \
+qtgui/uiprefs_w.h \
+qtgui/viewaction.ui \
+qtgui/viewaction_w.cpp \
+qtgui/viewaction_w.h \
+qtgui/webcache.ui \
+qtgui/webcache.cpp \
+qtgui/webcache.h \
+qtgui/widgets/editdialog.h \
+qtgui/widgets/editdialog.ui \
+qtgui/widgets/listdialog.h \
+qtgui/widgets/listdialog.ui \
+qtgui/widgets/qxtconfirmationmessage.cpp \
+qtgui/widgets/qxtconfirmationmessage.h \
+qtgui/widgets/qxtglobal.h \
+qtgui/xmltosd.cpp \
+qtgui/xmltosd.h \
+\
+python/README.txt \
+python/recoll/Makefile.in \
+python/recoll/pyrclextract.cpp \
+python/recoll/pyrecoll.cpp \
+python/recoll/pyrecoll.h \
+python/recoll/recoll/__init__.py \
+python/recoll/recoll/rclconfig.py \
+python/recoll/setup.py.in \
+python/samples/docdups.py \
+python/samples/mutt-recoll.py \
+python/samples/rcldlkp.py \
+python/samples/rclmbox.py \
+python/samples/recollgui/Makefile \
+python/samples/recollgui/qrecoll.py \
+python/samples/recollgui/rclmain.ui \
+python/samples/recollq.py \
+python/samples/recollqsd.py \
+\
+ \
+sampleconf/fields sampleconf/fragbuts.xml sampleconf/mimeconf \
+sampleconf/mimemap sampleconf/mimeview sampleconf/mimeview.mac \
+sampleconf/recoll.conf sampleconf/recoll.qss \
+\
+unac/AUTHORS unac/COPYING unac/README unac/README.recoll unac/unac.c \
+\
+VERSION
+
+# EXTRA_DIST: The Php Code does not build anymore. No need to ship it until
+# someone fixes it:
+# php/00README.txt php/recoll/config.m4 php/recoll/make.sh 
+# php/recoll/php_recoll.h php/recoll/recoll.cpp php/sample/shell.php 
+
+if MAKEPYTHON
+all-local: recollpython
+recollpython: librecoll.la
+	${MAKE} -C python/recoll libdir=$(libdir)
+install-exec-local: recollpython-install
+recollpython-install:
+	(cd python/recoll; \
+        if test -f /etc/debian_version ; then \
+            OPTSFORPYTHON=--install-layout=deb; \
+        fi; \
+        set -x; \
+        python setup.py install \
+         --prefix=${prefix} --root=$${DESTDIR:-/} $${OPTSFORPYTHON})
+clean-local: recollpython-clean
+recollpython-clean:
+	rm -rf python/recoll/build
+endif
+
+if MAKEQT
+all-local: recollqt
+recollqt: librecoll.la
+	(cd $(QTGUI); ${QMAKE} PREFIX=${prefix} recoll.pro)
+	$(MAKE) -C $(QTGUI) LFLAGS="$(LDFLAGS)" prefix=$(prefix) \
+                exec_prefix=$(exec_prefix) libdir=$(libdir)
+clean-local: recollqt-clean
+recollqt-clean:
+	-$(MAKE) -C $(QTGUI) clean
+install-exec-local: recollqt-install
+recollqt-install:
+	$(MAKE) -C $(QTGUI) LFLAGS="$(LDFLAGS)" INSTALL_ROOT=$(DESTDIR) \
+                prefix=$(prefix) exec_prefix=$(exec_prefix) libdir=$(libdir) \
+                install
+endif
+
+defconfdir = $(pkgdatadir)/examples
+defconf_DATA = \
+desktop/recollindex.desktop \
+index/rclmon.sh \
+sampleconf/fragbuts.xml \
+sampleconf/fields \
+sampleconf/recoll.conf \
+sampleconf/mimeconf \
+sampleconf/recoll.qss \
+sampleconf/mimemap \
+sampleconf/mimeview 
+
+filterdir = $(pkgdatadir)/filters
+filter_DATA = \
+desktop/hotrecoll.py \
+filters/rcl7z \
+filters/rclabw \
+filters/rclaptosidman \
+filters/rclaudio \
+filters/rclcheckneedretry.sh \
+filters/rclchm \
+filters/rcldia \
+filters/rcldjvu.py \
+filters/rcldoc.py \
+filters/rcldvi \
+filters/rclepub \
+filters/rclepub1 \
+filters/rclexec1.py \
+filters/rclexecm.py \
+filters/rclfb2 \
+filters/rclgaim \
+filters/rclgnm \
+filters/rclics \
+filters/rclimg \
+filters/rclimg.py \
+filters/rclinfo \
+filters/rclkar \
+filters/rclkwd \
+filters/rcllatinclass.py \
+filters/rcllatinstops.zip \
+filters/rcllyx \
+filters/rclman \
+filters/rclpdf.py \
+filters/rclokulnote \
+filters/rclopxml.py \
+filters/rclppt.py \
+filters/rclps \
+filters/rclpurple \
+filters/rclpython \
+filters/rclrar \
+filters/rclrtf.py \
+filters/rclscribus \
+filters/rclshowinfo \
+filters/rclsiduxman \
+filters/rclsoff.py \
+filters/rclsvg.py \
+filters/rcltar \
+filters/rcltex \
+filters/rcltext.py \
+filters/rcluncomp \
+filters/rcluncomp.py \
+filters/rclwar \
+filters/rclwpd \
+filters/rclxls.py \
+filters/rclxml.py \
+filters/rclxmp.py \
+filters/rclxslt.py \
+filters/rclzip \
+filters/ppt-dump.py \
+filters/xls-dump.py \
+filters/xlsxmltocsv.py \
+filters/msodump.zip \
+python/recoll/recoll/rclconfig.py 
+
+install-data-hook: 
+	(cd $(DESTDIR)/$(filterdir); \
+	chmod a+x rcl* ppt-dump.py xls-dump.py xlsxmltocsv.py hotrecoll.py; \
+	chmod 0644 msodump.zip rclexecm.py rcllatinstops.zip rclconfig.py) 
+
+if MAKEUSERDOC
+rdocdir = $(pkgdatadir)/doc
+rdoc_DATA = doc/user/usermanual.html doc/user/docbook-xsl.css 
+doc/user/usermanual.html: doc/user/usermanual.xml
+	mkdir -p doc/user
+	test -f doc/user/Makefile  || \
+		cp -p $(top_srcdir)/doc/user/Makefile doc/user
+	$(MAKE) -C doc/user VPATH=$(VPATH):$(VPATH)/doc/user usermanual.html
+endif
+
+dist_man1_MANS = doc/man/recoll.1 doc/man/recollq.1 doc/man/recollindex.1
+dist_man5_MANS = doc/man/recoll.conf.5
+
+dist-hook:
+	modified=`hg status | grep -v /$(distdir)/|grep -v debianunitysco`; \
+	if test ! -z "$$modified"; then \
+            echo Local directory is modified: $$modified ; exit 1; fi
+	hg tag -f -m "Release $(VERSION) tagged" RECOLL-$(VERSION)

src/Makefile.in

@@ -1,81 +0,0 @@
-# Copyright (C) 2005 J.F.Dockes
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-datadir = @datadir@
-datarootdir = @datarootdir@
-mandir = @mandir@
-
-QMAKE = @QMAKE@
-QTGUI = @QTGUI@
-
-all: mk/sysconf 
-	${MAKE} -C lib
-	${MAKE} -C index recollindex
-	@NOQTMAKE@(cd $(QTGUI); ${QMAKE} recoll.pro)
-	@NOQTMAKE@${MAKE} -C $(QTGUI) depth=..
-	@NOPYTHON@${MAKE} -C python/recoll
-	${MAKE} -C query recollq
-
-mk/sysconf:
-	@echo "You need to run configure first" ; exit 1
-
-static: mk/sysconf
-	${MAKE} -C lib
-	rm -f index/recollindex
-	${MAKE} -C index BSTATIC=-Wl,-Bstatic BDYNAMIC=-Wl,-Bdynamic \
-            LIBXAPIANSTATICEXTRA="@LIBXAPIANSTATICEXTRA@" \
-	       recollindex 
-	@NOQTMAKE@(cd $(QTGUI); $(QMAKE) recoll.pro)
-	@NOQTMAKE@rm -f $(QTGUI)/recoll
-	@NOQTMAKE@${MAKE} -C $(QTGUI) BSTATIC=-Wl,-Bstatic \
-	@NOQTMAKE@   BDYNAMIC=-Wl,-Bdynamic depth=.. \
-	@NOQTMAKE@   LIBXAPIANSTATICEXTRA="@LIBXAPIANSTATICEXTRA@"
-
-clean:
-	${MAKE} -C common clean
-	${MAKE} -C index clean
-	${MAKE} -C internfile clean
-	${MAKE} -C lib clean
-	${MAKE} -C query clean
-	${MAKE} -C utils clean
-	-${MAKE} -C desktop/unity-lens-recoll clean
-	-${MAKE} -C python/recoll clean
-	@NOQTMAKE@@-${MAKE} -C $(QTGUI) clean
-	rm -f qtgui/Makefile qtgui/confgui/Makefile qtgui/recoll
-	rm -f filters/rclexecm.pyc
-	rm -rf qtgui/.moc qtgui/.ui qtgui/confgui/.moc qtgui/confgui/.ui
-	rm -rf qtgui/.obj qtgui/.moc qtgui/.ui 
-	rm -rf python/recoll/build
-	rm -rf $(QTGUI)/recoll.app
-
-# Note: we don't remove the top Makefile, to keep the "clean" targets
-# available but a "Make" won't work without a configure anyway
-distclean: clean
-	-${MAKE} -C desktop/unity-lens-recoll distclean
-	-${MAKE} -C python/recoll distclean
-	rm -f mk/sysconf mk/localdefs sampleconf/recoll.conf \
-	   qtgui/recoll.pro \
-	   config.log config.status \
-	   recollinstall \
-	   lib/*.dep common/autoconfig.h
-	rm -f common/rclversion.h
-	rm -f index/alldeps lib/alldeps query/alldeps bincimapmime/alldeps
-	rm -rf autom4te.cache
-
-maintainer-clean: distclean
-	rm -f doc/user/*.html* doc/user/*.txt doc/user/HTML.manifest
-	rm -f qtgui/i18n/*.qm
-
-# recollinstall can be executed by the user and will compute 'normal'
-# values for bindir etc., relative to the prefix argument.  When executed
-# here, we pass a bunch of variables in the environment, the values will
-# override the computed defaults.
-install: all
-	DESTDIR=${DESTDIR} bindir=${bindir} datadir=${datadir} \
-	mandir=${mandir} \
-	/bin/sh ./recollinstall ${prefix}
-
-.PHONY: all static clean distclean install

src/VERSION

@@ -1 +1 @@
-1.17.2
+1.23.0

src/aspell/Makefile

@@ -1,31 +1,12 @@
-depth = ..
-include $(depth)/mk/sysconf
-
 PROGS = rclaspell
-SRCS = rclaspell.cpp
+all: $(PROGS)
 
-all: depend $(BIGLIB) $(PROGS)
+RCLASPELL_OBJS= trrclaspell.o 
-
-RCLASPELL_OBJS= trrclaspell.o  $(BIGLIB) 
 rclaspell : $(RCLASPELL_OBJS)
 	$(CXX) $(ALL_CXXFLAGS) -o rclaspell $(RCLASPELL_OBJS) \
-	       $(LIBXAPIAN) $(LIBICONV)
+          $(LIBRECOLL)
 trrclaspell.o : rclaspell.cpp
 	$(CXX) $(ALL_CXXFLAGS) -DTEST_RCLASPELL -c -o trrclaspell.o \
 	       rclaspell.cpp
 
-$(BIGLIB): force
+include ../utils/utmkdefs.mk
-	cd $(depth)/lib;$(MAKE)
-force:
-
-depend: alldeps.stamp
-alldeps.stamp : $(SRCS)
-	$(CXX) -M $(ALL_CXXFLAGS) $(SRCS) > alldeps
-	touch alldeps.stamp
-
-clean:
-	cp /dev/null alldeps
-	rm -f alldeps.stamp
-	rm -f *.o $(PROGS)
-
-include alldeps

src/aspell/rclaspell.cpp

@@ -21,20 +21,21 @@
 
 #ifdef RCL_USE_ASPELL
 
+#include <mutex>
+
 #include <unistd.h>
 #include <dlfcn.h>
-#include <iostream>
 #include <stdlib.h>
-#include <vector>
 
 #include ASPELL_INCLUDE
 
 #include "pathut.h"
 #include "execmd.h"
 #include "rclaspell.h"
-#include "debuglog.h"
+#include "log.h"
+#include "unacpp.h"
 
-#include "ptmutex.h"
+using namespace std;
 
 // Just a place where we keep the Aspell library entry points together
 class AspellApi {
@@ -63,7 +64,7 @@ public:
 
 };
 static AspellApi aapi;
-static PTMutexInit o_aapi_mutex;
+static std::mutex o_aapi_mutex;
 
 #define NMTOPTR(NM, TP)							\
     if ((aapi.NM = TP dlsym(m_data->m_handle, #NM)) == 0) {		\
@@ -84,7 +85,7 @@ public:
         : m_handle(0), m_speller(0) 
     {}
     ~AspellData() {
-        LOGDEB2(("~AspellData\n"));
+        LOGDEB2("~AspellData\n" );
 	if (m_handle) {
 	    dlclose(m_handle);
             m_handle = 0;
@@ -93,7 +94,7 @@ public:
             // Dumps core if I do this?? 
             //aapi.delete_aspell_speller(m_speller);
             m_speller = 0;
-            LOGDEB2(("~AspellData: speller done\n"));
+            LOGDEB2("~AspellData: speller done\n" );
         }
     }
 
@@ -114,7 +115,7 @@ Aspell::~Aspell()
 
 bool Aspell::init(string &reason)
 {
-    PTMutexLocker locker(o_aapi_mutex);
+    std::unique_lock<std::mutex> locker(o_aapi_mutex);
     deleteZ(m_data);
 
     // Language: we get this from the configuration, else from the NLS
@@ -151,25 +152,8 @@ bool Aspell::init(string &reason)
 	return false;
     }
 
-    // We first look for the aspell library in libdir, and also try to
-    // be clever with ASPELL_PROG.
-    vector<string> libdirs;
-    libdirs.push_back(LIBDIR);
-    // If not in the standard place, the aspell library has to live
-    // under the same prefix as the aspell program.
-    {
-	string aspellPrefix = path_getfather(path_getfather(m_data->m_exec));
-	// This would probably require some more tweaking on solaris/irix etc.
-	string dir = sizeof(long) > 4 ? "lib64" : "lib";
-	string libaspell = path_cat(aspellPrefix, dir);
-	if (libaspell != LIBDIR)
-	    libdirs.push_back(libaspell);
-    }
-
     reason = "Could not open shared library ";
-    for (vector<string>::iterator it = libdirs.begin(); 
+    string libbase("libaspell");
-	 it != libdirs.end(); it++) {
-	string libbase = path_cat(*it, "libaspell");
     string lib;
     for (unsigned int i = 0; i < nlibsuffs; i++) {
         lib = libbase + aspell_lib_suffixes[i];
@@ -179,7 +163,6 @@ bool Aspell::init(string &reason)
             goto found;
         }
     }
-    }
     
  found:
     if (m_data->m_handle == 0) {
@@ -238,8 +221,8 @@ bool Aspell::ok() const
 
 string Aspell::dicPath()
 {
-    return path_cat(m_config->getConfDir(), 
+    string ccdir = m_config->getAspellcacheDir();
-		    string("aspdict.") + m_lang + string(".rws"));
+    return path_cat(ccdir, string("aspdict.") + m_lang + string(".rws"));
 }
 
 
@@ -258,15 +241,20 @@ public:
     {}
     void newData() {
 	while (m_db.termWalkNext(m_tit, *m_input)) {
-	    // Prefixed terms are also somewhere else without the suffix,
+	    LOGDEB2("Aspell::buildDict: term: ["  << (m_input) << "]\n" );
-	    // skip them
+	    if (!Rcl::Db::isSpellingCandidate(*m_input)) {
-	    if (m_input->empty() || 
+		LOGDEB2("Aspell::buildDict: SKIP\n" );
-		('A' <= m_input->at(0) && m_input->at(0) <= 'Z'))
 		continue;
-	    if (!Rcl::Db::isSpellingCandidate(*m_input))
+	    }
+	    if (!o_index_stripchars) {
+		string lower;
+		if (!unacmaybefold(*m_input, lower, "UTF-8", UNACOP_FOLD))
 		    continue;
+		m_input->swap(lower);
+	    }
 	    // Got a non-empty sort-of appropriate term, let's send it to
 	    // aspell
+	    LOGDEB2("Apell::buildDict: SEND\n" );
 	    m_input->append("\n");
 	    return;
 	}
@@ -281,15 +269,35 @@ bool Aspell::buildDict(Rcl::Db &db, string &reason)
     if (!ok())
 	return false;
 
+    string addCreateParam;
+    m_config->getConfParam("aspellAddCreateParam", addCreateParam);
+
     // We create the dictionary by executing the aspell command:
     // aspell --lang=[lang] create master [dictApath]
+    string cmdstring(m_data->m_exec);
     ExecCmd aspell;
-    list<string> args;
+    vector<string> args;
     args.push_back(string("--lang=")+ m_lang);
+    cmdstring += string(" ") + string("--lang=") + m_lang;
     args.push_back("--encoding=utf-8");
+    cmdstring += string(" ") + "--encoding=utf-8";
+    if (!addCreateParam.empty()) {
+	args.push_back(addCreateParam);
+	cmdstring += string(" ") + addCreateParam;
+    }
     args.push_back("create");
+    cmdstring += string(" ") + "create";
     args.push_back("master");
+    cmdstring += string(" ") + "master";
     args.push_back(dicPath());
+    cmdstring += string(" ") + dicPath();
+
+    // Have to disable stderr, as numerous messages about bad strings are
+    // printed. We'd like to keep errors about missing databases though, so
+    // make it configurable for diags
+    bool keepStderr = false;
+    m_config->getConfParam("aspellKeepStderr", &keepStderr);
+    if (!keepStderr)
 	aspell.setStderr("/dev/null");
 
     Rcl::TermIter *tit = db.termWalkOpen();
@@ -297,15 +305,36 @@ bool Aspell::buildDict(Rcl::Db &db, string &reason)
 	reason = "termWalkOpen failed\n";
 	return false;
     }
-
     string termbuf;
     AspExecPv pv(&termbuf, tit, db);
     aspell.setProvide(&pv);
     
     if (aspell.doexec(m_data->m_exec, args, &termbuf)) {
-	reason = string("aspell dictionary creation command failed.\n"
+	ExecCmd cmd;
+	args.clear();
+	args.push_back("dicts");
+	string dicts;
+	bool hasdict = false;
+	if (cmd.doexec(m_data->m_exec, args, 0, &dicts)) {
+	    vector<string> vdicts;
+	    stringToTokens(dicts, vdicts, "\n\r\t ");
+	    if (find(vdicts.begin(), vdicts.end(), m_lang) != vdicts.end()) {
+		hasdict = true;
+	    }
+	}
+	if (hasdict)
+	    reason = string(
+		"\naspell dictionary creation command [") +
+                cmdstring + string("] failed. Reason unknown.\n"
+		"Try to set aspellKeepStderr = 1 in recoll.conf, and execute \n"
+		"the indexing command in a terminal to see the aspell "
+		"diagnostic output.\n");
+	else
+	    reason = string("aspell dictionary creation command failed:\n") +
+                cmdstring + "\n"
                 "One possible reason might be missing language "
-			"data files for lang = ") + m_lang;
+                "data files for lang = " + m_lang +
+                ". Maybe try to execute the command by hand for a better diag.";
 	return false;
     }
     db.termWalkClose(tit);
@@ -340,17 +369,27 @@ bool Aspell::make_speller(string& reason)
     return true;
 }
 
-bool Aspell::check(Rcl::Db &db, const string &term, string& reason)
+bool Aspell::check(const string &iterm, string& reason)
 {
-    LOGDEB2(("Aspell::check [%s]\n", term.c_str()));
+    LOGDEB2("Aspell::check ["  << (iterm) << "]\n" );
+    string mterm(iterm);
 
     if (!ok() || !make_speller(reason))
 	return false;
-    if (term.empty())
+    if (iterm.empty())
         return true; //??
 
+    if (!o_index_stripchars) {
+	string lower;
+	if (!unacmaybefold(mterm, lower, "UTF-8", UNACOP_FOLD)) {
+	    LOGERR("Aspell::check : cant lowercase input\n" );
+	    return false;
+	}
+	mterm.swap(lower);
+    }
+
     int ret = aapi.aspell_speller_check(m_data->m_speller, 
-                                        term.c_str(), term.length());
+                                        mterm.c_str(), mterm.length());
     reason.clear();
     switch (ret) {
     case 0: return false;
@@ -363,19 +402,29 @@ bool Aspell::check(Rcl::Db &db, const string &term, string& reason)
     }
 }
 
-bool Aspell::suggest(Rcl::Db &db, const string &term, 
+bool Aspell::suggest(Rcl::Db &db, const string &_term, 
                      list<string>& suggestions, string& reason)
 {
     if (!ok() || !make_speller(reason))
 	return false;
-    if (term.empty())
+    string mterm(_term);
+    if (mterm.empty())
         return true; //??
 
+    if (!o_index_stripchars) {
+	string lower;
+	if (!unacmaybefold(mterm, lower, "UTF-8", UNACOP_FOLD)) {
+	    LOGERR("Aspell::check : cant lowercase input\n" );
+	    return false;
+	}
+	mterm.swap(lower);
+    }
+
     AspellCanHaveError *ret;
 
     const AspellWordList *wl = 
 	aapi.aspell_speller_suggest(m_data->m_speller, 
-                                    term.c_str(), term.length());
+                                    mterm.c_str(), mterm.length());
     if (wl == 0) {
 	reason = aapi.aspell_speller_error_message(m_data->m_speller);
 	return false;
@@ -383,14 +432,13 @@ bool Aspell::suggest(Rcl::Db &db, const string &term,
     AspellStringEnumeration *els = aapi.aspell_word_list_elements(wl);
     const char *word;
     while ((word = aapi.aspell_string_enumeration_next(els)) != 0) {
-	// stemDiffers checks that the word exists (we don't want
+	// Check that the word exists in the index (we don't want
-	// aspell computed stuff, only exact terms from the dictionary),
+	// aspell computed stuff, only exact terms from the
-	// and that it stems differently to the base word (else it's not 
+	// dictionary).  We used to also check that it stems
-	// useful to expand the search). Or is it ? 
+	// differently from the base word but this is complicated
-        // ******** This should depend if
+	// (stemming on/off + language), so we now leave this to the
-	// stemming is turned on or not for querying  *******
+	// caller.
-	string sw(word);
+	if (db.termExists(word))
-	if (db.termExists(sw) && db.stemDiffers("english", sw, term))
 	    suggestions.push_back(word);
     }
     aapi.delete_aspell_string_enumeration(els);
@@ -423,12 +471,12 @@ using namespace std;
 
 static char *thisprog;
 RclConfig *rclconfig;
-Rcl::Db rcldb;
 
 static char usage [] =
 " -b : build dictionary\n"
 " -s <term>: suggestions for term\n"
-"\n\n"
+" -c <term>: check term\n"
+"\n"
 ;
 static void
 Usage(void)
@@ -441,6 +489,7 @@ static int     op_flags;
 #define OPT_MOINS 0x1
 #define OPT_s	  0x2 
 #define OPT_b	  0x4 
+#define OPT_c     0x8
 
 int main(int argc, char **argv)
 {
@@ -457,6 +506,10 @@ int main(int argc, char **argv)
 	while (**argv)
 	    switch (*(*argv)++) {
 	    case 'b':	op_flags |= OPT_b; break;
+	    case 'c':	op_flags |= OPT_c; if (argc < 2)  Usage();
+		word = *(++argv);
+		argc--; 
+		goto b1;
 	    case 's':	op_flags |= OPT_s; if (argc < 2)  Usage();
 		word = *(++argv);
 		argc--; 
@@ -482,7 +535,9 @@ int main(int argc, char **argv)
 	exit(1);
     }
 
-    if (!rcldb.open(dbdir, Rcl::Db::DbRO, 0)) {
+    Rcl::Db rcldb(rclconfig);
+
+    if (!rcldb.open(Rcl::Db::DbRO, 0)) {
 	fprintf(stderr, "Could not open database in %s\n", dbdir.c_str());
 	exit(1);
     }
@@ -498,6 +553,18 @@ int main(int argc, char **argv)
 	    cerr << "buildDict failed: " << reason << endl;
 	    exit(1);
 	}
+    } else if (op_flags & OPT_c) {
+	bool ret = aspell.check(word, reason);
+	if (!ret && reason.size()) {
+	    cerr << "Aspell error: " << reason << endl;
+	    return 1;
+	}
+	cout << word;
+	if (ret) {
+	    cout << " is in dictionary" << endl;
+	} else {
+	    cout << " not in dictionary" << endl;
+	}
     } else {
 	list<string> suggs;
 	if (!aspell.suggest(rcldb, word, suggs, reason)) {
@@ -518,3 +585,4 @@ int main(int argc, char **argv)
 #endif // RCL_USE_ASPELL
 
 #endif // TEST_RCLASPELL test driver
+

src/aspell/rclaspell.h

@@ -37,11 +37,6 @@
 #include "rclconfig.h"
 #include "rcldb.h"
 
-#ifndef NO_NAMESPACES
-using std::string;
-using std::list;
-#endif // NO_NAMESPACES
-
 class AspellData;
 
 class Aspell {
@@ -53,26 +48,31 @@ class Aspell {
     bool ok() const;
 
     /** Find the aspell command and shared library, init function pointers */
-    bool init(string &reason); 
+    bool init(std::string &reason); 
 
     /**  Build dictionary out of index term list. This is done at the end
      * of an indexing pass. */
-    bool buildDict(Rcl::Db &db, string &reason);
+    bool buildDict(Rcl::Db &db, std::string &reason);
 
-    /** Check that word is in dictionary. ret==false && !reason.empty() => err*/
+    /** Check that word is in dictionary. Note that this would mean
-    bool check(Rcl::Db &db, const string& term, string& reason);
+     * that the EXACT word is: aspell just does a lookup, no
+     * grammatical, case or diacritics magic of any kind
+     *
+     * @return true if word in dic, false if not. reason.size() -> error
+     */
+    bool check(const std::string& term, std::string& reason);
 
     /** Return a list of possible expansions for a given word */
-    bool suggest(Rcl::Db &db, const string& term, list<string> &suggestions, 
+    bool suggest(Rcl::Db &db, const std::string& term, 
-		 string &reason);
+		 std::list<std::string> &suggestions, std::string &reason);
 
  private:
-    string dicPath();
+    std::string dicPath();
     RclConfig  *m_config;
-    string      m_lang;
+    std::string      m_lang;
     AspellData *m_data;
 
-    bool make_speller(string& reason);
+    bool make_speller(std::string& reason);
 };
 
 #endif /* RCL_USE_ASPELL */

src/autogen.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+aclocal
+libtoolize --copy
+automake --add-missing --force-missing --copy
+autoconf

src/bincimapmime/Makefile

@@ -1,39 +1,11 @@
-# @(#$Id: Makefile,v 1.6 2006-01-19 12:01:42 dockes Exp $  (C) 2005 J.F.Dockes
-
-depth = ..
-include $(depth)/mk/sysconf
-
-LIBS = libmime.a
 PROGS = trbinc
-
+all: $(PROGS)
-all: depend $(LIBS) 
-
-SRCS = mime-getpart.cc mime-parsefull.cc mime-parseonlyheader.cc \
-     mime-printbody.cc mime-printdoc.cc mime-printheader.cc mime.cc \
-     convert.cc iodevice.cc iofactory.cc
-
-OBJS = mime-getpart.o mime-parsefull.o mime-parseonlyheader.o \
-     mime-printbody.o mime-printdoc.o mime-printheader.o mime.o  \
-     convert.o iodevice.o iofactory.o
-
-libmime.a : $(OBJS)
-	 $(AR) ru libmime.a $(OBJS)
-
-.cc.o:
-	$(CXX) $(ALL_CXXFLAGS) -c $<
 
 TRBINCOBJS = trbinc.o
 trbinc: trbinc.o
-	$(CXX) -o trbinc trbinc.o libmime.a 
+	$(CXX) -o trbinc trbinc.o $(LIBRECOLL)
 
-depend: alldeps.stamp
+trbinc.o: trbinc.cc
-alldeps.stamp : $(SRCS)
+	$(CXX) $(ALL_CXXFLAGS) -c -o trbinc.o trbinc.cc
-	$(CXX) -M $(ALL_CXXFLAGS) $(SRCS) > alldeps
-	touch alldeps.stamp
 
-clean:
+include ../utils/utmkdefs.mk
-	cp /dev/null alldeps
-	rm -f alldeps.stamp
-	rm -f ${LIBS} ${PROGS} ${OBJS}
-
-include alldeps

src/bincimapmime/address.cc

@@ -1,90 +0,0 @@
-/* -*- mode:c++;c-basic-offset:2 -*- */
-/*  --------------------------------------------------------------------
- *  Filename:
- *    address.cc
- *  
- *  Description:
- *    Implementation of the Address class.
- *  --------------------------------------------------------------------
- *  Copyright 2002-2005 Andreas Aardal Hanssen
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *  --------------------------------------------------------------------
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "address.h"
-#include "convert.h"
-#include <string>
-
-#ifndef NO_NAMESPACES
-using namespace ::std;
-using namespace Binc;
-#endif /* NO_NAMESPACES */
-
-//------------------------------------------------------------------------
-Address::Address(const string &name, const string &addr)
-{
-  string::size_type pos = addr.find('@');
-  this->name = name;
-  if (pos != string::npos) {
-    this->local = addr.substr(0, pos);
-    this->host = addr.substr(pos + 1);
-  } else this->local = addr;
-}
-
-//------------------------------------------------------------------------
-Address::Address(const string &wholeaddress)
-{
-  string::size_type start = wholeaddress.find('<');
-  string addr;
-  if (start != string::npos)
-    addr = wholeaddress.substr(start + 1);
-  else
-    addr = wholeaddress;
-
-  trim(addr, "<>");
-
-  if (start != string::npos)
-    name = wholeaddress.substr(0, start);
-  else
-    name = string();
-  trim(name);
-  trim(name, "\"");
-
-  start = addr.find('@');
-  local = addr.substr(0, start);
-  host = addr.substr(start + 1);
-
-  trim(local);
-  trim(host);
-  trim(name);
-}
-
-//------------------------------------------------------------------------
-string Address::toParenList(void) const
-{
-  string tmp = "(";
-  tmp += name.empty() ? "NIL" : toImapString(name);
-  tmp += " NIL ";
-  tmp += local.empty() ? "\"\"" : toImapString(local);
-  tmp += " ";
-  tmp += host.empty() ? "\"\"" : toImapString(host);
-  tmp += ")";
-
-  return tmp;
-}

src/bincimapmime/address.h

@@ -1,52 +0,0 @@
-/* -*- mode:c++;c-basic-offset:2 -*- */
-/*  --------------------------------------------------------------------
- *  Filename:
- *    src/mailbox/address.h
- *  
- *  Description:
- *    Declaration of the Address class.
- *  --------------------------------------------------------------------
- *  Copyright 2002-2005 Andreas Aardal Hanssen
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *  --------------------------------------------------------------------
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#ifndef address_h_included
-#define address_h_included
-#include <string>
-
-namespace Binc {
-
-  //------------------------------------------------------------------------
-  class Address {
-  public:
-    std::string name;
-    std::string local;
-    std::string host;
-
-    //--
-    std::string toParenList(void) const;
-    
-    //--
-    Address(const std::string &name, const std::string &addr);
-    Address(const std::string &wholeaddr);
-  };
-}
-
-#endif

src/bincimapmime/convert.cc

@@ -23,10 +23,6 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  *  --------------------------------------------------------------------
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "convert.h"
 #include <string>
 
@@ -47,7 +43,7 @@ BincStream::~BincStream(void)
 }
 
 //------------------------------------------------------------------------
-string BincStream::popString(unsigned int size)
+string BincStream::popString(std::string::size_type size)
 {
   if (size > nstr.length())
     size = nstr.length();

src/bincimapmime/convert.h

@@ -23,25 +23,18 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  *  --------------------------------------------------------------------
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef convert_h_included
 #define convert_h_included
+#include <stddef.h>
 #include <string>
 #include <vector>
 #include <iomanip>
 #include <iostream>
 
 #include <stdio.h>
-#include <sys/stat.h>
 #include <cstdlib>
 #include <cstring>
 
-#include "address.h"
-//#include "depot.h"
-
 namespace Binc {
 
   //----------------------------------------------------------------------
@@ -101,7 +94,7 @@ namespace Binc {
     std::string tmp;
     for (std::string::const_iterator i = s.begin();
 	 i != s.end() && i + 1 != s.end(); i += 2) {
-      int n;
+      ptrdiff_t n;
       unsigned char c = *i;
       unsigned char d = *(i + 1);
       
@@ -130,7 +123,7 @@ namespace Binc {
     for (std::string::const_iterator i = s_in.begin(); i != s_in.end(); ++i) {
       unsigned char c = (unsigned char)*i;
       if (c <= 31 || c >= 127 || c == '\"' || c == '\\')
-	return "{" + toString(s_in.length()) + "}\r\n" + s_in;
+	return "{" + toString((unsigned long)s_in.length()) + "}\r\n" + s_in;
     }
     
     return "\"" + s_in + "\"";
@@ -153,7 +146,7 @@ namespace Binc {
   //----------------------------------------------------------------------
   inline void chomp(std::string &s_in, const std::string &chars = " \t\r\n")
   {
-    int n = s_in.length();
+    std::string::size_type n = s_in.length();
     while (n > 1 && chars.find(s_in[n - 1]) != std::string::npos)
       s_in.resize(n-- - 1);
   }
@@ -298,7 +291,7 @@ namespace Binc {
     BincStream &operator << (char t);
 
     //--
-    std::string popString(unsigned int size);
+    std::string popString(std::string::size_type size);
 
     //--
     char popChar(void);

src/bincimapmime/iodevice.cc

@@ -1,322 +0,0 @@
-/*-*-mode:c++-*-*/
-/*  --------------------------------------------------------------------
- *  Filename:
- *    src/iodevice.cc
- *  
- *  Description:
- *    Implementation of the IODevice class.
- *  --------------------------------------------------------------------
- *  Copyright 2002, 2003 Andreas Aardal Hanssen
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *  --------------------------------------------------------------------
- */
-#include "iodevice.h"
-#include "convert.h" // BincStream
-//#include "session.h" // getEnv/hasEnv
-
-#include <stdlib.h>
-#include <unistd.h>
-
-#ifndef NO_NAMESPACES
-using namespace ::std;
-using namespace ::Binc;
-#endif /* NO_NAMESPACES */
-
-//------------------------------------------------------------------------
-IODevice::IODevice(int f) : flags(f | IsEnabled),
-			      maxInputBufferSize(0),
-			      maxOutputBufferSize(0),
-			      timeout(0), 
-			      readCount(0), writeCount(0),
-			      outputLevel(ErrorLevel),
-			      outputLevelLimit(ErrorLevel),
-			      error(Unknown), errorString("Unknown error"),
-			      dumpfd(0)
-{
-}
-
-//------------------------------------------------------------------------
-IODevice::~IODevice(void)
-{
-}
-
-//------------------------------------------------------------------------
-IODevice &IODevice::operator <<(ostream &(*source)(ostream &))
-{
-  if (!(flags & IsEnabled) || outputLevel > outputLevelLimit)
-    return *this;
-
-  static std::ostream &(*endl_funcptr)(ostream &) = endl;
-  
-  if (source != endl_funcptr)
-    return *this;
-
-  outputBuffer << "\r\n";
-
-  if (dumpfd)
-    ::write(dumpfd, "\r\n", 2);
-
-  if (flags & FlushesOnEndl)
-    flush();
-  else if (flags & HasOutputLimit)
-    if (outputBuffer.getSize() > maxOutputBufferSize)
-      flush();
-
-  return *this;
-}
-
-//------------------------------------------------------------------------
-bool IODevice::canRead(void) const
-{
-  return false;
-}
-
-//------------------------------------------------------------------------
-void IODevice::clear()
-{
-  if (!(flags & IsEnabled))
-    return;
-
-  inputBuffer.clear();
-  outputBuffer.clear();
-}
-
-//------------------------------------------------------------------------
-bool IODevice::flush()
-{
-  if (!(flags & IsEnabled))
-    return true;
-
-  WriteResult writeResult = WriteWait;
-  do {
-    unsigned int s = outputBuffer.getSize();
-    if (s == 0)
-      break;
-
-    if (!waitForWrite())
-      return false;
-    
-    writeResult = write();
-    if (writeResult == WriteError)
-      return false;
-
-    writeCount += s - outputBuffer.getSize();
-  } while (outputBuffer.getSize() > 0 && writeResult == WriteWait);
-
-  outputBuffer.clear();
-  return true;
-}
-
-//------------------------------------------------------------------------
-void IODevice::setFlags(unsigned int f)
-{
-  flags |= f;
-}
-
-//------------------------------------------------------------------------
-void IODevice::clearFlags(unsigned int f)
-{
-  flags &= ~f;
-}
-
-//------------------------------------------------------------------------
-void IODevice::setMaxInputBufferSize(unsigned int max)
-{
-  maxInputBufferSize = max;
-}
-
-//------------------------------------------------------------------------
-void IODevice::setMaxOutputBufferSize(unsigned int max)
-{
-  maxOutputBufferSize = max;
-}
-
-//------------------------------------------------------------------------
-void IODevice::setTimeout(unsigned int t)
-{
-  timeout = t;
-
-  if (t)
-    flags |= HasTimeout;
-  else
-    flags &= ~HasTimeout;
-}
-
-//------------------------------------------------------------------------
-unsigned int IODevice::getTimeout(void) const
-{
-  return timeout;
-}
-
-//------------------------------------------------------------------------
-void IODevice::setOutputLevel(LogLevel level)
-{
-  outputLevel = level;
-}
-
-//------------------------------------------------------------------------
-IODevice::LogLevel IODevice::getOutputLevel(void) const
-{
-  return outputLevel;
-}
-
-//------------------------------------------------------------------------
-void IODevice::setOutputLevelLimit(LogLevel level)
-{
-  outputLevelLimit = level;
-}
-
-//------------------------------------------------------------------------
-IODevice::LogLevel IODevice::getOutputLevelLimit(void) const
-{
-  return outputLevelLimit;
-}
-
-//------------------------------------------------------------------------
-bool IODevice::readStr(string *dest, unsigned int max)
-{
-  // If max is 0, fill the input buffer once only if it's empty.
-  if (!max && inputBuffer.getSize() == 0 && !fillInputBuffer())
-    return false;
-
-  // If max is != 0, wait until we have max.
-  while (max && inputBuffer.getSize() < max) {
-      if (!fillInputBuffer())
-	  return false;
-  }
-
-  unsigned int bytesToRead = max ? max : inputBuffer.getSize();
-  *dest += inputBuffer.str().substr(0, bytesToRead);
-  if (dumpfd) {
-      ::write(dumpfd, inputBuffer.str().substr(0, bytesToRead).c_str(), 
-	      bytesToRead);
-  }
-  
-  inputBuffer.popString(bytesToRead);
-  readCount += bytesToRead;
-  return true;
-}
-
-//------------------------------------------------------------------------
-bool IODevice::readChar(char *dest)
-{
-  if (inputBuffer.getSize() == 0 && !fillInputBuffer())
-    return false;
-
-  char c = inputBuffer.popChar();
-  if (dest)
-    *dest = c;
-  if (dumpfd)
-    ::write(dumpfd, &c, 1);
-
-  ++readCount;
-  return true;
-}
-
-//------------------------------------------------------------------------
-void IODevice::unreadChar(char c)
-{
-  inputBuffer.unpopChar(c);
-}
-
-//------------------------------------------------------------------------
-void IODevice::unreadStr(const string &s)
-{
-  inputBuffer.unpopStr(s);
-}
-
-//------------------------------------------------------------------------
-bool IODevice::skipTo(char c)
-{
-  char dest = '\0';
-  do {
-    if (!readChar(&dest))
-      return false;
-    if (dumpfd)
-      ::write(dumpfd, &dest, 1);
-  } while (c != dest);
-
-  return true;
-}
-
-//------------------------------------------------------------------------
-string IODevice::service(void) const
-{
-  return "nul";
-}
-
-//------------------------------------------------------------------------
-bool IODevice::waitForWrite(void) const
-{
-  return false;
-}
-
-//------------------------------------------------------------------------
-bool IODevice::waitForRead(void) const
-{
-  return false;
-}
-
-//------------------------------------------------------------------------
-IODevice::WriteResult IODevice::write(void)
-{
-  return WriteError;
-}
-
-//------------------------------------------------------------------------
-bool IODevice::fillInputBuffer(void)
-{
-  return false;
-}
-
-//------------------------------------------------------------------------
-IODevice::Error IODevice::getLastError(void) const
-{
-  return error;
-}
-
-//------------------------------------------------------------------------
-string IODevice::getLastErrorString(void) const
-{
-  return errorString;
-}
-
-//------------------------------------------------------------------------
-unsigned int IODevice::getReadCount(void) const
-{
-  return readCount;
-}
-
-//------------------------------------------------------------------------
-unsigned int IODevice::getWriteCount(void) const
-{
-  return writeCount;
-}
-
-//------------------------------------------------------------------------
-void IODevice::enableProtocolDumping(void)
-{
-#if 0
-  BincStream ss;
-  ss << "/tmp/bincimap-dump-" << (int) time(0) << "-" 
-     << Session::getInstance().getIP() << "-XXXXXX";
-  char *safename = strdup(ss.str().c_str());
-  dumpfd = mkstemp(safename);
-  if (dumpfd == -1)
-    dumpfd = 0;
-  delete safename;
-#endif
-}

src/bincimapmime/iodevice.h

@@ -1,401 +0,0 @@
-/*-*-mode:c++;c-basic-offset:2-*-*/
-/*  --------------------------------------------------------------------
- *  Filename:
- *    src/iodevice.h
- *  
- *  Description:
- *    Declaration of the IODevice class.
- *  --------------------------------------------------------------------
- *  Copyright 2002, 2003 Andreas Aardal Hanssen
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *  --------------------------------------------------------------------
- */
-#ifndef iodevice_h_included
-#define iodevice_h_included
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "convert.h" // BincStream
-#include <string>
-#include <unistd.h> // ::write
-
-namespace Binc {
-  /*!
-    \class IODevice
-    \brief The IODevice class provides a framework for reading and
-    writing to device.
-
-    Implement new devices by inheriting this class and overloading all
-    virtual methods.
-
-    service() returns the service that the specific device is used
-    for. Two values are "log" and "client".
-
-    \sa IOFactory, MultilogDevice, SyslogDevice, StdIODevice, SSLDevice
-  */
-  class IODevice {
-  public:
-    /*!
-      Standard options for an IODevice.
-    */
-    enum Flags {
-      None = 0,
-      FlushesOnEndl = 1 << 0,
-      HasInputLimit = 1 << 1,
-      HasOutputLimit = 1 << 2,
-      IsEnabled = 1 << 3,
-      HasTimeout = 1 << 4
-    };
-
-    /*!
-      Errors from when an operation returned false.
-    */
-    enum Error {
-      Unknown,
-      Timeout
-    };
-
-    /*!
-      Constructs an invalid IODevice.      
-
-      Instances of IODevice perform no operations, and all boolean
-      functions always return false. This constructor is only useful
-      if called from a subclass that reimplements all virtual methods.
-    */
-    IODevice(int f = 0);
-
-    /*!
-      Destructs an IODevice; does nothing.
-    */
-    virtual ~IODevice(void);
-
-    /*!
-      Clears all data in the input and output buffers.
-    */
-    void clear(void);
-
-    /*!
-      Sets one or more flags.
-      \param f A bitwise OR of flags from the Flags enum.
-    */
-    void setFlags(unsigned int f);
-
-    /*!
-      Clears one or more flags.
-      \param f A bitwise OR of flags from the Flags enum.
-    */
-    void clearFlags(unsigned int f);
-
-    /*!
-      Sets the maximum allowed input buffer size. If this size is
-      non-zero and exceeded, reading from the device will fail. This
-      functionality is used to prevent clients from forcing this class
-      to consume so much memory that the program crashes.
-
-      Setting the max input buffer size to 0 disables the input size
-      limit.
-
-      \param max The maximum input buffer size in bytes.
-    */
-    void setMaxInputBufferSize(unsigned int max);
-
-    /*!
-      Sets the maximum allowed output buffer size. If this size is
-      non-zero and exceeded, flush() is called implicitly.
-
-      Setting the max output buffer size to 0 disables the output size
-      limit. This is generally discouraged.
-
-      As a contrast to setMaxInputBufferSize(), this function is used
-      to bundle up consequent write calls, allowing more efficient use
-      of the underlying device as larger blocks of data are written at
-      a time.
-
-      \param max The maximum output buffer size in bytes.
-    */
-    void setMaxOutputBufferSize(unsigned int max);
-
-    /*!
-      Sets the device's internal timeout in seconds. This timeout is
-      used both when waiting for data to read and for waiting for the
-      ability to write.
-
-      If this timeout is exceeded, the read or write function that
-      triggered the timeout will fail.
-
-      Setting the timeout to 0 disables the timeout.
-
-      \param t The timeout in seconds.
-      \sa getTimeout()
-    */
-    void setTimeout(unsigned int t);
-
-    /*!
-      Returns the timeout in seconds, or 0 if there is no timeout.
-
-      \sa setTimeout()
-    */
-    unsigned int getTimeout(void) const;
-
-    enum LogLevel {
-      ErrorLevel,
-      InfoLevel,
-      WarningLevel,
-      DebugLevel
-    };
-    
-    /*!
-      Sets the output level for the following write operations on this
-      device.
-
-      The output level is a number which gives the following write
-      operations a priority. You can use setOutputLevelLimit() to
-      filter the write operations valid for different operating modes.
-      This enables you to have certain write operations ignored.
-
-      For instance, if the output level is set to 0, then "Hello" is
-      written, and the output level is set to 1, followed by writing
-      "Daisy", the output level limit value will decive wether only
-      "Hello" is written, or if also "Daisy" is written.
-
-      A low value of the level gives higher priority, and a high level
-      will give low priority. The default value is 0, and write
-      operations that are done with output level 0 are never ignored.
-
-      \param level The output level
-      \sa getOutputLevel(), setOutputLevelLimit()
-    */
-    void setOutputLevel(LogLevel level);
-
-    /*!
-      Returns the current output level.
-
-      \sa setOutputLevel()
-    */
-    LogLevel getOutputLevel(void) const;
-
-    /*!
-      Sets the current output level limit. Write operations with a
-      level higher than the output level limit are ignored.
-
-      \param level The output level limit
-      \sa setOutputLevel()
-    */
-    void setOutputLevelLimit(LogLevel level);
-
-    /*!
-      Returns the current output level limit.
-
-      \sa setOutputLevelLimit()
-    */
-    LogLevel getOutputLevelLimit(void) const;
-
-    /*!
-      Returns the number of bytes that have been read from this device
-      since it was created.
-    */
-    unsigned int getReadCount(void) const;
-
-    /*!
-      Returns the number of bytes that have been written to this
-      device since it was created.
-    */
-    unsigned int getWriteCount(void) const;
-
-    /*!
-      Calling this function enables the built-in protocol dumping feature in
-      the device. All input and output to this device will be dumped to a file
-      in /tmp.
-    */
-    void enableProtocolDumping(void);
-
-    /*!
-      Writes data to the device. Depending on the value of the max
-      output buffer size, the data may not be written immediately.
-
-      \sa setMaxOutputBufferSize()
-    */
-    template <class T> IODevice &operator <<(const T &source);
-
-    /*!
-      Writes data to the device. This function specializes on standard
-      ostream derivates, such as std::endl.
-     */
-    IODevice &operator <<(std::ostream &(*source)(std::ostream &));
-
-    /*!
-      Returns true if data can be read from the device; otherwise
-      returns false.
-    */
-    virtual bool canRead(void) const;
-
-    /*!
-      Reads data from the device, and stores this in a string. Returns
-      true on success; otherwise returns false.
-      
-      \param dest The incoming data is stored in this string.
-      \param max No more than this number of bytes is read from the
-      device.
-    */
-    bool readStr(std::string *dest, unsigned int max = 0);
-
-    /*!
-      Reads exactly one byte from the device and stores this in a
-      char. Returns true on success; otherwise returns false.
-
-      \param dest The incoming byte is stored in this char.
-    */
-    bool readChar(char *dest = 0);
-
-    /*!
-      FIXME: add docs
-    */
-    void unreadChar(char c);
-
-    /*!
-      FIXME: add docs
-    */
-    void unreadStr(const std::string &s);
-
-    /*!
-      Reads characters from the device, until and including one
-      certain character is found. All read characters are discarded.
-
-      This function can be used to skip to the beginning of a line,
-      with the terminating character being '\n'.
-
-      \param The certain character.
-    */
-    bool skipTo(char c);
-
-    /*!
-      Flushes the output buffer. Writes all data in the output buffer
-      to the device.
-    */
-    bool flush(void);
-
-    /*!
-      Returns the type of error that most recently occurred.
-    */
-    Error getLastError(void) const;
-
-    /*!
-      Returns a human readable description of the error that most
-      recently occurred. If no known error has occurred, this method
-      returns "Unknown error".
-    */
-    std::string getLastErrorString(void) const;
-
-    /*!
-      Returns the type of service provided by this device. Two valid
-      return values are "client" and "log".
-    */
-    virtual std::string service(void) const;
-    
-  protected:
-    /*!
-      Waits until data can be written to the device. If the timeout is
-      0, this function waits indefinitely. Otherwise, it waits until
-      the timeout has expired.
-
-      If this function returns true, data can be written to the
-      device; otherwise, getLastError() must be checked to determine
-      whether a timeout occurred or whether an error with the device
-      prevents further writing.
-    */
-    virtual bool waitForWrite(void) const;
-
-    /*!
-      Waits until data can be read from the device.
-
-      \sa waitForWrite()
-    */
-    virtual bool waitForRead(void) const;
-
-    /*!
-      Types of results from a write. 
-    */
-    enum WriteResult {
-      WriteWait = 0,
-      WriteDone = 1 << 0,
-      WriteError = 1 << 1
-    };
-
-    /*!
-      Writes as much data as possible to the device. If some but not
-      all data was written, returns WriteWait. If all data was
-      written, returns WriteDone.  If an error occurred, returns
-      WriteError.
-    */
-    virtual WriteResult write(void);
-
-    /*!
-      Reads data from the device, and stores it in the input buffer.
-      Returns true on success; otherwise returns false.
-      
-      This method will fail if there is no more data available, if a
-      timeout occurred or if an error with the device prevents more
-      data from being read.
-
-      The number of bytes read from the device is undefined.
-    */
-    virtual bool fillInputBuffer(void);
-
-    BincStream inputBuffer;
-    BincStream outputBuffer;
-
-  protected:
-    unsigned int flags;
-    unsigned int maxInputBufferSize;
-    unsigned int maxOutputBufferSize;
-
-    unsigned int timeout;
-
-    unsigned int readCount;
-    unsigned int writeCount;
-
-    LogLevel outputLevel;
-    LogLevel outputLevelLimit;
-
-    mutable Error error;
-    mutable std::string errorString;
-
-    int dumpfd;
-  };
-
-  //----------------------------------------------------------------------
-  template <class T> IODevice &IODevice::operator <<(const T &source)
-  {
-    if ((flags & IsEnabled) && outputLevel <= outputLevelLimit) {
-      outputBuffer << source;
-
-      if (dumpfd) {
-	BincStream ss;
-	ss << source;
-	::write(dumpfd, ss.str().c_str(), ss.getSize());
-      }
-
-      if (flags & HasInputLimit)
-	if (outputBuffer.getSize() > maxOutputBufferSize)
-	  flush();
-    }
-
-    return *this;
-  }
-}
-
-#endif

src/bincimapmime/iofactory.cc

@@ -1,87 +0,0 @@
-/*-*-mode:c++-*-*/
-/*  --------------------------------------------------------------------
- *  Filename:
- *    src/iofactory.cc
- *  
- *  Description:
- *    Implementation of the IOFactory class.
- *  --------------------------------------------------------------------
- *  Copyright 2002, 2003 Andreas Aardal Hanssen
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *  --------------------------------------------------------------------
- */
-#include "iofactory.h"
-#include "iodevice.h"
-
-#ifndef NO_NAMESPACES
-using namespace ::Binc;
-using namespace ::std;
-#endif /* NO_NAMESPACES */
-
-//------------------------------------------------------------------------
-IOFactory::IOFactory(void)
-{
-}
-
-//------------------------------------------------------------------------
-IOFactory::~IOFactory(void)
-{
-}
-
-//------------------------------------------------------------------------
-IOFactory &IOFactory::getInstance(void)
-{
-  static IOFactory ioFactory;
-  return ioFactory;
-}
-
-//------------------------------------------------------------------------
-void IOFactory::addDevice(IODevice *dev)
-{
-  IODevice *ioDevice = IOFactory::getInstance().devices[dev->service()];
-
-  // FIXME: Delete correct object. Now, only IODevice's destructor is
-  // called, and only IODevice's memory is freed.
-  if (ioDevice)
-    delete ioDevice;
-
-  IOFactory::getInstance().devices[dev->service()] = dev;
-}
-
-//------------------------------------------------------------------------
-IODevice &IOFactory::getClient(void)
-{
-  static IODevice nulDevice;
-
-  IOFactory &ioFactory = IOFactory::getInstance();
-
-  if (ioFactory.devices.find("client") != ioFactory.devices.end())
-    return *ioFactory.devices["client"];
-
-  return nulDevice;
-}
-
-//------------------------------------------------------------------------
-IODevice &IOFactory::getLogger(void)
-{
-  static IODevice nulDevice;
-
-  IOFactory &ioFactory = IOFactory::getInstance();
-
-  if (ioFactory.devices.find("log") != ioFactory.devices.end())
-    return *ioFactory.devices["log"];
-  return nulDevice;
-}

src/bincimapmime/iofactory.h

@@ -1,69 +0,0 @@
-/*-*-mode:c++-*-*/
-/*  --------------------------------------------------------------------
- *  Filename:
- *    src/iofactory.h
- *  
- *  Description:
- *    Declaration of the IOFactory class.
- *  --------------------------------------------------------------------
- *  Copyright 2002, 2003 Andreas Aardal Hanssen
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *  --------------------------------------------------------------------
- */
-#ifndef IOFACTORY_H_INCLUDED
-#define IOFACTORY_H_INCLUDED
-#include <map>
-#include <string>
-
-#include "iodevice.h"
-
-namespace Binc {
-  class IOFactory {
-  public:
-    ~IOFactory(void);
-
-    static void addDevice(IODevice *dev);
-    static IOFactory &getInstance(void);
-    static IODevice &getClient(void);
-    static IODevice &getLogger(void);
-
-  private:
-    IOFactory(void);
-    
-    std::map<std::string, IODevice *> devices;
-  };
-}
-
-#define bincClient \
-  IOFactory::getClient()
-
-#if !defined (DEBUG)
-#define bincError if (false) std::cout
-#define bincWarning if (false) std::cout
-#define bincDebug if (false) std::cout
-#else
-#define bincError \
-  IOFactory::getLogger().setOutputLevel(IODevice::ErrorLevel);IOFactory::getLogger()
-#define bincWarning \
-  IOFactory::getLogger().setOutputLevel(IODevice::WarningLevel);IOFactory::getLogger()
-#define bincDebug \
-  IOFactory::getLogger().setOutputLevel(IODevice::DebugLevel);IOFactory::getLogger()
-#endif
-
-#define bincInfo \
-  IOFactory::getLogger().setOutputLevel(IODevice::InfoLevel);IOFactory::getLogger()
-
-#endif

src/bincimapmime/mime-getpart.cc

@@ -1,96 +0,0 @@
-/* -*- mode:c++;c-basic-offset:2 -*- */
-/*  --------------------------------------------------------------------
- *  Filename:
- *    mime-getpart.cc
- *  
- *  Description:
- *    Implementation of main mime parser components
- *  --------------------------------------------------------------------
- *  Copyright 2002-2005 Andreas Aardal Hanssen
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *  --------------------------------------------------------------------
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "mime.h"
-#include "convert.h"
-#include <string>
-#include <vector>
-#include <map>
-#include <exception>
-#include <iostream>
-
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <errno.h>
-
-#ifndef NO_NAMESPACES
-using namespace ::std;
-#endif /* NO_NAMESPACES */
-
-//------------------------------------------------------------------------
-const Binc::MimePart *Binc::MimePart::getPart(const string &findpart,
-					      string genpart, FetchType fetchType) const
-{
-  if (findpart == genpart)
-    return this;
-
-  if (isMultipart()) {
-    if (members.size() != 0) {
-      vector<MimePart>::const_iterator i = members.begin();
-      int part = 1;
-      while (i != members.end()) {
-	BincStream ss;
-
-	ss << genpart;
-	if (genpart != "")
-	  ss << ".";
-	ss << part;
-	
-	const MimePart *m;
-	if ((m = (*i).getPart(findpart, ss.str())) != 0) {
-	  if (fetchType == FetchHeader && m->isMessageRFC822())
-	    m = &m->members[0];
-
-	  return m;
-	}
-
-	++i;
-	++part;
-      }
-    }
-  } else if (isMessageRFC822()) {
-    if (members.size() == 1) {
-      const MimePart *m = members[0].getPart(findpart, genpart);
-      return m;
-    } else {
-      return 0;
-    }
-  } else {
-    // Singlepart
-    if (genpart != "")
-      genpart += ".";
-    genpart += "1";
-
-    if (findpart == genpart)
-      return this;
-  }
-
-  return 0;
-}

src/bincimapmime/mime-inputsource.h

@@ -25,13 +25,19 @@
  */
 #ifndef mime_inputsource_h_included
 #define mime_inputsource_h_included
+#include "autoconfig.h"
+// Data source for MIME parser
 
-#ifdef HAVE_CONFIG_H
+// Note about large files: we might want to change the unsigned int
-#include <config.h>
+// used for offsets into an off_t for intellectual satisfaction, but
-#endif
+// in the context of recoll, we could only get into trouble if a
+// *single message* exceeded 2GB, which seems rather unlikely. When
+// parsing a mailbox files, we read each message in memory and use the
+// stream input source (from a memory buffer, no file offsets). When
+// parsing a raw message file, it's only one message.
 
 #include <string.h>
-#include <unistd.h>
+#include "safeunistd.h"
 
 #include <iostream>
 
@@ -39,10 +45,11 @@ namespace Binc {
 
   class MimeInputSource {
   public:
+    // Note that we do NOT take ownership of fd, won't close it on delete
     inline MimeInputSource(int fd, unsigned int start = 0);
     virtual inline ~MimeInputSource(void);
 
-    virtual inline size_t fillRaw(char *raw, size_t nbytes);
+    virtual inline ssize_t fillRaw(char *raw, size_t nbytes);
     virtual inline void reset(void);
 
     virtual inline bool fillInputBuffer(void);
@@ -80,7 +87,7 @@ namespace Binc {
   {
   }
 
-  inline size_t MimeInputSource::fillRaw(char *raw, size_t nbytes)
+  inline ssize_t MimeInputSource::fillRaw(char *raw, size_t nbytes)
   {
       return read(fd, raw, nbytes);
   }
@@ -172,7 +179,7 @@ namespace Binc {
     class MimeInputSourceStream : public MimeInputSource {
   public:
     inline MimeInputSourceStream(istream& s, unsigned int start = 0);
-    virtual inline size_t fillRaw(char *raw, size_t nb);
+    virtual inline ssize_t fillRaw(char *raw, size_t nb);
     virtual inline void reset(void);
   private:
       istream& s;
@@ -184,7 +191,7 @@ namespace Binc {
   {
   }
 
-  inline size_t MimeInputSourceStream::fillRaw(char *raw, size_t nb)
+  inline ssize_t MimeInputSourceStream::fillRaw(char *raw, size_t nb)
   {
     // Why can't streams tell how many characters were actually read
     // when hitting eof ?
@@ -192,16 +199,16 @@ namespace Binc {
     s.seekg(0, ios::end);
     std::streampos lst = s.tellg();
     s.seekg(st);
-    size_t nbytes = lst - st;
+    size_t nbytes = size_t(lst - st);
     if (nbytes > nb) {
 	nbytes = nb;
     }
     if (nbytes <= 0) {
-	return (size_t)-1;
+	return (ssize_t)-1;
     }
 
     s.read(raw, nbytes);
-    return nbytes;
+    return static_cast<ssize_t>(nbytes);
   }
 
   inline void MimeInputSourceStream::reset(void)
@@ -211,6 +218,5 @@ namespace Binc {
   }
 
 }
-extern Binc::MimeInputSource *mimeSource;
 
 #endif

src/bincimapmime/mime-parsefull.cc

@@ -23,32 +23,27 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  *  --------------------------------------------------------------------
  */
-#ifdef HAVE_CONFIG_H
+#include <string.h>
-#include <config.h>
+#include <ctype.h>
-#endif
+#include <stdio.h>
+#include <errno.h>
 
-#include "mime.h"
-#include "mime-utils.h"
-#include "mime-inputsource.h"
-#include "convert.h"
 #include <string>
 #include <vector>
 #include <map>
 #include <exception>
 #include <iostream>
 
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <errno.h>
-
-Binc::MimeInputSource *mimeSource = 0;
-
 #ifndef NO_NAMESPACES
 using namespace ::std;
 #endif /* NO_NAMESPACES */
 
-#undef MPF
+#include "mime.h"
+#include "mime-utils.h"
+#include "mime-inputsource.h"
+#include "convert.h"
+
+// #define MPF
 #ifdef MPF
 #define MPFDEB(X) fprintf X
 #else
@@ -56,19 +51,15 @@ using namespace ::std;
 #endif
 
 //------------------------------------------------------------------------
-void Binc::MimeDocument::parseFull(int fd) const
+void Binc::MimeDocument::parseFull(int fd)
 {
   if (allIsParsed)
     return;
 
   allIsParsed = true;
 
-  if (!mimeSource || mimeSource->getFileDescriptor() != fd) {
+  delete doc_mimeSource;
-    delete mimeSource;
+  doc_mimeSource = new MimeInputSource(fd);
-    mimeSource = new MimeInputSource(fd);
-  } else {
-    mimeSource->reset();
-  }
 
   headerstartoffsetcrlf = 0;
   headerlength = 0;
@@ -80,24 +71,24 @@ void Binc::MimeDocument::parseFull(int fd) const
 
   int bsize = 0;
   string bound;
-  MimePart::parseFull(bound, bsize);
+  doParseFull(doc_mimeSource, bound, bsize);
 
   // eat any trailing junk to get the correct size
   char c;
-  while (mimeSource->getChar(&c));
+  while (doc_mimeSource->getChar(&c));
 
-  size = mimeSource->getOffset();
+  size = doc_mimeSource->getOffset();
 }
 
-void Binc::MimeDocument::parseFull(istream& s) const
+void Binc::MimeDocument::parseFull(istream& s)
 {
   if (allIsParsed)
     return;
 
   allIsParsed = true;
 
-  delete mimeSource;
+  delete doc_mimeSource;
-  mimeSource = new MimeInputSourceStream(s);
+  doc_mimeSource = new MimeInputSourceStream(s);
 
   headerstartoffsetcrlf = 0;
   headerlength = 0;
@@ -109,17 +100,18 @@ void Binc::MimeDocument::parseFull(istream& s) const
 
   int bsize = 0;
   string bound;
-  MimePart::parseFull(bound, bsize);
+  doParseFull(doc_mimeSource, bound, bsize);
 
   // eat any trailing junk to get the correct size
   char c;
-  while (mimeSource->getChar(&c));
+  while (doc_mimeSource->getChar(&c));
 
-  size = mimeSource->getOffset();
+  size = doc_mimeSource->getOffset();
 }
 
 //------------------------------------------------------------------------
-static bool parseOneHeaderLine(Binc::Header *header, unsigned int *nlines)
+bool Binc::MimePart::parseOneHeaderLine(Binc::Header *header, 
+					unsigned int *nlines)
 {
   using namespace ::Binc;
   char c;
@@ -202,14 +194,14 @@ static bool parseOneHeaderLine(Binc::Header *header, unsigned int *nlines)
 }
 
 //------------------------------------------------------------------------
-static void parseHeader(Binc::Header *header, unsigned int *nlines)
+void Binc::MimePart::parseHeader(Binc::Header *header, unsigned int *nlines)
 {
   while (parseOneHeaderLine(header, nlines))
   { }
 }
 
 //------------------------------------------------------------------------
-static void analyzeHeader(Binc::Header *header, bool *multipart,
+void Binc::MimePart::analyzeHeader(Binc::Header *header, bool *multipart,
 				   bool *messagerfc822, string *subtype,
 				   string *boundary)
 {
@@ -267,7 +259,7 @@ static void analyzeHeader(Binc::Header *header, bool *multipart,
   }
 }
 
-static void parseMessageRFC822(vector<Binc::MimePart> *members,
+void Binc::MimePart::parseMessageRFC822(vector<Binc::MimePart> *members,
 					bool *foundendofpart,
 					unsigned int *bodylength,
 					unsigned int *nbodylines,
@@ -286,7 +278,7 @@ static void parseMessageRFC822(vector<Binc::MimePart> *members,
   // parsefull returns the number of bytes that need to be removed
   // from the body because of the terminating boundary string.
   int bsize = 0;
-  if (m.parseFull(toboundary, bsize))
+  if (m.doParseFull(mimeSource, toboundary, bsize))
     *foundendofpart = true;
 
   // make sure bodylength doesn't overflow    
@@ -307,12 +299,12 @@ static void parseMessageRFC822(vector<Binc::MimePart> *members,
   members->push_back(m);
 }
 
-static bool skipUntilBoundary(const string &delimiter,
+bool Binc::MimePart::skipUntilBoundary(const string &delimiter,
 				       unsigned int *nlines, bool *eof)
 {
-  int endpos = delimiter.length();
+  string::size_type endpos = delimiter.length();
   char *delimiterqueue = 0;
-  int delimiterpos = 0;
+  string::size_type delimiterpos = 0;
   const char *delimiterStr = delimiter.c_str();
   if (delimiter != "") {
     delimiterqueue = new char[endpos];
@@ -344,7 +336,7 @@ static bool skipUntilBoundary(const string &delimiter,
       delimiterpos = 0;
       
     if (compareStringToQueue(delimiterStr, delimiterqueue,
-			     delimiterpos, endpos)) {
+			     delimiterpos, int(endpos))) {
       foundBoundary = true;
       break;
     }
@@ -360,7 +352,7 @@ static bool skipUntilBoundary(const string &delimiter,
 // Need to see if this is a final one (with an additional -- at the end),
 // and need to check if it is immediately followed by another boundary 
 // (in this case, we give up our final CRLF in its favour)
-static inline void postBoundaryProcessing(bool *eof,
+inline void Binc::MimePart::postBoundaryProcessing(bool *eof,
 						   unsigned int *nlines,
 						   int *boundarysize,
 						   bool *foundendofpart)
@@ -430,7 +422,7 @@ static inline void postBoundaryProcessing(bool *eof,
     }
 }
 
-static void parseMultipart(const string &boundary,
+void Binc::MimePart::parseMultipart(const string &boundary,
 				    const string &toboundary,
 				    bool *eof,
 				    unsigned int *nlines,
@@ -455,7 +447,7 @@ static void parseMultipart(const string &boundary,
   skipUntilBoundary(delimiter, nlines, eof);
 
   if (!eof)
-    *boundarysize = delimiter.size();
+    *boundarysize = int(delimiter.size());
 
   postBoundaryProcessing(eof, nlines, boundarysize, foundendofpart);
 
@@ -468,7 +460,7 @@ static void parseMultipart(const string &boundary,
       // If parseFull returns != 0, then it encountered the multipart's
       // final boundary.
       int bsize = 0;
-      if (m.parseFull(boundary, bsize)) {
+      if (m.doParseFull(mimeSource, boundary, bsize)) {
 	quit = true;
 	*boundarysize = bsize;
       }
@@ -488,7 +480,7 @@ static void parseMultipart(const string &boundary,
     skipUntilBoundary(delimiter, nlines, eof);
 
     if (!*eof)
-      *boundarysize = delimiter.size();
+      *boundarysize = int(delimiter.size());
 
     postBoundaryProcessing(eof, nlines, boundarysize, foundendofpart);
   }
@@ -508,7 +500,7 @@ static void parseMultipart(const string &boundary,
   MPFDEB((stderr, "BINC: ParseMultipart return\n"));
 }
 
-static void parseSinglePart(const string &toboundary,
+void Binc::MimePart::parseSinglePart(const string &toboundary,
 			    int *boundarysize,
 			    unsigned int *nbodylines,
 			    unsigned int *nlines,
@@ -532,7 +524,7 @@ static void parseSinglePart(const string &toboundary,
   //    *boundarysize = _toboundary.length();
 
   char *boundaryqueue = 0;
-  int endpos = _toboundary.length();
+  size_t endpos = _toboundary.length();
   if (toboundary != "") {
     boundaryqueue = new char[endpos];
     memset(boundaryqueue, 0, endpos);
@@ -544,7 +536,7 @@ static void parseSinglePart(const string &toboundary,
   string line;
   bool toboundaryIsEmpty = (toboundary == "");
   char c;
-  int boundarypos = 0;
+  string::size_type boundarypos = 0;
   while (mimeSource->getChar(&c)) {
     if (c == '\n') { ++*nbodylines; ++*nlines; }
 
@@ -557,8 +549,8 @@ static void parseSinglePart(const string &toboundary,
       boundarypos = 0;
       
     if (compareStringToQueue(_toboundaryStr, boundaryqueue,
-			     boundarypos, endpos)) {
+			     boundarypos, int(endpos))) {
-      *boundarysize = _toboundary.length();
+      *boundarysize = static_cast<int>(_toboundary.length());
       break;
     }
   }
@@ -591,10 +583,11 @@ static void parseSinglePart(const string &toboundary,
 }
 
 //------------------------------------------------------------------------
-int Binc::MimePart::parseFull(const string &toboundary,
+int Binc::MimePart::doParseFull(MimeInputSource *ms, const string &toboundary,
-			      int &boundarysize) const
+				int &boundarysize)
 {
-  MPFDEB((stderr, "BINC: parsefull, toboundary[%s]\n", toboundary.c_str()));
+  MPFDEB((stderr, "BINC: doParsefull, toboundary[%s]\n", toboundary.c_str()));
+  mimeSource = ms;
   headerstartoffsetcrlf = mimeSource->getOffset();
 
   // Parse the header of this mime part.
@@ -604,6 +597,7 @@ int Binc::MimePart::parseFull(const string &toboundary,
   // CRLF.
   headerlength = mimeSource->getOffset() - headerstartoffsetcrlf;
   bodystartoffsetcrlf = mimeSource->getOffset();
+  MPFDEB((stderr, "BINC: doParsefull, bodystartoffsetcrlf %d\n", bodystartoffsetcrlf));
   bodylength = 0;
 
   // Determine the type of mime part by looking at fields in the
@@ -626,6 +620,6 @@ int Binc::MimePart::parseFull(const string &toboundary,
 		    &eof, &foundendofpart, &bodylength);
   }
 
-  MPFDEB((stderr, "BINC: parsefull ret, toboundary[%s]\n", toboundary.c_str()));
+  MPFDEB((stderr, "BINC: doParsefull ret, toboundary[%s]\n", toboundary.c_str()));
   return (eof || foundendofpart) ? 1 : 0;
 }

src/bincimapmime/mime-parseonlyheader.cc

@@ -23,10 +23,6 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  *  --------------------------------------------------------------------
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include "mime.h"
 #include "mime-utils.h"
 #include "mime-inputsource.h"
@@ -47,20 +43,15 @@ using namespace ::std;
 #endif /* NO_NAMESPACES */
 
 //------------------------------------------------------------------------
-void Binc::MimeDocument::parseOnlyHeader(int fd) const
+void Binc::MimeDocument::parseOnlyHeader(int fd)
 {
   if (allIsParsed || headerIsParsed)
     return;
   
   headerIsParsed = true;
 
-  if (!mimeSource || mimeSource->getFileDescriptor() != fd) {
+  delete doc_mimeSource;
-    delete mimeSource;
+  doc_mimeSource = new MimeInputSource(fd);
-    mimeSource = new MimeInputSource(fd);
-  } else {
-    mimeSource->reset();
-  }
-
 
   headerstartoffsetcrlf = 0;
   headerlength = 0;
@@ -72,18 +63,18 @@ void Binc::MimeDocument::parseOnlyHeader(int fd) const
   nlines = 0;
   nbodylines = 0;
 
-  MimePart::parseOnlyHeader("");
+  doParseOnlyHeader(doc_mimeSource, "");
 }
 
-void Binc::MimeDocument::parseOnlyHeader(istream& s) const
+void Binc::MimeDocument::parseOnlyHeader(istream& s)
 {
   if (allIsParsed || headerIsParsed)
     return;
   
   headerIsParsed = true;
 
-  delete mimeSource;
+  delete doc_mimeSource;
-  mimeSource = new MimeInputSourceStream(s);
+  doc_mimeSource = new MimeInputSourceStream(s);
 
   headerstartoffsetcrlf = 0;
   headerlength = 0;
@@ -95,12 +86,14 @@ void Binc::MimeDocument::parseOnlyHeader(istream& s) const
   nlines = 0;
   nbodylines = 0;
 
-  MimePart::parseOnlyHeader("");
+  doParseOnlyHeader(doc_mimeSource, "");
 }
 
 //------------------------------------------------------------------------
-int Binc::MimePart::parseOnlyHeader(const string &toboundary) const
+int Binc::MimePart::doParseOnlyHeader(MimeInputSource *ms, 
+				      const string &toboundary)
 {
+  mimeSource = ms;
   string name;
   string content;
   char cqueue[4];
@@ -122,7 +115,7 @@ int Binc::MimePart::parseOnlyHeader(const string &toboundary) const
       if (c == '\n') ++nlines;
       if (c == ':') break;
       if (c == '\n') {
-	for (int i = name.length() - 1; i >= 0; --i)
+    for (int i = int(name.length()) - 1; i >= 0; --i)
 	  mimeSource->ungetChar();
 
 	quit = true;

src/bincimapmime/mime-printbody.cc

@@ -23,69 +23,14 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  *  --------------------------------------------------------------------
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 #include "mime.h"
 #include "mime-utils.h"
 #include "mime-inputsource.h"
 
-#include "convert.h"
-#include "iodevice.h"
-#include "iofactory.h"
-
 #include <string>
-#include <vector>
-#include <map>
-#include <exception>
-#include <iostream>
 
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <errno.h>
-
-#ifndef NO_NAMESPACES
 using namespace ::std;
-#endif /* NO_NAMESPACES */
-
-//------------------------------------------------------------------------
-void Binc::MimePart::printBody(int fd, IODevice &output,
-			       unsigned int startoffset,
-			       unsigned int length) const
-{
-  if (!mimeSource || mimeSource->getFileDescriptor() != fd) {
-    delete mimeSource;
-    mimeSource = new MimeInputSource(fd);
-  }
-
-  mimeSource->reset();
-  mimeSource->seek(bodystartoffsetcrlf + startoffset);
-
-  if (startoffset + length > bodylength)
-    length = bodylength - startoffset;
-
-  char c = '\0';
-  for (unsigned int i = 0; i < length; ++i) {
-    if (!mimeSource->getChar(&c))
-      break;
-
-    output << (char)c;
-  }
-}
-
-void Binc::MimePart::getBody(int fd, string &s,
-			     unsigned int startoffset,
-			     unsigned int length) const
-{
-
-  if (!mimeSource || mimeSource->getFileDescriptor() != fd) {
-    delete mimeSource;
-    mimeSource = new MimeInputSource(fd);
-  }
-  getBody(s, startoffset, length);
-}
 
 void Binc::MimePart::getBody(string &s,
 			     unsigned int startoffset,

src/bincimapmime/mime-printdoc.cc

@@ -1,72 +0,0 @@
-/* -*- mode:c++;c-basic-offset:2 -*- */
-/*  --------------------------------------------------------------------
- *  Filename:
- *    mime-printdoc.cc
- *  
- *  Description:
- *    Implementation of main mime parser components
- *  --------------------------------------------------------------------
- *  Copyright 2002-2005 Andreas Aardal Hanssen
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *  --------------------------------------------------------------------
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "mime.h"
-#include "mime-utils.h"
-#include "mime-inputsource.h"
-#include "convert.h"
-#include "iodevice.h"
-#include "iofactory.h"
-
-#include <string>
-#include <vector>
-#include <map>
-#include <exception>
-#include <iostream>
-
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <errno.h>
-
-#ifndef NO_NAMESPACES
-using namespace ::std;
-#endif /* NO_NAMESPACES */
-
-//------------------------------------------------------------------------
-void Binc::MimePart::printDoc(int fd, IODevice &output,
-			      unsigned int startoffset,
-			      unsigned int length) const
-{
-  if (!mimeSource || mimeSource->getFileDescriptor() != fd) {
-    delete mimeSource;
-    mimeSource = new MimeInputSource(fd);
-  }
-
-  mimeSource->reset();
-  mimeSource->seek(headerstartoffsetcrlf);
-
-  char c;
-  for (unsigned int i = 0; i < length; ++i) {
-    if (!mimeSource->getChar(&c))
-      break;
-
-    output << (char)c;
-  }
-}

src/bincimapmime/mime-printheader.cc

@@ -1,200 +0,0 @@
-/* -*- mode:c++;c-basic-offset:2 -*- */
-/*  --------------------------------------------------------------------
- *  Filename:
- *    mime-printheader.cc
- *  
- *  Description:
- *    Implementation of main mime parser components
- *  --------------------------------------------------------------------
- *  Copyright 2002-2005 Andreas Aardal Hanssen
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *  --------------------------------------------------------------------
- */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "mime.h"
-#include "mime-utils.h"
-#include "mime-inputsource.h"
-#include "convert.h"
-#include "iodevice.h"
-#include "iofactory.h"
-
-#include <string>
-#include <vector>
-#include <map>
-#include <exception>
-#include <iostream>
-
-#include <string.h>
-#include <ctype.h>
-#include <stdio.h>
-#include <errno.h>
-
-#ifndef NO_NAMESPACES
-using namespace ::std;
-#endif /* NO_NAMESPACES */
-
-//------------------------------------------------------------------------
-void Binc::MimePart::printHeader(int fd, IODevice &output,
-				 vector<string> headers, bool includeheaders, 
-				 unsigned int startoffset,
-				 unsigned int length, string &store) const
-{
-  if (!mimeSource || mimeSource->getFileDescriptor() != fd) {
-    delete mimeSource;
-    mimeSource = new MimeInputSource(fd);
-  }
-
-  mimeSource->seek(headerstartoffsetcrlf);
-
-  string name;
-  string content;
-  char cqueue[2];
-  memset(cqueue, 0, sizeof(cqueue));
-
-  bool quit = false;
-  char c = '\0';
-
-  unsigned int wrotebytes = 0;
-  unsigned int processedbytes = 0;
-  bool hasHeaderSeparator = false;
-
-  while (!quit) {
-    // read name
-    while (1) {
-      // allow EOF to end the header
-      if (!mimeSource->getChar(&c)) {
-	quit = true;
-	break;
-      }
-
-      // assume this character is part of the header name.
-      name += c;
-      
-      // break on the first colon
-      if (c == ':')
-	break;
-
-      // break if a '\n' turned up.
-      if (c == '\n') {
-	// end of headers detected
-	if (name == "\r\n") {
-	  hasHeaderSeparator = true;
-	  quit = true;
-	  break;
-	}
-	
-	// put all data back in the buffer to the beginning of this
-	// line.
-	for (int i = name.length(); i >= 0; --i)
-	  mimeSource->ungetChar();
-	
-	// abort printing of header. note that in this case, the
-	// headers will not end with a seperate \r\n.
-	quit = true;
-	name.clear();
-	break;
-      }
-    }
-
-    if (quit) break;
-
-    // at this point, we have a name, that is - the start of a
-    // header. we'll read until the end of the header.
-    while (!quit) {
-      // allow EOF to end the header.
-      if (!mimeSource->getChar(&c)) {
-	quit = true;
-	break;
-      }
-
-      if (c == '\n') ++nlines;
-
-      // make a fifo queue of the last 4 characters.
-      cqueue[0] = cqueue[1];
-      cqueue[1] = c;
-
-      // print header
-      if (cqueue[0] == '\n' && cqueue[1] != '\t' && cqueue[1] != ' ') {
-	// it wasn't a space, so put it back as it is most likely
-	// the start of a header name. in any case it terminates the
-	// content part of this header.
-	mimeSource->ungetChar();
-	
-	string lowername = name;
-	lowercase(lowername);
-	trim(lowername, ": \t");
-	bool foundMatch = false;
-	for (vector<string>::const_iterator i = headers.begin();
-	     i != headers.end(); ++i) {
-	  string nametmp = *i;
-	  lowercase(nametmp);
-	  if (nametmp == lowername) {
-	    foundMatch = true;
-	    break;
-	  }
-	}
-
-	if (foundMatch == includeheaders || headers.size() == 0) {
-	  string out = name + content;
-	  for (string::const_iterator i = out.begin(); i != out.end(); ++i)
-	    if (processedbytes >= startoffset && wrotebytes < length) {
-	      if (processedbytes >= startoffset) {
-		store += *i;
-		++wrotebytes;
-	      }
-	    } else
-	      ++processedbytes;
-	}
-
-	// move on to the next header
-	content.clear();
-	name.clear();
-	break;
-      }
-
-      content += c;
-    }
-  }
-
-  if (name != "") {
-    string lowername = name;
-    lowercase(lowername);
-    trim(lowername, ": \t");
-    bool foundMatch = false;
-    for (vector<string>::const_iterator i = headers.begin();
-	 i != headers.end(); ++i) {
-      string nametmp = *i;
-      lowercase(nametmp);
-      if (nametmp == lowername) {
-	foundMatch = true;
-	break;
-      }
-    }
-    
-    if (hasHeaderSeparator || foundMatch == includeheaders || headers.size() == 0) {
-      string out = name + content;
-      for (string::const_iterator i = out.begin(); i != out.end(); ++i)
-	if (processedbytes >= startoffset && wrotebytes < length) {
-	  store += *i;
-	  ++wrotebytes;
-	} else
-	  ++processedbytes;
-    }
-  }
-}

src/bincimapmime/mime-utils.h

@@ -25,11 +25,6 @@
  */
 #ifndef mime_utils_h_included
 #define mime_utils_h_included
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>

src/bincimapmime/mime.cc

@@ -23,53 +23,57 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  *  --------------------------------------------------------------------
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "mime.h"
-#include "convert.h"
-#include <string>
-#include <vector>
-#include <map>
-#include <exception>
-#include <iostream>
-
 #include <string.h>
 #include <ctype.h>
 #include <stdio.h>
 #include <errno.h>
 
+#include <string>
+#include <vector>
+#include <map>
+#include <exception>
+#include <iostream>
 #ifndef NO_NAMESPACES
 using namespace ::std;
 #endif /* NO_NAMESPACES */
 
+
+#include "mime.h"
+#include "convert.h"
+#include "mime-inputsource.h"
+
 //------------------------------------------------------------------------
-Binc::MimeDocument::MimeDocument(void) : MimePart()
+Binc::MimeDocument::MimeDocument(void)
 {
   allIsParsed = false;
   headerIsParsed = false;
+  doc_mimeSource = 0;
 }
 
 //------------------------------------------------------------------------
 Binc::MimeDocument::~MimeDocument(void)
 {
+  delete doc_mimeSource;
+  doc_mimeSource = 0;
 }
 
 //------------------------------------------------------------------------
-void Binc::MimeDocument::clear(void) const
+void Binc::MimeDocument::clear(void)
 {
   members.clear();
   h.clear();
   headerIsParsed = false;
   allIsParsed = false;
+  delete doc_mimeSource;
+  doc_mimeSource = 0;
 }
 
 //------------------------------------------------------------------------
-void Binc::MimePart::clear(void) const
+void Binc::MimePart::clear(void)
 {
   members.clear();
   h.clear();
+  mimeSource = 0;
 }
 
 //------------------------------------------------------------------------
@@ -81,6 +85,7 @@ Binc::MimePart::MimePart(void)
 
   nlines = 0;
   nbodylines = 0;
+  mimeSource = 0;
 }
 
 //------------------------------------------------------------------------
@@ -147,7 +152,7 @@ bool Binc::Header::getAllHeaders(const string &key, vector<HeaderItem> &dest) co
 }
 
 //------------------------------------------------------------------------
-void Binc::Header::clear(void) const
+void Binc::Header::clear(void)
 {
   content.clear();
 }

src/bincimapmime/mime.h

@@ -23,10 +23,6 @@
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
  *  --------------------------------------------------------------------
  */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
 #ifndef mime_h_included
 #define mime_h_included
 #include <string>
@@ -35,6 +31,10 @@
 #include <stdio.h>
 
 namespace Binc {
+
+  class MimeInputSource;
+
+
   //---------------------------------------------------------------------- 
   class HeaderItem {
   private:
@@ -59,7 +59,7 @@ namespace Binc {
     bool getFirstHeader(const std::string &key, HeaderItem &dest) const;
     bool getAllHeaders(const std::string &key, std::vector<HeaderItem> &dest) const;
     void add(const std::string &name, const std::string &content);
-    void clear(void) const;
+    void clear(void);
 
     //--
     Header(void);
@@ -106,40 +106,80 @@ namespace Binc {
     inline unsigned int getBodyLength(void) const { return bodylength; }
     inline unsigned int getBodyStartOffset(void) const { return bodystartoffsetcrlf; }
 
-    void printBody(int fd, Binc::IODevice &output, unsigned int startoffset, unsigned int length) const;
+    void printBody(Binc::IODevice &output, unsigned int startoffset, unsigned int length) const;
-      void getBody(int fd, std::string& s, unsigned int startoffset, unsigned int length) const;
       void getBody(std::string& s, unsigned int startoffset, unsigned int length) const;
-    void printHeader(int fd, Binc::IODevice &output, std::vector<std::string> headers, bool includeheaders, unsigned int startoffset, unsigned int length, std::string &storage) const;
+    virtual void clear(void);
-    void printDoc(int fd, Binc::IODevice &output, unsigned int startoffset, unsigned int length) const;
-    virtual void clear(void) const;
 
-    const MimePart *getPart(const std::string &findpart, std::string genpart, FetchType fetchType = FetchBody) const;
+    virtual int doParseOnlyHeader(MimeInputSource *ms, 
-    virtual int parseOnlyHeader(const std::string &toboundary) const;
+				  const std::string &toboundary);
-    virtual int parseFull(const std::string &toboundary, int &boundarysize) const;
+    virtual int doParseFull(MimeInputSource *ms, 
+			    const std::string &toboundary, int &boundarysize);
 
     MimePart(void);
     virtual ~MimePart(void);
+
+  private:
+    MimeInputSource *mimeSource;
+
+    bool parseOneHeaderLine(Binc::Header *header, unsigned int *nlines);
+
+    bool skipUntilBoundary(const std::string &delimiter,
+			   unsigned int *nlines, bool *eof);
+    inline void postBoundaryProcessing(bool *eof,
+				       unsigned int *nlines,
+				       int *boundarysize,
+				       bool *foundendofpart);
+      void parseMultipart(const std::string &boundary,
+			   const std::string &toboundary,
+			   bool *eof,
+			   unsigned int *nlines,
+			   int *boundarysize,
+			   bool *foundendofpart,
+			   unsigned int *bodylength,
+			  std::vector<Binc::MimePart> *members);
+      void parseSinglePart(const std::string &toboundary,
+			    int *boundarysize,
+			    unsigned int *nbodylines,
+			    unsigned int *nlines,
+			    bool *eof, bool *foundendofpart,
+			   unsigned int *bodylength);
+    void parseHeader(Binc::Header *header, unsigned int *nlines);
+    void analyzeHeader(Binc::Header *header, bool *multipart,
+		       bool *messagerfc822, std::string *subtype,
+		       std::string *boundary);
+    void parseMessageRFC822(std::vector<Binc::MimePart> *members,
+			    bool *foundendofpart,
+			    unsigned int *bodylength,
+			    unsigned int *nbodylines,
+			    const std::string &toboundary);
   };
 
   //----------------------------------------------------------------------
   class MimeDocument : public MimePart {
-  private:
-    mutable bool headerIsParsed;
-    mutable bool allIsParsed;
-
   public:
-    void parseOnlyHeader(int fd) const;
-    void parseFull(int fd) const;
-    void parseOnlyHeader(std::istream& s) const;
-    void parseFull(std::istream& s) const;
-    void clear(void) const;
-    
-    inline bool isHeaderParsed(void) { return headerIsParsed; }
-    inline bool isAllParsed(void) { return allIsParsed; }
-
-    //--
     MimeDocument(void);
     ~MimeDocument(void);
+
+    void parseOnlyHeader(int fd);
+    void parseFull(int fd);
+    void parseOnlyHeader(std::istream& s);
+    void parseFull(std::istream& s);
+
+    void clear(void);
+    
+    bool isHeaderParsed(void) const 
+    {
+      return headerIsParsed; 
+    }
+    bool isAllParsed(void) const 
+    { 
+      return allIsParsed; 
+    }
+
+  private:
+    bool headerIsParsed;
+    bool allIsParsed;
+    MimeInputSource *doc_mimeSource;
   };
 
 };

src/bincimapmime/trbinc.cc

@@ -1,4 +1,4 @@
-/* Copyright (C) 2006 J.F.Dockes */
+/* Copyright (C) 2006 J.F.Dockes
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License as published by
  *   the Free Software Foundation; either version 2 of the License, or
@@ -17,10 +17,10 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <errno.h>
+#include "safefcntl.h"
+#include "safeunistd.h"
 #include <string.h>
-#include <fcntl.h>
 
 #include <sstream>
 

src/common/Makefile

@@ -1,38 +1,33 @@
-# @(#$Id: Makefile,v 1.16 2008-12-17 14:26:49 dockes Exp $  (C) 2005 J.F.Dockes
-depth = ..
-include $(depth)/mk/sysconf
 
-# Only test executables get build in here
+PROGS = unacpp textsplit rclconfig syngroups
-PROGS = unacpp textsplit rclconfig
 
-all: $(BIGLIB) $(PROGS) 
+all: $(PROGS) 
 
-$(BIGLIB): force
+UNACPP_OBJS= trunacpp.o
-	cd $(depth)/lib;$(MAKE)
-force:
-
-UNACPP_OBJS= trunacpp.o $(BIGLIB)
 unacpp : $(UNACPP_OBJS)
-	$(CXX) $(ALL_CXXFLAGS) -o unacpp $(UNACPP_OBJS) \
+	$(CXX) $(ALL_CXXFLAGS) -o unacpp $(UNACPP_OBJS) $(LIBRECOLL)
-	       $(LIBICONV)
 trunacpp.o : unacpp.cpp unacpp.h
 	$(CXX) $(ALL_CXXFLAGS) -DTEST_UNACPP -c -o trunacpp.o unacpp.cpp
 
-TEXTSPLIT_OBJS= trtextsplit.o  $(BIGLIB)
+TEXTSPLIT_OBJS= trtextsplit.o  
 textsplit : $(TEXTSPLIT_OBJS)
-	$(CXX) $(ALL_CXXFLAGS) -o textsplit $(TEXTSPLIT_OBJS) $(LIBICONV)
+	$(CXX) $(ALL_CXXFLAGS) -o textsplit $(TEXTSPLIT_OBJS) $(LIBRECOLL)
 trtextsplit.o : textsplit.cpp 
 	$(CXX) $(ALL_CXXFLAGS) -DTEST_TEXTSPLIT -c -o trtextsplit.o \
 	       textsplit.cpp
 
-RCLCONFIG_OBJS= trrclconfig.o  $(BIGLIB) 
+RCLCONFIG_OBJS= trrclconfig.o 
 rclconfig : $(RCLCONFIG_OBJS) 
-	$(CXX) $(ALL_CXXFLAGS) -o rclconfig $(RCLCONFIG_OBJS) \
+	$(CXX) $(ALL_CXXFLAGS) -o rclconfig $(RCLCONFIG_OBJS) $(LIBRECOLL) 
-	       $(LIBICONV) $(LIBSYS)
 trrclconfig.o : rclconfig.cpp 
 	$(CXX) $(ALL_CXXFLAGS) -DTEST_RCLCONFIG -c -o trrclconfig.o \
 	       rclconfig.cpp
 
-clean:
+SYNGROUPS_OBJS= trsyngroups.o 
-	rm -f *.o $(PROGS)
+syngroups : $(SYNGROUPS_OBJS) 
+	$(CXX) $(ALL_CXXFLAGS) -o syngroups $(SYNGROUPS_OBJS) $(LIBRECOLL) 
+trsyngroups.o : syngroups.cpp 
+	$(CXX) $(ALL_CXXFLAGS) -DTEST_SYNGROUPS -c -o trsyngroups.o \
+	       syngroups.cpp
 
+include ../utils/utmkdefs.mk

src/common/autoconfig-win.h

@@ -0,0 +1,183 @@
+/* Manually edited version of autoconfig.h for windows. Many things are
+overriden in the c++ code by ifdefs _WIN32 anyway  */
+#ifndef _AUTOCONFIG_H_INCLUDED
+#define _AUTOCONFIG_H_INCLUDED
+/* Define if building universal (internal helper macro) */
+/* #undef AC_APPLE_UNIVERSAL_BUILD */
+
+/* Path to the aspell api include file */
+/* #undef ASPELL_INCLUDE "aspell-local.h" */
+
+/* Path to the aspell program */
+/* #define ASPELL_PROG "/usr/bin/aspell" */
+
+/* No X11 session monitoring support */
+#define DISABLE_X11MON
+
+/* Path to the fam api include file */
+/* #undef FAM_INCLUDE */
+
+/* Path to the file program */
+#define FILE_PROG "/usr/bin/file"
+
+/* "Have C++0x" */
+#define HAVE_CXX0X_UNORDERED 1
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#define HAVE_DLFCN_H 1
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#define HAVE_INTTYPES_H 1
+
+/* Define to 1 if you have the `dl' library (-ldl). */
+#define HAVE_LIBDL 1
+
+/* Define to 1 if you have the `z' library (-lz). */
+#define HAVE_LIBZ 1
+
+/* Define to 1 if you have the <memory.h> header file. */
+#define HAVE_MEMORY_H 1
+
+/* Define to 1 if you have the `mkdtemp' function. */
+/* #undef HAVE_MKDTEMP */
+
+/* Define to 1 if you have the `posix_spawn,' function. */
+/* #undef HAVE_POSIX_SPAWN_ */
+
+/* Define to 1 if you have the `setrlimit' function. */
+#define HAVE_SETRLIMIT 1
+
+/* Has std::shared_ptr */
+#define HAVE_SHARED_PTR_STD
+
+/* Has std::tr1::shared_ptr */
+/* #undef HAVE_SHARED_PTR_TR1 */
+
+/* Define to 1 if you have the <spawn.h> header file. */
+#define HAVE_SPAWN_H 1
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#define HAVE_STDINT_H 1
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#define HAVE_STDLIB_H 1
+
+/* Define to 1 if you have the <strings.h> header file. */
+#define HAVE_STRINGS_H 1
+
+/* Define to 1 if you have the <string.h> header file. */
+#define HAVE_STRING_H 1
+
+/* Define to 1 if you have the <sys/mount.h> header file. */
+/* #undef HAVE_SYS_MOUNT_H */
+
+/* Define to 1 if you have the <sys/param.h,> header file. */
+/* #undef HAVE_SYS_PARAM_H_ */
+
+/* Define to 1 if you have the <sys/statfs.h> header file. */
+/* #undef HAVE_SYS_STATFS_H */
+
+/* Define to 1 if you have the <sys/statvfs.h> header file. */
+/* #undef HAVE_SYS_STATVFS_H */
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#define HAVE_SYS_STAT_H 1
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#define HAVE_SYS_TYPES_H 1
+
+/* Define to 1 if you have the <sys/vfs.h> header file. */
+/* #undef HAVE_SYS_VFS_H */
+
+/* "Have tr1" */
+/* #undef HAVE_TR1_UNORDERED */
+
+/* Define to 1 if you have the <unistd.h> header file. */
+/* #undef HAVE_UNISTD_H */
+
+/* Use multiple threads for indexing */
+#define IDX_THREADS 1
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+   */
+#define LT_OBJDIR ".libs/"
+
+/* Define to the address where bug reports for this package should be sent. */
+#define PACKAGE_BUGREPORT ""
+
+/* Define to the full name of this package. */
+#define PACKAGE_NAME "Recoll"
+
+/* Define to the full name and version of this package. */
+#define PACKAGE_STRING "Recoll 1.23.0-x"
+
+/* Define to the one symbol short name of this package. */
+#define PACKAGE_TARNAME "recoll"
+
+/* Define to the home page for this package. */
+#define PACKAGE_URL ""
+
+/* Define to the version of this package. */
+#define PACKAGE_VERSION "1.23.0-x"
+
+/* putenv parameter is const */
+/* #undef PUTENV_ARG_CONST */
+
+/* iconv parameter 2 is const char** */
+#define RCL_ICONV_INBUF_CONST 1
+
+/* Real time monitoring option */
+#undef RCL_MONITOR
+
+/* Split camelCase words */
+/* #undef RCL_SPLIT_CAMELCASE */
+
+/* Compile the aspell interface */
+/* #undef RCL_USE_ASPELL */
+
+/* Compile the fam interface */
+/* #undef RCL_USE_FAM */
+
+/* Compile the inotify interface */
+#define RCL_USE_INOTIFY 1
+
+/* Define to 1 if you have the ANSI C header files. */
+#define STDC_HEADERS 1
+
+/* Use posix_spawn() */
+/* #undef USE_POSIX_SPAWN */
+
+/* Enable using the system's 'file' command to id mime if we fail internally
+   */
+/* #undef USE_SYSTEM_FILE_COMMAND */
+
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+/* #  undef WORDS_BIGENDIAN */
+# endif
+#endif
+
+/* Define to 1 if the X Window System is missing or not being used. */
+/* #undef X_DISPLAY_MISSING */
+
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
+/* #undef _FILE_OFFSET_BITS */
+
+/* Define for large files, on AIX-style hosts. */
+/* #undef _LARGE_FILES */
+
+#define DISABLE_WEB_INDEXER
+
+#include "conf_post.h"
+#endif // already included

src/common/autoconfig.h.in

@@ -1,5 +1,8 @@
 /* common/autoconfig.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Define if building universal (internal helper macro) */
+#undef AC_APPLE_UNIVERSAL_BUILD
+
 /* Path to the aspell api include file */
 #undef ASPELL_INCLUDE
 
@@ -15,15 +18,45 @@
 /* Path to the file program */
 #undef FILE_PROG
 
+/* "Have C++0x" */
+#undef HAVE_CXX0X_UNORDERED
+
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#undef HAVE_DLFCN_H
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 if you have the `dl' library (-ldl). */
+#undef HAVE_LIBDL
+
+/* Define to 1 if you have the `pthread' library (-lpthread). */
+#undef HAVE_LIBPTHREAD
+
+/* Define to 1 if you have the `z' library (-lz). */
+#undef HAVE_LIBZ
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
 /* Define to 1 if you have the `mkdtemp' function. */
 #undef HAVE_MKDTEMP
 
+/* Define to 1 if you have the `posix_spawn,' function. */
+#undef HAVE_POSIX_SPAWN_
+
+/* Define to 1 if you have the `setrlimit' function. */
+#undef HAVE_SETRLIMIT
+
+/* Has std::shared_ptr */
+#undef HAVE_SHARED_PTR_STD
+
+/* Has std::tr1::shared_ptr */
+#undef HAVE_SHARED_PTR_TR1
+
+/* Define to 1 if you have the <spawn.h> header file. */
+#undef HAVE_SPAWN_H
+
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
@@ -39,6 +72,9 @@
 /* Define to 1 if you have the <sys/mount.h> header file. */
 #undef HAVE_SYS_MOUNT_H
 
+/* Define to 1 if you have the <sys/param.h,> header file. */
+#undef HAVE_SYS_PARAM_H_
+
 /* Define to 1 if you have the <sys/statfs.h> header file. */
 #undef HAVE_SYS_STATFS_H
 
@@ -54,9 +90,18 @@
 /* Define to 1 if you have the <sys/vfs.h> header file. */
 #undef HAVE_SYS_VFS_H
 
+/* "Have tr1" */
+#undef HAVE_TR1_UNORDERED
+
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Use multiple threads for indexing */
+#undef IDX_THREADS
+
+/* Define to the sub-directory where libtool stores uninstalled libraries. */
+#undef LT_OBJDIR
+
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
@@ -69,6 +114,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -93,26 +141,40 @@
 /* Compile the inotify interface */
 #undef RCL_USE_INOTIFY
 
-/* Use file extended attributes */
-#undef RCL_USE_XATTR
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
+/* Use posix_spawn() */
+#undef USE_POSIX_SPAWN
+
 /* Enable using the system's 'file' command to id mime if we fail internally
    */
 #undef USE_SYSTEM_FILE_COMMAND
 
+/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
+   significant byte first (like Motorola and SPARC, unlike Intel). */
+#if defined AC_APPLE_UNIVERSAL_BUILD
+# if defined __BIG_ENDIAN__
+#  define WORDS_BIGENDIAN 1
+# endif
+#else
+# ifndef WORDS_BIGENDIAN
+#  undef WORDS_BIGENDIAN
+# endif
+#endif
+
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
 
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
+/* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
+
+/* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
 
-/* The __FreeBSD_kernel__ thing is for debian/kfreebsd. */
+#include "conf_post.h"
-#if _FILE_OFFSET_BITS == 64 || defined(__APPLE__) || defined(__OpenBSD__) ||\
-    defined(__FreeBSD_kernel__)
-#define OFFTPC "%lld"
-#else
-#define OFFTPC "%ld"
-#endif

src/common/beaglequeuecache.cpp

@@ -20,7 +20,7 @@
 #include "cstr.h"
 #include "beaglequeuecache.h"
 #include "circache.h"
-#include "debuglog.h"
+#include "log.h"
 #include "rclconfig.h"
 #include "pathut.h"
 #include "rcldoc.h"
@@ -29,19 +29,20 @@ const string cstr_bgc_mimetype("mimetype");
 
 BeagleQueueCache::BeagleQueueCache(RclConfig *cnf) 
 {
-    string ccdir;
+    string ccdir = cnf->getWebcacheDir();
-    cnf->getConfParam("webcachedir", ccdir);
-    if (ccdir.empty())
-        ccdir = "webcache";
-    ccdir = path_tildexpand(ccdir);
-    // If not an absolute path, compute relative to config dir
-    if (ccdir.at(0) != '/')
-        ccdir = path_cat(cnf->getConfDir(), ccdir);
 
     int maxmbs = 40;
     cnf->getConfParam("webcachemaxmbs", &maxmbs);
-    m_cache = new CirCache(ccdir);
+    if ((m_cache = new CirCache(ccdir)) == 0) {
-    m_cache->create(off_t(maxmbs)*1000*1024, CirCache::CC_CRUNIQUE);
+	LOGERR("BeagleQueueCache: cant create CirCache object\n" );
+	return;
+    }
+    if (!m_cache->create(off_t(maxmbs)*1000*1024, CirCache::CC_CRUNIQUE)) {
+	LOGERR("BeagleQueueCache: cache file creation failed: "  << (m_cache->getReason()) << "\n" );
+	delete m_cache;
+	m_cache = 0;
+	return;
+    }
 }
 
 BeagleQueueCache::~BeagleQueueCache()
@@ -56,8 +57,14 @@ bool BeagleQueueCache::getFromCache(const string& udi, Rcl::Doc &dotdoc,
 {
     string dict;
 
-    if (!m_cache->get(udi, dict, data))
+    if (m_cache == 0) {
+	LOGERR("BeagleQueueCache::getFromCache: cache is null\n" );
 	return false;
+    }
+    if (!m_cache->get(udi, dict, &data)) {
+	LOGDEB("BeagleQueueCache::getFromCache: get failed\n" );
+	return false;
+    }
 
     ConfSimple cf(dict, 1);
     
@@ -70,11 +77,12 @@ bool BeagleQueueCache::getFromCache(const string& udi, Rcl::Doc &dotdoc,
     cf.get(cstr_fmtime, dotdoc.fmtime, cstr_null);
     cf.get(cstr_fbytes, dotdoc.pcbytes, cstr_null);
     dotdoc.sig.clear();
-    list<string> names = cf.getNames(cstr_null);
+    vector<string> names = cf.getNames(cstr_null);
-    for (list<string>::const_iterator it = names.begin();
+    for (vector<string>::const_iterator it = names.begin();
          it != names.end(); it++) {
         cf.get(*it, dotdoc.meta[*it], cstr_null);
     }
     dotdoc.meta[Rcl::Doc::keyudi] = udi;
     return true;
 }
+

src/common/conf_post.h

@@ -0,0 +1,51 @@
+
+#ifdef _WIN32
+#include "safewindows.h"
+
+
+#ifdef _MSC_VER
+// gmtime is supposedly thread-safe on windows
+#define gmtime_r(A, B) gmtime(A)
+#define localtime_r(A,B) localtime(A)
+typedef int mode_t;
+#define fseeko _fseeki64
+#define ftello (off_t)_ftelli64
+#define ftruncate _chsize_s
+#define PATH_MAX MAX_PATH
+#define RCL_ICONV_INBUF_CONST 1
+#define HAVE_STRUCT_TIMESPEC
+#define strdup _strdup
+#define timegm _mkgmtime
+
+#else // End _MSC_VER -> Gminw
+
+#undef RCL_ICONV_INBUF_CONST
+#define timegm portable_timegm
+
+#endif // GMinw only
+
+typedef int pid_t;
+inline int readlink(const char *cp, void *buf, int cnt)
+{
+    return -1;
+}
+
+#define MAXPATHLEN PATH_MAX
+typedef DWORD32 u_int32_t;
+typedef DWORD64 u_int64_t;
+typedef unsigned __int8 u_int8_t;
+typedef int ssize_t;
+#define strncasecmp _strnicmp
+#define strcasecmp _stricmp
+#define chdir _chdir
+
+#define R_OK 4
+#define W_OK 2
+#ifndef X_OK
+#define X_OK 4
+#endif
+
+#define S_ISLNK(X) false
+#define lstat stat
+
+#endif // _WIN32

src/common/cstr.h

@@ -41,19 +41,26 @@ using std::string;
 #endif
 
 DEF_CSTR(caption, "caption");
+DEF_CSTR(colon, ":");
 DEF_CSTR(dmtime, "dmtime");
 DEF_CSTR(dquote, "\"");
 DEF_CSTR(fbytes, "fbytes");
 DEF_CSTR(fileu, "file://");
 DEF_CSTR(fmtime, "fmtime");
 DEF_CSTR(iso_8859_1, "ISO-8859-1");
+DEF_CSTR(utf8, "UTF-8");
+DEF_CSTR(cp1252, "CP1252");
 DEF_CSTR(minwilds, "*?[");
 DEF_CSTR(newline, "\n");
 DEF_CSTR(null, "");
 DEF_CSTR(plus, "+");
 DEF_CSTR(textplain, "text/plain");
 DEF_CSTR(url, "url");
-
+// Marker for HTML format fields
+DEF_CSTR(fldhtm, "\007");
+// Characters that can -begin- a wildcard or regexp expression. 
+DEF_CSTR(wildSpecStChars, "*?[");
+DEF_CSTR(regSpecStChars, "(.[{");
 
 // Values used as keys inside Dijon::Filter::metaData[]. This structure is 
 // used to store all data generated by format-translating filters. It is
@@ -73,6 +80,6 @@ DEF_CSTR(dj_keycontent, "content");
 DEF_CSTR(dj_keyipath, "ipath");
 DEF_CSTR(dj_keymd5, "md5");
 DEF_CSTR(dj_keymt, "mimetype");
-DEF_CSTR(dj_keydocsize, "docsize");
+DEF_CSTR(dj_keyanc, "rclanc");
 
 #endif /* _CSTR_H_INCLUDED_ */

src/common/rclconfig.h

@@ -16,23 +16,20 @@
  */
 #ifndef _RCLCONFIG_H_INCLUDED_
 #define _RCLCONFIG_H_INCLUDED_
+#include "autoconfig.h"
 
-#include <list>
 #include <string>
 #include <vector>
 #include <set>
 #include <utility>
 #include <map>
-#include <set>
+#include <unordered_set>
-#ifndef NO_NAMESPACES
+
-using std::list;
 using std::string;
 using std::vector;
 using std::pair;
 using std::set;
 using std::map;
-using std::set;
-#endif
 
 #include "conftree.h"
 #include "smallut.h"
@@ -48,21 +45,31 @@ public:
     RclConfig *parent;
     ConfNull  *conffile;
     string    paramname;
+    bool      active; // Check at init if config defines name at all
     int       savedkeydirgen;
     string    savedvalue;
 
-    void init(RclConfig *rconf, ConfNull *cnf, const string& nm);
+    ParamStale(RclConfig *rconf, const string& nm);
+    void init(ConfNull *cnf);
     bool needrecompute();
 };
 
+// Hold the description for an external metadata-gathering command
+struct MDReaper {
+  string fieldname;
+  vector<string> cmdv;
+};
+
 // Data associated to a indexed field name: 
 struct FieldTraits {
     string pfx; // indexing prefix, 
     int    wdfinc; // Index time term frequency increment (default 1)
     double boost; // Query time boost (default 1.0)
-    FieldTraits(int i, double f) {wdfinc = i; boost = f;}
+    bool   pfxonly; // Suppress prefix-less indexing
-    FieldTraits() : wdfinc(1), boost(1.0) {}
+    bool   noterms; // Don't add term to highlight data (e.g.: rclbes)
-    FieldTraits(const string& s) : pfx(s), wdfinc(1), boost(1.0) {}
+    FieldTraits() 
+        : wdfinc(1), boost(1.0), pfxonly(false), noterms(false)
+        {}
 };
 
 class RclConfig {
@@ -73,6 +80,20 @@ class RclConfig {
     // argcnf
     RclConfig(const string *argcnf = 0);
 
+    RclConfig(const RclConfig &r) 
+    : m_oldstpsuffstate(this, "recoll_noindex"),
+      m_stpsuffstate(this, "noContentSuffixes"),
+      m_skpnstate(this, "skippedNames"),
+      m_rmtstate(this, "indexedmimetypes"),
+      m_xmtstate(this, "excludedmimetypes"),
+      m_mdrstate(this, "metadatacmds") {
+        initFrom(r);
+    }
+
+    ~RclConfig() {
+	freeAll();
+    }
+
     // Return a writable clone of the main config. This belongs to the
     // caller (must delete it when done)
     ConfNull *cloneMainConfig();
@@ -80,53 +101,63 @@ class RclConfig {
     /** (re)Read recoll.conf */
     bool updateMainConfig();
 
-    bool ok() {return m_ok;}
+    bool ok() const {return m_ok;}
-    const string &getReason() {return m_reason;}
+    const string &getReason() const {return m_reason;}
 
     /** Return the directory where this configuration is stored. 
      *  This was possibly silently created by the rclconfig
      *  constructor it it is the default one (~/.recoll) and it did 
      *  not exist yet. */
-    string getConfDir() {return m_confdir;}
+    string getConfDir() const {return m_confdir;}
+    string getCacheDir() const;
 
     /** Check if the config files were modified since we read them */
-    bool sourceChanged();
+    bool sourceChanged() const;
 
     /** Returns true if this is ~/.recoll */
-    bool isDefaultConfig(); 
+    bool isDefaultConfig() const;
     /** Get the local value for /usr/local/share/recoll/ */
-    const string& getDatadir() {return m_datadir;}
+    const string& getDatadir() const {return m_datadir;}
 
     /** Set current directory reference, and fetch automatic parameters. */
     void setKeyDir(const string &dir);
     string getKeyDir() const {return m_keydir;}
 
     /** Get generic configuration parameter according to current keydir */
-    bool getConfParam(const string &name, string &value) 
+    bool getConfParam(const string &name, string &value, 
+                      bool shallow=false) const
     {
 	if (m_conf == 0)
 	    return false;
-	return m_conf->get(name, value, m_keydir);
+	return m_conf->get(name, value, m_keydir, shallow);
     }
     /** Variant with autoconversion to int */
-    bool getConfParam(const string &name, int *value);
+    bool getConfParam(const string &name, int *value, bool shallow=false) const;
     /** Variant with autoconversion to bool */
-    bool getConfParam(const string &name, bool *value);
+    bool getConfParam(const string &name, bool *value, 
-    /** Variant with conversion to string list/vector
+                      bool shallow=false) const;
+    /** Variant with conversion to vector<string>
      *  (stringToStrings). Can fail if the string is malformed. */
-    bool getConfParam(const string &name, vector<string> *value);
+    bool getConfParam(const string &name, vector<string> *value, 
-    bool getConfParam(const string &name, list<string> *value);
+                      bool shallow=false) const;
+    /** Variant with conversion to vector<int> */
+    bool getConfParam(const string &name, vector<int> *value, 
+                      bool shallow=false) const;
+
+    enum ThrStage {ThrIntern=0, ThrSplit=1, ThrDbWrite=2};
+    pair<int, int> getThrConf(ThrStage who) const;
 
     /** 
      * Get list of config names under current sk, with possible 
      * wildcard filtering 
      */
-    list<string> getConfNames(const char *pattern = 0) {
+    vector<string> getConfNames(const char *pattern = 0) const
+    {
 	return m_conf->getNames(m_keydir, pattern);
     }
 
     /** Check if name exists anywhere in config */
-    bool hasNameAnywhere(const string& nm) 
+    bool hasNameAnywhere(const string& nm) const
     {
         return m_conf? m_conf->hasNameAnywhere(nm) : false;
     }
@@ -134,33 +165,45 @@ class RclConfig {
 
     /** Get default charset for current keydir (was set during setKeydir) 
      * filenames are handled differently */
-    const string &getDefCharset(bool filename = false);
+    const string &getDefCharset(bool filename = false) const;
 
     /** Get list of top directories. This is needed from a number of places
      * and needs some cleaning-up code. An empty list is always an error, no
      * need for other status */
-    list<string> getTopdirs();
+    vector<string> getTopdirs() const;
 
-    /** Get database directory */
+    string getConfdirPath(const char *varname, const char *dflt) const;
-    string getDbDir();
+    string getCachedirPath(const char *varname, const char *dflt) const;
+    /** Get database and other directories */
+    string getDbDir() const;
+    string getWebcacheDir() const;
+    string getMboxcacheDir() const;
+    string getAspellcacheDir() const;
     /** Get stoplist file name */
-    string getStopfile();
+    string getStopfile() const;
+    /** Get synonym groups file name */
+    string getSynGroupsFile() const;
     /** Get indexing pid file name */
-    string getPidfile();
+    string getPidfile() const;
     /** Get indexing status file name */
-    string getIdxStatusFile();
+    string getIdxStatusFile() const;
+    /** Do path translation according to the ptrans table */
+    void urlrewrite(const string& dbdir, string& url) const;
+    ConfSimple *getPTrans()
+    {
+	return m_ptrans;
+    }
+    /** Get Web Queue directory name */
+    string getWebQueueDir() const;
 
     /** Get list of skipped file names for current keydir */
-    list<string>& getSkippedNames();
+    vector<string>& getSkippedNames();
 
     /** Get list of skipped paths patterns. Doesn't depend on the keydir */
-    list<string> getSkippedPaths();
+    vector<string> getSkippedPaths() const;
     /** Get list of skipped paths patterns, daemon version (may add some)
 	Doesn't depend on the keydir */
-    list<string> getDaemSkippedPaths();
+    vector<string> getDaemSkippedPaths() const;
-
-    /** conf: Add local fields to target dic */
-    bool addLocalFields(map<string, string> *tgt);
 
     /** 
      * mimemap: Check if file name should be ignored because of suffix
@@ -177,14 +220,14 @@ class RclConfig {
      * The returned command has substitutable places for input file name 
      * and temp dir name, and will return output name
      */
-    bool getUncompressor(const string &mtpe, list<string>& cmd);
+    bool getUncompressor(const string &mtpe, vector<string>& cmd) const;
 
     /** mimemap: compute mimetype */
-    string getMimeTypeFromSuffix(const string &suffix);
+    string getMimeTypeFromSuffix(const string &suffix) const;
     /** mimemap: get a list of all indexable mime types defined */
-    list<string> getAllMimeTypes();
+    vector<string> getAllMimeTypes() const;
     /** mimemap: Get appropriate suffix for mime type. This is inefficient */
-    string getSuffixFromMimeType(const string &mt);
+    string getSuffixFromMimeType(const string &mt) const;
 
     /** mimeconf: get input filter for mimetype */
     string getMimeHandlerDef(const string &mimetype, bool filtertypes=false);
@@ -193,62 +236,97 @@ class RclConfig {
      * Separate the value and store the attributes in a ConfSimple 
      * @param whole the raw value. No way to escape a semi-colon in there.
      */
-    bool valueSplitAttributes(const string& whole, string& value, 
+    static bool valueSplitAttributes(const string& whole, string& value, 
 				     ConfSimple& attrs) ;
 
-    /** mimeconf: get icon name for mimetype */
+    /** Return the locale's character set */
-    string getMimeIconName(const string &mtype, string *path = 0);
+    static const std::string& getLocaleCharset();
+    
+    /** Return icon path for mime type and tag */
+    string getMimeIconPath(const string &mt, const string& apptag) const;
 
     /** mimeconf: get list of file categories */
-    bool getMimeCategories(list<string>&);
+    bool getMimeCategories(vector<string>&) const;
     /** mimeconf: is parameter one of the categories ? */
-    bool isMimeCategory(string&);
+    bool isMimeCategory(string&) const;
     /** mimeconf: get list of mime types for category */
-    bool getMimeCatTypes(const string& cat, list<string>&);
+    bool getMimeCatTypes(const string& cat, vector<string>&) const;
 
     /** mimeconf: get list of gui filters (doc cats by default */
-    bool getGuiFilterNames(list<string>&);
+    bool getGuiFilterNames(vector<string>&) const;
     /** mimeconf: get query lang frag for named filter */
-    bool getGuiFilter(const string& filtername, string& frag);
+    bool getGuiFilter(const string& filtername, string& frag) const;
+
+    /** fields: get field prefix from field name. Use additional query
+       aliases if isquery is set */
+    bool getFieldTraits(const string& fldname, const FieldTraits **,
+        bool isquery = false) const;
+
+    const set<string>& getStoredFields() const {return m_storedFields;}
+
+    set<string> getIndexedFields() const;
 
-    /** fields: get field prefix from field name */
-    bool getFieldTraits(const string& fldname, const FieldTraits **);
-    const set<string>& getStoredFields() {return m_storedFields;}
-    set<string> getIndexedFields();
     /** Get canonic name for possible alias */
-    string fieldCanon(const string& fld);
+    string fieldCanon(const string& fld) const;
+
+    /** Get canonic name for possible alias, including query-only aliases */
+    string fieldQCanon(const string& fld) const;
+
     /** Get xattr name to field names translations */
-    const map<string, string>& getXattrToField() {return m_xattrtofld;}
+    const map<string, string>& getXattrToField() const {return m_xattrtofld;}
+
     /** Get value of a parameter inside the "fields" file. Only some filters 
-        use this (ie: mh_mail). The information specific to a given filter
+     * use this (ie: mh_mail). The information specific to a given filter
-        is typically stored in a separate section(ie: [mail]) */
+     * is typically stored in a separate section(ie: [mail]) 
-    list<string> getFieldSectNames(const string &sk, const char* = 0);
+     */
-    bool getFieldConfParam(const string &name, const string &sk, string &value);
+    vector<string> getFieldSectNames(const string &sk, const char* = 0) const;
+    bool getFieldConfParam(const string &name, const string &sk, string &value)
+    const;
 
     /** mimeview: get/set external viewer exec string(s) for mimetype(s) */
-    string getMimeViewerDef(const string &mimetype, const string& apptag);
+    string getMimeViewerDef(const string &mimetype, const string& apptag, 
-    bool getMimeViewerDefs(vector<pair<string, string> >&);
+			    bool useall) const;
+    string getMimeViewerAllEx() const;
+    bool setMimeViewerAllEx(const string& allex);
+    bool getMimeViewerDefs(vector<pair<string, string> >&) const;
     bool setMimeViewerDef(const string& mimetype, const string& cmd);
     /** Check if mime type is designated as needing no uncompress before view
      * (if a file of this type is found compressed). Default is true,
      *  exceptions are found in the nouncompforviewmts mimeview list */
-    bool mimeViewerNeedsUncomp(const string &mimetype);
+    bool mimeViewerNeedsUncomp(const string &mimetype) const;
+
+    /** Retrieve extra metadata-gathering commands */
+    const vector<MDReaper>& getMDReapers();
 
     /** Store/retrieve missing helpers description string */
-    string getMissingHelperDesc();
+    bool getMissingHelperDesc(string&) const;
     void storeMissingHelperDesc(const string &s);
 
-    /** Find exec file for external filter. cmd is the command name from the
+    /** Find exec file for external filter. 
-     * command string returned by getMimeHandlerDef */
+     *
-    string findFilter(const string& cmd);
+     * If the input is an absolute path, we just return it. Else We
+     * look in $RECOLL_FILTERSDIR, "filtersdir" from the config file,
+     * $RECOLL_CONFDIR/. If nothing is found, we return the input with
+     * the assumption that this will be used with a PATH-searching
+     * exec.
+     *
+     * @param cmd is normally the command name from the command string 
+     *    returned by getMimeHandlerDef(), but this could be used for any 
+     *    command. If cmd begins with a /, we return cmd without
+     *    further processing.
+     */
+    string findFilter(const string& cmd) const;
 
-    ~RclConfig() {
+    /** Thread config init is not done automatically because not all
-	freeAll();
+	programs need it and it uses the debug log so that it's better to
+	call it after primary init */
+    void initThrConf();
+
+    const string& getOrigCwd() 
+    {
+	return o_origcwd;
     }
 
-    RclConfig(const RclConfig &r) {
-	initFrom(r);
-    }
     RclConfig& operator=(const RclConfig &r) {
 	if (this != &r) {
 	    freeAll();
@@ -263,37 +341,62 @@ class RclConfig {
     int m_ok;
     string m_reason;    // Explanation for bad state
     string m_confdir;   // User directory where the customized files are stored
+    // Normally same as confdir. Set to store all bulk data elsewhere.
+    // Provides defaults top location for dbdir, webcachedir,
+    // mboxcachedir, aspellDictDir, which can still be used to
+    // override.
+    string m_cachedir;  
     string m_datadir;   // Example: /usr/local/share/recoll
     string m_keydir;    // Current directory used for parameter fetches.
     int    m_keydirgen; // To help with knowing when to update computed data.
 
-    list<string> m_cdirs; // directory stack for the confstacks
+    vector<string> m_cdirs; // directory stack for the confstacks
 
     ConfStack<ConfTree> *m_conf;   // Parsed configuration files
     ConfStack<ConfTree> *mimemap;  // The files don't change with keydir, 
     ConfStack<ConfSimple> *mimeconf; // but their content may depend on it.
     ConfStack<ConfSimple> *mimeview; // 
     ConfStack<ConfSimple> *m_fields;
+    ConfSimple            *m_ptrans; // Paths translations
     map<string, FieldTraits>  m_fldtotraits; // Field to field params
     map<string, string>  m_aliastocanon;
+    map<string, string>  m_aliastoqcanon;
     set<string>          m_storedFields;
     map<string, string>  m_xattrtofld;
 
     void        *m_stopsuffixes;
     unsigned int m_maxsufflen;
+    ParamStale   m_oldstpsuffstate; // Values from user mimemap, now obsolete
     ParamStale   m_stpsuffstate;
 
     ParamStale   m_skpnstate;
-    list<string> m_skpnlist;
+    vector<string> m_skpnlist;
+
+    // Original current working directory. Set once at init before we do any
+    // chdir'ing and used for converting user args to absolute paths.
+    static string o_origcwd;
 
     // Parameters auto-fetched on setkeydir
-    string defcharset;
+    string m_defcharset;
+    static string o_localecharset;
     // Limiting set of mime types to be processed. Normally empty.
     ParamStale    m_rmtstate;
-    set<string>   m_restrictMTypes; 
+    std::unordered_set<string>   m_restrictMTypes; 
+    // Exclusion set of mime types. Normally empty
+    ParamStale    m_xmtstate;
+    std::unordered_set<string>   m_excludeMTypes; 
+
+    vector<pair<int, int> > m_thrConf;
+
+    // Same idea with the metadata-gathering external commands,
+    // (e.g. used to reap tagging info: "tmsu tags %f")
+    ParamStale    m_mdrstate;
+    vector<MDReaper> m_mdreapers;
 
     /** Create initial user configuration */
     bool initUserConfig();
+    /** Init all ParamStale members */
+    void initParamStale(ConfNull *cnf, ConfNull *mimemap);
     /** Copy from other */
     void initFrom(const RclConfig& r);
     /** Init pointers to 0 */
@@ -303,5 +406,17 @@ class RclConfig {
     bool readFieldsConfig(const string& errloc);
 };
 
+// This global variable defines if we are running with an index
+// stripped of accents and case or a raw one. Ideally, it should be
+// constant, but it needs to be initialized from the configuration, so
+// there is no way to do this. It never changes after initialization
+// of course. Changing the value on a given index imposes a
+// reset. When using multiple indexes, all must have the same value
+extern bool o_index_stripchars;
+
+// This global variable defines if we use mtime instead of ctime for
+// up-to-date tests. This is mostly incompatible with xattr indexing,
+// in addition to other issues. See recoll.conf comments. 
+extern bool o_uptodate_test_use_mtime;
 
 #endif /* _RCLCONFIG_H_INCLUDED_ */

src/common/rclinit.cpp

@@ -17,38 +17,63 @@
 #include "autoconfig.h"
 
 #include <stdio.h>
+#ifdef _WIN32
+#include "safewindows.h"
+#endif
 #include <signal.h>
 #include <locale.h>
-#include <pthread.h>
 #include <cstdlib>
 #if !defined(PUTENV_ARG_CONST)
 #include <string.h>
 #endif
 
-#include "debuglog.h"
+#include <thread>
+
+#include "log.h"
 #include "rclconfig.h"
 #include "rclinit.h"
 #include "pathut.h"
+#include "rclutil.h"
 #include "unac.h"
+#include "smallut.h"
+#include "execmd.h"
 
-static const int catchedSigs[] = {SIGHUP, SIGINT, SIGQUIT, SIGTERM, 
+std::thread::id mainthread_id;
-     SIGUSR1, SIGUSR2};
 
-RclConfig *recollinit(RclInitFlags flags, 
+// Signal etc. processing. We want to be able to properly close the
-		      void (*cleanup)(void), void (*sigcleanup)(int), 
+// index if we are currently writing to it.
-		      string &reason, const string *argcnf)
+//
+// This is active if the sigcleanup parameter to recollinit is set,
+// which only recollindex does. We arrange for the handler to be
+// called when process termination is requested either by the system
+// or a user keyboard intr.
+//
+// The recollindex handler just sets a global termination flag (plus
+// the cancelcheck thing), which are tested in all timeout loops
+// etc. When the flag is seen, the main thread processing returns, and
+// recollindex calls exit().
+//
+// The other parameter, to recollinit(), cleanup, is set as an
+// atexit() routine, it does the job of actually signalling the
+// workers to stop and tidy up. It's automagically called by exit().
+
+#ifndef _WIN32
+static void siglogreopen(int)
 {
-    if (cleanup)
+    if (recoll_ismainthread())
-	atexit(cleanup);
+        Logger::getTheLog("")->reopen("");
+}
 
+// We would like to block SIGCHLD globally, but we can't because
+// QT uses it. Have to block it inside execmd.cpp
+static const int catchedSigs[] = {SIGINT, SIGQUIT, SIGTERM, SIGUSR1, SIGUSR2};
+void initAsyncSigs(void (*sigcleanup)(int))
+{
     // We ignore SIGPIPE always. All pieces of code which can write to a pipe
     // must check write() return values.
     signal(SIGPIPE, SIG_IGN);
 
-    // We would like to block SIGCHLD globally, but we can't because
+    // Install app signal handler
-    // QT uses it. Have to block it inside execmd.cpp
-
-    // Install signal handler
     if (sigcleanup) {
 	struct sigaction action;
 	action.sa_handler = sigcleanup;
@@ -62,8 +87,182 @@ RclConfig *recollinit(RclInitFlags flags,
 	    }
     }
 
-    DebugLog::getdbl()->setloglevel(DEBDEB1);
+    // Install log rotate sig handler
-    DebugLog::setfilename("stderr");
+    {
+	struct sigaction action;
+	action.sa_handler = siglogreopen;
+	action.sa_flags = 0;
+	sigemptyset(&action.sa_mask);
+	if (signal(SIGHUP, SIG_IGN) != SIG_IGN) {
+	    if (sigaction(SIGHUP, &action, 0) < 0) {
+		perror("Sigaction failed");
+	    }
+	}
+    }
+}
+void recoll_exitready()
+{
+}
+
+#else // _WIN32 ->
+
+// Windows signals etc.
+//
+// ^C can be caught by the signal() emulation, but not ^Break
+// apparently, which is why we use the native approach too
+//
+// When a keyboard interrupt occurs, windows creates a thread inside
+// the process and calls the handler. The process exits when the
+// handler returns or after at most 10S
+//
+// This should also work, with different signals (CTRL_LOGOFF_EVENT,
+// CTRL_SHUTDOWN_EVENT) when the user exits or the system shuts down).
+//
+// Unfortunately, this is not the end of the story. It seems that in
+// recent Windows version "some kinds" of apps will not reliably
+// receive the signals. "Some kind" is variably defined, for example a
+// simple test program works when built with vs 2015, but not
+// mingw. See the following discussion thread for tentative
+// explanations, it seems that importing or not from user32.dll is the
+// determining factor.
+// https://social.msdn.microsoft.com/Forums/windowsdesktop/en-US/abf09824-4e4c-4f2c-ae1e-5981f06c9c6e/windows-7-console-application-has-no-way-of-trapping-logoffshutdown-event?forum=windowscompatibility
+// In any case, it appears that the only reliable way to be advised of
+// system shutdown or user exit is to create an "invisible window" and
+// process window messages, which we now do.
+
+static void (*l_sigcleanup)(int);
+static HANDLE eWorkFinished = INVALID_HANDLE_VALUE;
+
+static BOOL WINAPI CtrlHandler(DWORD fdwCtrlType)
+{
+    LOGDEB("CtrlHandler\n" );
+    if (l_sigcleanup == 0)
+        return FALSE;
+
+    switch(fdwCtrlType) { 
+    case CTRL_C_EVENT: 
+    case CTRL_CLOSE_EVENT: 
+    case CTRL_BREAK_EVENT: 
+    case CTRL_LOGOFF_EVENT: 
+    case CTRL_SHUTDOWN_EVENT:
+    {
+        l_sigcleanup(SIGINT);
+        LOGDEB0("CtrlHandler: waiting for exit ready\n" );
+	DWORD res = WaitForSingleObject(eWorkFinished, INFINITE);
+	if (res != WAIT_OBJECT_0) {
+            LOGERR("CtrlHandler: exit ack wait failed\n" );
+	}
+        LOGDEB0("CtrlHandler: got exit ready event, exiting\n" );
+        return TRUE;
+    }
+    default: 
+        return FALSE; 
+    } 
+} 
+
+LRESULT CALLBACK MainWndProc(HWND hwnd , UINT msg , WPARAM wParam,
+                             LPARAM lParam)
+{
+    switch (msg) {
+    case WM_QUERYENDSESSION:
+    case WM_ENDSESSION:
+    case WM_DESTROY:
+    case WM_CLOSE:
+    {
+        l_sigcleanup(SIGINT);
+        LOGDEB("MainWndProc: got end message, waiting for work finished\n" );
+	DWORD res = WaitForSingleObject(eWorkFinished, INFINITE);
+	if (res != WAIT_OBJECT_0) {
+            LOGERR("MainWndProc: exit ack wait failed\n" );
+	}
+        LOGDEB("MainWindowProc: got exit ready event, exiting\n" );
+        return TRUE;
+    }
+    default:
+        return DefWindowProc(hwnd, msg, wParam, lParam);
+    }
+    return TRUE;
+}
+
+bool CreateInvisibleWindow()
+{
+    HWND hwnd;
+    WNDCLASS wc = {0};
+
+    wc.lpfnWndProc = (WNDPROC)MainWndProc;
+    wc.hInstance = GetModuleHandle(NULL);
+    wc.hIcon = LoadIcon(GetModuleHandle(NULL), "TestWClass");
+    wc.lpszClassName = "TestWClass";
+    RegisterClass(&wc);
+
+    hwnd =
+        CreateWindowEx(0, "TestWClass", "TestWClass", WS_OVERLAPPEDWINDOW,
+                       CW_USEDEFAULT, CW_USEDEFAULT, CW_USEDEFAULT,
+                       CW_USEDEFAULT, (HWND) NULL, (HMENU) NULL,
+                       GetModuleHandle(NULL), (LPVOID) NULL);
+    if (!hwnd) {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+DWORD WINAPI RunInvisibleWindowThread(LPVOID lpParam)
+{
+    MSG msg;
+    CreateInvisibleWindow();
+    while (GetMessage(&msg, (HWND) NULL , 0 , 0)) {
+        TranslateMessage(&msg);
+        DispatchMessage(&msg);
+    }
+    return 0;
+}
+
+static const int catchedSigs[] = {SIGINT, SIGTERM};
+void initAsyncSigs(void (*sigcleanup)(int))
+{
+    DWORD tid;
+    // Install app signal handler
+    if (sigcleanup) {
+        l_sigcleanup = sigcleanup;
+	for (unsigned int i = 0; i < sizeof(catchedSigs) / sizeof(int); i++) {
+	    if (signal(catchedSigs[i], SIG_IGN) != SIG_IGN) {
+		signal(catchedSigs[i], sigcleanup);
+	    }
+        }
+    }
+    HANDLE hInvisiblethread =
+        CreateThread(NULL, 0, RunInvisibleWindowThread, NULL, 0, &tid);
+    SetConsoleCtrlHandler((PHANDLER_ROUTINE)CtrlHandler, TRUE);
+    eWorkFinished = CreateEvent(NULL, TRUE, FALSE, NULL);
+    if (eWorkFinished == INVALID_HANDLE_VALUE) {
+        LOGERR("initAsyncSigs: error creating exitready event\n" );
+    }
+}
+void recoll_exitready()
+{
+    LOGDEB("recoll_exitready()\n" );
+    if (!SetEvent(eWorkFinished)) {
+        LOGERR("recoll_exitready: SetEvent failed\n" );
+    }
+}
+
+#endif
+
+RclConfig *recollinit(RclInitFlags flags, 
+		      void (*cleanup)(void), void (*sigcleanup)(int), 
+		      string &reason, const string *argcnf)
+{
+    if (cleanup)
+	atexit(cleanup);
+
+    // Make sure the locale is set. This is only for converting file names 
+    // to utf8 for indexing.
+    setlocale(LC_CTYPE, "");
+
+    Logger::getTheLog("")->setLogLevel(Logger::LLDEB1);
+
+    initAsyncSigs(sigcleanup);
+    
     RclConfig *config = new RclConfig(argcnf);
     if (!config || !config->ok()) {
 	reason = "Configuration could not be built:\n";
@@ -74,12 +273,19 @@ RclConfig *recollinit(RclInitFlags flags,
 	return 0;
     }
 
-    // Retrieve the log file name and level
+    // Retrieve the log file name and level. Daemon and batch indexing
+    // processes may use specific values, else fall back on common
+    // ones.
     string logfilename, loglevel;
     if (flags & RCLINIT_DAEMON) {
 	config->getConfParam(string("daemlogfilename"), logfilename);
 	config->getConfParam(string("daemloglevel"), loglevel);
     }
+    if ((flags & RCLINIT_IDX) && logfilename.empty())
+	config->getConfParam(string("idxlogfilename"), logfilename);
+    if ((flags & RCLINIT_IDX) && loglevel.empty()) 
+	config->getConfParam(string("idxloglevel"), loglevel);
+
     if (logfilename.empty())
 	config->getConfParam(string("logfilename"), logfilename);
     if (loglevel.empty())
@@ -89,37 +295,62 @@ RclConfig *recollinit(RclInitFlags flags,
     if (!logfilename.empty()) {
 	logfilename = path_tildexpand(logfilename);
 	// If not an absolute path or , compute relative to config dir
-	if (logfilename.at(0) != '/' && 
+	if (!path_isabsolute(logfilename) &&
-	    !DebugLog::DebugLog::isspecialname(logfilename.c_str())) {
+            logfilename.compare("stderr")) {
 	    logfilename = path_cat(config->getConfDir(), logfilename);
 	}
-	DebugLog::setfilename(logfilename.c_str());
+        Logger::getTheLog("")->reopen(logfilename);
     }
     if (!loglevel.empty()) {
 	int lev = atoi(loglevel.c_str());
-	DebugLog::getdbl()->setloglevel(lev);
+        Logger::getTheLog("")->setLogLevel(Logger::LogLevel(lev));
     }
 
-    // Make sure the locale is set. This is only for converting file names 
-    // to utf8 for indexing.
-    setlocale(LC_CTYPE, "");
-
     // Make sure the locale charset is initialized (so that multiple
     // threads don't try to do it at once).
     config->getDefCharset();
 
-    // Init unac locking
+    mainthread_id = std::this_thread::get_id();
-    unac_init_mt();
+
+    // Init smallut and pathut static values
+    pathut_init_mt();
+    smallut_init_mt();
+    rclutil_init_mt();
+    
+    // Init execmd.h static PATH and PATHELT splitting
+    {string bogus;
+        ExecCmd::which("nosuchcmd", bogus);
+    }
     
     // Init Unac translation exceptions
     string unacex;
     if (config->getConfParam("unac_except_trans", unacex) && !unacex.empty()) 
 	unac_set_except_translations(unacex.c_str());
 
+#ifndef IDX_THREADS
+    ExecCmd::useVfork(true);
+#else
+    // Keep threads init behind log init, but make sure it's done before
+    // we do the vfork choice ! The latter is not used any more actually, 
+    // we always use vfork except if forbidden by config.
+    if ((flags & RCLINIT_IDX)) {
+        config->initThrConf();
+    }
+
+    bool novfork;
+    config->getConfParam("novfork", &novfork);
+    if (novfork) {
+	LOGDEB0("rclinit: will use fork() for starting commands\n" );
+        ExecCmd::useVfork(false);
+    } else {
+	LOGDEB0("rclinit: will use vfork() for starting commands\n" );
+	ExecCmd::useVfork(true);
+    }
+#endif
+
     int flushmb;
     if (config->getConfParam("idxflushmb", &flushmb) && flushmb > 0) {
-	LOGDEB1(("rclinit: idxflushmb=%d, set XAPIAN_FLUSH_THRESHOLD to 10E6\n",
+	LOGDEB1("rclinit: idxflushmb="  << (flushmb) << ", set XAPIAN_FLUSH_THRESHOLD to 10E6\n" );
-		 flushmb));
 	static const char *cp = "XAPIAN_FLUSH_THRESHOLD=1000000";
 #ifdef PUTENV_ARG_CONST
 	::putenv(cp);
@@ -131,14 +362,31 @@ RclConfig *recollinit(RclInitFlags flags,
     return config;
 }
 
-// Signals are handled by the main thread. All others should call this routine
+// Signals are handled by the main thread. All others should call this
-// to block possible signals
+// routine to block possible signals
 void recoll_threadinit()
 {
+#ifndef _WIN32
     sigset_t sset;
     sigemptyset(&sset);
 
     for (unsigned int i = 0; i < sizeof(catchedSigs) / sizeof(int); i++)
 	sigaddset(&sset, catchedSigs[i]);
+    sigaddset(&sset, SIGHUP);
     pthread_sigmask(SIG_BLOCK, &sset, 0);
+#else
+    // Not sure that this is needed at all or correct under windows.
+    for (unsigned int i = 0; i < sizeof(catchedSigs) / sizeof(int); i++) {
+        if (signal(catchedSigs[i], SIG_IGN) != SIG_IGN) {
+            signal(catchedSigs[i], SIG_IGN);
         }
+    }
+#endif
+}
+
+bool recoll_ismainthread()
+{
+    return std::this_thread::get_id() == mainthread_id;
+}
+
+

src/common/rclinit.h

@@ -18,9 +18,6 @@
 #define _RCLINIT_H_INCLUDED_
 
 #include <string>
-#ifndef NO_NAMESPACES
-using std::string;
-#endif
 
 class RclConfig;
 /**
@@ -30,7 +27,8 @@ class RclConfig;
  * up the global signal handling. other threads must call recoll_threadinit()
  * when starting.
  *
- * @param flags   misc modifiers
+ * @param flags   misc modifiers. These are currently only used to customize
+ *      the log file and verbosity.
  * @param cleanup function to call before exiting (atexit)
  * @param sigcleanup function to call on terminal signal (INT/HUP...) This
  *       should typically set a flag which tells the program (recoll,
@@ -41,12 +39,14 @@ class RclConfig;
  *               default and environment
  * @return the parsed configuration.
  */
-enum RclInitFlags {RCLINIT_NONE=0, RCLINIT_DAEMON=1};
+enum RclInitFlags {RCLINIT_NONE = 0, RCLINIT_DAEMON = 1, RCLINIT_IDX = 2};
 extern RclConfig *recollinit(RclInitFlags flags,
                              void (*cleanup)(void), void (*sigcleanup)(int),
-			     string &reason, const string *argcnf = 0);
+                             std::string& reason, const string *argcnf = 0);
 inline RclConfig *recollinit(void (*cleanup)(void), void (*sigcleanup)(int),
-			     string &reason, const string *argcnf = 0) {
+                             std::string& reason,
+                             const std::string *argcnf = 0)
+{
     return recollinit(RCLINIT_NONE, cleanup, sigcleanup, reason, argcnf);
 }
 
@@ -54,4 +54,12 @@ inline RclConfig *recollinit(void (*cleanup)(void), void (*sigcleanup)(int),
 // The main thread handles all signals.
 extern void recoll_threadinit();
 
+// Check if main thread
+extern bool recoll_ismainthread();
+
+// Should be called while exiting asap when critical cleanup (db
+// close) has been performed. Only useful for the indexer (writes to
+// the db), and only actually does something on Windows.
+extern void recoll_exitready();
+
 #endif /* _RCLINIT_H_INCLUDED_ */

src/common/syngroups.cpp

@@ -0,0 +1,250 @@
+/* Copyright (C) 2014 J.F.Dockes
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+#ifndef TEST_SYNGROUPS
+#include "autoconfig.h"
+
+#include "syngroups.h"
+
+#include "log.h"
+#include "smallut.h"
+
+#include <errno.h>
+#include <unordered_map>
+#include <fstream>
+#include <iostream>
+#include <cstring>
+
+using namespace std;
+
+// Note that we are storing each term twice. I don't think that the
+// size could possibly be a serious issue, but if it was, we could
+// reduce the storage a bit by storing (short hash)-> vector<int>
+// correspondances in the direct map, and then checking all the
+// resulting groups for the input word.
+//
+// As it is, a word can only index one group (the last it is found
+// in). It can be part of several groups though (appear in
+// expansions). I really don't know what we should do with multiple
+// groups anyway
+class SynGroups::Internal {
+public:
+    Internal() : ok(false) {
+    }
+    bool ok;
+    // Term to group num 
+    std::unordered_map<string, unsigned int> terms;
+    // Group num to group
+    vector<vector<string> > groups;
+};
+
+bool SynGroups::ok() 
+{
+    return m && m->ok;
+}
+
+SynGroups::~SynGroups()
+{
+    delete m;
+}
+
+SynGroups::SynGroups()
+    : m(new Internal)
+{
+}
+
+bool SynGroups::setfile(const string& fn)
+{
+    LOGDEB("SynGroups::setfile("  << (fn) << ")\n" );
+    if (!m) {
+        m = new Internal;
+        if (!m) {
+            LOGERR("SynGroups:setfile:: new Internal failed: no mem ?\n" );
+            return false;
+        }
+    }
+
+    if (fn.empty()) {
+        delete m;
+        m = 0;
+	return true;
+    }
+
+    ifstream input;
+    input.open(fn.c_str(), ios::in);
+    if (!input.is_open()) {
+	LOGERR("SynGroups:setfile:: could not open "  << (fn) << " errno "  << (errno) << "\n" );
+	return false;
+    }	    
+
+    string cline;
+    bool appending = false;
+    string line;
+    bool eof = false;
+    int lnum = 0;
+
+    for (;;) {
+        cline.clear();
+	getline(input, cline);
+	if (!input.good()) {
+	    if (input.bad()) {
+                LOGERR("Syngroup::setfile("  << (fn) << "):Parse: input.bad()\n" );
+		return false;
+	    }
+	    // Must be eof ? But maybe we have a partial line which
+	    // must be processed. This happens if the last line before
+	    // eof ends with a backslash, or there is no final \n
+            eof = true;
+	}
+	lnum++;
+
+        {
+            string::size_type pos = cline.find_last_not_of("\n\r");
+            if (pos == string::npos) {
+                cline.clear();
+            } else if (pos != cline.length()-1) {
+                cline.erase(pos+1);
+            }
+        }
+
+	if (appending)
+	    line += cline;
+	else
+	    line = cline;
+
+	// Note that we trim whitespace before checking for backslash-eol
+	// This avoids invisible whitespace problems.
+	trimstring(line);
+	if (line.empty() || line.at(0) == '#') {
+            if (eof)
+                break;
+	    continue;
+	}
+	if (line[line.length() - 1] == '\\') {
+	    line.erase(line.length() - 1);
+	    appending = true;
+	    continue;
+	}
+	appending = false;
+
+	vector<string> words;
+	if (!stringToStrings(line, words)) {
+	    LOGERR("SynGroups:setfile: "  << (fn) << ": bad line "  << (lnum) << ": "  << (line) << "\n" );
+	    continue;
+	}
+
+	if (words.empty())
+	    continue;
+	if (words.size() == 1) {
+	    LOGERR("Syngroup::setfile("  << (fn) << "):single term group at line "  << (lnum) << " ??\n" );
+	    continue;
+	}
+
+	m->groups.push_back(words);
+	for (vector<string>::const_iterator it = words.begin();
+	     it != words.end(); it++) {
+	    m->terms[*it] = m->groups.size()-1;
+	}
+	LOGDEB1("SynGroups::setfile: group: ["  << (stringsToString(m->groups.back())) << "]\n" );
+    }
+    m->ok = true;
+    return true;
+}
+
+vector<string> SynGroups::getgroup(const string& term)
+{
+    vector<string> ret;
+    if (!ok())
+	return ret;
+
+    std::unordered_map<string, unsigned int>::const_iterator it1 =
+        m->terms.find(term);
+    if (it1 == m->terms.end()) {
+	LOGDEB1("SynGroups::getgroup: ["  << (term) << "] not found in direct map\n" );
+	return ret;
+    }
+
+    unsigned int idx = it1->second;
+    if (idx >= m->groups.size()) {
+        LOGERR("SynGroups::getgroup: line index higher than line count !\n" );
+        return ret;
+    }
+    return m->groups[idx];
+}
+
+#else
+
+#include "syngroups.h"
+#include "log.h"
+
+
+#include <string>
+#include <iostream>
+#include <vector>
+#include <cstdlib>
+#include <cstdio>
+
+using namespace std;
+
+static char *thisprog;
+
+static char usage [] =
+    "syngroups <synfilename> <word>\n"
+    "  \n\n"
+    ;
+static void Usage(void)
+{
+    fprintf(stderr, "%s: usage:\n%s", thisprog, usage);
+    exit(1);
+}
+
+static int     op_flags;
+#define OPT_MOINS 0x1
+#define OPT_s     0x2
+#define OPT_b     0x4
+
+int main(int argc, char **argv)
+{
+    thisprog = argv[0];
+    argc--; argv++;
+
+    if (argc != 2) {
+        Usage();
+    }
+    string fn = *argv++;argc--;
+    string word = *argv++;argc--;
+
+    DebugLog::getdbl()->setloglevel(DEBDEB1);
+    DebugLog::setfilename("stderr");
+    SynGroups syns;
+    syns.setfile(fn);
+    if (!syns.ok()) {
+	cerr << "Initialization failed\n";
+	return 1;
+    }
+
+    vector<string> group = syns.getgroup(word);
+    cout << group.size() << " terms in group\n";
+    for (vector<string>::const_iterator it = group.begin();
+	 it != group.end(); it++) {
+	cout << "[" << *it << "] ";
+    }
+    cout << endl;
+    return 0;
+}
+
+#endif
+

src/common/syngroups.h

@@ -0,0 +1,41 @@
+/* Copyright (C) 2015 J.F.Dockes
+ *   This program is free software; you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation; either version 2 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program; if not, write to the
+ *   Free Software Foundation, Inc.,
+ *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+#ifndef _SYNGROUPS_H_INCLUDED_
+#define _SYNGROUPS_H_INCLUDED_
+
+#include <string>
+#include <vector>
+
+// Manage synonym groups. This is very different from stemming and
+// case/diac expansion because there is no reference form: all terms
+// in a group are equivalent.
+class SynGroups {
+public:
+    SynGroups();
+    ~SynGroups();
+    bool setfile(const std::string& fname);
+    std::vector<std::string> getgroup(const std::string& term);
+    bool ok();
+private:
+    class Internal;
+    Internal *m;
+    SynGroups(const SynGroups&);
+    SynGroups& operator=(const SynGroups&);
+};
+
+#endif /* _SYNGROUPS_H_INCLUDED_ */

src/common/textsplit.h

@@ -17,13 +17,10 @@
 #ifndef _TEXTSPLIT_H_INCLUDED_
 #define _TEXTSPLIT_H_INCLUDED_
 
-#include <string>
+#include <math.h>
-#include <list>
 
-#ifndef NO_NAMESPACES
+#include <string>
-using std::string;
+#include <vector>
-using std::list;
-#endif
 
 class Utf8Iter;
 
@@ -55,12 +52,26 @@ public:
 	o_noNumbers = true;
     }
 
-    enum Flags {TXTS_NONE = 0, 
+    // Given [co-worker] as input, do we also generate [coworker] ?
-		TXTS_ONLYSPANS = 1,  // Only return maximum spans (a@b.com) 
+    // Set by rclconfig
-		TXTS_NOSPANS = 2,  // Only return atomic words (a, b, com)
+    static bool o_deHyphenate;
-		TXTS_KEEPWILD = 4 // Handle wildcards as letters
+    static void deHyphenate(bool on) {
-    };
+	o_deHyphenate = on;
+    }
 
+    enum Flags {
+        // Default: will return spans and words (a_b, a, b)
+        TXTS_NONE = 0, 
+        // Only return maximum spans (a@b.com, not a, b, or com) 
+        TXTS_ONLYSPANS = 1,  
+        // Special: Only return atomic words (a, b, com).  This is not
+        // used for indexing, but for position computation during
+        // abstract generation,
+        TXTS_NOSPANS = 2,  
+        // Handle wildcards as letters. This is used with ONLYSPANS
+        // for parsing a user query (never alone).
+        TXTS_KEEPWILD = 4 
+    };
     
     TextSplit(Flags flags = Flags(TXTS_NONE))
 	: m_flags(flags), m_maxWordLength(40), m_prevpos(-1)
@@ -69,23 +80,29 @@ public:
     virtual ~TextSplit() {}
 
     /** Split text, emit words and positions. */
-    virtual bool text_to_words(const string &in);
+    virtual bool text_to_words(const std::string &in);
 
     /** Process one output word: to be implemented by the actual user class */
-    virtual bool takeword(const string& term, 
+    virtual bool takeword(const std::string& term, 
 			  int pos,  // term pos
 			  int bts,  // byte offset of first char in term
 			  int bte   // byte offset of first char after term
 			  ) = 0; 
 
+    /** Called when we encounter formfeed \f 0x0c. Override to use the event.
+     * Mostly or exclusively used with pdftoxx output. Other filters mostly 
+     * just don't know about pages. */
+    virtual void newpage(int /*pos*/)
+    {
+    }
 
     // Static utility functions:
 
     /** Count words in string, as the splitter would generate them */
-    static int countWords(const string &in, Flags flgs = TXTS_ONLYSPANS);
+    static int countWords(const std::string &in, Flags flgs = TXTS_ONLYSPANS);
 
     /** Check if this is visibly not a single block of text */
-    static bool hasVisibleWhite(const string &in);
+    static bool hasVisibleWhite(const std::string &in);
 
     /** Split text span into strings, at white space, allowing for substrings
      * quoted with " . Escaping with \ works as usual inside the quoted areas.
@@ -94,17 +111,80 @@ public:
      * non-utf-8 input (iso-8859 config files work ok). This hopefully
      * handles all Unicode whitespace, but needs correct utf-8 input
      */
-    static bool stringToStrings(const string &s, list<string> &tokens);
+    static bool stringToStrings(const std::string &s, std::vector<std::string> &tokens);
 
     /** Is char CJK ? */
     static bool isCJK(int c);
 
+    /** Statistics about word length (average and dispersion) can
+     * detect bad data like undecoded base64 or other mis-identified
+     * pieces of data taken as text. In practise, this keeps some junk out 
+     * of the index, but does not decrease the index size much, and is
+     * probably not worth the trouble in general. Code kept because it
+     * probably can be useful in special cases. Base64 data does has
+     * word separators in it (+/) and is characterised by high average
+     * word length (>10, often close to 20) and high word length
+     * dispersion (avg/sigma > 0.8). In my tests, most natural
+     * language text has average word lengths around 5-8 and avg/sigma
+     * < 0.7
+     */
+#ifdef TEXTSPLIT_STATS
+    class Stats {
+    public:
+	Stats()
+	{
+	    reset();
+	}
+	void reset()
+	{
+	    count = 0;
+	    totlen = 0;
+	    sigma_acc = 0;
+	}
+	void newsamp(unsigned int len)
+	{
+	    ++count;
+	    totlen += len;
+	    double avglen = double(totlen) / double(count);
+	    sigma_acc += (avglen - len) * (avglen - len);
+	}
+	struct Values {
+	    int count;
+	    double avglen;
+	    double sigma;
+	};
+	Values get()
+	{
+	    Values v;
+	    v.count = count;
+	    v.avglen = double(totlen) / double(count);
+	    v.sigma = sqrt(sigma_acc / count);
+	    return v;
+	}
+    private:
+	int count;
+	int totlen;
+	double sigma_acc;
+    };
+
+    Stats::Values getStats()
+    {
+	return m_stats.get();
+    }
+    void resetStats()
+    {
+	m_stats.reset();
+    }
+#endif // TEXTSPLIT_STATS
+
 private:
     Flags         m_flags;
     int           m_maxWordLength;
 
     // Current span. Might be jf.dockes@wanadoo.f
-    string        m_span; 
+    std::string        m_span; 
+
+    std::vector <std::pair<int, int> > m_words_in_span;
 
     // Current word: no punctuation at all in there. Byte offset
     // relative to the current span and byte length
@@ -121,14 +201,25 @@ private:
     // It may happen that our cleanup would result in emitting the
     // same term twice. We try to avoid this
     int           m_prevpos;
-    unsigned int  m_prevlen;
+    int           m_prevlen;
+
+#ifdef TEXTSPLIT_STATS
+    // Stats counters. These are processed in TextSplit rather than by a 
+    // TermProc so that we can take very long words (not emitted) into
+    // account.
+    Stats         m_stats;
+#endif
+    // Word length in characters. Declared but not updated if !TEXTSPLIT_STATS
+    unsigned int  m_wordChars;
 
     // This processes cjk text:
     bool cjk_to_words(Utf8Iter *it, unsigned int *cp);
 
-    bool emitterm(bool isspan, string &term, int pos, int bs, int be);
+    bool emitterm(bool isspan, std::string &term, int pos, size_t bs,size_t be);
-    bool doemit(bool spanerase, int bp, bool spanemit=false);
+    bool doemit(bool spanerase, size_t bp);
     void discardspan();
+    bool span_is_acronym(std::string *acronym);
+    bool words_from_span(size_t bp);
 };
 
 #endif /* _TEXTSPLIT_H_INCLUDED_ */

src/common/unacpp.cpp

@@ -24,18 +24,31 @@
 
 #include "unacpp.h"
 #include "unac.h"
-#include "debuglog.h"
+#include "log.h"
 #include "utf8iter.h"
 
 bool unacmaybefold(const string &in, string &out, 
-		   const char *encoding, bool dofold)
+		   const char *encoding, UnacOp what)
 {
     char *cout = 0;
     size_t out_len;
-    int status;
+    int status = -1;
-    status = dofold ? 
+
-	unacfold_string(encoding, in.c_str(), in.length(), &cout, &out_len) :
+    switch (what) {
-	unac_string(encoding, in.c_str(), in.length(), &cout, &out_len);
+    case UNACOP_UNAC:
+	status = unac_string(encoding, in.c_str(), in.length(), 
+			     &cout, &out_len);
+	break;
+    case UNACOP_UNACFOLD:
+	status = unacfold_string(encoding, in.c_str(), in.length(), 
+				 &cout, &out_len);
+	break;
+    case UNACOP_FOLD:
+	status = fold_string(encoding, in.c_str(), in.length(), 
+			     &cout, &out_len);
+	break;
+    }
+
     if (status < 0) {
 	if (cout)
 	    free(cout);
@@ -50,26 +63,57 @@ bool unacmaybefold(const string &in, string &out,
     return true;
 }
 
+// Functions to determine upper-case or accented status could be implemented
+// hugely more efficiently inside the unac c code, but there only used for
+// testing user-entered terms, so we don't really care.
 bool unaciscapital(const string& in)
 {
+    LOGDEB2("unaciscapital: ["  << (in) << "]\n" );
     if (in.empty())
 	return false;
     Utf8Iter it(in);
     string shorter;
     it.appendchartostring(shorter);
 
-    string noacterm, noaclowterm;
+    string lower;
-    if (!unacmaybefold(shorter, noacterm, "UTF-8", false)) {
+    if (!unacmaybefold(shorter, lower, "UTF-8", UNACOP_FOLD)) {
-	LOGINFO(("unaciscapital: unac failed for [%s]\n", in.c_str()));
+	LOGINFO("unaciscapital: unac/fold failed for ["  << (in) << "]\n" );
 	return false;
     } 
-    if (!unacmaybefold(noacterm, noaclowterm, "UTF-8", true)) {
+    Utf8Iter it1(lower);
-	LOGINFO(("unaciscapital: unacfold failed for [%s]\n", in.c_str()));
+    if (*it != *it1)
+	return true;
+    else
 	return false;
 }
-    Utf8Iter it1(noacterm);
+bool unachasuppercase(const string& in)
-    Utf8Iter it2(noaclowterm);
+{
-    if (*it1 != *it2)
+    LOGDEB2("unachasuppercase: ["  << (in) << "]\n" );
+    if (in.empty())
+	return false;
+
+    string lower;
+    if (!unacmaybefold(in, lower, "UTF-8", UNACOP_FOLD)) {
+	LOGINFO("unachasuppercase: unac/fold failed for ["  << (in) << "]\n" );
+	return false;
+    } 
+    if (lower != in)
+	return true;
+    else
+	return false;
+}
+bool unachasaccents(const string& in)
+{
+    LOGDEB2("unachasaccents: ["  << (in) << "]\n" );
+    if (in.empty())
+	return false;
+
+    string noac;
+    if (!unacmaybefold(in, noac, "UTF-8", UNACOP_UNAC)) {
+	LOGINFO("unachasaccents: unac/unac failed for ["  << (in) << "]\n" );
+	return false;
+    } 
+    if (noac != in)
 	return true;
     else
 	return false;
@@ -77,6 +121,8 @@ bool unaciscapital(const string& in)
 
 #else // not testing
 
+#include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
@@ -90,31 +136,94 @@ using namespace std;
 #include "readfile.h"
 #include "rclinit.h"
 
-int main(int argc, char **argv)
+static char *thisprog;
+
+static char usage [] = "\n"
+    "[-c|-C] <encoding> <infile> <outfile>\n"
+    "   Default : unaccent\n"
+    "   -c : unaccent and casefold\n"
+    "   -C : casefold only\n"
+    "-t <string> test string as capitalized, upper-case anywhere, accents\n"
+    "   the parameter is supposedly utf-8 so this can only work in an utf-8\n"
+    "   locale\n"
+    "\n";
+;
+
+static void
+Usage(void)
 {
-    bool dofold = true;
+    fprintf(stderr, "%s: usage: %s\n", thisprog, usage);
-    if (argc != 4) {
-	cerr << "Usage: unacpp  <encoding> <infile> <outfile>" << endl;
     exit(1);
 }
-    const char *encoding = argv[1];
+
-    string ifn = argv[2];
+static int     op_flags;
+#define OPT_c	  0x2 
+#define OPT_C	  0x4 
+#define OPT_t     0x8
+
+int main(int argc, char **argv)
+{
+    UnacOp op = UNACOP_UNAC;
+
+    thisprog = argv[0];
+    argc--; argv++;
+
+    while (argc > 0 && **argv == '-') {
+	(*argv)++;
+	if (!(**argv))
+	    /* Cas du "adb - core" */
+	    Usage();
+	while (**argv)
+	    switch (*(*argv)++) {
+	    case 'c':	op_flags |= OPT_c; break;
+	    case 'C':	op_flags |= OPT_C; break;
+	    case 't':	op_flags |= OPT_t; break;
+	    default: Usage();	break;
+	    }
+	argc--; argv++;
+    }
+
+    if (op_flags & OPT_t) {
+	if (argc != 1)
+	    Usage();
+	string in = *argv++;argc--;
+	bool capital, upper, accent;
+	capital = unaciscapital(in);
+	upper = unachasuppercase(in);
+	accent = unachasaccents(in);
+	cout << "[" << in << "] : " << 
+	    "capitalized: " << (capital ? "Yes. " : "No. ") <<
+	    "has uppercase: " << (upper ? "Yes. " : "No. ") <<
+	    "has accents: " << (accent ? "Yes. " : "No. ") << 
+	    endl;
+	return 0;
+    } else {
+	if (argc != 3)
+	    Usage();
+	if (op_flags & OPT_c) {
+	    op = UNACOP_UNACFOLD;
+	} else if (op_flags & OPT_C) {
+	    op = UNACOP_FOLD;
+	}
+
+	const char *encoding = *argv++; argc--;
+	string ifn = *argv++; argc--;
 	if (!ifn.compare("stdin"))
 	    ifn.clear();
-    const char *ofn = argv[3];
+	const char *ofn = *argv++; argc--;
 
 	string reason;
 	(void)recollinit(RCLINIT_NONE, 0, 0, reason, 0);
 
 	string odata;
 	if (!file_to_string(ifn, odata)) {
-	cerr << "file_to_string: " << odata << endl;
+	    cerr << "file_to_string " << ifn << " : " << odata << endl;
-	exit(1);
+	    return 1;
 	}
 	string ndata;
-    if (!unacmaybefold(odata, ndata, encoding, dofold)) {
+	if (!unacmaybefold(odata, ndata, encoding, op)) {
 	    cerr << "unac: " << ndata << endl;
-	exit(1);
+	    return 1;
 	}
     
 	int fd;
@@ -126,14 +235,16 @@ int main(int argc, char **argv)
 	if (fd < 0) {
 	    cerr << "Open/Create " << ofn << " failed: " << strerror(errno) 
 		 << endl;
-	exit(1);
+	    return 1;
 	}
 	if (write(fd, ndata.c_str(), ndata.length()) != (int)ndata.length()) {
 	    cerr << "Write(2) failed: " << strerror(errno)  << endl;
-	exit(1);
+	    return 1;
 	}
 	close(fd);
-    exit(0);
+	return 0;
+    }
 }
 
 #endif
+

src/common/unacpp.h

@@ -24,10 +24,17 @@ using std::string;
 #endif /* NO_NAMESPACES */
 
 // A small stringified wrapper for unac.c
+enum UnacOp {UNACOP_UNAC = 1, UNACOP_FOLD = 2, UNACOP_UNACFOLD = 3};
 extern bool unacmaybefold(const string& in, string& out, 
-			  const char *encoding, bool dofold);
+			  const char *encoding, UnacOp what);
 
 // Utility function to determine if string begins with capital
 extern bool unaciscapital(const string& in);
+// Utility function to determine if string has upper-case anywhere
+extern bool unachasuppercase(const string& in);
+// Utility function to determine if any character is accented. This
+// approprialey ignores the characters from unac_except_chars which
+// are really separate letters
+extern bool unachasaccents(const string& in);
 
 #endif /* _UNACPP_H_INCLUDED_ */

src/common/uproplist.h

@@ -25,170 +25,152 @@
  * This is used as a quick fix to the ascii-based code, and is not correct.
  * the correct way would be to do what http://www.unicode.org/reports/tr29/ 
  * says. 
- * 
- * Data from:
-# PropList-4.0.1.txt
-# Date: 2004-03-02, 02:42:40 GMT [MD]
-#
-# Unicode Character Database
-# Copyright (c) 1991-2004 Unicode, Inc.
-# For terms of use, see http://www.unicode.org/terms_of_use.html
-# For documentation, see UCD.html
 */
-static const unsigned int uniign[] = {
+
-    0x0021, /*  ; Terminal_Punctuation # Po       EXCLAMATION MARK*/
+// Punctuation chararacters blocks array.  Each block is defined by a
-    0x002C, /*  ; Terminal_Punctuation # Po       COMMA*/
+// starting and ending code point (both included). MUST BE SORTED.
-    0x002D, /*  ; Dash # Pd       HYPHEN-MINUS*/
+static const unsigned unipuncblocks[] = {
-    0x002E, /*  ; Terminal_Punctuation # Po       FULL STOP*/
+    // Start of latin-1 supplement block, up to capital A grave
-    0x003A, /*  ; Terminal_Punctuation # Po   [2] COLON..SEMICOLON*/
+    0x0080, 0x00BF,
-    0x003B, /*  ; Terminal_Punctuation # Po   [2] COLON..SEMICOLON*/
+    // General punctuation
-    0x003F, /*  ; Terminal_Punctuation # Po       QUESTION MARK*/
+    0x2000, 0x206F,
-    0x0085, /* NEXT LINE NEL;Cc */
+    // Superscripts and subscripts
-    0x00A0, /* NO-BREAK SPACE; Zs */
+    0x2070, 0x209F,
-    0x00A1, /* INVERTED EXCLAMATION MARK;Po */
+    // Currency symbols
-    0x00A2, /* CENT SIGN;Sc */
+    0x20A0, 0x20CF,
-    0x00A3, /* POUND SIGN;Sc; */
+    // Letterlike symbols
-    0x00A4, /* CURRENCY SIGN;Sc; */
+    0x2100, 0x214f,
-    0x00A5, /* YEN SIGN;Sc; */
+    // Number forms
-    0x00A6, /* BROKEN BAR;So */
+    0x2150, 0x218F,
-    0x00A7, /* SECTION SIGN;So; */
+    // Arrows
-    0x00A9, /* COPYRIGHT SIGN;So */
+    0x2190, 0x21FF,
-    0x00AB, /*  ; Quotation_Mark # Pi       LEFT-POINTING DOUBLE ANGLE QUOTATION MARK*/
+    // Mathematical Operators
-    0x00AC, /* NOT SIGN;Sm */
+    0x2200, 0x22FF,
-    0x00AD, /*  ; Hyphen # Cf       SOFT HYPHEN*/
+    // Miscellaneous Technical
-    0x00AE, /* registered sign */
+    0x2300, 0x23FF,
-    0x00B0, /* DEGREE SIGN;So;0;ET;;;;;N;;;;; */
+    // Control Pictures
-    0x00B1, /* PLUS-MINUS SIGN;Sm;0;ET;;;;;N;PLUS-OR-MINUS SIGN;;;;*/
+    0x2400, 0x243F,
-    0x00B7, /* MIDDLE DOT;Po;0;ON;;;;;N;;;;;*/
+    // Optical Character Recognition
-    0x00BB, /*  ; Quotation_Mark # Pf       RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK*/
+    0x2440, 0x245F,
-    0x00BF, /*                   INVERTED QUESTION MARK;Po */
+    // Enclosed Alphanumerics
-    0x00D7, /* MULTIPLICATION SIGN;Sm;0;ON;;;;;N;;;;; */
+    0x2460, 0x24FF,
-    0x037E, /*  ; Terminal_Punctuation # Po       GREEK QUESTION MARK*/
+    // Box Drawing
-    0x0387, /*  ; Terminal_Punctuation # Po       GREEK ANO TELEIA*/
+    0x2500, 0x257F,
-    0x055C, /*  ; STerm # Po       ARMENIAN EXCLAMATION MARK*/
+    // Block Elements
-    0x055E, /*  ; STerm # Po       ARMENIAN QUESTION MARK*/
+    0x2580, 0x259F,
-    0x0589, /*  ; STerm # Po       ARMENIAN FULL STOP*/
+    // Geometric Shapes
-    0x0589, /*  ; Terminal_Punctuation # Po       ARMENIAN FULL STOP*/
+    0x25A0, 0x25FF,
-    0x058A, /*  ; Dash # Pd       ARMENIAN HYPHEN*/
+    // Miscellaneous Symbols
-    0x058A, /*  ; Hyphen # Pd       ARMENIAN HYPHEN*/
+    0x2600, 0x26FF,
-    0x05C3, /*  ; Terminal_Punctuation # Po       HEBREW PUNCTUATION SOF PASUQ*/
+    // Dingbats
-    0x060C, /*  ; Terminal_Punctuation # Po       ARABIC COMMA*/
+    0x2700, 0x27BF,
-    0x061B, /*  ; Terminal_Punctuation # Po       ARABIC SEMICOLON*/
+    // Miscellaneous Mathematical Symbols-A 	
-    0x061F, /*  ; STerm # Po       ARABIC QUESTION MARK*/
+    0x27C0, 0x27EF,
-    0x061F, /*  ; Terminal_Punctuation # Po       ARABIC QUESTION MARK*/
+    // Supplemental Arrows-A
-    0x06D4, /*  ; STerm # Po       ARABIC FULL STOP*/
+    0x27F0, 0x27FF,
-    0x06D4, /*  ; Terminal_Punctuation # Po       ARABIC FULL STOP*/
+    // Supplemental Arrows-B
-    0x166E, /*  ; STerm # Po       CANADIAN SYLLABICS FULL STOP*/
+    0x2900, 0x297F,
-    0x1680, /*  ; White_Space # Zs       OGHAM SPACE MARK*/
+    // Miscellaneous Mathematical Symbols-B 	
-    0x16EB, /* RUNIC SINGLE PUNCTUATION;Po;0;L;;;;;N;;;;;*/
+    0x2980,  0x29FF,
-    0x16EC, /* RUNIC MULTIPLE PUNCTUATION;Po;0;L;;;;;N;;;;;*/
+    // Supplemental Mathematical Operators
-    0x16ED, /* RUNIC CROSS PUNCTUATION;Po;0;L;;;;;N;;;;; */
+    0x2A00, 0x2AFF,
-    0x1803, /*  ; STerm # Po       MONGOLIAN FULL STOP*/
+    // Miscellaneous Symbols and Arrows
-    0x1806, /*  ; Hyphen # Pd       MONGOLIAN TODO SOFT HYPHEN*/
+    0x2B00, 0x2BFF,
-    0x1809, /*  ; STerm # Po       MONGOLIAN MANCHU FULL STOP*/
+};
-    0x180E, /*  ; White_Space # Zs       MONGOLIAN VOWEL SEPARATOR*/
+
-    0x2000, /*  ; White_Space # Zs  [11] EN QUAD..HAIR SPACE*/
+// Other punctuation characters list. Not all punctuation is in a
-    0x2001, /*  ; White_Space # Zs  [11] EN QUAD..HAIR SPACE*/
+// separate block some is found in the middle of alphanumeric codes.
-    0x2002, /*  ; White_Space # Zs  [11] EN QUAD..HAIR SPACE*/
+static const unsigned int unipunc[] = {
-    0x2003, /*  ; White_Space # Zs  [11] EN QUAD..HAIR SPACE*/
+    0x00D7, /* MULTIPLICATION SIGN */
-    0x2004, /*  ; White_Space # Zs  [11] EN QUAD..HAIR SPACE*/
+    0x00F7, /* DIVISION SIGN */
-    0x2005, /*  ; White_Space # Zs  [11] EN QUAD..HAIR SPACE*/
+    0x037E, /* GREEK QUESTION MARK */
-    0x2006, /*  ; White_Space # Zs  [11] EN QUAD..HAIR SPACE*/
+    0x0387, /* GREEK ANO TELEIA */
-    0x2007, /*  ; White_Space # Zs  [11] EN QUAD..HAIR SPACE*/
+    0x055C, /* ARMENIAN EXCLAMATION MARK */
-    0x2008, /*  ; White_Space # Zs  [11] EN QUAD..HAIR SPACE*/
+    0x055E, /* ARMENIAN QUESTION MARK */
-    0x2009, /*  ; White_Space # Zs  [11] EN QUAD..HAIR SPACE*/
+    0x0589, /* ARMENIAN FULL STOP */
-    0x200A, /*  ; White_Space # Zs  [11] EN QUAD..HAIR SPACE*/
+    0x058A, /* ARMENIAN HYPHEN */
-    0x2010, /*  ; Hyphen # Pd   [2] HYPHEN..NON-BREAKING HYPHEN*/
+    0x05C3, /* HEBREW PUNCTUATION SOF PASUQ */
-    0x2011, /*  ; Hyphen # Pd   [2] HYPHEN..NON-BREAKING HYPHEN*/
+    0x060C, /* ARABIC COMMA */
-    0x2012, /*  ; Dash # Pd   [6] HYPHEN..HORIZONTAL BAR*/
+    0x061B, /* ARABIC SEMICOLON */
-    0x2013, /*  ; Dash # Pd   [6] HYPHEN..HORIZONTAL BAR*/
+    0x061F, /* ARABIC QUESTION MARK */
-    0x2014, /*  ; Dash # Pd   [6] HYPHEN..HORIZONTAL BAR*/
+    0x06D4, /* ARABIC FULL STOP */
-    0x2015, /*  ; Dash # Pd   [6] HYPHEN..HORIZONTAL BAR*/
+    0x0964, /* DEVANAGARI DANDA */
-    0x2018, /*  ; Quotation_Mark # Pi       LEFT SINGLE QUOTATION MARK*/
+    0x0965, /* DEVANAGARI DOUBLE DANDA */
-    0x2019, /*  ; Quotation_Mark # Pf       RIGHT SINGLE QUOTATION MARK*/
+    0x166E, /* CANADIAN SYLLABICS FULL STOP */
-    0x201A, /*  ; Quotation_Mark # Ps       SINGLE LOW-9 QUOTATION MARK*/
+    0x1680, /* OGHAM SPACE MARK */
-    0x201B, /*  ; Quotation_Mark # Pi       SINGLE HIGH-REVERSED-9 QUOTATION MARK*/
+    0x16EB, /* RUNIC SINGLE PUNCTUATION */
-    0x201C, /*  ; Quotation_Mark # Pi       LEFT DOUBLE QUOTATION MARK*/
+    0x16EC, /* RUNIC MULTIPLE PUNCTUATION */
-    0x201D, /*  ; Quotation_Mark # Pf       RIGHT DOUBLE QUOTATION MARK*/
+    0x16ED, /* RUNIC CROSS PUNCTUATION */
-    0x201E, /*  ; Quotation_Mark # Ps       DOUBLE LOW-9 QUOTATION MARK*/
+    0x1803, /* MONGOLIAN FULL STOP */
-    0x201F, /*  ; Quotation_Mark # Pi       DOUBLE HIGH-REVERSED-9 QUOTATION MARK*/
+    0x1806, /* MONGOLIAN TODO SOFT HYPHEN */
-    0x2022, /* BULLET;Po;0;ON;;;;;N;;;;; */
+    0x1809, /* MONGOLIAN MANCHU FULL STOP */
-    0x2023, /* TRIANGULAR BULLET;Po;0;ON;;;;;N;;;;;*/
+    0x180E, /* MONGOLIAN VOWEL SEPARATOR */
-    0x2024, /* ONE DOT LEADER;Po;0;ON;<compat> 002E;;;;N;;;;;*/
-    0x2025, /* TWO DOT LEADER;Po;0;ON;<compat> 002E 002E;;;;N;;;;; */
-    0x2026, /* HORIZONTAL ELLIPSIS;Po;0;ON;<compat> 002E 002E 002E;;;;N;;;;; */
-    0x2028, /*  ; White_Space # Zl       LINE SEPARATOR*/
-    0x2029, /*  ; White_Space # Zp       PARAGRAPH SEPARATOR*/
-    0x202F, /*  ; White_Space # Zs       NARROW NO-BREAK SPACE*/
-    0x2032, /* PRIME;Po;0;ET;;;;;N;;;;;*/
-    0x2039, /*  ; Quotation_Mark # Pi       SINGLE LEFT-POINTING ANGLE QUOTATION MARK*/
-    0x203A, /*  ; Quotation_Mark # Pf       SINGLE RIGHT-POINTING ANGLE QUOTATION MARK*/
-    0x203C, /*  ; STerm # Po   [2] DOUBLE EXCLAMATION MARK..INTERROBANG*/
-    0x203D, /*  ; STerm # Po   [2] DOUBLE EXCLAMATION MARK..INTERROBANG*/
-    0x2047, /*  ; Terminal_Punctuation # Po   [3] DOUBLE QUESTION MARK..EXCLAMATION QUESTION MARK*/
-    0x2048, /*  ; Terminal_Punctuation # Po   [3] DOUBLE QUESTION MARK..EXCLAMATION QUESTION MARK*/
-    0x2049, /*  ; Terminal_Punctuation # Po   [3] DOUBLE QUESTION MARK..EXCLAMATION QUESTION MARK*/
-    0x2053, /*  ; Dash # Po       SWUNG DASH*/
-    0x205F, /*  ; White_Space # Zs       MEDIUM MATHEMATICAL SPACE*/
-    0x207B, /*  ; Dash # Sm       SUPERSCRIPT MINUS*/
-    0x208B, /*  ; Dash # Sm       SUBSCRIPT MINUS*/
-    0x2117, /* SOUND RECORDING COPYRIGHT;So */
-    0x2122, /* TRADE MARK SIGN;So; */
-    0x2192, /* RIGHTWARDS ARROW;Sm;0;ON;;;;;N;RIGHT ARROW;;;;*/
-    0x2212, /*  ; Dash # Sm       MINUS SIGN*/
     0x2E2E, /* REVERSED QUESTION MARK;Po;0;ON;;;;;N;;;;; */
-    0x3000, /*  ; White_Space # Zs       IDEOGRAPHIC SPACE*/
+    0x3000, /* IDEOGRAPHIC SPACE*/
-    0x3002, /*  ; STerm # Po       IDEOGRAPHIC FULL STOP*/
+    0x3002, /* IDEOGRAPHIC FULL STOP*/
-    0x300C, /*  ; Quotation_Mark # Ps       LEFT CORNER BRACKET*/
+    0x300C, /* LEFT CORNER BRACKET*/
-    0x300D, /*  ; Quotation_Mark # Pe       RIGHT CORNER BRACKET*/
+    0x300D, /* RIGHT CORNER BRACKET*/
-    0x300E, /*  ; Quotation_Mark # Ps       LEFT WHITE CORNER BRACKET*/
+    0x300E, /* LEFT WHITE CORNER BRACKET*/
-    0x300F, /*  ; Quotation_Mark # Pe       RIGHT WHITE CORNER BRACKET*/
+    0x300F, /* RIGHT WHITE CORNER BRACKET*/
-    0x301C, /*  ; Dash # Pd       WAVE DASH*/
+    0x301C, /* WAVE DASH*/
-    0x301D, /*  ; Quotation_Mark # Ps       REVERSED DOUBLE PRIME QUOTATION MARK*/
+    0x301D, /* REVERSED DOUBLE PRIME QUOTATION MARK*/
-    0x301E, /*  ; Quotation_Mark # Pe       LOW DOUBLE PRIME QUOTATION MARK*/
+    0x301E, /* LOW DOUBLE PRIME QUOTATION MARK*/
-    0x3030, /*  ; Dash # Pd       WAVY DASH*/
+    0x3030, /* WAVY DASH*/
-    0x30FB, /*  ; Hyphen # Pc       KATAKANA MIDDLE DOT*/
+    0x30FB, /* KATAKANA MIDDLE DOT*/
     0xC2B6, /* PILCROW SIGN;So;0;ON;;;;;N;PARAGRAPH SIGN;;;; */
     0xC3B7, /* DIVISION SIGN;Sm;0;ON;;;;;N;;;;; */
-    0xFE31, /*  ; Dash # Pd       PRESENTATION FORM FOR VERTICAL EM DASH*/
+    0xFE31, /* PRESENTATION FORM FOR VERTICAL EM DASH*/
-    0xFE32, /*  ; Dash # Pd       PRESENTATION FORM FOR VERTICAL EN DASH*/
+    0xFE32, /* PRESENTATION FORM FOR VERTICAL EN DASH*/
-    0xFE41, /*  ; Quotation_Mark # Ps       PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET*/
+    0xFE41, /* PRESENTATION FORM FOR VERTICAL LEFT CORNER BRACKET*/
-    0xFE42, /*  ; Quotation_Mark # Pe       PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET*/
+    0xFE42, /* PRESENTATION FORM FOR VERTICAL RIGHT CORNER BRACKET*/
-    0xFE43, /*  ; Quotation_Mark # Ps       PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET*/
+    0xFE43, /* PRESENTATION FORM FOR VERTICAL LEFT WHITE CORNER BRACKET*/
-    0xFE44, /*  ; Quotation_Mark # Pe       PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET*/
+    0xFE44, /* PRESENTATION FORM FOR VERTICAL RIGHT WHITE CORNER BRACKET*/
-    0xFE50, /*  ; Terminal_Punctuation # Po   [3] SMALL COMMA..SMALL FULL STOP*/
+    0xFE50, /* [3] SMALL COMMA..SMALL FULL STOP*/
-    0xFE51, /*  ; Terminal_Punctuation # Po   [3] SMALL COMMA..SMALL FULL STOP*/
+    0xFE51, /* [3] SMALL COMMA..SMALL FULL STOP*/
-    0xFE52, /*  ; STerm # Po       SMALL FULL STOP*/
+    0xFE52, /* STOP*/
-    0xFE52, /*  ; Terminal_Punctuation # Po   [3] SMALL COMMA..SMALL FULL STOP*/
+    0xFE52, /* [3] SMALL COMMA..SMALL FULL STOP*/
-    0xFE54, /*  ; Terminal_Punctuation # Po   [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK*/
+    0xFE54, /* [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK*/
-    0xFE55, /*  ; Terminal_Punctuation # Po   [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK*/
+    0xFE55, /* [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK*/
-    0xFE56, /*  ; Terminal_Punctuation # Po   [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK*/
+    0xFE56, /* [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK*/
-    0xFE57, /*  ; Terminal_Punctuation # Po   [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK*/
+    0xFE57, /* [4] SMALL SEMICOLON..SMALL EXCLAMATION MARK*/
-    0xFE58, /*  ; Dash # Pd       SMALL EM DASH*/
+    0xFE58, /* SMALL EM DASH */
-    0xFE63, /*  ; Hyphen # Pd       SMALL HYPHEN-MINUS*/
+    0xFE63, /* SMALL HYPHEN-MINUS */
-    0xFF01, /* FULLWIDTH EXCLAMATION MARK;Po;0;ON;<wide> 0021;;;;N;;;;; */
+    0xFF01, /* FULLWIDTH EXCLAMATION MARK */
-    0xFF02, /* FULLWIDTH QUOTATION MARK;Po;0;ON;<wide> 0022;;;;N;;;;; */
+    0xFF02, /* FULLWIDTH QUOTATION MARK */
-    0xFF03, /* FULLWIDTH NUMBER SIGN;Po;0;ET;<wide> 0023;;;;N;;;;; */
+    0xFF03, /* FULLWIDTH NUMBER SIGN */
-    0xFF04, /* FULLWIDTH DOLLAR SIGN;Sc;0;ET;<wide> 0024;;;;N;;;;; */
+    0xFF04, /* FULLWIDTH DOLLAR SIGN */
-    0xFF05, /* FULLWIDTH PERCENT SIGN;Po;0;ET;<wide> 0025;;;;N;;;;; */
+    0xFF05, /* FULLWIDTH PERCENT SIGN */
-    0xFF06, /* FULLWIDTH AMPERSAND;Po;0;ON;<wide> 0026;;;;N;;;;; */
+    0xFF06, /* FULLWIDTH AMPERSAND */
-    0xFF07, /* FULLWIDTH APOSTROPHE;Po;0;ON;<wide> 0027;;;;N;;;;; */
+    0xFF07, /* FULLWIDTH APOSTROPHE */
-    0xFF08, /* FULLWIDTH LEFT PARENTHESIS;Ps;0;ON;<wide> 0028;;;;Y;FULLWIDTH OPENIN*/
+    0xFF08, /* FULLWIDTH LEFT PARENTHESIS */
-    0xFF09, /* FULLWIDTH RIGHT PARENTHESIS;Pe;0;ON;<wide> 0029;;;;Y;FULLWIDTH CLOS*/
+    0xFF09, /* FULLWIDTH RIGHT PARENTHESIS */
-    0xFF0A, /* FULLWIDTH ASTERISK;Po;0;ON;<wide> 002A;;;;N;;;;; */
+    0xFF0A, /* FULLWIDTH ASTERISK */
-    0xFF0B, /* FULLWIDTH PLUS SIGN;Sm;0;ES;<wide> 002B;;;;N;;;;; */
+    0xFF0B, /* FULLWIDTH PLUS SIGN */
-    0xFF0C, /* FULLWIDTH COMMA;Po;0;CS;<wide> 002C;;;;N;;;;; */
+    0xFF0C, /* FULLWIDTH COMMA */
-    0xFF0D, /* FULLWIDTH HYPHEN-MINUS;Pd;0;ES;<wide> 002D;;;;N;;;;; */
+    0xFF0D, /* FULLWIDTH HYPHEN-MINUS */
-    0xFF0E, /* FULLWIDTH FULL STOP;Po;0;CS;<wide> 002E;;;;N;FULLWIDTH PERIOD;;;; */
+    0xFF0E, /* FULLWIDTH FULL STOP */
-    0xFF0F, /* FULLWIDTH SOLIDUS;Po;0;CS;<wide> 002F;;;;N;FULLWIDTH SLASH;;;; */
+    0xFF0F, /* FULLWIDTH SOLIDUS  */
-    0xFF1A, /*  ; Terminal_Punctuation # Po   [2] FULLWIDTH COLON..FULLWIDTH SEMICOLON*/
+    0xFF1A, /* [2] FULLWIDTH COLON..FULLWIDTH SEMICOLON*/
-    0xFF1B, /*  ; Terminal_Punctuation # Po   [2] FULLWIDTH COLON..FULLWIDTH SEMICOLON*/
+    0xFF1B, /* [2] FULLWIDTH COLON..FULLWIDTH SEMICOLON*/
-    0xFF1F, /*  ; Terminal_Punctuation # Po       FULLWIDTH QUESTION MARK*/
+    0xFF1F, /* FULLWIDTH QUESTION MARK*/
-    0xFF61, /*  ; Terminal_Punctuation # Po       HALFWIDTH IDEOGRAPHIC FULL STOP*/
+    0xFF61, /* HALFWIDTH IDEOGRAPHIC FULL STOP*/
-    0xFF62, /*  ; Quotation_Mark # Ps       HALFWIDTH LEFT CORNER BRACKET*/
+    0xFF62, /* HALFWIDTH LEFT CORNER BRACKET*/
-    0xFF63, /*  ; Quotation_Mark # Pe       HALFWIDTH RIGHT CORNER BRACKET*/
+    0xFF63, /* HALFWIDTH RIGHT CORNER BRACKET*/
-    0xFF64, /*  ; Terminal_Punctuation # Po       HALFWIDTH IDEOGRAPHIC COMMA*/
+    0xFF64, /* HALFWIDTH IDEOGRAPHIC COMMA*/
-    0xFF65, /*  ; Hyphen # Pc       HALFWIDTH KATAKANA MIDDLE DOT*/
+    0xFF65, /* HALFWIDTH KATAKANA MIDDLE DOT*/
+};
+
+// Characters that should just be discarded. Some of these are in the
+// above blocks, but this array is tested first, so it's not worth
+// breaking the blocks
+static const unsigned int uniskip[] = {
+    0x00AD, /* SOFT HYPHEN */
+    0x034F, /* COMBINING GRAPHEME JOINER */
+    0x2027, /* HYPHENATION POINT */
+    0x200C, /* ZERO WIDTH NON-JOINER */
+    0x200D, /* ZERO WIDTH JOINER */
+    0x2060, /* WORD JOINER . Actually this should not be ignored but used to 
+	     * prevent a word break... */
 };
 
 /* Things that would visibly break a block of text, rendering obvious the need

src/common/utf8fn.cpp

@@ -0,0 +1,24 @@
+#include "utf8fn.h"
+#include "rclconfig.h"
+#include "transcode.h"
+#include "log.h"
+
+using namespace std;
+
+string compute_utf8fn(const RclConfig *config, const string& ifn, bool simple)
+{
+    string charset = config->getDefCharset(true);
+    string utf8fn; 
+    int ercnt;
+    string lfn(simple ? path_getsimple(ifn) : ifn);
+    if (!transcode(lfn, utf8fn, charset, "UTF-8", &ercnt)) {
+	LOGERR("compute_utf8fn: fn transcode failure from ["  << charset <<
+               "] to UTF-8 for: [" << lfn << "]\n");
+    } else if (ercnt) {
+	LOGDEB("compute_utf8fn: "  << ercnt << " transcode errors from [" <<
+               charset << "] to UTF-8 for: ["  << lfn << "]\n");
+    }
+    LOGDEB1("compute_utf8fn: transcoded from ["  << lfn << "] to ["  <<
+            utf8fn << "] ("  << charset << "->"  << "UTF-8)\n");
+    return utf8fn;
+}

src/common/utf8fn.h

@@ -0,0 +1,16 @@
+#ifndef _UTF8FN_H_
+#define _UTF8FN_H_
+
+#include <string>
+
+class RclConfig;
+
+// Translate file name/path to utf8 for indexing.
+// 
+// @param simple If true we extract and process only the simple file name
+// (ignore the path)
+std::string compute_utf8fn(const RclConfig *config, const std::string& ifn,
+                           bool simple);
+
+#endif // _UTF8FN_H_
+