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

Add %u spec to reslist paragraph format to output either local file path (with file:// stripped) or url). Fixes issue #254

Browse Source
This commit is contained in:
Jean-Francois Dockes 2015-06-06 16:08:54 +02:00
parent 7e2db42988
commit d184361e79
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/query/reslistpager.cpp
View File

@ -167,6 +167,13 @@ void ResListPager::displayDoc(RclConfig *config, int i, Rcl::Doc& doc,
string url; string url;
printableUrl(config->getDefCharset(), doc.url, url); printableUrl(config->getDefCharset(), doc.url, url);
// Same as url, but with file:// possibly stripped. output by %u instead
// of %U.
string urlOrLocal;
urlOrLocal = fileurltolocalpath(url);
if (urlOrLocal.empty())
urlOrLocal = url;
// Make title out of file name if none yet // Make title out of file name if none yet
string titleOrFilename; string titleOrFilename;
string utf8fn; string utf8fn;
@ -301,6 +308,7 @@ void ResListPager::displayDoc(RclConfig *config, int i, Rcl::Doc& doc,
subs["T"] = maybeEscapeHtml(titleOrFilename); subs["T"] = maybeEscapeHtml(titleOrFilename);
subs["t"] = maybeEscapeHtml(doc.meta[Rcl::Doc::keytt]); subs["t"] = maybeEscapeHtml(doc.meta[Rcl::Doc::keytt]);
subs["U"] = url; subs["U"] = url;
subs["u"] = urlOrLocal;
// Let %(xx) access all metadata. HTML-neuter everything: // Let %(xx) access all metadata. HTML-neuter everything:
for (map<string,string>::iterator it = doc.meta.begin(); for (map<string,string>::iterator it = doc.meta.begin();