mirror of
https://github.com/gigablast/open-source-search-engine.git
synced 2024-10-04 12:17:35 +03:00
fixes for widget
This commit is contained in:
Matt Wells
parent
2f331d55e5
commit
285c7e298e
@ -808,20 +808,71 @@ bool sendPageBasicStatus ( TcpSocket *socket , HttpRequest *hr ) {
|
||||
"if(!this.responseText)return;"
|
||||
// get the widget container
|
||||
"var w=document.getElementById(\"widget123\");"
|
||||
|
||||
// GET DOCID of first div/searchresult
|
||||
"var sd=document.getElementById("
|
||||
"\"widget123_scrolldiv\");"
|
||||
"var cd;"
|
||||
"if ( sd ) cd=sd.firstChild;"
|
||||
"var fd=0;"
|
||||
"if(cd) fd=cd.getAttribute('docid');"
|
||||
|
||||
// just set the widget content to the reply
|
||||
"w.innerHTML=this.responseText;"
|
||||
|
||||
//
|
||||
// find that SAME docid in response and see
|
||||
// how many new results were added above it
|
||||
//
|
||||
"var added=0;"
|
||||
// did we find the docid?
|
||||
"var found=0;"
|
||||
// get div again since we updated innerHTML
|
||||
"sd=document.getElementById("
|
||||
"\"widget123_scrolldiv\");"
|
||||
// scan the kids
|
||||
"var kid=sd.firstChild;"
|
||||
// begin the while loop to scan the kids
|
||||
"while (kid) {"
|
||||
// if div had no docid it might have been a line
|
||||
// break div, so ignore
|
||||
"if (!kid.hasAttribute('docid') ) {"
|
||||
"kid=kid.nextSibling;"
|
||||
"continue;"
|
||||
"}"
|
||||
// set kd to docid of kid
|
||||
"var kd=kid.getAttribute('docid');"
|
||||
// stop if we hit our original top docid
|
||||
"if(kd==fd) {found=1;break;}"
|
||||
// otherwise count it as a NEW result we got
|
||||
"added++;"
|
||||
// advance kid
|
||||
"kid=kid.nextSibling;"
|
||||
// end while loop
|
||||
"}"
|
||||
|
||||
//"alert(\"added=\"+added);"
|
||||
|
||||
// how many results did we ADD above the
|
||||
// reported "topdocid" of the widget?
|
||||
// it should be in the ajax reply from the
|
||||
// search engine. how many result were above
|
||||
// the given "topdocid".
|
||||
"var ta=document.getElementById(\"topadd\");"
|
||||
"var added=0;"
|
||||
"if(ta)added=ta.value;"
|
||||
//"var ta=document.getElementById(\"topadd\");"
|
||||
//"var added=0;"
|
||||
//"if(ta)added=ta.value;"
|
||||
|
||||
// if nothing added do nothing
|
||||
"if (added==0)return;"
|
||||
|
||||
// if original top docid not found, i guess we
|
||||
// added too many new guys to the top of the
|
||||
// search results, so don't bother scrolling
|
||||
// just reset to top
|
||||
"if (!found) return;"
|
||||
|
||||
// show that
|
||||
//"alert(this.responseText);"
|
||||
"alert(\"added=\"+added);"
|
||||
|
||||
// get the div that has the scrollbar
|
||||
"var sd=document.getElementById("
|
||||
@ -873,7 +924,7 @@ bool sendPageBasicStatus ( TcpSocket *socket , HttpRequest *hr ) {
|
||||
// so it delays on each new result. perhaps make
|
||||
// it less than 1000ms if we have a lot of
|
||||
// results above us!
|
||||
"setTimeout('widget123_scroll()',30000);}\n\n"
|
||||
"setTimeout('widget123_scroll()',3);}\n\n"
|
||||
|
||||
);
|
||||
|
||||
@ -887,6 +938,8 @@ bool sendPageBasicStatus ( TcpSocket *socket , HttpRequest *hr ) {
|
||||
"outstanding=0;"
|
||||
// if error or empty reply then do nothing
|
||||
"if(!this.responseText)return;"
|
||||
// if too small
|
||||
"if(this.responseText.length<=3)return;"
|
||||
// get the widget container
|
||||
"var w=document.getElementById("
|
||||
"\"widget123_scrolldiv\");"
|
||||
@ -910,8 +963,8 @@ bool sendPageBasicStatus ( TcpSocket *socket , HttpRequest *hr ) {
|
||||
"&q=gbsortbyint%%3Agbspiderdate"
|
||||
"&sc=0" // no site clustering
|
||||
"&dr=0" // no deduping
|
||||
// test dbug for now:
|
||||
"&n=4"
|
||||
// 10 results at a time
|
||||
"&n=10"
|
||||
"&widgetheight=%li"
|
||||
"&widgetwidth=%li"
|
||||
, cr->m_coll
|
||||
@ -976,7 +1029,8 @@ bool sendPageBasicStatus ( TcpSocket *socket , HttpRequest *hr ) {
|
||||
"var td=document.getElementById('topdocid');"
|
||||
"if ( td ) u=u+\"&topdocid=\"+td.value;"
|
||||
|
||||
"alert('reloading');"
|
||||
//"alert('reloading');"
|
||||
|
||||
"client.open('GET',u);"
|
||||
"client.send();"
|
||||
"}\n\n"
|
||||
@ -1047,7 +1101,7 @@ bool sendPageBasicStatus ( TcpSocket *socket , HttpRequest *hr ) {
|
||||
// turn on the lock to prevent excessive calls
|
||||
"outstanding=1;"
|
||||
|
||||
"alert(\"scrolling2 u=\"+u);"
|
||||
//"alert(\"scrolling2 u=\"+u);"
|
||||
|
||||
"var client=new XMLHttpRequest();"
|
||||
"client.onreadystatechange="
|
||||
|
||||
@ -904,11 +904,13 @@ bool gotResults ( void *state ) {
|
||||
//
|
||||
|
||||
|
||||
long numResults = msg40->getNumResults();
|
||||
|
||||
// if user is doing ajax widget we need to know the current docid
|
||||
// that is listed at the top of their widget display so we can
|
||||
// hide the new docids above that and scroll them down slowly.
|
||||
long numResults = msg40->getNumResults();
|
||||
long topDocIdPos = -1;
|
||||
/*
|
||||
//long topDocIdPos = -1;
|
||||
bool hasInvisibleResults = false;
|
||||
//long numInvisible = 0;
|
||||
long numAbove = 0;
|
||||
@ -952,10 +954,11 @@ bool gotResults ( void *state ) {
|
||||
continue;
|
||||
}
|
||||
// we match it, so set this if not already set
|
||||
if ( topDocIdPos != -1 ) topDocIdPos = i;
|
||||
//if ( topDocIdPos != -1 ) topDocIdPos = i;
|
||||
//break;
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
SafeBuf *sb = &st->m_sb;
|
||||
|
||||
@ -1000,16 +1003,16 @@ bool gotResults ( void *state ) {
|
||||
|
||||
// propagate "topdocid" so when he does another query every 30 secs
|
||||
// or so we know what docid was on top for scrolling purposes
|
||||
if ( si->m_format == FORMAT_WIDGET_AJAX )
|
||||
sb->safePrintf("<input type=hidden "
|
||||
"id=topdocid name=topdocid value=%lli>\n",
|
||||
oldTop);
|
||||
//if ( si->m_format == FORMAT_WIDGET_AJAX )
|
||||
// sb->safePrintf("<input type=hidden "
|
||||
// "id=topdocid name=topdocid value=%lli>\n",
|
||||
// oldTop);
|
||||
|
||||
// report how many results we added above the topdocid provided, if any
|
||||
// so widget can scroll down automatically
|
||||
if ( si->m_format == FORMAT_WIDGET_AJAX && numAbove )
|
||||
sb->safePrintf("<input type=hidden "
|
||||
"id=topadd name=topadd value=%li>\n",numAbove);
|
||||
//if ( si->m_format == FORMAT_WIDGET_AJAX && numAbove )
|
||||
// sb->safePrintf("<input type=hidden "
|
||||
// "id=topadd name=topadd value=%li>\n",numAbove);
|
||||
|
||||
|
||||
// we often can add 100s of things to the widget's result set per
|
||||
@ -1102,7 +1105,7 @@ bool gotResults ( void *state ) {
|
||||
|
||||
// if we split the serps into 2 divs for scrolling purposes
|
||||
// then close up the 2nd one
|
||||
if ( hasInvisibleResults ) sb->safePrintf("</div>");
|
||||
//if ( hasInvisibleResults ) sb->safePrintf("</div>");
|
||||
|
||||
// END SERP DIV
|
||||
if ( si->m_format == FORMAT_WIDGET_IFRAME ||
|
||||
|
||||
@ -992,11 +992,11 @@ m if (! cr->hasSearchPermission ( sock, encapIp ) ) {
|
||||
if(m_firstResultNum < 0) m_firstResultNum = 0;
|
||||
|
||||
// DEBUG: temp hack
|
||||
//static bool first = true;
|
||||
// if ( first ) {
|
||||
// first = false;
|
||||
// m_firstResultNum = 5;
|
||||
// }
|
||||
// static bool first = true;
|
||||
// if ( first ) {
|
||||
// first = false;
|
||||
// m_firstResultNum = 10;
|
||||
// }
|
||||
|
||||
|
||||
// if useCache is -1 then pick a default value
|
||||
|
||||
Loading…
Reference in New Issue
Block a user