|
a/src/internfile/mh_html.cpp |
|
b/src/internfile/mh_html.cpp |
|
... |
|
... |
| 54 |
m_havedoc = true;
|
54 |
m_havedoc = true;
|
| 55 |
|
55 |
|
| 56 |
// We want to compute the md5 now because we may modify m_html later
|
56 |
// We want to compute the md5 now because we may modify m_html later
|
| 57 |
string md5, xmd5;
|
57 |
string md5, xmd5;
|
| 58 |
MD5String(htext, md5);
|
58 |
MD5String(htext, md5);
|
| 59 |
m_metaData[cstr_md5] = MD5HexPrint(md5, xmd5);
|
59 |
m_metaData[cstr_dj_keymd5] = MD5HexPrint(md5, xmd5);
|
| 60 |
|
60 |
|
| 61 |
return true;
|
61 |
return true;
|
| 62 |
}
|
62 |
}
|
| 63 |
|
63 |
|
| 64 |
bool MimeHandlerHtml::next_document()
|
64 |
bool MimeHandlerHtml::next_document()
|
|
... |
|
... |
| 72 |
|
72 |
|
| 73 |
string charset = m_dfltInputCharset;
|
73 |
string charset = m_dfltInputCharset;
|
| 74 |
LOGDEB(("MHHtml::next_doc.: default supposed input charset: [%s]\n",
|
74 |
LOGDEB(("MHHtml::next_doc.: default supposed input charset: [%s]\n",
|
| 75 |
charset.c_str()));
|
75 |
charset.c_str()));
|
| 76 |
// Override default input charset if someone took care to set one:
|
76 |
// Override default input charset if someone took care to set one:
|
| 77 |
map<string,string>::const_iterator it = m_metaData.find(cstr_charset);
|
77 |
map<string,string>::const_iterator it = m_metaData.find(cstr_dj_keycharset);
|
| 78 |
if (it != m_metaData.end() && !it->second.empty()) {
|
78 |
if (it != m_metaData.end() && !it->second.empty()) {
|
| 79 |
charset = it->second;
|
79 |
charset = it->second;
|
| 80 |
LOGDEB(("MHHtml: next_doc.: input charset from ext. metadata: [%s]\n",
|
80 |
LOGDEB(("MHHtml: next_doc.: input charset from ext. metadata: [%s]\n",
|
| 81 |
charset.c_str()));
|
81 |
charset.c_str()));
|
| 82 |
}
|
82 |
}
|
|
... |
|
... |
| 161 |
return false;
|
161 |
return false;
|
| 162 |
}
|
162 |
}
|
| 163 |
}
|
163 |
}
|
| 164 |
}
|
164 |
}
|
| 165 |
|
165 |
|
| 166 |
m_metaData[cstr_origcharset] = result.get_charset();
|
166 |
m_metaData[cstr_dj_keyorigcharset] = result.get_charset();
|
| 167 |
m_metaData[cstr_content] = result.dump;
|
167 |
m_metaData[cstr_dj_keycontent] = result.dump;
|
| 168 |
m_metaData[cstr_charset] = "utf-8";
|
168 |
m_metaData[cstr_dj_keycharset] = "utf-8";
|
| 169 |
// Avoid setting empty values which would crush ones possibly inherited
|
169 |
// Avoid setting empty values which would crush ones possibly inherited
|
| 170 |
// from parent (if we're an attachment)
|
170 |
// from parent (if we're an attachment)
|
| 171 |
if (!result.dmtime.empty())
|
171 |
if (!result.dmtime.empty())
|
| 172 |
m_metaData["modificationdate"] = result.dmtime;
|
172 |
m_metaData[cstr_dj_keymd] = result.dmtime;
|
| 173 |
m_metaData[cstr_mimetype] = cstr_textplain;
|
173 |
m_metaData[cstr_dj_keymt] = cstr_textplain;
|
| 174 |
|
174 |
|
| 175 |
for (map<string,string>::const_iterator it = result.meta.begin();
|
175 |
for (map<string,string>::const_iterator it = result.meta.begin();
|
| 176 |
it != result.meta.end(); it++) {
|
176 |
it != result.meta.end(); it++) {
|
| 177 |
if (!it->second.empty())
|
177 |
if (!it->second.empty())
|
| 178 |
m_metaData[it->first] = it->second;
|
178 |
m_metaData[it->first] = it->second;
|