smallsolar/libkiwix
1
0
Fork 0
mirror of https://github.com/kiwix/libkiwix.git synced 2025-06-26 10:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

+ fix small regression in kiwix-serve search engine display

Browse Source
This commit is contained in:
kelson42
2012-04-24 18:09:09 +00:00
parent b61db587ac
commit 508fd68958
3 changed files with 62 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/kiwix/searcher.cpp
View File

@ -169,7 +169,7 @@ namespace kiwix {
while (this->resultOffset != this->results.end()) {
CDT result;
result["title"] = this->resultOffset->title;
result["url"] = this->contentHumanReadableId + "/" + this->resultOffset->url;
result["url"] = this->resultOffset->url;
result["snippet"] = this->resultOffset->snippet;
if (this->resultOffset->size >= 0)
@ -216,6 +216,7 @@ namespace kiwix {
oData["resultLastPageStart"] = this->estimatedResultCount > this->resultRange ? this->estimatedResultCount - this->resultRange : 0;
oData["protocolPrefix"] = this->protocolPrefix;
oData["searchProtocolPrefix"] = this->searchProtocolPrefix;
oData["contentId"] = this->contentHumanReadableId;
STLW::string sResult;
StringOutputCollector oDataCollector(sResult);

103
src/common/resourceTools.h
View File

@ -16885,55 +16885,60 @@ const char results_tmpl[]=
"\x73\x75\x6c\x74\x73\x3e\x0a\x09\x20\x20\x3c\x6c\x69\x3e\x0a\x09\x20\x20\x20\x20"
"\x3c\x61\x20\x68\x72\x65\x66\x3d\x22\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x70"
"\x72\x6f\x74\x6f\x63\x6f\x6c\x50\x72\x65\x66\x69\x78\x3e\x3c\x54\x4d\x50\x4c\x5f"
"\x76\x61\x72\x20\x75\x72\x6c\x3e\x22\x3e\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20"
"\x74\x69\x74\x6c\x65\x3e\x3c\x2f\x61\x3e\x0a\x09\x20\x20\x20\x20\x3c\x63\x69\x74"
"\x65\x3e\x3c\x54\x4d\x50\x4c\x5f\x69\x66\x20\x73\x6e\x69\x70\x70\x65\x74\x3e\x3c"
"\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x73\x6e\x69\x70\x70\x65\x74\x3e\x2e\x2e\x2e"
"\x3c\x2f\x54\x4d\x50\x4c\x5f\x69\x66\x3e\x3c\x2f\x63\x69\x74\x65\x3e\x0a\x09\x20"
"\x20\x20\x20\x3c\x54\x4d\x50\x4c\x5f\x69\x66\x20\x77\x6f\x72\x64\x43\x6f\x75\x6e"
"\x74\x3e\x3c\x64\x69\x76\x20\x63\x6c\x61\x73\x73\x3d\x22\x69\x6e\x66\x6f\x72\x6d"
"\x61\x74\x69\x6f\x6e\x73\x22\x3e\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x77\x6f"
"\x72\x64\x43\x6f\x75\x6e\x74\x3e\x20\x77\x6f\x72\x64\x73\x3c\x2f\x64\x69\x76\x3e"
"\x3c\x2f\x54\x4d\x50\x4c\x5f\x69\x66\x3e\x0a\x09\x20\x20\x3c\x2f\x6c\x69\x3e\x0a"
"\x20\x20\x20\x20\x3c\x2f\x54\x4d\x50\x4c\x5f\x6c\x6f\x6f\x70\x3e\x0a\x20\x20\x20"
"\x20\x3c\x2f\x75\x6c\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x64\x69\x76\x3e\x0a\x0a\x20"
"\x20\x3c\x64\x69\x76\x20\x63\x6c\x61\x73\x73\x3d\x22\x66\x6f\x6f\x74\x65\x72\x22"
"\x3e\x0a\x20\x20\x20\x20\x3c\x75\x6c\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x54\x4d"
"\x50\x4c\x5f\x69\x66\x20\x28\x72\x65\x73\x75\x6c\x74\x4c\x61\x73\x74\x50\x61\x67"
"\x65\x53\x74\x61\x72\x74\x3e\x30\x29\x3e\x0a\x09\x3c\x6c\x69\x3e\x3c\x61\x20\x68"
"\x72\x65\x66\x3d\x22\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x73\x65\x61\x72\x63"
"\x68\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x50\x72\x65\x66\x69\x78\x3e\x70\x61\x74\x74"
"\x65\x72\x6e\x3d\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x73\x65\x61\x72\x63\x68"
"\x50\x61\x74\x74\x65\x72\x6e\x3e\x26\x73\x74\x61\x72\x74\x3d\x30\x26\x65\x6e\x64"
"\x3d\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x72\x65\x73\x75\x6c\x74\x52\x61\x6e"
"\x67\x65\x3e\x22\x3e\xe2\x97\x80\x3c\x2f\x61\x3e\x3c\x2f\x6c\x69\x3e\x0a\x20\x20"
"\x20\x20\x20\x20\x3c\x2f\x54\x4d\x50\x4c\x5f\x69\x66\x3e\x0a\x20\x20\x20\x20\x20"
"\x20\x3c\x54\x4d\x50\x4c\x5f\x6c\x6f\x6f\x70\x20\x70\x61\x67\x65\x73\x3e\x0a\x20"
"\x20\x20\x20\x20\x20\x3c\x6c\x69\x3e\x3c\x61\x20\x3c\x54\x4d\x50\x4c\x5f\x69\x66"
"\x20\x73\x65\x6c\x65\x63\x74\x65\x64\x3e\x63\x6c\x61\x73\x73\x3d\x22\x73\x65\x6c"
"\x65\x63\x74\x65\x64\x22\x3c\x2f\x54\x4d\x50\x4c\x5f\x69\x66\x3e\x20\x68\x72\x65"
"\x66\x3d\x22\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x73\x65\x61\x72\x63\x68\x50"
"\x72\x6f\x74\x6f\x63\x6f\x6c\x50\x72\x65\x66\x69\x78\x3e\x70\x61\x74\x74\x65\x72"
"\x6e\x3d\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x73\x65\x61\x72\x63\x68\x50\x61"
"\x74\x74\x65\x72\x6e\x3e\x26\x73\x74\x61\x72\x74\x3d\x3c\x54\x4d\x50\x4c\x5f\x76"
"\x61\x72\x20\x73\x74\x61\x72\x74\x3e\x26\x65\x6e\x64\x3d\x3c\x54\x4d\x50\x4c\x5f"
"\x76\x61\x72\x20\x65\x6e\x64\x3e\x22\x3e\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20"
"\x6c\x61\x62\x65\x6c\x3e\x3c\x2f\x61\x3e\x3c\x2f\x6c\x69\x3e\x0a\x20\x20\x20\x20"
"\x20\x20\x3c\x2f\x54\x4d\x50\x4c\x5f\x4c\x4f\x4f\x50\x3e\x0a\x20\x20\x20\x20\x20"
"\x20\x3c\x54\x4d\x50\x4c\x5f\x69\x66\x20\x28\x72\x65\x73\x75\x6c\x74\x4c\x61\x73"
"\x74\x50\x61\x67\x65\x53\x74\x61\x72\x74\x3e\x30\x29\x3e\x0a\x09\x3c\x6c\x69\x3e"
"\x3c\x61\x20\x68\x72\x65\x66\x3d\x22\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x73"
"\x65\x61\x72\x63\x68\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x50\x72\x65\x66\x69\x78\x3e"
"\x70\x61\x74\x74\x65\x72\x6e\x3d\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x73\x65"
"\x61\x72\x63\x68\x50\x61\x74\x74\x65\x72\x6e\x3e\x26\x73\x74\x61\x72\x74\x3d\x3c"
"\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x72\x65\x73\x75\x6c\x74\x4c\x61\x73\x74\x50"
"\x61\x67\x65\x53\x74\x61\x72\x74\x3e\x26\x65\x6e\x64\x3d\x3c\x54\x4d\x50\x4c\x5f"
"\x76\x61\x72\x20\x28\x72\x65\x73\x75\x6c\x74\x4c\x61\x73\x74\x50\x61\x67\x65\x53"
"\x74\x61\x72\x74\x2b\x72\x65\x73\x75\x6c\x74\x52\x61\x6e\x67\x65\x29\x3e\x22\x3e"
"\xe2\x96\xb6\x3c\x2f\x61\x3e\x3c\x2f\x6c\x69\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c"
"\x2f\x54\x4d\x50\x4c\x5f\x69\x66\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x75\x6c\x3e\x0a"
"\x20\x20\x3c\x2f\x64\x69\x76\x3e\x0a\x3c\x2f\x62\x6f\x64\x79\x3e\x0a\x3c\x2f\x68"
"\x74\x6d\x6c\x3e\x0a"
"\x76\x61\x72\x20\x63\x6f\x6e\x74\x65\x6e\x74\x49\x64\x3e\x2f\x3c\x54\x4d\x50\x4c"
"\x5f\x76\x61\x72\x20\x75\x72\x6c\x3e\x22\x3e\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72"
"\x20\x74\x69\x74\x6c\x65\x3e\x3c\x2f\x61\x3e\x0a\x09\x20\x20\x20\x20\x3c\x63\x69"
"\x74\x65\x3e\x3c\x54\x4d\x50\x4c\x5f\x69\x66\x20\x73\x6e\x69\x70\x70\x65\x74\x3e"
"\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x73\x6e\x69\x70\x70\x65\x74\x3e\x2e\x2e"
"\x2e\x3c\x2f\x54\x4d\x50\x4c\x5f\x69\x66\x3e\x3c\x2f\x63\x69\x74\x65\x3e\x0a\x09"
"\x20\x20\x20\x20\x3c\x54\x4d\x50\x4c\x5f\x69\x66\x20\x77\x6f\x72\x64\x43\x6f\x75"
"\x6e\x74\x3e\x3c\x64\x69\x76\x20\x63\x6c\x61\x73\x73\x3d\x22\x69\x6e\x66\x6f\x72"
"\x6d\x61\x74\x69\x6f\x6e\x73\x22\x3e\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x77"
"\x6f\x72\x64\x43\x6f\x75\x6e\x74\x3e\x20\x77\x6f\x72\x64\x73\x3c\x2f\x64\x69\x76"
"\x3e\x3c\x2f\x54\x4d\x50\x4c\x5f\x69\x66\x3e\x0a\x09\x20\x20\x3c\x2f\x6c\x69\x3e"
"\x0a\x20\x20\x20\x20\x3c\x2f\x54\x4d\x50\x4c\x5f\x6c\x6f\x6f\x70\x3e\x0a\x20\x20"
"\x20\x20\x3c\x2f\x75\x6c\x3e\x0a\x20\x20\x20\x20\x3c\x2f\x64\x69\x76\x3e\x0a\x0a"
"\x20\x20\x3c\x64\x69\x76\x20\x63\x6c\x61\x73\x73\x3d\x22\x66\x6f\x6f\x74\x65\x72"
"\x22\x3e\x0a\x20\x20\x20\x20\x3c\x75\x6c\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x54"
"\x4d\x50\x4c\x5f\x69\x66\x20\x28\x72\x65\x73\x75\x6c\x74\x4c\x61\x73\x74\x50\x61"
"\x67\x65\x53\x74\x61\x72\x74\x3e\x30\x29\x3e\x0a\x09\x3c\x6c\x69\x3e\x3c\x61\x20"
"\x68\x72\x65\x66\x3d\x22\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x73\x65\x61\x72"
"\x63\x68\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x50\x72\x65\x66\x69\x78\x3e\x63\x6f\x6e"
"\x74\x65\x6e\x74\x3d\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x63\x6f\x6e\x74\x65"
"\x6e\x74\x49\x64\x3e\x26\x70\x61\x74\x74\x65\x72\x6e\x3d\x3c\x54\x4d\x50\x4c\x5f"
"\x76\x61\x72\x20\x73\x65\x61\x72\x63\x68\x50\x61\x74\x74\x65\x72\x6e\x3e\x26\x73"
"\x74\x61\x72\x74\x3d\x30\x26\x65\x6e\x64\x3d\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72"
"\x20\x72\x65\x73\x75\x6c\x74\x52\x61\x6e\x67\x65\x3e\x22\x3e\xe2\x97\x80\x3c\x2f"
"\x61\x3e\x3c\x2f\x6c\x69\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x2f\x54\x4d\x50\x4c"
"\x5f\x69\x66\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x54\x4d\x50\x4c\x5f\x6c\x6f\x6f"
"\x70\x20\x70\x61\x67\x65\x73\x3e\x0a\x20\x20\x20\x20\x20\x20\x3c\x6c\x69\x3e\x3c"
"\x61\x20\x3c\x54\x4d\x50\x4c\x5f\x69\x66\x20\x73\x65\x6c\x65\x63\x74\x65\x64\x3e"
"\x63\x6c\x61\x73\x73\x3d\x22\x73\x65\x6c\x65\x63\x74\x65\x64\x22\x3c\x2f\x54\x4d"
"\x50\x4c\x5f\x69\x66\x3e\x20\x68\x72\x65\x66\x3d\x22\x3c\x54\x4d\x50\x4c\x5f\x76"
"\x61\x72\x20\x73\x65\x61\x72\x63\x68\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x50\x72\x65"
"\x66\x69\x78\x3e\x63\x6f\x6e\x74\x65\x6e\x74\x3d\x3c\x54\x4d\x50\x4c\x5f\x76\x61"
"\x72\x20\x63\x6f\x6e\x74\x65\x6e\x74\x49\x64\x3e\x26\x70\x61\x74\x74\x65\x72\x6e"
"\x3d\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x73\x65\x61\x72\x63\x68\x50\x61\x74"
"\x74\x65\x72\x6e\x3e\x26\x73\x74\x61\x72\x74\x3d\x3c\x54\x4d\x50\x4c\x5f\x76\x61"
"\x72\x20\x73\x74\x61\x72\x74\x3e\x26\x65\x6e\x64\x3d\x3c\x54\x4d\x50\x4c\x5f\x76"
"\x61\x72\x20\x65\x6e\x64\x3e\x22\x3e\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x6c"
"\x61\x62\x65\x6c\x3e\x3c\x2f\x61\x3e\x3c\x2f\x6c\x69\x3e\x0a\x20\x20\x20\x20\x20"
"\x20\x3c\x2f\x54\x4d\x50\x4c\x5f\x4c\x4f\x4f\x50\x3e\x0a\x20\x20\x20\x20\x20\x20"
"\x3c\x54\x4d\x50\x4c\x5f\x69\x66\x20\x28\x72\x65\x73\x75\x6c\x74\x4c\x61\x73\x74"
"\x50\x61\x67\x65\x53\x74\x61\x72\x74\x3e\x30\x29\x3e\x0a\x09\x3c\x6c\x69\x3e\x3c"
"\x61\x20\x68\x72\x65\x66\x3d\x22\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x73\x65"
"\x61\x72\x63\x68\x50\x72\x6f\x74\x6f\x63\x6f\x6c\x50\x72\x65\x66\x69\x78\x3e\x63"
"\x6f\x6e\x74\x65\x6e\x74\x3d\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x63\x6f\x6e"
"\x74\x65\x6e\x74\x49\x64\x3e\x26\x70\x61\x74\x74\x65\x72\x6e\x3d\x3c\x54\x4d\x50"
"\x4c\x5f\x76\x61\x72\x20\x73\x65\x61\x72\x63\x68\x50\x61\x74\x74\x65\x72\x6e\x3e"
"\x26\x73\x74\x61\x72\x74\x3d\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x72\x65\x73"
"\x75\x6c\x74\x4c\x61\x73\x74\x50\x61\x67\x65\x53\x74\x61\x72\x74\x3e\x26\x65\x6e"
"\x64\x3d\x3c\x54\x4d\x50\x4c\x5f\x76\x61\x72\x20\x28\x72\x65\x73\x75\x6c\x74\x4c"
"\x61\x73\x74\x50\x61\x67\x65\x53\x74\x61\x72\x74\x2b\x72\x65\x73\x75\x6c\x74\x52"
"\x61\x6e\x67\x65\x29\x3e\x22\x3e\xe2\x96\xb6\x3c\x2f\x61\x3e\x3c\x2f\x6c\x69\x3e"
"\x0a\x20\x20\x20\x20\x20\x20\x3c\x2f\x54\x4d\x50\x4c\x5f\x69\x66\x3e\x0a\x20\x20"
"\x20\x20\x3c\x2f\x75\x6c\x3e\x20\x0a\x20\x3c\x2f\x64\x69\x76\x3e\x0a\x3c\x2f\x62"
"\x6f\x64\x79\x3e\x0a\x3c\x2f\x68\x74\x6d\x6c\x3e\x0a"
;
static std::map<std::string, const char*> createResourceMap() {

8
static/results.tmpl
View File

@ -104,7 +104,7 @@
<TMPL_loop results>
<li>
<a href="<TMPL_var protocolPrefix><TMPL_var url>"><TMPL_var title></a>
<a href="<TMPL_var protocolPrefix><TMPL_var contentId>/<TMPL_var url>"><TMPL_var title></a>
<cite><TMPL_if snippet><TMPL_var snippet>...</TMPL_if></cite>
<TMPL_if wordCount><div class="informations"><TMPL_var wordCount> words</div></TMPL_if>
</li>
@ -115,13 +115,13 @@
<div class="footer">
<ul>
<TMPL_if (resultLastPageStart>0)>
<li><a href="<TMPL_var searchProtocolPrefix>pattern=<TMPL_var searchPattern>&start=0&end=<TMPL_var resultRange>">◀</a></li>
<li><a href="<TMPL_var searchProtocolPrefix>content=<TMPL_var contentId>&pattern=<TMPL_var searchPattern>&start=0&end=<TMPL_var resultRange>">◀</a></li>
</TMPL_if>
<TMPL_loop pages>
<li><a <TMPL_if selected>class="selected"</TMPL_if> href="<TMPL_var searchProtocolPrefix>pattern=<TMPL_var searchPattern>&start=<TMPL_var start>&end=<TMPL_var end>"><TMPL_var label></a></li>
<li><a <TMPL_if selected>class="selected"</TMPL_if> href="<TMPL_var searchProtocolPrefix>content=<TMPL_var contentId>&pattern=<TMPL_var searchPattern>&start=<TMPL_var start>&end=<TMPL_var end>"><TMPL_var label></a></li>
</TMPL_LOOP>
<TMPL_if (resultLastPageStart>0)>
<li><a href="<TMPL_var searchProtocolPrefix>pattern=<TMPL_var searchPattern>&start=<TMPL_var resultLastPageStart>&end=<TMPL_var (resultLastPageStart+resultRange)>">▶</a></li>
<li><a href="<TMPL_var searchProtocolPrefix>content=<TMPL_var contentId>&pattern=<TMPL_var searchPattern>&start=<TMPL_var resultLastPageStart>&end=<TMPL_var (resultLastPageStart+resultRange)>">▶</a></li>
</TMPL_if>
</ul>
</div>