X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Ftest1%2Fsearch.js;h=e1b3b24705ddf501c3f5274183989fc46279d159;hb=e709c597b12450d07d225419f6d08e8d3d295820;hp=d9c6af326399dfa619632b429a581ab493017eee;hpb=28589aa29d2c105b8862116b7466110f77bc7b35;p=pazpar2-moved-to-github.git diff --git a/www/test1/search.js b/www/test1/search.js index d9c6af3..e1b3b24 100644 --- a/www/test1/search.js +++ b/www/test1/search.js @@ -1,4 +1,4 @@ -/* $Id: search.js,v 1.4 2007-01-04 02:53:37 quinn Exp $ +/* $Id: search.js,v 1.14 2007-06-20 19:27:18 adam Exp $ * --------------------------------------------------- * Javascript container */ @@ -20,7 +20,8 @@ var stattimer; var session_cells = Array('query', 'startrec', 'action_type'); var old_session = session_read(); var url_surveillence; - +var recstoshow = 15; +var cur_termlist = "subject"; function initialize () { @@ -43,6 +44,13 @@ function GetXmlHttpObject() return objXMLHttp } +function SendXmlHttpObject(obj, url, handler) +{ + obj.onreadystatechange=handler; + obj.open("GET", url); + obj.send(null); +} + function session_started() { if (xinitSession.readyState != 4) @@ -51,12 +59,13 @@ function session_started() var sesid = xml.getElementsByTagName("session")[0].childNodes[0].nodeValue; document.getElementById("status").innerHTML = "Live"; session = sesid; + setTimeout(ping_session, 50000); } function start_session() { xinitSession = GetXmlHttpObject(); - var url="search.pz2?"; + var url="/pazpar2/search.pz2?"; url += "command=init"; xinitSession.onreadystatechange=session_started; xinitSession.open("GET", url); @@ -65,6 +74,30 @@ function start_session() //url_surveillence = setInterval(session_check, 200); } +function ping_session() +{ + if (!session) + return; + var url = "/pazpar2/search.pz2?command=ping&session=" + session; + SendXmlHttpObject(xpingSession = GetXmlHttpObject(), url, session_pinged); +} + +function session_pinged() +{ + if (xpingSession.readyState != 4) + return; + var xml = xpingSession.responseXML; + var error = xml.getElementsByTagName("error"); + if (error[0]) + { + var msg = error[0].childNodes[0].nodeValue; + alert(msg); + location = "?"; + return; + } + setTimeout(ping_session, 50000); +} + function targets_loaded() { if (xloadTargets.readyState != 4) @@ -93,7 +126,7 @@ function load_targets() alert("Please enter a target definition file name"); return; } - var url="search.pz2?" + + var url="/pazpar2/search.pz2?" + "command=load" + "&session=" + session + "&name=" + fn; @@ -121,7 +154,7 @@ function show_records() if (!hits[0]) // We should never get here with blocking operations { body.innerHTML = "No records yet"; - searchtimer = setTimeout(check_search, 250); + searchtimer = setTimeout(check_search, 2000); } else { @@ -137,13 +170,13 @@ function show_records() if (start + num < merged) body.innerHTML += ' Next'; if (start > 0) body.innerHTML += ' Previous'; @@ -152,33 +185,34 @@ function show_records() { body.innerHTML += '

'; body.innerHTML += (i + start + 1) + ': '; - var mk = hits[i].getElementsByTagName("title"); + var mk = hits[i].getElementsByTagName("md-title"); if (mk[0]) body.innerHTML += mk[0].childNodes[0].nodeValue; body.innerHTML += '

'; } - shown++; - if (clients > 0) - { + if (shown >= 0) { + shown++; if (shown < 5) searchtimer = setTimeout(check_search, 1000); else searchtimer = setTimeout(check_search, 2000); + if (clients == 0) + shown = -1; } } if (!termtimer) - termtimer = setTimeout(check_termlist, 1000); + termtimer = setTimeout(check_termlist, 2000); } function check_search() { clearTimeout(searchtimer); - var url = "search.pz2?" + + var url = "/pazpar2/search.pz2?" + "command=show" + "&start=" + document.search.startrec.value + - "&num=15" + + "&num=" + recstoshow + "&session=" + session + - "&block=1"; + "&sort=relevance"; xshow = GetXmlHttpObject(); xshow.onreadystatechange=show_records; xshow.open("GET", url); @@ -188,13 +222,46 @@ function check_search() function refine_query (obj) { var query_cell = document.getElementById('query'); - var subject = obj.innerHTML; + var term = obj.firstChild.nodeValue; - subject = subject.replace(/[\(\)]/g, ''); - query_cell.value += ' and su=(' + subject + ')'; + term = term.replace(/[\(\)]/g, ''); + if (cur_termlist == 'subject') + query_cell.value += ' and su=(' + term + ')'; + else if (cur_termlist == 'author') + query_cell.value += ' and au=(' + term + ')'; start_search(); } +function set_termlist(termlist) +{ + cur_termlist = termlist; + check_termlist(); + if (termtimer) + { + clearTimeout(termtimer); + termtimer = 0; + } +} + +function show_termlistoptions(body) +{ + var opts = Array( + Array('subject', 'Subject'), + Array('author', 'Author') + ); + + for (i in opts) + { + if (opts[i][0] == cur_termlist) + body.innerHTML += opts[i][1]; + else + body.innerHTML += '' + opts[i][1] + ''; + body.innerHTML += ' '; + } + body.innerHTML += '

'; +} + function show_termlist() { if (xtermlist.readyState != 4) @@ -208,12 +275,12 @@ function show_termlist() Number(xml.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue); if (!hits[0]) { - termtimer = setTimeout(check_termlist, 1000); - + termtimer = setTimeout(check_termlist, 2000); } else { body.innerHTML = "Limit results:
"; + show_termlistoptions(body); for (i = 0; i < hits.length; i++) { var namen = hits[i].getElementsByTagName("name"); @@ -228,12 +295,13 @@ function show_termlist() } } - function check_termlist() { - var url = "search.pz2?" + + var url = "/pazpar2/search.pz2?" + "command=termlist" + - "&session=" + session; + "&session=" + session + + "&num=20" + + "&name=" + cur_termlist; xtermlist = GetXmlHttpObject(); xtermlist.onreadystatechange=show_termlist; xtermlist.open("GET", url); @@ -275,7 +343,7 @@ function show_stat() function check_stat() { - var url = "search.pz2?" + + var url = "/pazpar2/search.pz2?" + "command=stat" + "&session=" + session; xstat = GetXmlHttpObject(); @@ -302,6 +370,7 @@ function search_started() function start_search() { + shown = 0; clearTimeout(termtimer); termtimer = 0; clearTimeout(searchtimer); @@ -316,7 +385,7 @@ function start_search() return; } var query = escape(document.getElementById('query').value); - var url = "search.pz2?" + + var url = "/pazpar2/search.pz2?" + "command=search" + "&session=" + session + "&query=" + query; @@ -327,7 +396,6 @@ function start_search() document.getElementById("termlist").innerHTML = ''; document.getElementById("body").innerHTML = ''; update_history(); - shown = 0; document.search.startrec.value = 0; }