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

"md5"->cstr_md5

Browse Source
This commit is contained in:
Jean-Francois Dockes 2012-02-25 10:41:27 +01:00
parent 6cdf9ae12b
commit a5af2b93bd
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/cstr.h
View File

@ -51,6 +51,7 @@ DEF_CSTR(fileu, "file://");
DEF_CSTR(fmtime, "fmtime");
DEF_CSTR(ipath, "ipath");
DEF_CSTR(iso_8859_1, "ISO-8859-1");
DEF_CSTR(md5, "md5");
DEF_CSTR(mimetype, "mimetype");
DEF_CSTR(minwilds, "*?[");
DEF_CSTR(newline, "\n");

2
src/internfile/mh_exec.cpp
View File

@ -165,7 +165,7 @@ void MimeHandlerExec::finaldetails()
string md5, xmd5, reason;
if (MD5File(m_fn, md5, &reason)) {
m_metaData["md5"] = MD5HexPrint(md5, xmd5);
m_metaData[cstr_md5] = MD5HexPrint(md5, xmd5);
} else {
LOGERR(("MimeHandlerExec: cant compute md5 for [%s]: %s\n",
m_fn.c_str(), reason.c_str()));

4
src/internfile/mh_execm.cpp
View File

@ -268,13 +268,13 @@ bool MimeHandlerExecMultiple::next_document()
m_metaData[cstr_mimetype] = mtype;
string md5, xmd5;
MD5String(m_metaData[cstr_content], md5);
m_metaData["md5"] = MD5HexPrint(md5, xmd5);
m_metaData[cstr_md5] = MD5HexPrint(md5, xmd5);
} else {
m_metaData[cstr_mimetype] = mtype.empty() ? "text/html" : mtype;
m_metaData.erase(cstr_ipath);
string md5, xmd5, reason;
if (MD5File(m_fn, md5, &reason)) {
m_metaData["md5"] = MD5HexPrint(md5, xmd5);
m_metaData[cstr_md5] = MD5HexPrint(md5, xmd5);
} else {
LOGERR(("MimeHandlerExecM: cant compute md5 for [%s]: %s\n",
m_fn.c_str(), reason.c_str()));

2
src/internfile/mh_html.cpp
View File

@ -56,7 +56,7 @@ bool MimeHandlerHtml::set_document_string(const string& htext)
// We want to compute the md5 now because we may modify m_html later
string md5, xmd5;
MD5String(htext, md5);
m_metaData["md5"] = MD5HexPrint(md5, xmd5);
m_metaData[cstr_md5] = MD5HexPrint(md5, xmd5);
return true;
}

4
src/internfile/mh_mail.cpp
View File

@ -100,7 +100,7 @@ bool MimeHandlerMail::set_document_file(const string &fn)
// the md5 computation to the mime analysis, but ...
string md5, xmd5, reason;
if (MD5File(fn, md5, &reason)) {
m_metaData["md5"] = MD5HexPrint(md5, xmd5);
m_metaData[cstr_md5] = MD5HexPrint(md5, xmd5);
} else {
LOGERR(("MimeHandlerMail: cant compute md5 for [%s]: %s\n", fn.c_str(),
reason.c_str()));
@ -132,7 +132,7 @@ bool MimeHandlerMail::set_document_string(const string &msgtxt)
string md5, xmd5;
MD5String(msgtxt, md5);
m_metaData["md5"] = MD5HexPrint(md5, xmd5);
m_metaData[cstr_md5] = MD5HexPrint(md5, xmd5);
m_stream = new stringstream(msgtxt);
delete m_bincdoc;

4
src/internfile/mh_text.cpp
View File

@ -81,7 +81,7 @@ bool MimeHandlerText::set_document_file(const string &fn)
string md5, xmd5;
MD5String(m_text, md5);
m_metaData["md5"] = MD5HexPrint(md5, xmd5);
m_metaData[cstr_md5] = MD5HexPrint(md5, xmd5);
m_havedoc = true;
return true;
}
@ -91,7 +91,7 @@ bool MimeHandlerText::set_document_string(const string& otext)
m_text = otext;
string md5, xmd5;
MD5String(m_text, md5);
m_metaData["md5"] = MD5HexPrint(md5, xmd5);
m_metaData[cstr_md5] = MD5HexPrint(md5, xmd5);
m_havedoc = true;
return true;
}