uncompression+linux port

src/COPYING

@@ -0,0 +1,340 @@
+		    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/INSTALL

@@ -0,0 +1,52 @@
+Installation instructions:
+
+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.
+
+ - 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
+   'recoll' executable where it will be found.
+
+ - Copy the files from the sampleconf directory somewhere. The default
+   location is $HOME/.recoll/ If you choose another location, you will have
+   to set the RECOLL_CONFDIR environment variable.
+
+ - Possibly adjust the recoll.conf file. The default should be fine for
+   trying in most cases.
+ - Possibly adjust the mimeconf file, especially the external viewer
+   section, depending on what you are using (ie acrobat vs xpdf, etc...)
+
+ - Start the 'recoll' program. After displaying a dialog, it will normally
+   begin to index the directories specified in recoll.conf.
+
+Building from source
+--------------------
+
+Prerequisites:
+
+To build from source, you need the following packages. Except if you're
+using a really strange system, you can probably easily find, or already
+have, a precompiled version of iconv, and maybe qt.
+
+    - qt and qt-devel (www.trolltech.com). Currently using 3.3.3
+    - xapian-core  (www.xapian.org). Currently using 0.8.5
+    - libiconv (http://www.gnu.org/software/libiconv/). Currently using 1.9,
+
+Building:
+ 
+There is no autoconf for now. You need to chose a file in the mk directory,
+and link it into a file named 'sysconf' there. If your system is not
+supported by the supplied files, it should be easy enough to build a new
+one from the examples (then send it to me please).
+
+You also need to adjust the recoll.pro file inside the qtgui directory to
+fix the "-L/usr/local/lib -lxapian -liconv" piece, depending on where your
+libs are installed.
+
+Then cd to the top directory, and type make.
+
+
+
+  

src/Makefile

@@ -5,6 +5,7 @@ all:
 clean:
 	cd common;make clean
 	cd index;make clean
+	cd lib;make clean
 	cd qtgui;rm -f recoll;make clean
 	cd query;make clean
 	cd utils;make clean

src/README

@@ -0,0 +1,90 @@
+ @(#$Id: README,v 1.1 2005-02-04 14:21:17 dockes Exp $  (C) 2004 J.F.Dockes
+
+Hello.
+
+This is Recoll, a personal full text indexing system.
+
+Recoll is copyrighted, licensed under a GPL license, see COPYING
+
+Recoll is still in infancy, but it is based on a very strong backend, and
+it can actually be useful right now, which is why I release it so early.
+
+It will become much better in the near future.
+
+What it has:
+
+ - Easy installation. No db, web server or exotic language necessary. The
+   binary packages are statically linked and should run almost as soon as
+   unpacked. The idea is that EVERYBODY should index their files because it
+   makes life easier.
+ - Indexes text, pdf, html, postscript. Deals with compressed versions of
+   same. 
+ - Support for multiple charsets. Internal processing and storage uses
+   Unicode UTF-8.
+ - An ugly GUI, qt-based, written with qt Designer.
+ - An indexer which runs either as a thread inside the GUI or as an
+   external, cron'able program.
+
+What it doesn't have, but will have in the not too far future:
+
+ - A more sophisticated query interface: the current one only does
+   probabilistic OR'ed terms. Not even phrases, no stemming (searching for
+   a plural won't find the singular). This is very high on the priority
+   list, and will come soon because I just have to steal code from xapian
+   omega. 
+ - A pretty GUI (see above)
+ - Mail folder indexing. This would be quite easy to add for single message
+   folders right now, more complicated for concatenated ones, I intend to
+   do it.
+ - An interactive configuration tool. You need to edit files by hand for now.
+ - Packages, rpm or other. It' all tar files currently.
+ - Documentation and help. 
+ - A build system, autoconf et al.
+ - etc. etc.
+
+USING:
+
+ - Enter search terms, click <Search> or type <CR>
+ - A result list should appear in the left pane. You can use the Next/Prev
+   buttons to paginate.
+ - Clicking on an entry in the list will display a preview in the right
+   pane -- This can take some time for big postscript or pdf files, as the
+   file is converted on the fly for preview --
+ - Double-clicking on an entry should launch an external viewer, as
+   specified in the mimeconf file (see INSTALL). This doesn't work for
+   compressed files for now.
+ - Use File->Index to rebuild the database.
+
+I very much welcome suggestions or (gasp) code:
+  jean-francois.dockes@wanadoo.fr
+
+Cheers,
+Jean-Francois
+
+
+INSTALLATION
+See the INSTALL file.
+
+
+CREDITS:
+
+Recoll is mainly a little glue code, and most of the intelligent work uses
+code from external projects (xapian, estraier, unac, iconv). 
+
+Recoll borrows (steals?) heavily from the following projects. I tried to
+include the relevant copyright attributions with the code. Any omission
+is unintentional and will be fixed as soon as notified.
+
+ - Xapian (http://www.xapian.org). The database module (core) is used
+   unmodified, and quite a lot of code has been borrowed from Omega, the
+   web-based search application (ie: the html parser, plus miscellaneous
+   bits and ideas).
+ - Estraier (http://estraier.sourceforge.net/). Miscellaneous bits of codes
+   and ideas, especially for charset handling, and code from external
+   filters.
+ - Unac (http://www.senga.org/) for accent removal. This is a relatively small
+   package, not that easy to find, it has been integrated almost unmodified
+   in the Recoll package.
+ - Iconv (http://www.gnu.org/software/libiconv/), for character set
+   conversion.
+

src/VERSION

@@ -0,0 +1 @@
+0.5

src/common/Makefile

@@ -1,4 +1,4 @@
-include ../mk/FreeBSD
+include ../mk/sysconf
 BIGLIB = ../lib/librcl.a
 
 
@@ -8,7 +8,7 @@ all: $(PROGS)
 UNACPP_OBJS= trunacpp.o $(BIGLIB)
 unacpp : $(UNACPP_OBJS)
 	$(CXX) $(CXXFLAGS) -o unacpp $(UNACPP_OBJS) \
-	       -L/usr/local/lib -liconv
+	       $(LIBICONV)
 trunacpp.o : unacpp.cpp unacpp.h
 	$(CXX) $(CXXFLAGS) -DTEST_UNACPP -c -o trunacpp.o unacpp.cpp
 

src/common/unacpp.cpp

@@ -1,8 +1,9 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: unacpp.cpp,v 1.2 2005-01-24 13:17:58 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: unacpp.cpp,v 1.3 2005-02-04 14:21:17 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_UNACPP
+#include <stdio.h>
 
 #include <errno.h>
 

src/filters/rcluncomp

@@ -0,0 +1,24 @@
+#!/bin/sh
+# @(#$Id: rcluncomp,v 1.1 2005-02-04 14:21:17 dockes Exp $  (C) 2004 J.F.Dockes
+
+# Uncompress file using any program like gunzip/bunzip2. We jump through
+# hoops to let the decompressor remove the compression suffix in the file
+# name. The input directory must be empty on entry.
+
+if test $# != 3 -o ! -f $2 -o ! -d $3 ; then 
+   echo "Usage: rcluncomp <ucomp_prog> <infile> <outdir>"
+   exit 1
+fi
+
+uncomp=$1
+infile=$2
+outdir=$3
+
+sinfile=`basename $infile`
+cp $infile $outdir/$sinfile || exit 1
+
+$uncomp $outdir/$sinfile
+
+uncompressed=`echo $outdir/*`
+
+echo $uncompressed

src/index/Makefile

@@ -1,5 +1,4 @@
-
+include ../mk/sysconf
-include ../mk/FreeBSD
 
 BIGLIB = ../lib/librcl.a
 
@@ -9,12 +8,12 @@ all: $(PROGS)
 IDXDRIVER_OBJS= idxdriver.o $(BIGLIB)
 idxdriver : $(IDXDRIVER_OBJS)
 	$(CXX) $(CXXFLAGS) -o idxdriver $(IDXDRIVER_OBJS) \
-	       -L/usr/local/lib -lxapian -liconv
+		$(LIBXAPIAN) $(LIBICONV) $(LIBSYS)
 
 CSGUESS_OBJS= trcsguess.o  $(BIGLIB) 
 csguess : $(CSGUESS_OBJS)
 	$(CXX) $(CXXFLAGS) -o csguess $(CSGUESS_OBJS) \
-	       -L/usr/local/lib -liconv
+	       $(LIBICONV)
 trcsguess.o : csguess.cpp
 	$(CXX) $(CXXFLAGS) -DTEST_CSGUESS -c -o trcsguess.o \
 	       csguess.cpp

src/index/csguess.cpp

@@ -1,5 +1,5 @@
 #ifndef lint
-static char	rcsid[] = "@(#$Id: csguess.cpp,v 1.2 2004-12-15 15:00:37 dockes Exp $ (C) 2004 J.F.Dockes";
+static char	rcsid[] = "@(#$Id: csguess.cpp,v 1.3 2005-02-04 14:21:17 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_CSGUESS
@@ -54,7 +54,13 @@ static int transcodeErrCnt(const char *ptr, int size,
     while(isiz > 0){
 	osiz = 2*ICONVCHECKSIZ;
 	wp = obuf;
-	if(iconv(ic, (const char **)&rp, &isiz, &wp, &osiz) == (size_t)-1){
+	if(iconv(ic, 
+#if defined(_LIBICONV_VERSION)
+		 (const char **)&rp, 
+#else
+		 (char **)&rp, 
+#endif
+		 &isiz, &wp, &osiz) == (size_t)-1){
 	    if(errno == EILSEQ || errno == EINVAL){
 		rp++;
 		isiz--;

src/index/indexer.cpp

@@ -1,6 +1,7 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: indexer.cpp,v 1.3 2005-02-04 09:39:44 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: indexer.cpp,v 1.4 2005-02-04 14:21:17 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
+#include <stdio.h>
 #include <sys/stat.h>
 
 #include <strings.h>

src/internfile/internfile.cpp

@@ -0,0 +1,165 @@
+#ifndef lint
+static char rcsid[] = "@(#$Id: internfile.cpp,v 1.1 2005-02-04 14:21:17 dockes Exp $ (C) 2004 J.F.Dockes";
+#endif
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <errno.h>
+
+#include <string>
+#include <iostream>
+using namespace std;
+
+#include "internfile.h"
+#include "mimetype.h"
+#include "debuglog.h"
+#include "mimehandler.h"
+#include "execmd.h"
+#include "pathut.h"
+
+static bool uncompressfile(RclConfig *conf, const string& ifn, 
+			   const list<string>& cmdv, string& tdir, 
+			   string& tfile)
+{
+    const char *tmpdir = getenv("RECOLL_TMPDIR");
+    if (!tmpdir)
+	tmpdir = getenv("TMPDIR");
+    if (!tmpdir)
+	tmpdir = "/tmp";
+    tdir = tmpdir;
+    path_cat(tdir, "rcltmpXXXXXX");
+    {
+	char *cp = strdup(tdir.c_str());
+	if (!cp) {
+	    LOGERR(("uncompressfile: out of memory (for file name !)\n"));
+	    return false;
+	}	
+	if (!mktemp(cp)) {
+	    free(cp);
+	    LOGERR(("uncompressfile: mktemp failed\n"));
+	    return false;
+	}	
+	tdir = cp;
+	free(cp);
+    }
+
+    if (mkdir(tdir.c_str(), 0700) < 0) {
+	LOGERR(("uncompressfile: mkdir %s failed\n", tdir.c_str()));
+	return false;
+    }
+
+    string cmd = find_filter(conf, cmdv.front());
+
+    // Substitute file name and temp dir in command elements
+    list<string>::const_iterator it = cmdv.begin();
+    ++it;
+    list<string> args;
+    for (; it != cmdv.end(); it++) {
+	string s = *it;
+	string ns;
+	string::const_iterator it1;
+	for (it1 = s.begin(); it1 != s.end();it1++) {
+	    if (*it1 == '%') {
+		if (++it1 == s.end()) {
+		    ns += '%';
+		    break;
+		}
+		if (*it1 == '%')
+		    ns += '%';
+		if (*it1 == 'f')
+		    ns += ifn;
+		if (*it1 == 't')
+		    ns += tdir;
+	    } else {
+		ns += *it1;
+	    }
+	}
+	args.push_back(ns);
+    }
+
+    // Execute command and retrieve output file name, check that it exists
+    ExecCmd ex;
+    int status = ex.doexec(cmd, args, 0, &tfile);
+    if (status) {
+	LOGERR(("uncompressfile: doexec: status 0x%x\n", status));
+	rmdir(tdir.c_str());
+	return false;
+    }
+    if (!tfile.empty() && tfile[tfile.length() - 1] == '\n')
+	tfile.erase(tfile.length() - 1, 1);
+    return true;
+}
+
+static void tmpcleanup(const string& tdir, const string& tfile)
+{
+    if (tdir.empty())
+	return;
+    if (!tfile.empty()) {
+	if (unlink(tfile.c_str()) < 0) {
+	    LOGERR(("tmpcleanup: unlink(%s) errno %d\n", tfile.c_str(), 
+		    errno));
+	    return;
+	}
+    }
+    if (rmdir(tdir.c_str()) < 0) {
+	LOGERR(("tmpcleanup: rmdir(%s) errno %d\n", tdir.c_str(), errno));
+	return;
+    }
+}
+
+bool internfile(const std::string &ifn, RclConfig *config, Rcl::Doc& doc)
+{
+    string fn = ifn;
+    string tdir;
+    string tfile;
+    MimeHandler *handler = 0;
+    bool ret = false;
+
+    string mime = mimetype(fn, config->getMimeMap());
+    if (mime.empty()) {
+	// No mime type ?? pass on.
+	LOGDEB(("internfile: (no mime) [%s]\n", fn.c_str()));
+	return false;
+    }
+
+    // First check for a compressed file
+    list<string>ucmd;
+    if (getUncompressor(mime, config->getMimeConf(), ucmd)) {
+	if (!uncompressfile(config, fn, ucmd, tdir, tfile)) 
+	    return false;
+	LOGDEB(("internfile: after ucomp: tdir %s, tfile %s\n", 
+		tdir.c_str(), tfile.c_str()));
+	fn = tfile;
+	mime = mimetype(fn, config->getMimeMap());
+	if (mime.empty()) {
+	    // No mime type ?? pass on.
+	    LOGDEB(("internfile: (no mime) [%s]\n", fn.c_str()));
+	    goto out;
+	}
+
+    }
+    
+    // Look for appropriate handler
+    handler = getMimeHandler(mime, config->getMimeConf());
+    if (!handler) {
+	// No handler for this type, for now :(
+	LOGDEB(("internfile: %s : no handler\n", mime.c_str()));
+	goto out;
+    }
+
+    LOGDEB(("internfile: %s [%s]\n", mime.c_str(), fn.c_str()));
+
+    // Turn file into a document. The document has fields for title, body 
+    // etc.,  all text converted to utf8
+    if (!handler->worker(config, fn,  mime, doc)) {
+	goto out;
+    }
+    doc.mimetype = mime;
+
+    // Clean up. We delete the temp file and its father directory
+    ret = true;
+ out:
+    delete handler;
+    tmpcleanup(tdir, tfile);
+    return ret;
+}

src/internfile/internfile.h

@@ -0,0 +1,14 @@
+#ifndef _INTERNFILE_H_INCLUDED_
+#define _INTERNFILE_H_INCLUDED_
+/* @(#$Id: internfile.h,v 1.1 2005-02-04 14:21:17 dockes Exp $  (C) 2004 J.F.Dockes */
+
+#include <string>
+
+#include "rclconfig.h"
+#include "rcldb.h"
+
+/// Turn external file into internal representation, according to mime type etc
+extern bool internfile(const std::string &fn, RclConfig *config, 
+		       Rcl::Doc& doc);
+
+#endif /* _INTERNFILE_H_INCLUDED_ */

src/internfile/mimehandler.cpp

@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: mimehandler.cpp,v 1.7 2005-02-04 09:39:44 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mimehandler.cpp,v 1.8 2005-02-04 14:21:17 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #include <iostream>
@@ -71,6 +71,12 @@ class MimeHandlerExec : public MimeHandler {
 bool MimeHandlerExec::worker(RclConfig *conf, const string &fn, 
 			     const string &mtype, Rcl::Doc &docout)
 {
+    if (params.empty()) {
+	// Hu ho
+	LOGERR(("MimeHandlerExec::worker: empty params for mime %s\n",
+		mtype.c_str()));
+	return false;
+    }
     // Command name
     string cmd = find_filter(conf, params.front());
     
@@ -163,8 +169,14 @@ bool getUncompressor(const std::string &mtype, ConfTree *mhandlers,
     string hs;
 
     mhandlers->get(mtype, hs, "");
+    if (hs.empty())
+	return false;
     list<string> tokens;
     ConfTree::stringToStrings(hs, tokens);
+    if (tokens.empty()) {
+	LOGERR(("getUncompressor: empty spec for mtype %s\n", mtype.c_str()));
+	return false;
+    }
     if (stringlowercmp("uncompress", tokens.front())) 
 	return false;
     list<string>::iterator it = tokens.begin();

src/lib/Makefile

@@ -1,4 +1,4 @@
-include ../mk/FreeBSD
+include ../mk/sysconf
 
 UNACCFLAGS = -g -I. -I../unac -I/usr/local/include -DUNAC_VERSION=\"1.0.7\"
 

src/mk/FreeBSD

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

src/mk/Linux

@@ -0,0 +1,7 @@
+CXXFLAGS = -Wall -g -I. -I../index -I../utils -I../common \
+	 -I../unac -I/usr/local/include
+
+LIBXAPIAN = -L/usr/local/lib -lxapian
+LIBICONV =  
+
+LIBSYS = -lpthread

src/qtgui/idxthread.cpp

@@ -1,4 +1,7 @@
 #include <stdio.h>
+#include <unistd.h>
+
+
 #include <qthread.h>
 
 #include "indexer.h"

src/qtgui/recoll.pro

@@ -1,7 +1,7 @@
 TEMPLATE	= app
 LANGUAGE	= C++
 
-CONFIG	+= qt warn_on release
+CONFIG	+= qt warn_on thread release
 
 SOURCES	+= main.cpp \
 	idxthread.cpp
@@ -27,5 +27,7 @@ unix {
   INCLUDEPATH += ../common ../index ../query ../unac ../utils 
 }
 
-
+UNAME = $$system(uname -s)
-
+contains( UNAME, [lL]inux ) {
+	  LIBS -= -liconv
+}

src/qtgui/recollmain.ui

@@ -202,6 +202,7 @@
     </item>
     <item text="&amp;Help" name="helpMenu">
         <separator/>
+        <action name="helpQuick_startAction"/>
     </item>
 </menubar>
 <toolbars>
@@ -232,6 +233,17 @@
             <string>Start Indexing</string>
         </property>
     </action>
+    <action>
+        <property name="name">
+            <cstring>helpQuick_startAction</cstring>
+        </property>
+        <property name="text">
+            <string>Quick start</string>
+        </property>
+        <property name="menuText">
+            <string>Quick start</string>
+        </property>
+    </action>
 </actions>
 <connections>
     <connection>
@@ -288,6 +300,12 @@
         <receiver>RecollMain</receiver>
         <slot>clearqPB_clicked()</slot>
     </connection>
+    <connection>
+        <sender>helpQuick_startAction</sender>
+        <signal>activated()</signal>
+        <receiver>RecollMain</receiver>
+        <slot>helpQuick_startAction_activated()</slot>
+    </connection>
 </connections>
 <includes>
     <include location="local" impldecl="in implementation">recollmain.ui.h</include>
@@ -307,6 +325,7 @@
     <slot>clearqPB_clicked()</slot>
     <slot>listPrevPB_clicked()</slot>
     <slot>listNextPB_clicked()</slot>
+    <slot>helpQuick_startAction_activated()</slot>
 </slots>
 <pixmapinproject/>
 <layoutdefaults spacing="6" margin="11"/>

src/qtgui/recollmain.ui.h

@@ -313,3 +313,9 @@ void RecollMain::listNextPB_clicked()
 }
 
 
+
+
+void RecollMain::helpQuick_startAction_activated()
+{
+
+}

src/query/Makefile

@@ -1,4 +1,4 @@
-include ../mk/FreeBSD
+include ../mk/sysconf
 
 BIGLIB=../lib/librcl.a
 
@@ -8,17 +8,17 @@ all: $(PROGS)
 XADUMP_OBJS= xadump.o $(BIGLIB)
 xadump : $(XADUMP_OBJS)
 	$(CXX) $(CXXFLAGS) -o xadump $(XADUMP_OBJS) \
-	       -L/usr/local/lib -lxapian -liconv
+	       $(LIBICONV) $(LIBXAPIAN)
 
 QXTRY_OBJS= qxtry.o  $(BIGLIB)
 qxtry : $(QXTRY_OBJS)
 	$(CXX) $(CXXFLAGS) -o qxtry $(QXTRY_OBJS) \
-	       -L/usr/local/lib -lxapian -liconv
+	       $(LIBICONV) $(LIBXAPIAN)
 
 QTRY_OBJS= qtry.o  $(BIGLIB)
 qtry : $(QTRY_OBJS)
 	$(CXX) $(CXXFLAGS) -o qtry $(QTRY_OBJS) \
-	       -L/usr/local/lib -lxapian -liconv
+	       $(LIBICONV) $(LIBXAPIAN)
 
 $(BIGLIB):
 	cd ../lib;make

src/rcldb/rcldb.cpp

@@ -1,7 +1,7 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.17 2005-02-01 17:52:06 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: rcldb.cpp,v 1.18 2005-02-04 14:21:17 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
-
+#include <stdio.h>
 #include <sys/stat.h>
 
 #include <iostream>

src/utils/Makefile

@@ -1,4 +1,4 @@
-include ../mk/FreeBSD
+include ../mk/sysconf
 
 BIGLIB = ../lib/librcl.a
 
@@ -26,24 +26,21 @@ trexecmd.o : execmd.cpp execmd.h
 
 TRANSCODE_OBJS= trtranscode.o  $(BIGLIB) 
 transcode : $(TRANSCODE_OBJS)
-	$(CXX) $(CXXFLAGS) -o transcode $(TRANSCODE_OBJS) \
+	$(CXX) $(CXXFLAGS) -o transcode $(TRANSCODE_OBJS) $(LIBICONV)
-	       -L/usr/local/lib -liconv
 trtranscode.o : ../utils/transcode.cpp 
 	$(CXX) $(CXXFLAGS) -DTEST_TRANSCODE -c -o trtranscode.o \
 	       transcode.cpp
 
 MIMEPARSE_OBJS= trmimeparse.o  $(BIGLIB) 
 trmimeparse : $(MIMEPARSE_OBJS)
-	$(CXX) $(CXXFLAGS) -o mimeparse $(MIMEPARSE_OBJS) \
+	$(CXX) $(CXXFLAGS) -o mimeparse $(MIMEPARSE_OBJS) $(LIBICONV)
-	       -L/usr/local/lib -liconv
 trmimeparse.o : mimeparse.cpp 
 	$(CXX) $(CXXFLAGS) -DTEST_MIMEPARSE -c -o trmimeparse.o \
 	       mimeparse.cpp
 
 SMALLUT_OBJS= trsmallut.o  $(BIGLIB) 
 smallut : $(SMALLUT_OBJS)
-	$(CXX) $(CXXFLAGS) -o smallut $(SMALLUT_OBJS) \
+	$(CXX) $(CXXFLAGS) -o smallut $(SMALLUT_OBJS) $(LIBICONV)
-	       -L/usr/local/lib -liconv
 trsmallut.o : ../utils/smallut.cpp 
 	$(CXX) $(CXXFLAGS) -DTEST_SMALLUT -c -o trsmallut.o \
 	       smallut.cpp

src/utils/pathut.cpp

@@ -1,9 +1,9 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: pathut.cpp,v 1.3 2005-01-31 14:31:10 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: pathut.cpp,v 1.4 2005-02-04 14:21:18 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_PATHUT
-
+#include <unistd.h>
 #include <pwd.h>
 #include <iostream>
 

src/utils/transcode.cpp

@@ -1,5 +1,5 @@
 #ifndef lint
-static char	rcsid[] = "@(#$Id: transcode.cpp,v 1.2 2004-12-15 15:00:37 dockes Exp $ (C) 2004 J.F.Dockes";
+static char	rcsid[] = "@(#$Id: transcode.cpp,v 1.3 2005-02-04 14:21:18 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_TRANSCODE
@@ -40,7 +40,13 @@ bool transcode(const string &in, string &out, const string &icode,
 	size_t osiz;
 	op = obuf;
 	osiz = OBSIZ;
-	if(iconv(ic, &ip, &isiz, &op, &osiz) == (size_t)-1 && errno != E2BIG){
+	if(iconv(ic, 
+#if defined(_LIBICONV_VERSION)
+		 &ip, 
+#else
+		 (char **)&ip, 
+#endif
+		 &isiz, &op, &osiz) == (size_t)-1 && errno != E2BIG){
 	    out.erase();
 	    out = string("iconv failed for ") + icode + " -> " + ocode +
 		" : " + strerror(errno);