*** empty log message ***

src/index/indexer.cpp

@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: indexer.cpp,v 1.9 2005-03-25 09:40:27 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: indexer.cpp,v 1.10 2005-04-04 13:18:46 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 #include <stdio.h>
 #include <sys/stat.h>
@@ -89,6 +89,22 @@ bool DbIndexer::index()
 	 it != topdirs->end(); it++) {
 	LOGDEB(("DbIndexer::index: Indexing %s into %s\n", it->c_str(), 
 		dbdir.c_str()));
+	config->setKeyDir(*it);
+
+	// Set up skipped patterns for this subtree
+	{
+	    walker.clearSkippedNames();
+	    string skipped; 
+	    if (config->getConfParam("skippedNames", skipped)) {
+		list<string> skpl;
+		ConfTree::stringToStrings(skipped, skpl);
+		list<string>::const_iterator it;
+		for (it = skpl.begin(); it != skpl.end(); it++) {
+		    walker.addSkippedName(*it);
+		}
+	    }
+	}
+
 	if (walker.walk(*it, *this) != FsTreeWalker::FtwOk) {
 	    LOGERR(("DbIndexer::index: error while indexing %s\n", 
 		    it->c_str()));

src/index/mimetype.cpp

@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.6 2005-03-25 09:40:27 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.7 2005-04-04 13:18:46 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #include <ctype.h>
@@ -82,8 +82,12 @@ string mimetype(const string &fn, ConfTree *mtypes)
 	    return mtype;
     }
 
-    // Look at file data ? Only when no suffix
-    if (suff.empty())
+    // Look at file data ? Only when no suffix or always
+    // Also 'file' is not that great for us. For exemple it will 
+    // mistake mail folders for simple text files if there is no 'Received' 
+    // header, which would be the case, for exemple in a 'Sent' folder. Also
+    // I'm not sure that file -i exists on all systems
+    //if (suff.empty())
 	return mimetypefromdata(fn);
     return "";
 }