projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
[pazpar2-moved-to-github.git]
/
www
/
test1
/
search.js
diff --git
a/www/test1/search.js
b/www/test1/search.js
index
94f0752
..
e1b3b24
100644
(file)
--- a/
www/test1/search.js
+++ b/
www/test1/search.js
@@
-1,4
+1,4
@@
-/* $Id: search.js,v 1.10 2007-01-15 04:34:29 quinn Exp $
+/* $Id: search.js,v 1.14 2007-06-20 19:27:18 adam Exp $
* ---------------------------------------------------
* Javascript container
*/
* ---------------------------------------------------
* Javascript container
*/
@@
-65,7
+65,7
@@
function session_started()
function start_session()
{
xinitSession = GetXmlHttpObject();
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);
url += "command=init";
xinitSession.onreadystatechange=session_started;
xinitSession.open("GET", url);
@@
-78,7
+78,7
@@
function ping_session()
{
if (!session)
return;
{
if (!session)
return;
- var url = "search.pz2?command=ping&session=" + session;
+ var url = "/pazpar2/search.pz2?command=ping&session=" + session;
SendXmlHttpObject(xpingSession = GetXmlHttpObject(), url, session_pinged);
}
SendXmlHttpObject(xpingSession = GetXmlHttpObject(), url, session_pinged);
}
@@
-126,7
+126,7
@@
function load_targets()
alert("Please enter a target definition file name");
return;
}
alert("Please enter a target definition file name");
return;
}
- var url="search.pz2?" +
+ var url="/pazpar2/search.pz2?" +
"command=load" +
"&session=" + session +
"&name=" + fn;
"command=load" +
"&session=" + session +
"&name=" + fn;
@@
-154,7
+154,7
@@
function show_records()
if (!hits[0]) // We should never get here with blocking operations
{
body.innerHTML = "No records yet";
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
{
}
else
{
@@
-190,29
+190,29
@@
function show_records()
body.innerHTML += mk[0].childNodes[0].nodeValue;
body.innerHTML += '</p>';
}
body.innerHTML += mk[0].childNodes[0].nodeValue;
body.innerHTML += '</p>';
}
- shown++;
- if (clients > 0)
- {
+ if (shown >= 0) {
+ shown++;
if (shown < 5)
searchtimer = setTimeout(check_search, 1000);
else
searchtimer = setTimeout(check_search, 2000);
if (shown < 5)
searchtimer = setTimeout(check_search, 1000);
else
searchtimer = setTimeout(check_search, 2000);
+ if (clients == 0)
+ shown = -1;
}
}
if (!termtimer)
}
}
if (!termtimer)
- termtimer = setTimeout(check_termlist, 1000);
+ termtimer = setTimeout(check_termlist, 2000);
}
function check_search()
{
clearTimeout(searchtimer);
}
function check_search()
{
clearTimeout(searchtimer);
- var url = "search.pz2?" +
+ var url = "/pazpar2/search.pz2?" +
"command=show" +
"&start=" + document.search.startrec.value +
"&num=" + recstoshow +
"&session=" + session +
"command=show" +
"&start=" + document.search.startrec.value +
"&num=" + recstoshow +
"&session=" + session +
- "&sort=title:1" +
- "&block=1";
+ "&sort=relevance";
xshow = GetXmlHttpObject();
xshow.onreadystatechange=show_records;
xshow.open("GET", url);
xshow = GetXmlHttpObject();
xshow.onreadystatechange=show_records;
xshow.open("GET", url);
@@
-222,7
+222,7
@@
function check_search()
function refine_query (obj) {
var query_cell = document.getElementById('query');
function refine_query (obj) {
var query_cell = document.getElementById('query');
- var term = obj.innerHTML;
+ var term = obj.firstChild.nodeValue;
term = term.replace(/[\(\)]/g, '');
if (cur_termlist == 'subject')
term = term.replace(/[\(\)]/g, '');
if (cur_termlist == 'subject')
@@
-275,7
+275,7
@@
function show_termlist()
Number(xml.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue);
if (!hits[0])
{
Number(xml.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue);
if (!hits[0])
{
- termtimer = setTimeout(check_termlist, 1000);
+ termtimer = setTimeout(check_termlist, 2000);
}
else
{
}
else
{
@@
-297,9
+297,10
@@
function show_termlist()
function check_termlist()
{
function check_termlist()
{
- var url = "search.pz2?" +
+ var url = "/pazpar2/search.pz2?" +
"command=termlist" +
"&session=" + session +
"command=termlist" +
"&session=" + session +
+ "&num=20" +
"&name=" + cur_termlist;
xtermlist = GetXmlHttpObject();
xtermlist.onreadystatechange=show_termlist;
"&name=" + cur_termlist;
xtermlist = GetXmlHttpObject();
xtermlist.onreadystatechange=show_termlist;
@@
-342,7
+343,7
@@
function show_stat()
function check_stat()
{
function check_stat()
{
- var url = "search.pz2?" +
+ var url = "/pazpar2/search.pz2?" +
"command=stat" +
"&session=" + session;
xstat = GetXmlHttpObject();
"command=stat" +
"&session=" + session;
xstat = GetXmlHttpObject();
@@
-369,6
+370,7
@@
function search_started()
function start_search()
{
function start_search()
{
+ shown = 0;
clearTimeout(termtimer);
termtimer = 0;
clearTimeout(searchtimer);
clearTimeout(termtimer);
termtimer = 0;
clearTimeout(searchtimer);
@@
-383,7
+385,7
@@
function start_search()
return;
}
var query = escape(document.getElementById('query').value);
return;
}
var query = escape(document.getElementById('query').value);
- var url = "search.pz2?" +
+ var url = "/pazpar2/search.pz2?" +
"command=search" +
"&session=" + session +
"&query=" + query;
"command=search" +
"&session=" + session +
"&query=" + query;
@@
-394,7
+396,6
@@
function start_search()
document.getElementById("termlist").innerHTML = '';
document.getElementById("body").innerHTML = '';
update_history();
document.getElementById("termlist").innerHTML = '';
document.getElementById("body").innerHTML = '';
update_history();
- shown = 0;
document.search.startrec.value = 0;
}
document.search.startrec.value = 0;
}