X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Ftest1%2Fsearch.js;h=e1b3b24705ddf501c3f5274183989fc46279d159;hb=e709c597b12450d07d225419f6d08e8d3d295820;hp=28f72a3ebb28b47f8700734f893a1438bacb8e6a;hpb=d3daf2613e7577626bc84c54b4b70f74aff7f8e7;p=pazpar2-moved-to-github.git diff --git a/www/test1/search.js b/www/test1/search.js index 28f72a3..e1b3b24 100644 --- a/www/test1/search.js +++ b/www/test1/search.js @@ -1,4 +1,4 @@ -/* $Id: search.js,v 1.1 2006-12-29 10:22:09 sondberg Exp $ +/* $Id: search.js,v 1.14 2007-06-20 19:27:18 adam Exp $ * --------------------------------------------------- * Javascript container */ @@ -17,9 +17,18 @@ var searchtimer; var showtimer; var termtimer; var stattimer; -var startrec; -var session_cells = Array('query'); +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 () +{ + start_session(); + session_check(); +} + function GetXmlHttpObject() { @@ -35,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) @@ -43,16 +59,43 @@ 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); xinitSession.send(null); + + //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() @@ -83,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; @@ -94,6 +137,12 @@ function load_targets() xloadTargets.send(null); } + +function update_action (new_action) { + document.search.action_type.value = new_action; +} + + function show_records() { if (xshow.readyState != 4) @@ -105,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 { @@ -114,49 +163,56 @@ function show_records() var merged = Number(xml.getElementsByTagName('merged')[0].childNodes[0].nodeValue); var start = Number(xml.getElementsByTagName('start')[0].childNodes[0].nodeValue); var num = Number(xml.getElementsByTagName('num')[0].childNodes[0].nodeValue); + var clients = Number(xml.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue); body.innerHTML = 'Records : '; body.innerHTML += (start + 1) + ' to ' + (start + num) + ' of ' + merged + ' (total hits: ' + total + ')'; if (start + num < merged) body.innerHTML += ' Next'; + 'onclick="document.search.startrec.value=' + (start + recstoshow) + + ";update_action('page')" + + ';check_search(); update_history(); return false;">Next'; if (start > 0) body.innerHTML += ' Previous'; + 'onclick="document.search.startrec.value=' + (start - recstoshow) + + ";update_action('page')" + + ';check_search(); update_history();return false;">Previous'; body.innerHTML += '
'; for (i = 0; i < hits.length; i++) { 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 (shown < 5) - searchtimer = setTimeout(check_search, 1000); - else - searchtimer = setTimeout(check_search, 2000); + 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=" + startrec + - "&num=15" + + "&start=" + document.search.startrec.value + + "&num=" + recstoshow + "&session=" + session + - "&block=1"; + "&sort=relevance"; xshow = GetXmlHttpObject(); xshow.onreadystatechange=show_records; xshow.open("GET", url); @@ -166,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) @@ -182,14 +271,16 @@ function show_termlist() var xml = xtermlist.responseXML; var body = document.getElementById("termlist"); var hits = xml.getElementsByTagName("term"); + var clients = + 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"); @@ -197,25 +288,20 @@ function show_termlist() body.innerHTML += '' + namen[0].childNodes[0].nodeValue + ''; - /* - body.innerHTML += ' ('; - var freqn = hits[i].getElementsByTagName("frequency"); - if (freqn[0]) - body.innerHTML += freqn[0].childNodes[0].nodeValue; - body.innerHTML += ')
'; - */ body.innerHTML += '
'; } - termtimer = setTimeout(check_termlist, 2000); + if (clients > 0) + termtimer = setTimeout(check_termlist, 2000); } } - 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); @@ -230,6 +316,8 @@ function show_stat() var xml = xstat.responseXML; var body = document.getElementById("stat"); var nodes = xml.childNodes[0].childNodes; + var clients = + Number(xml.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue); if (!nodes[0]) { stattimer = setTimeout(check_stat, 500); @@ -248,13 +336,14 @@ function show_stat() body.innerHTML += ' ' + name + '=' + value; } body.innerHTML += ')'; - stattimer = setTimeout(check_stat, 2000); + if (clients > 0) + stattimer = setTimeout(check_stat, 2000); } } function check_stat() { - var url = "search.pz2?" + + var url = "/pazpar2/search.pz2?" + "command=stat" + "&session=" + session; xstat = GetXmlHttpObject(); @@ -281,6 +370,7 @@ function search_started() function start_search() { + shown = 0; clearTimeout(termtimer); termtimer = 0; clearTimeout(searchtimer); @@ -295,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; @@ -306,8 +396,7 @@ function start_search() document.getElementById("termlist").innerHTML = ''; document.getElementById("body").innerHTML = ''; update_history(); - shown = 0; - startrec = 0; + document.search.startrec.value = 0; } @@ -369,19 +458,23 @@ function update_history () function session_check () { var session = session_read(); + var action = document.search.action_type.value; clearInterval(url_surveillence); if ( session != unescape(old_session) ) { session_restore(session); - start_search(); - + + if (action == 'search') { + start_search(); + } else if (action == 'page') { + check_search(); + } else { + alert('Unregocnized action_type: ' + action); + return; + } } url_surveillence = setInterval(session_check, 200); } - - -var url_surveillence = setInterval(session_check, 200); -