tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mimehandler: accept additional parameter from config after internal for using different mime type

Browse Source
This commit is contained in:
Jean-Francois Dockes 2011-01-08 19:22:09 +01:00
parent ca2297e363
commit fccc9a590f
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/internfile/mimehandler.cpp
View File

@ -188,12 +188,24 @@ Dijon::Filter *getMimeHandler(const string &mtype, RclConfig *cfg,
// string and instanciate handler object // string and instanciate handler object
string::size_type b1 = hs.find_first_of(" \t"); string::size_type b1 = hs.find_first_of(" \t");
string handlertype = hs.substr(0, b1); string handlertype = hs.substr(0, b1);
string cmdstr;
if (b1 != string::npos) {
cmdstr = hs.substr(b1);
trimstring(cmdstr);
}
if (!stringlowercmp("internal", handlertype)) { if (!stringlowercmp("internal", handlertype)) {
// If there is a parameter after "internal" it's the mime
// type to use. This is so that we can have bogus mime
// types like text/x-purple-html-log (for ie: specific
// icon) and still use the html filter on them. This is
// partly redundant with the localfields/rclaptg, but
// better and the latter will probably go away at some
// point in the future
if (!cmdstr.empty())
return mhFactory(cmdstr);
return mhFactory(mtype); return mhFactory(mtype);
} else if (!stringlowercmp("dll", handlertype)) { } else if (!stringlowercmp("dll", handlertype)) {
} else { } else {
string cmdstr = hs.substr(b1);
trimstring(cmdstr);
if (cmdstr.empty()) { if (cmdstr.empty()) {
LOGERR(("getMimeHandler: bad line for %s: %s\n", LOGERR(("getMimeHandler: bad line for %s: %s\n",
mtype.c_str(), hs.c_str())); mtype.c_str(), hs.c_str()));