From 46e82f550a68aae696010e0b6bb29e61ed849bc1 Mon Sep 17 00:00:00 2001
From: dockes <none@none>
Date: Fri, 25 Nov 2005 09:14:14 +0000
Subject: [PATCH] *** empty log message ***

---
 src/index/indexer.cpp   |  8 ++++----
 src/index/mimetype.cpp  |  4 ++--
 src/sampleconf/mimeconf | 16 +++++++---------
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/index/indexer.cpp b/src/index/indexer.cpp
index b9b61239..da2af3ec 100644
--- a/src/index/indexer.cpp
+++ b/src/index/indexer.cpp
@@ -1,5 +1,5 @@
 #ifndef lint
-static char rcsid[] = "@(#$Id: indexer.cpp,v 1.17 2005-11-24 07:16:15 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: indexer.cpp,v 1.18 2005-11-25 09:13:39 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 #include <stdio.h>
 #include <sys/stat.h>
@@ -106,7 +106,7 @@ bool DbIndexer::index()
 	    string skipped; 
 	    if (config->getConfParam("skippedNames", skipped)) {
 		list<string> skpl;
-		ConfTree::stringToStrings(skipped, skpl);
+		stringToStrings(skipped, skpl);
 		list<string>::const_iterator it;
 		for (it = skpl.begin(); it != skpl.end(); it++) {
 		    walker.addSkippedName(*it);
@@ -131,7 +131,7 @@ bool DbIndexer::index()
     string slangs;
     if (config->getConfParam("indexstemminglanguages", slangs)) {
 	list<string> langs;
-	ConfTree::stringToStrings(slangs, langs);
+	stringToStrings(slangs, langs);
 	for (list<string>::const_iterator it = langs.begin(); 
 	     it != langs.end(); it++) {
 	    db.createStemDb(*it);
@@ -224,7 +224,7 @@ bool ConfIndexer::index()
 	return false;
     }
     list<string> tdl; // List of directories to be indexed
-    if (!ConfTree::stringToStrings(topdirs, tdl)) {
+    if (!stringToStrings(topdirs, tdl)) {
 	LOGERR(("ConfIndexer::index: parse error for directory list\n"));
 	return false;
     }
diff --git a/src/index/mimetype.cpp b/src/index/mimetype.cpp
index ee395fcb..60f9ab0f 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.14 2005-11-24 07:16:15 dockes Exp $ (C) 2004 J.F.Dockes";
+static char rcsid[] = "@(#$Id: mimetype.cpp,v 1.15 2005-11-25 09:13:38 dockes Exp $ (C) 2004 J.F.Dockes";
 #endif
 
 #ifndef TEST_MIMETYPE
@@ -68,7 +68,7 @@ static string mimetypefromdata(const string &fn, bool usfc)
 	// Now looks like ": text/plain; charset=us-ascii"
 	// Split it, and take second field
 	list<string> res;
-	ConfTree::stringToStrings(result, res);
+	stringToStrings(result, res);
 	if (res.size() <= 1) 
 	    return "";
 	list<string>::iterator it = res.begin();
diff --git a/src/sampleconf/mimeconf b/src/sampleconf/mimeconf
index 4401cd5b..fec72c92 100644
--- a/src/sampleconf/mimeconf
+++ b/src/sampleconf/mimeconf
@@ -1,4 +1,4 @@
-# @(#$Id: mimeconf,v 1.10 2005-11-21 16:05:07 dockes Exp $  (C) 2004 J.F.Dockes
+# @(#$Id: mimeconf,v 1.11 2005-11-25 09:14:14 dockes Exp $  (C) 2004 J.F.Dockes
 
 # Recoll : associations of mime types to processing filters.
 # There are different sections for decompression, 'interning' for indexing
@@ -25,15 +25,9 @@ application/x-bzip2 =  uncompress rcluncomp bunzip2 %f %t
 # The external (exec) filters  output the document in simple html format,
 # have a look at the scripts.
 [index]
-text/plain = internal 
-text/html  = internal 
-text/x-mail = internal
-message/rfc822 = internal
-
+application/msword = exec rcldoc
 application/pdf = exec rclpdf
 application/postscript = exec rclps
-application/msword = exec rcldoc
-
 application/vnd.sun.xml.calc = exec rclsoff
 application/vnd.sun.xml.calc.template = exec rclsoff
 application/vnd.sun.xml.draw = exec rclsoff
@@ -45,9 +39,13 @@ application/vnd.sun.xml.writer = exec rclsoff
 application/vnd.sun.xml.writer.global = exec rclsoff
 application/vnd.sun.xml.writer.template = exec rclsoff
 
-text/x-gaim-log = exec rclgaim
+message/rfc822 = internal
 
+text/html  = internal 
+text/plain = internal 
 text/rtf = exec rclrtf
+text/x-gaim-log = exec rclgaim
+text/x-mail = internal
 
 ## 
 # External viewers, launched when you double-click a result entry