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

+ possible now to navigate trhough all the results

This commit is contained in:
kelson42 2011-04-03 11:32:51 +00:00
parent 91dfb75b47
commit bfd78ed71c
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,14 +175,18 @@ namespace kiwix {
// pages // pages
CDT pagesCDT(CDT::ARRAY_VAL); CDT pagesCDT(CDT::ARRAY_VAL);
unsigned int pageCount = this->estimatedResultCount / this->resultCountPerPage + 1;
unsigned int pageStart = this->resultStart / this->resultCountPerPage >= 5 ? this->resultStart / this->resultCountPerPage - 4 : 0;
unsigned int pageCount = this->estimatedResultCount / this->resultCountPerPage + 1 - pageStart;
if (pageCount > 10) if (pageCount > 10)
pageCount = 10; pageCount = 10;
else if (pageCount == 1) else if (pageCount == 1)
pageCount = 0; pageCount = 0;
for (unsigned int i=0; i<pageCount; i++) { for (unsigned int i=pageStart; i<pageStart+pageCount; i++) {
CDT page; CDT page;
page["label"] = i + 1;
page["start"] = i * this->resultCountPerPage; page["start"] = i * this->resultCountPerPage;
page["end"] = (i+1) * this->resultCountPerPage; page["end"] = (i+1) * this->resultCountPerPage;

2
static/results.tmpl
View File

@ -114,7 +114,7 @@
<div class="footer"> <div class="footer">
<ul> <ul>
<TMPL_loop pages> <TMPL_loop pages>
<li><a <TMPL_if selected>class="selected"</TMPL_if> href="search://?pattern=<TMPL_var searchPattern>&start=<TMPL_var start>&end=<TMPL_var end>"><TMPL_var __COUNTER__></a></li> <li><a <TMPL_if selected>class="selected"</TMPL_if> href="search://?pattern=<TMPL_var searchPattern>&start=<TMPL_var start>&end=<TMPL_var end>"><TMPL_var label></a></li>
</TMPL_LOOP> </TMPL_LOOP>
</ul> </ul>
</div> </div>