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

html: handle the html5 charset meta tag

Browse Source
This commit is contained in:
Jean-Francois Dockes 2012-01-26 19:27:58 +01:00
parent 0d8a61ced9
commit ec87379015
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/internfile/myhtmlparse.cpp
View File

@ -391,7 +391,7 @@ MyHtmlParser::opening_tag(const string &tag)
p.params.end()) { p.params.end()) {
charset = k->second; charset = k->second;
if (!samecharset(charset, fromcharset)) { if (!samecharset(charset, fromcharset)) {
LOGDEB1(("Doc specified charset '%s' " LOGDEB1(("Doc http-equiv charset '%s' "
"differs from dir deflt '%s'\n", "differs from dir deflt '%s'\n",
charset.c_str(), charset.c_str(),
fromcharset.c_str())); fromcharset.c_str()));
@ -401,6 +401,19 @@ MyHtmlParser::opening_tag(const string &tag)
} }
} }
} }
string newcharset;
if (get_parameter(cstr_charset, newcharset)) {
// HTML5 added: <meta charset="...">
lowercase_term(newcharset);
charset = newcharset;
if (!samecharset(charset, fromcharset)) {
LOGDEB1(("Doc html5 charset '%s' "
"differs from dir deflt '%s'\n",
charset.c_str(),
fromcharset.c_str()));
throw false;
}
}
break; break;
} }
if (tag == "marquee" || tag == "menu" || tag == "multicol") if (tag == "marquee" || tag == "menu" || tag == "multicol")