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

allow indexing individual files. Fix pb with preview and charsets (local defcharset ignored)

Browse Source
This commit is contained in:
dockes
2005-12-14 11:00:48 +00:00
parent 315f8cdb33
commit be485e8059
9 changed files with 329 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/internfile/mh_html.cpp
+1 -3
View File
@@ -112,9 +112,7 @@ MimeHandlerHtml::mkDoc(RclConfig *conf, const string &,
charset.c_str(),result.doccharset.c_str()));
if (!result.doccharset.empty() &&
!samecharset(result.doccharset, result.ocharset)) {
LOGDEB(("textHtmlToDoc: charset '%s' doc charset '%s',"
"reparse\n", charset.c_str(),
result.doccharset.c_str()));
LOGDEB(("textHtmlToDoc: reparse for charsets\n"));
charset = result.doccharset;
} else {
LOGERR(("textHtmlToDoc:: error: non charset exception\n"));
src/internfile/mh_text.cpp
+7 -5
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: mh_text.cpp,v 1.2 2005-11-24 07:16:15 dockes Exp $ (C) 2005 J.F.Dockes";
static char rcsid[] = "@(#$Id: mh_text.cpp,v 1.3 2005-12-14 11:00:48 dockes Exp $ (C) 2005 J.F.Dockes";
#endif
#include <iostream>
@@ -30,12 +30,14 @@ MimeHandler::Status MimeHandlerText::mkDoc(RclConfig *conf, const string &fn,
charset = csguess(otext, conf->getDefCharset());
} else
charset = conf->getDefCharset();
string utf8;
LOGDEB1(("textPlainToDoc: transcod from %s to %s\n", charset, "UTF-8"));
LOGDEB1(("MimeHandlerText::mkDoc: transcod from %s to utf-8\n",
charset.c_str()));
string utf8;
if (!transcode(otext, utf8, charset, "UTF-8")) {
cerr << "textPlainToDoc: transcode failed: charset '" << charset
<< "' to UTF-8: "<< utf8 << endl;
LOGERR(("MimeHandlerText::mkDoc: transcode to utf-8 failed "
"for charset [%s]\n", charset.c_str()));
otext.erase();
return MimeHandler::MHError;
}