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

internfile: revert 2314:17098b627784 which was unneeded and wrong

Browse Source
This commit is contained in:
Jean-Francois Dockes 2011-06-22 17:49:51 +02:00
parent 860da987b7
commit 67ad817e52
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/internfile/internfile.cpp
View File

@ -213,6 +213,10 @@ void FileInterner::init(const string &f, const struct stat *stp, RclConfig *cnf,
bool usfci = false; bool usfci = false;
cnf->getConfParam("usesystemfilecommand", &usfci); cnf->getConfParam("usesystemfilecommand", &usfci);
// In general, even when the input mime type is set (when
// previewing), we can't use it: it's the type for the actual
// document, but this can be part of a compound document, and
// we're dealing with the top level file here.
if (flags & FIF_doUseInputMimetype) { if (flags & FIF_doUseInputMimetype) {
if (!imime) { if (!imime) {
LOGERR(("FileInterner:: told to use null imime\n")); LOGERR(("FileInterner:: told to use null imime\n"));
@ -250,20 +254,10 @@ void FileInterner::init(const string &f, const struct stat *stp, RclConfig *cnf,
LOGDEB1(("FileInterner:: after ucomp: m_tdir %s, tfile %s\n", LOGDEB1(("FileInterner:: after ucomp: m_tdir %s, tfile %s\n",
m_tdir.dirname(), m_tfile.c_str())); m_tdir.dirname(), m_tfile.c_str()));
m_fn = m_tfile; m_fn = m_tfile;
// Note: still using the original file's stat. right ?
// Now identify the decompressed file. l_mime = mimetype(m_fn, stp, m_cfg, usfci);
if ((flags & FIF_forPreview) && imime) { if (l_mime.empty() && imime)
// In preview mode, trust the input parameter. The
// file type may depend on the location, ie, for
// .1->text/man, and we just moved the file, so
// we'd be wrong to use mimetype().
l_mime = *imime; l_mime = *imime;
} else {
// Note: still using the original file's stat. right ?
l_mime = mimetype(m_fn, stp, m_cfg, usfci);
if (l_mime.empty() && imime)
l_mime = *imime;
}
} else { } else {
LOGINFO(("FileInterner:: %s over size limit %d kbs\n", LOGINFO(("FileInterner:: %s over size limit %d kbs\n",
m_fn.c_str(), maxkbs)); m_fn.c_str(), maxkbs));