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

Dont store filename in empty title at index time, to keep choice at display time. Define %t as title in addition to %T as title or filename

Browse Source
This commit is contained in:
Jean-Francois Dockes 2012-03-10 14:45:40 +01:00
parent ab13efdc9c
commit 07813ab6ba
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/query/reslistpager.cpp
View File

@ -145,8 +145,15 @@ void ResListPager::displayDoc(RclConfig *config,
printableUrl(config->getDefCharset(), doc.url, url); printableUrl(config->getDefCharset(), doc.url, url);
// Make title out of file name if none yet // Make title out of file name if none yet
if (doc.meta[Rcl::Doc::keytt].empty()) { string titleOrFilename;
doc.meta[Rcl::Doc::keytt] = path_getsimple(url); string utf8fn;
doc.getmeta(Rcl::Doc::keytt, &titleOrFilename);
doc.getmeta(Rcl::Doc::keyfn, &utf8fn);
if (utf8fn.empty()) {
utf8fn = path_getsimple(url);
}
if (titleOrFilename.empty()) {
titleOrFilename = utf8fn;
} }
// Result number // Result number
@ -234,7 +241,8 @@ void ResListPager::displayDoc(RclConfig *config,
subs["M"] = doc.mimetype; subs["M"] = doc.mimetype;
subs["R"] = doc.meta[Rcl::Doc::keyrr]; subs["R"] = doc.meta[Rcl::Doc::keyrr];
subs["S"] = sizebuf; subs["S"] = sizebuf;
subs["T"] = escapeHtml(doc.meta[Rcl::Doc::keytt]); subs["T"] = escapeHtml(titleOrFilename);
subs["t"] = escapeHtml(doc.meta[Rcl::Doc::keytt]);
subs["U"] = url; subs["U"] = url;
// Let %(xx) access all metadata. // Let %(xx) access all metadata.

2
src/rcldb/rcldb.cpp
View File

@ -1278,8 +1278,6 @@ bool Db::addOrUpdate(const string &udi, const string &parent_udi,
if (!doc.ipath.empty()) if (!doc.ipath.empty())
RECORD_APPEND(record, Doc::keyipt, doc.ipath); RECORD_APPEND(record, Doc::keyipt, doc.ipath);
if (doc.meta[Doc::keytt].empty())
doc.meta[Doc::keytt] = doc.utf8fn;
doc.meta[Doc::keytt] = doc.meta[Doc::keytt] =
neutchars(truncate_to_word(doc.meta[Doc::keytt], 150), cstr_nc); neutchars(truncate_to_word(doc.meta[Doc::keytt], 150), cstr_nc);
if (!doc.meta[Doc::keytt].empty()) if (!doc.meta[Doc::keytt].empty())