From 3fc0738c8192aace4048aaf539eeba0a4d58e224 Mon Sep 17 00:00:00 2001 From: dockes Date: Wed, 9 Feb 2005 13:34:08 +0000 Subject: [PATCH] *** empty log message *** --- src/index/Makefile | 10 ++++++---- src/index/mimetype.cpp | 9 ++++++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/index/Makefile b/src/index/Makefile index ba72db96..b546dc10 100644 --- a/src/index/Makefile +++ b/src/index/Makefile @@ -2,13 +2,15 @@ include ../mk/sysconf BIGLIB = ../lib/librcl.a -PROGS = idxdriver csguess +PROGS = recollindex csguess all: $(PROGS) -IDXDRIVER_OBJS= idxdriver.o $(BIGLIB) -idxdriver : $(IDXDRIVER_OBJS) - $(CXX) $(CXXFLAGS) -o idxdriver $(IDXDRIVER_OBJS) \ +RECOLLINDEX_OBJS= recollindex.o $(BIGLIB) +recollindex : $(RECOLLINDEX_OBJS) + $(CXX) $(CXXFLAGS) -o recollindex $(RECOLLINDEX_OBJS) \ $(LIBXAPIAN) $(LIBICONV) $(LIBSYS) +recollindex.o : idxdriver.cpp + $(CXX) $(CXXFLAGS) -c -o recollindex.o idxdriver.cpp CSGUESS_OBJS= trcsguess.o $(BIGLIB) csguess : $(CSGUESS_OBJS) diff --git a/src/index/mimetype.cpp b/src/index/mimetype.cpp index ab0c0d83..342e137a 100644 --- a/src/index/mimetype.cpp +++ b/src/index/mimetype.cpp @@ -1,5 +1,5 @@ #ifndef lint -static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.4 2005-02-09 12:07:30 dockes Exp $ (C) 2004 J.F.Dockes"; +static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.5 2005-02-09 13:34:08 dockes Exp $ (C) 2004 J.F.Dockes"; #endif #include @@ -8,6 +8,7 @@ static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.4 2005-02-09 12:07:30 dockes Exp using std::string; #include "mimetype.h" +#include "debuglog.h" string mimetype(const string &fn, ConfTree *mtypes) { @@ -27,9 +28,11 @@ string mimetype(const string &fn, ConfTree *mtypes) it != stoplist.end(); it++) { if (it->length() > fn.length()) continue; - if (!fn.compare(fn.length() - it->length(), string::npos, - *it)) + if (!fn.compare(fn.length() - it->length(), string::npos, *it)) { + LOGDEB1(("mimetype: fn %s in stoplist (%s)\n", fn.c_str(), + it->c_str())); return ""; + } } }