re-port to linux

src/INSTALL

@@ -23,8 +23,10 @@ have, a precompiled version of iconv, and maybe qt.
     - libiconv (http://www.gnu.org/software/libiconv/). Currently using
       1.9, on Linux it's part of the libc, you should have nothing special
       to do.
-The main trouble you'll have will probably be resolving the myriad
+The main trouble you'll have will probably be resolving the dependencies
-dependancies for qt
+dependancies for qt, but, hopefully, your package manager will take care of
+the matter.
+
 
 Building:
 --------
@@ -50,7 +52,7 @@ Installation:
  - Copy all files from sampleconf/* to ~/.recoll
  - Copy all files from filters/* to ~/.recoll.
  - Copy qtgui/recoll to a place in your PATH (if you want. You can also
-   execute it from there).
+   execute it from its build directory).
 
 Configuration
 =============
@@ -66,7 +68,12 @@ There is a sample in the 'sampleconf' src/ subdirectory, you copied it to
 Then start 'recoll', and select the "file->start indexing" menu
 entry. When it's done, you can play with the search
 
-Usage: see README
+Usage
+=====
+The very simple Gui should be easy enough to use. Clicking on a search
+result entry in the left column will display it in the left
+part. Double-clicking will start an external viewer (look at the
+~/.recoll/mimeconf file to see how these are configured).
 
 
 
@@ -75,8 +82,8 @@ Future from here on, there are currently no binary packages ...
 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 Installing a binary package:
 ----------------------------
-The binary packages are statically linked and should install real easy
+
-(hopefully). There are no rpm or other managed packages for now.
+There are no rpm or other managed packages for now.
 
  - Unpack the tar file. Will create a recoll-x.y directory
  - Arrange to have the recoll-x.y/bin directory in your PATH, or copy/link the

src/VERSION

@@ -1 +1 @@
-0.6
+0.7

src/bincimapmime/AUTHORS

@@ -0,0 +1,45 @@
+The following parties have participated in writing code or otherwise
+contributed to the Binc IMAP project:
+
+Author:
+Andreas Aardal Hanssen                  <andreas-binc@bincimap.org>
+
+Several users have been very helpful with bug reports and suggestions, and
+the author is very grateful for their contributions.
+
+Some users have also gone to the extra effort of debugging the cause of a
+bug, or have found a way of implementing a feature, and have either provided
+a very good description of what is needed, or they have actually provided a
+patch that has been added to Binc IMAP.
+
+While adding extra value to the discussion around the discovery of a bug or
+the evaluation of a new feature, these contributors also take some load of
+the author's back, so they deserve extra thanks.
+
+In this list are also included people who have contributed with mirrors and
+translations of the web pages.
+
+Henry Baragar                           <Henry.Baragar (a) Instantiated.Ca>
+Jürgen Botz                             <jurgen (a) botz.org>
+Charlie Brady                           <charlieb (a) e-smith.com>
+Caskey Dickson                          <caskey (a) technocage.com>
+Ketil Froyn                             <ketil (a) froyn.name>
+Gary Gordon                             <gv-mail (a) mygirlfriday.info>
+Marek Gutkowski                         <marek (a) moveo.pl>
+Daniel James                            <daniel_james (a) eml.cc>
+Zak Johnson                             <zakj (a) nox.cx>
+Sergei Kolobov                          <sergei (a) kolobov.com>
+Rafal Kupka                             <kupson (a) kupson.fdns.net>
+Eivind Kvedalen                         <bincimap (a) eivind.kvedalen.name>
+HIROSHIMA Naoki                         <naokih (a) iron-horse.org>
+Greger Stolt Nilsen			<greger (a) psychoproject.net>
+John Starks                             <jstarks (a) starksnet.net>
+Peter Stuge                             <stuge-binc (a) cdy.org>
+Gerrit Pape                             <pape (a) smarden.org>
+Jeremy Rossi                            <jeremy (a) jeremyrossi.com>
+Dale Woolridge                          <dale-contrib-bincimap (a) woolridge.org>
+
+If you have contributed to the Binc IMAP project but are not listed here
+(this happens quite often), please send a mail to andreas-binc@bincimap.org
+and I'll add you to the list.
+

src/bincimapmime/COPYING

@@ -0,0 +1,356 @@
+This software is released under the GPL. Find a full copy of the GNU
+General Public License below.
+
+In addition, as a special exception, Andreas Aardal Hanssen, author of
+Binc IMAP, gives permission to link the code of this program with the
+OpenSSL library (or with modified versions of OpenSSL that use the
+same license as OpenSSL, listed in the included COPYING.OpenSSL file),
+and distribute linked combinations including the two.
+
+You must obey the GNU General Public License in all respects for all
+of the code used other than OpenSSL.  If you modify this file, you may
+extend this exception to your version of the file, but you are not
+obligated to do so. If you do not wish to do so, delete this exception
+statement from your version.
+
+---------------------------------------------------------------------
+                   GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    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
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.

src/bincimapmime/mime-inputsource.h

@@ -33,7 +33,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include <istream>
+#include <iostream>
 
 namespace Binc {
 
@@ -189,7 +189,7 @@ namespace Binc {
     // Why can't streams tell how many characters were actually read
     // when hitting eof ?
     std::streampos st = s.tellg();
-    s.seekg(0, ios_base::end);
+    s.seekg(0, ios::end);
     std::streampos lst = s.tellg();
     s.seekg(st);
     size_t nbytes = lst - st;

src/index/indexer.cpp

@@ -1,8 +1,9 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: indexer.cpp,v 1.10 2005-04-04 13:18:46 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: indexer.cpp,v 1.11 2005-04-06 10:20:11 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 #include <stdio.h>
 #include <sys/stat.h>
+#include <unistd.h>
 
 #include <strings.h>
 

src/internfile/mh_mail.cpp

@@ -1,10 +1,11 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: mh_mail.cpp,v 1.4 2005-04-05 09:35:35 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mh_mail.cpp,v 1.5 2005-04-06 10:20:11 dockes Exp $ (C) 2005 J.F.Dockes";
 #endif
 
 #include <stdio.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <unistd.h>
 
 #include <map>
 #include <sstream>

src/makesrcdist.sh

@@ -27,7 +27,7 @@ else
 fi
 
 chmod +w README
-links -dump ~/projets/pagepers/index.html > toto && mv toto README
+links -dump ~/projets/pagepers/recoll/index.html > toto && mv toto README
 cvs commit -m '' README
 
 # Clean up this dir and copy the dist-specific files 

src/mk/FreeBSD

@@ -1,5 +1,7 @@
 CXXFLAGS = -pthread -Wall -g -I. -I../index -I../utils -I../common \
-	 -I../unac -I../bincimapmime -I/usr/local/include 
+	 -I../unac -I../bincimapmime -I/usr/local/include  \
+	 \
+	 -DHAVE_VASPRINTF=1
 
 LIBXAPIAN = -L/usr/local/lib -lxapian
 LIBICONV =  -L/usr/local/lib -liconv

src/mk/Linux

@@ -1,5 +1,7 @@
 CXXFLAGS = -Wall -g -I. -I../index -I../utils -I../common \
-	 -I../unac -I/usr/local/include
+	 -I../unac -I../bincimapmime -I/usr/local/include \
+	 \
+	 -DHAVE_VASPRINTF=1 -D_GNU_SOURCE
 
 LIBXAPIAN = -L/usr/local/lib -lxapian
 LIBICONV =  

src/qtgui/main.cpp

@@ -1,4 +1,6 @@
-#include <signal.h>
+
+#include <unistd.h>
+
 #include <qapplication.h>
 #include <qthread.h>
 #include <qtimer.h>

src/rcldb/rcldb.cpp

@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.27 2005-04-05 09:35:35 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.28 2005-04-06 10:20:11 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 #include <stdio.h>
 #include <sys/stat.h>
@@ -7,6 +7,7 @@ static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.27 2005-04-05 09:35:35 dockes Exp $
 #include <iostream>
 #include <string>
 #include <vector>
+#include <algorithm>
 
 using namespace std;
 

src/sampleconf/recoll.conf

@@ -1,17 +1,26 @@
-# @(#$Id: recoll.conf,v 1.3 2005-02-08 14:45:54 dockes Exp $  (C) 2004 J.F.Dockes
+# @(#$Id: recoll.conf,v 1.4 2005-04-06 10:20:11 dockes Exp $  (C) 2004 J.F.Dockes
 
 # Recoll default configuration file. This should be copied to
 # ~/.recoll/recoll.conf 
 
-# Space-separated list of directories to index
+# Space-separated list of directories to index. Next line indexes $HOME
-
 topdirs = ~
 
+# Wildcard expressions for names of files and directories that we should
+# ignore:
+skippedNames = *~ #* .deps bin CVS  Cache caughtspam
+
+# Debug messages
+loglevel = 4
+logfilename = stderr
+
+# Languages for which to build stemming databases at the end of
+# indexing. Stemmer names can be found on the xapian site
+indexstemminglanguages = english french
+
 # Use stemming of query terms or not (ie: expand search for floors to
-# floor, flooring, etc... There is currently a serious performance hit for
+# floor, flooring, etc... )
-# this (at query time), but you can try it, it may be acceptable depending
+querystemming = 1
-# on your database size 
-querystemming = 0
 querystemminglanguage = english
 
 # Name of file suffix to mime-type map file. 
@@ -31,8 +40,8 @@ defaultlanguage = french
 # Guessing charsets usually does not work well
 guesscharset = 0
 
-# You could specify different parameters for a subdirectory like this: (no
+# You could specify different parameters for a subdirectory like this. No
-# tilde substitution there for now, sorry)
+# tilde substitution there for now, sorry:
 #[/home/me/englishdocs/plain]
 #defaultcharset = iso-8859-2
 

src/utils/smallut.h

@@ -1,9 +1,9 @@
 #ifndef _SMALLUT_H_INCLUDED_
 #define _SMALLUT_H_INCLUDED_
-/* @(#$Id: smallut.h,v 1.5 2005-03-17 14:02:06 dockes Exp $  (C) 2004 J.F.Dockes */
+/* @(#$Id: smallut.h,v 1.6 2005-04-06 10:20:11 dockes Exp $  (C) 2004 J.F.Dockes */
 #include <string>
 #include <list>
-#include <ostream>
+#include <iostream>
 using std::string;
 using std::list;
 using std::ostream;

src/utils/wipedir.cpp

@@ -1,8 +1,10 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: wipedir.cpp,v 1.1 2005-02-09 12:07:30 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: wipedir.cpp,v 1.2 2005-04-06 10:20:11 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_WIPEDIR
+#include <unistd.h>
+#include <fcntl.h>
 #include <dirent.h>
 #include <sys/stat.h>
 #include <errno.h>