Forks/privacore-open-source-search-engine
1
0
Fork 0
forked from Mirrors/privacore-open-source-search-engine
Code Pull Requests Activity

Merge branch 'testing'

Browse Source
This commit is contained in:
Matt
2015-03-07 15:52:41 -08:00
parent 605a384449 b593027ff6
commit 521bcf01a2
3 changed files with 11 additions and 6 deletions

3
PageRoot.cpp

@ -726,7 +726,8 @@ bool printLeftColumnRocketAndTabs ( SafeBuf *sb ,
for ( int32_t i = 0 ; i < n ; i++ ) {
if ( isSearchResultsPage && i >= 5 ) break;
// just show search, directort and advanced tab in serps
if ( isSearchResultsPage && i >= 3 ) break;
// what was this for?
// if ( i >= 1 && i <= 4 &&

2
Parms.cpp

@ -15424,7 +15424,7 @@ void Parms::init ( ) {
"boosts to no language in particular. See the language "
"abbreviations at the bottom of the "
"<a href=/admin/filters>url filters</a> page.";
m->m_cgi = "qlang";
m->m_cgi = "defqlang";
m->m_off = (char *)&cr.m_defaultSortLanguage2 - x;
m->m_type = TYPE_STRING;
m->m_size = 6; // up to 5 chars + NULL, e.g. "en_US"

12
main.cpp

@ -14464,7 +14464,9 @@ int injectFile ( char *filename , char *ips ,
for ( ; p && p < pend ; p = nextLine ) {
nextLine = strstr(p,"\n");
if ( nextLine ) nextLine++;
if ( count >= 20 ) count = 0;
// this is how many hosts we are using!!
// TODO: make this get from hosts.conf!!!
if ( count >= 40 ) count = 0;
if ( count++ != split ) continue;
// get line
char *archiveDirName = p;
@ -15285,7 +15287,8 @@ void doInjectWarc ( int64_t fsize ) {
for ( ; *whp && strncmp(whp,"WARC/",5) ; whp++ );
// none?
if ( ! *whp ) {
log("inject: could not find WARC/1 header start");
log("inject: could not find WARC/1 header start for file=%s",
s_file.getFilename());
if ( s_outstanding ) {
log("inject: waiting for socks");return;}
exit(0);
@ -15296,7 +15299,8 @@ void doInjectWarc ( int64_t fsize ) {
// find end of warc mime HEADER not the content
char *warcHeaderEnd = strstr(warcHeader,"\r\n\r\n");
if ( ! warcHeaderEnd ) {
log("inject: could not find end of WARC header.");
log("inject: could not find end of WARC header for file=%s.",
s_file.getFilename());
if ( s_outstanding ) {
log("inject: waiting for socks");return;}
exit(0);
@ -15565,7 +15569,7 @@ void doInjectWarc ( int64_t fsize ) {
int realMax = 10;
if ( s_hosts2.getNumHosts() > 1 )
realMax = s_hosts2.getNumHosts() * 3;
realMax = s_hosts2.getNumHosts() * 2;
// launch another if blocked
if ( ! status ) {