gigablast/open-source-search-engine
1
0
Fork 0
mirror of https://github.com/gigablast/open-source-search-engine.git synced 2024-10-04 04:07:13 +03:00
Code Issues Projects Releases Wiki Activity

a few cleanups for the new dmoz code.

Browse Source
This commit is contained in:
mwells 2013-10-13 16:48:59 -07:00
parent 0cc78dc2e0
commit 3bc85cf528
3 changed files with 59 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Msg1.cpp
View File

@ -356,10 +356,10 @@ bool Msg1::sendSomeOfList ( ) {
char *xx=NULL;*xx=0; }
// little debug thing for genCatdb from msg9b's huge list add
if ( m_list->m_listSize > 10000000 )
log("msg1: adding chunk @ %li of %li bytes",
(long)(dataStart - m_list->m_list) ,
(long)m_list->m_listSize );
//if ( m_list->m_listSize > 10000000 )
// log("msg1: adding chunk @ %li of %li bytes",
// (long)(dataStart - m_list->m_list) ,
// (long)m_list->m_listSize );
// . now send this list to the host
// . this returns false if blocked, true otherwise

101
PageResults.cpp
View File

@ -3956,42 +3956,6 @@ bool printSingleScore ( SafeBuf &sb ,
return true;
}
// print the search options under a dmoz search box
bool printDirectorySearchType ( SafeBuf& sb, long sdirt ) {
// default to entire directory
if (sdirt < 1 || sdirt > 4)
sdirt = 3;
// by default search the whole thing
sb.safePrintf("<input type=\"radio\" name=\"sdirt\" value=\"3\"");
if (sdirt == 3) sb.safePrintf(" checked>");
else sb.safePrintf(">");
sb.safePrintf("Entire Directory<br>\n");
// entire category
sb.safePrintf("<input type=\"radio\" name=\"sdirt\" value=\"1\"");
if (sdirt == 1) sb.safePrintf(" checked>");
else sb.safePrintf(">");
sb.safePrintf("Entire Category<br>\n");
// base category only
sb.safePrintf("<nobr><input type=\"radio\" name=\"sdirt\" value=\"2\"");
if (sdirt == 2) sb.safePrintf(" checked>");
else sb.safePrintf(">");
sb.safePrintf("Pages in Base Category</nobr><br>\n");
// sites in base category
sb.safePrintf("<input type=\"radio\" name=\"sdirt\" value=\"7\"");
if (sdirt == 7) sb.safePrintf(" checked>");
else sb.safePrintf(">");
sb.safePrintf("Sites in Base Category<br>\n");
// sites in entire category
sb.safePrintf("<input type=\"radio\" name=\"sdirt\" value=\"6\"");
if (sdirt == 6) sb.safePrintf(" checked>");
else sb.safePrintf(">");
sb.safePrintf("Sites in Entire Category<br>\n");
// end it
return true;
}
////////
//
// . print the directory subtopics
@ -4060,6 +4024,8 @@ bool printDMOZSubTopics ( SafeBuf& sb, long catId, bool inXml ) {
SubCategory *cat = (SubCategory *)p;
ptrs[count++] = cat;
p += cat->getRecSize();
// do not breach
if ( count >= MAX_SUB_CATS ) break;
}
@ -4447,18 +4413,7 @@ bool printDMOZCrumb ( SafeBuf &sb , long catId , bool xml ) {
return true;
}
bool printDmozRadioButtons ( SafeBuf &sb , long catId ) {
sb.safePrintf("Search "
"<input type=radio name=prepend "
"value=gbipcatid:%li checked> sites "
"<input type=radio name=prepend "
"value=gbpcatid:%li> pages "
"in this topic or below"
, catId
, catId
);
return true;
}
bool printDmozRadioButtons ( SafeBuf &sb , long catId ) ;
// if catId >= 1 then print the dmoz radio button
bool printLogoAndSearchBox ( SafeBuf &sb , HttpRequest *hr , long catId ) {
@ -4584,3 +4539,53 @@ bool printLogoAndSearchBox ( SafeBuf &sb , HttpRequest *hr , long catId ) {
);
return true;
}
bool printDmozRadioButtons ( SafeBuf &sb , long catId ) {
sb.safePrintf("Search "
"<input type=radio name=prepend "
"value=gbipcatid:%li checked> sites "
"<input type=radio name=prepend "
"value=gbpcatid:%li> pages "
"in this topic or below"
, catId
, catId
);
return true;
}
/*
// print the search options under a dmoz search box
bool printDirectorySearchType ( SafeBuf& sb, long sdirt ) {
// default to entire directory
if (sdirt < 1 || sdirt > 4)
sdirt = 3;
// by default search the whole thing
sb.safePrintf("<input type=\"radio\" name=\"sdirt\" value=\"3\"");
if (sdirt == 3) sb.safePrintf(" checked>");
else sb.safePrintf(">");
sb.safePrintf("Entire Directory<br>\n");
// entire category
sb.safePrintf("<input type=\"radio\" name=\"sdirt\" value=\"1\"");
if (sdirt == 1) sb.safePrintf(" checked>");
else sb.safePrintf(">");
sb.safePrintf("Entire Category<br>\n");
// base category only
sb.safePrintf("<nobr><input type=\"radio\" name=\"sdirt\" value=\"2\"");
if (sdirt == 2) sb.safePrintf(" checked>");
else sb.safePrintf(">");
sb.safePrintf("Pages in Base Category</nobr><br>\n");
// sites in base category
sb.safePrintf("<input type=\"radio\" name=\"sdirt\" value=\"7\"");
if (sdirt == 7) sb.safePrintf(" checked>");
else sb.safePrintf(">");
sb.safePrintf("Sites in Base Category<br>\n");
// sites in entire category
sb.safePrintf("<input type=\"radio\" name=\"sdirt\" value=\"6\"");
if (sdirt == 6) sb.safePrintf(" checked>");
else sb.safePrintf(">");
sb.safePrintf("Sites in Entire Category<br>\n");
// end it
return true;
}
*/

2
XmlDoc.cpp
View File

@ -2111,6 +2111,8 @@ long *XmlDoc::getIndexCode ( ) {
// if we could not get an ip we need to make a fake one
if ( ! m_ipValid || m_ip == 0 || m_ip == -1 ) {
log("build: ip unattainable. forcing ip address of %s "
"to 10.5.123.45",m_firstUrl.m_url);
m_ip = atoip("10.5.123.45");
m_ipValid = true;
}