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

Fixed search results for kiwix-desktop

This commit is contained in:
Veloman Yunkan 2022-09-26 13:09:12 +04:00
parent 266e29dff2
commit 60148717e1
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/search_renderer.cpp
View File

@ -166,7 +166,7 @@ kainjow::mustache::data buildPagination(
std::string SearchRenderer::renderTemplate(const std::string& tmpl_str) std::string SearchRenderer::renderTemplate(const std::string& tmpl_str)
{ {
const std::string absPathPrefix = protocolPrefix + "content/"; const std::string absPathPrefix = protocolPrefix;
// Build the results list // Build the results list
kainjow::mustache::data items{kainjow::mustache::data::type::list}; kainjow::mustache::data items{kainjow::mustache::data::type::list};
for (auto it = m_srs.begin(); it != m_srs.end(); it++) { for (auto it = m_srs.begin(); it != m_srs.end(); it++) {
@ -206,7 +206,7 @@ std::string SearchRenderer::renderTemplate(const std::string& tmpl_str)
kainjow::mustache::data allData; kainjow::mustache::data allData;
allData.set("protocolPrefix", protocolPrefix); allData.set("searchProtocolPrefix", searchProtocolPrefix);
allData.set("results", results); allData.set("results", results);
allData.set("pagination", pagination); allData.set("pagination", pagination);
allData.set("query", query); allData.set("query", query);

2
src/server/internalServer.cpp
View File

@ -830,7 +830,7 @@ std::unique_ptr<Response> InternalServer::handle_search(const RequestContext& re
search->getEstimatedMatches()); search->getEstimatedMatches());
renderer.setSearchPattern(searchInfo.pattern); renderer.setSearchPattern(searchInfo.pattern);
renderer.setSearchBookQuery(searchInfo.bookFilterQuery); renderer.setSearchBookQuery(searchInfo.bookFilterQuery);
renderer.setProtocolPrefix(m_root + "/"); renderer.setProtocolPrefix(m_root + "/content/");
renderer.setSearchProtocolPrefix(m_root + "/search"); renderer.setSearchProtocolPrefix(m_root + "/search");
renderer.setPageLength(pageLength); renderer.setPageLength(pageLength);
if (request.get_requested_format() == "xml") { if (request.get_requested_format() == "xml") {

2
static/templates/search_result.xml
View File

@ -9,7 +9,7 @@
<opensearch:totalResults>{{results.count}}</opensearch:totalResults> <opensearch:totalResults>{{results.count}}</opensearch:totalResults>
<opensearch:startIndex>{{results.start}}</opensearch:startIndex> <opensearch:startIndex>{{results.start}}</opensearch:startIndex>
<opensearch:itemsPerPage>{{pagination.itemsPerPage}}</opensearch:itemsPerPage> <opensearch:itemsPerPage>{{pagination.itemsPerPage}}</opensearch:itemsPerPage>
<atom:link rel="search" type="application/opensearchdescription+xml" href="{{protocolPrefix}}search/searchdescription.xml"/> <atom:link rel="search" type="application/opensearchdescription+xml" href="{{searchProtocolPrefix}}/searchdescription.xml"/>
<opensearch:Query role="request" <opensearch:Query role="request"
searchTerms="{{query.pattern}}"{{#query.lang}} searchTerms="{{query.pattern}}"{{#query.lang}}
language="{{query.lang}}"{{/query.lang}} language="{{query.lang}}"{{/query.lang}}