--- a/src/query/reslistpager.cpp
+++ b/src/query/reslistpager.cpp
@@ -25,6 +25,7 @@
#include <stdint.h>
#include <sstream>
+#include <iostream>
#include <list>
using std::ostringstream;
using std::endl;
@@ -69,12 +70,13 @@
void ResListPager::resultPageNext()
{
if (!m_docSource) {
- LOGDEB("ResListPager::resultPageNext: null source\n" );
+ LOGDEB("ResListPager::resultPageNext: null source\n");
return;
}
int resCnt = m_docSource->getResCnt();
- LOGDEB("ResListPager::resultPageNext: rescnt " << (resCnt) << ", winfirst " << (m_winfirst) << "\n" );
+ LOGDEB("ResListPager::resultPageNext: rescnt " << resCnt <<
+ ", winfirst " << m_winfirst << "\n");
if (m_winfirst < 0) {
m_winfirst = 0;
@@ -126,12 +128,13 @@
void ResListPager::resultPageFor(int docnum)
{
if (!m_docSource) {
- LOGDEB("ResListPager::resultPageFor: null source\n" );
+ LOGDEB("ResListPager::resultPageFor: null source\n");
return;
}
int resCnt = m_docSource->getResCnt();
- LOGDEB("ResListPager::resultPageFor(" << (docnum) << "): rescnt " << (resCnt) << ", winfirst " << (m_winfirst) << "\n" );
+ LOGDEB("ResListPager::resultPageFor(" << docnum << "): rescnt " <<
+ resCnt << ", winfirst " << m_winfirst << "\n");
m_winfirst = (docnum / m_pagesize) * m_pagesize;
// Get the next page of results.
@@ -250,7 +253,7 @@
// Links;
ostringstream linksbuf;
if (canIntern(doc.mimetype, config)) {
- linksbuf << "<a href=\"P" << docnumforlinks << "\">"
+ linksbuf << "<a href=\""<< linkPrefix()<< "P" << docnumforlinks << "\">"
<< trans("Preview") << "</a> ";
}
@@ -258,12 +261,12 @@
doc.getmeta(Rcl::Doc::keyapptg, &apptag);
if (!config->getMimeViewerDef(doc.mimetype, apptag, false).empty()) {
- linksbuf << "<a href=\"E" << docnumforlinks << "\">"
+ linksbuf << "<a href=\"" <<linkPrefix() + "E" <<docnumforlinks << "\">"
<< trans("Open") << "</a>";
}
ostringstream snipsbuf;
if (doc.haspages) {
- snipsbuf << "<a href=\"A" << docnumforlinks << "\">"
+ snipsbuf << "<a href=\"" <<linkPrefix()<<"A" << docnumforlinks << "\">"
<< trans("Snippets") << "</a> ";
linksbuf << " " << snipsbuf.str();
}
@@ -272,8 +275,8 @@
if (doc.getmeta(Rcl::Doc::keycc, &collapscnt) && !collapscnt.empty()) {
ostringstream collpsbuf;
int clc = atoi(collapscnt.c_str()) + 1;
- collpsbuf << "<a href=\"D" << docnumforlinks << "\">"
- << trans("Dups") << "(" << clc << ")" << "</a> ";
+ collpsbuf << "<a href=\""<<linkPrefix()<<"D" << docnumforlinks << "\">"
+ << trans("Dups") << "(" << clc << ")" << "</a> ";
linksbuf << " " << collpsbuf.str();
}
@@ -326,7 +329,7 @@
// the table approach for 1.15 for now (in guiutils.cpp)
// chunk << "<br style='clear:both;height:0;line-height:0;'>" << endl;
- LOGDEB2("Chunk: [" << ((const char *)chunk.rdbuf()->str()) << "]\n" );
+ LOGDEB2("Chunk: [" << chunk.rdbuf()->str() << "]\n");
append(chunk.rdbuf()->str(), i, doc);
}
@@ -342,13 +345,13 @@
void ResListPager::displayPage(RclConfig *config)
{
- LOGDEB("ResListPager::displayPage\n" );
+ LOGDEB("ResListPager::displayPage. linkPrefix: " << linkPrefix() << "\n");
if (!m_docSource) {
- LOGDEB("ResListPager::displayPage: null source\n" );
+ LOGDEB("ResListPager::displayPage: null source\n");
return;
}
if (m_winfirst < 0 && !pageEmpty()) {
- LOGDEB("ResListPager::displayPage: sequence error: winfirst < 0\n" );
+ LOGDEB("ResListPager::displayPage: sequence error: winfirst < 0\n");
return;
}
@@ -363,14 +366,14 @@
// accumulator
// Also note that there can be results beyond the estimated resCnt.
chunk << "<html><head>" << endl
- << "<meta http-equiv=\"content-type\""
- << " content=\"text/html; charset=utf-8\">" << endl
- << headerContent()
- << "</head><body>" << endl
- << pageTop()
- << "<p><span style=\"font-size:110%;\"><b>"
- << m_docSource->title()
- << "</b></span> ";
+ << "<meta http-equiv=\"content-type\""
+ << " content=\"text/html; charset=utf-8\">" << endl
+ << headerContent()
+ << "</head><body>" << endl
+ << pageTop()
+ << "<p><span style=\"font-size:110%;\"><b>"
+ << m_docSource->title()
+ << "</b></span> ";
if (pageEmpty()) {
chunk << trans("<p><b>No results found</b><br>");
@@ -389,11 +392,11 @@
if (o_index_stripchars) {
chunk <<
trans("<p><i>Alternate spellings (accents suppressed): </i>")
- << "<br /><blockquote>";
+ << "<br /><blockquote>";
} else {
chunk <<
trans("<p><i>Alternate spellings: </i>")
- << "<br /><blockquote>";
+ << "<br /><blockquote>";
}
@@ -412,27 +415,27 @@
unsigned int resCnt = m_docSource->getResCnt();
if (m_winfirst + m_respage.size() < resCnt) {
chunk << trans("Documents") << " <b>" << m_winfirst + 1
- << "-" << m_winfirst + m_respage.size() << "</b> "
- << trans("out of at least") << " "
- << resCnt << " " << trans("for") << " " ;
+ << "-" << m_winfirst + m_respage.size() << "</b> "
+ << trans("out of at least") << " "
+ << resCnt << " " << trans("for") << " " ;
} else {
chunk << trans("Documents") << " <b>"
- << m_winfirst + 1 << "-" << m_winfirst + m_respage.size()
- << "</b> " << trans("for") << " ";
+ << m_winfirst + 1 << "-" << m_winfirst + m_respage.size()
+ << "</b> " << trans("for") << " ";
}
}
chunk << detailsLink();
if (hasPrev() || hasNext()) {
chunk << " ";
if (hasPrev()) {
- chunk << "<a href=\"" + prevUrl() + "\"><b>"
- << trans("Previous")
- << "</b></a> ";
+ chunk << "<a href=\"" << linkPrefix() + prevUrl() + "\"><b>"
+ << trans("Previous")
+ << "</b></a> ";
}
if (hasNext()) {
- chunk << "<a href=\""+ nextUrl() + "\"><b>"
- << trans("Next")
- << "</b></a>";
+ chunk << "<a href=\"" << linkPrefix() + nextUrl() + "\"><b>"
+ << trans("Next")
+ << "</b></a>";
}
}
chunk << "</p>" << endl;
@@ -457,14 +460,14 @@
chunk << "<p align=\"center\">";
if (hasPrev() || hasNext()) {
if (hasPrev()) {
- chunk << "<a href=\"" + prevUrl() + "\"><b>"
- << trans("Previous")
- << "</b></a> ";
+ chunk << "<a href=\"" + linkPrefix() + prevUrl() + "\"><b>"
+ << trans("Previous")
+ << "</b></a> ";
}
if (hasNext()) {
- chunk << "<a href=\""+ nextUrl() + "\"><b>"
- << trans("Next")
- << "</b></a>";
+ chunk << "<a href=\"" << linkPrefix() + nextUrl() + "\"><b>"
+ << trans("Next")
+ << "</b></a>";
}
}
chunk << "</p>" << endl;
@@ -505,7 +508,7 @@
string ResListPager::detailsLink()
{
- string chunk = "<a href=\"H-1\">";
+ string chunk = string("<a href=\"") + linkPrefix() + "H-1\">";
chunk += trans("(show query)") + "</a>";
return chunk;
}