smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use right contentId to generate the article url in search template. 

As we do multisearch, we must use the associated contentID of the result
to generate the url.
This commit is contained in:
Matthieu Gautier 2017-07-12 18:41:30 +02:00
parent 9cc329dbd2
commit bc5f4f5de4
2 changed files with 56 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/searcher.cpp
View File

@ -314,6 +314,7 @@ string Searcher::getHtml()
result["title"] = p_result->get_title(); result["title"] = p_result->get_title();
result["url"] = p_result->get_url(); result["url"] = p_result->get_url();
result["snippet"] = p_result->get_snippet(); result["snippet"] = p_result->get_snippet();
result["contentId"] = humanReaderNames[p_result->get_readerIndex()];
if (p_result->get_size() >= 0) { if (p_result->get_size() >= 0) {
result["size"] = kiwix::beautifyInteger(p_result->get_size()); result["size"] = kiwix::beautifyInteger(p_result->get_size());

48
static/results.tmpl
View File

@ -95,15 +95,35 @@
</head> </head>
<body bgcolor="white"> <body bgcolor="white">
<div class="header"> <div class="header">
<TMPL_if results>Results <b><TMPL_var resultStart>-<TMPL_var resultEnd></b> of <b><TMPL_var count></b> for <b><TMPL_var searchPattern></b><TMPL_else>No result were found for <b><TMPL_var searchPattern></b></TMPL_if> <TMPL_if results>
Results
<b>
<TMPL_var resultStart>-<TMPL_var resultEnd>
</b> of <b>
<TMPL_var count>
</b> for <b>
<TMPL_var searchPattern>
</b>
<TMPL_else>
No result were found for <b><TMPL_var searchPattern></b>
</TMPL_if>
</div> </div>
<div class="results"> <div class="results">
<ul> <ul>
<TMPL_foreach results as result> <TMPL_foreach results as result>
<li><a href="<TMPL_var protocolPrefix><TMPL_var contentId>/<TMPL_var result.url>"><TMPL_var result.title></a> <li>
<cite><TMPL_if result.snippet><TMPL_var result.snippet>...</TMPL_if></cite> <a href="<TMPL_var protocolPrefix><TMPL_var result.contentId>/<TMPL_var result.url>">
<TMPL_if wordCount><div class="informations"><TMPL_var wordCount> words</div></TMPL_if> <TMPL_var result.title>
</a>
<cite>
<TMPL_if result.snippet>
<TMPL_var result.snippet>...
</TMPL_if>
</cite>
<TMPL_if wordCount>
<div class="informations"><TMPL_var wordCount> words</div>
</TMPL_if>
</li> </li>
</TMPL_foreach> </TMPL_foreach>
</ul> </ul>
@ -112,16 +132,28 @@
<div class="footer"> <div class="footer">
<ul> <ul>
<TMPL_if (resultLastPageStart>0)> <TMPL_if (resultLastPageStart>0)>
<li><a href="<TMPL_var searchProtocolPrefix>content=<TMPL_var contentId>&pattern=<TMPL_var searchPatternEncoded>&start=0&end=<TMPL_var resultRange>">◀</a></li> <li>
<a href="<TMPL_var searchProtocolPrefix>pattern=<TMPL_var searchPatternEncoded><TMPL_if contentId>&content=<TMPL_var contentId></TMPL_if>&start=0&end=<TMPL_var resultRange>">
◀
</a>
</li>
</TMPL_if> </TMPL_if>
<TMPL_foreach pages as page> <TMPL_foreach pages as page>
<li><a <TMPL_if page.selected>class="selected"</TMPL_if> href="<TMPL_var searchProtocolPrefix>content=<TMPL_var contentId>&pattern=<TMPL_var searchPatternEncoded>&start=<TMPL_var page.start>&end=<TMPL_var page.end>"><TMPL_var page.label></a></li> <li>
<a <TMPL_if page.selected>class="selected"</TMPL_if>
href="<TMPL_var searchProtocolPrefix>pattern=<TMPL_var searchPatternEncoded><TMPL_if contentId>&content=<TMPL_var contentId></TMPL_if>&start=<TMPL_var page.start>&end=<TMPL_var page.end>">
<TMPL_var page.label>
</a>
</li>
</TMPL_foreach> </TMPL_foreach>
<TMPL_if (resultLastPageStart>0)> <TMPL_if (resultLastPageStart>0)>
<li><a href="<TMPL_var searchProtocolPrefix>content=<TMPL_var contentId>&pattern=<TMPL_var searchPatternEncoded>&start=<TMPL_var resultLastPageStart>&end=<TMPL_var (resultLastPageStart+resultRange)>">▶</a></li> <li>
<a href="<TMPL_var searchProtocolPrefix>pattern=<TMPL_var searchPatternEncoded><TMPL_if contentId>&content=<TMPL_var contentId></TMPL_if>&start=<TMPL_var resultLastPageStart>&end=<TMPL_var (resultLastPageStart+resultRange)>">
▶
</a>
</li>
</TMPL_if> </TMPL_if>
</ul> </ul>
</div> </div>
</body> </body>
</html> </html>