|
a/src/query/reslistpager.cpp |
|
b/src/query/reslistpager.cpp |
|
... |
|
... |
143 |
// Printable url: either utf-8 if transcoding succeeds, or url-encoded
|
143 |
// Printable url: either utf-8 if transcoding succeeds, or url-encoded
|
144 |
string url;
|
144 |
string url;
|
145 |
printableUrl(config->getDefCharset(), doc.url, url);
|
145 |
printableUrl(config->getDefCharset(), doc.url, url);
|
146 |
|
146 |
|
147 |
// Make title out of file name if none yet
|
147 |
// Make title out of file name if none yet
|
148 |
if (doc.meta[Rcl::Doc::keytt].empty()) {
|
148 |
string titleOrFilename;
|
149 |
doc.meta[Rcl::Doc::keytt] = path_getsimple(url);
|
149 |
string utf8fn;
|
|
|
150 |
doc.getmeta(Rcl::Doc::keytt, &titleOrFilename);
|
|
|
151 |
doc.getmeta(Rcl::Doc::keyfn, &utf8fn);
|
|
|
152 |
if (utf8fn.empty()) {
|
|
|
153 |
utf8fn = path_getsimple(url);
|
|
|
154 |
}
|
|
|
155 |
if (titleOrFilename.empty()) {
|
|
|
156 |
titleOrFilename = utf8fn;
|
150 |
}
|
157 |
}
|
151 |
|
158 |
|
152 |
// Result number
|
159 |
// Result number
|
153 |
char numbuf[20];
|
160 |
char numbuf[20];
|
154 |
int docnumforlinks = m_winfirst + 1 + i;
|
161 |
int docnumforlinks = m_winfirst + 1 + i;
|
|
... |
|
... |
232 |
subs["L"] = linksbuf.rdbuf()->str();
|
239 |
subs["L"] = linksbuf.rdbuf()->str();
|
233 |
subs["N"] = numbuf;
|
240 |
subs["N"] = numbuf;
|
234 |
subs["M"] = doc.mimetype;
|
241 |
subs["M"] = doc.mimetype;
|
235 |
subs["R"] = doc.meta[Rcl::Doc::keyrr];
|
242 |
subs["R"] = doc.meta[Rcl::Doc::keyrr];
|
236 |
subs["S"] = sizebuf;
|
243 |
subs["S"] = sizebuf;
|
|
|
244 |
subs["T"] = escapeHtml(titleOrFilename);
|
237 |
subs["T"] = escapeHtml(doc.meta[Rcl::Doc::keytt]);
|
245 |
subs["t"] = escapeHtml(doc.meta[Rcl::Doc::keytt]);
|
238 |
subs["U"] = url;
|
246 |
subs["U"] = url;
|
239 |
|
247 |
|
240 |
// Let %(xx) access all metadata.
|
248 |
// Let %(xx) access all metadata.
|
241 |
subs.insert(doc.meta.begin(), doc.meta.end());
|
249 |
subs.insert(doc.meta.begin(), doc.meta.end());
|
242 |
|
250 |
|