doc updates. core fixes.

This commit is contained in:
mwells 2014-04-10 00:31:41 -07:00
parent 6675facc4f
commit 02304073d4
5 changed files with 130 additions and 108 deletions

View File

@ -52,7 +52,7 @@ bool sendPageInject ( TcpSocket *s , HttpRequest *r ) {
msg7->m_crawlbotAPI = crawlbotAPI;
strncpy(msg7->m_coll,coll,MAX_COLL_LEN);
strncpy(msg7->m_coll,cr->m_coll,MAX_COLL_LEN);
// for diffbot
//if ( crawlbotAPI )

View File

@ -1320,13 +1320,12 @@ bool printSearchResultsHeader ( State0 *st ) {
}
// is it the main collection?
bool isMain = false;
if ( collLen == 4 && strncmp ( coll, "main", 4) == 0 ) isMain = true;
// print "in collection ***" if we had a collection
if ( collLen > 0 && ! isMain && si->m_format == FORMAT_HTML )
if (collLen>0 && numResults>0 && !isMain && si->m_format==FORMAT_HTML )
sb->safePrintf (" in collection <b>%s</b>",coll);
@ -1364,12 +1363,14 @@ bool printSearchResultsHeader ( State0 *st ) {
// print reindex link
// get the filename directly
char *langStr = getLangAbbr ( si->m_queryLang );
sb->safePrintf (" &nbsp; "
"<font color=red><b>"
"<a href=\"/admin/reindex?c=%s&"
"qlang=%s&q=%s\">"
"[reindex or delete these results]</a></b>"
"</font> ", coll , langStr , st->m_qe );
if ( numResults>0 )
sb->safePrintf (" &nbsp; "
"<font color=red><b>"
"<a href=\"/admin/reindex?c=%s&"
"qlang=%s&q=%s\">"
"[reindex or delete these results]"
"</a></b>"
"</font> ",coll, langStr , st->m_qe );
sb->safePrintf (" &nbsp; "
"<font color=red><b>"
"<a href=\"/inject?c=%s&qts=%s\">"

View File

@ -170,6 +170,16 @@ bool printWebHomePage ( SafeBuf &sb , HttpRequest *r ) {
sb.safePrintf("<br>\n");
sb.safePrintf("\n");
if ( cr && cr->m_coll && strcmp(cr->m_coll,"main") ) {
sb.safePrintf("<center>"
"Searching the <b>%s</b> collection."
"</center>",
cr->m_coll);
sb.safePrintf("<br>\n");
sb.safePrintf("\n");
}
// print any red boxes we might need to
if ( printRedBox2 ( &sb , true ) )
sb.safePrintf("<br>\n");
@ -190,7 +200,7 @@ bool printWebHomePage ( SafeBuf &sb , HttpRequest *r ) {
sb.safePrintf("<td><font size=+1><b>Open Source!</b>"
"</font><br>\n");
sb.brify2("Gigablast is now available as an <a href=https://github.com/gigablast/open-source-search-engine>open source search engine</a> on github.com. Download it today. Finally a robust, scalable search solution in C/C++ that has been in development and used commercially since 2000. <a href=/admin.html#features>Features.</a> Limited support available for free."
sb.brify2("Gigablast is now available as an <a href=https://github.com/gigablast/open-source-search-engine>open source search engine</a> on github.com. Download it today. Finally a robust, scalable search solution in C/C++ that has been in development and used commercially since 2000. <a href=/admin.html#features>Features</a>. Limited support available for free."
,80);
sb.safePrintf("<br><br>");
sb.safePrintf("</td></tr>\n");

View File

@ -12399,8 +12399,9 @@ bool getSpiderStatusMsg ( CollectionRec *cx , SafeBuf *msg , long *status ) {
*status = SP_ROUNDDONE;
return msg->safePrintf ( "Nothing currently "
"available to spider. "
"Change your url filters or try "
"adding new urls.");
"Change your url filters, try "
"adding new urls, or wait for "
"existing urls to be respidered.");
}

File diff suppressed because one or more lines are too long