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
Back-button now works with paging too.
[pazpar2-moved-to-github.git]
/
www
/
test1
/
search.js
diff --git
a/www/test1/search.js
b/www/test1/search.js
index
28f72a3
..
60de378
100644
(file)
--- 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.3 2007-01-02 11:02:50 sondberg Exp $
* ---------------------------------------------------
* Javascript container
*/
* ---------------------------------------------------
* Javascript container
*/
@@
-17,9
+17,17
@@
var searchtimer;
var showtimer;
var termtimer;
var stattimer;
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 old_session = session_read();
+var url_surveillence;
+
+
+function initialize ()
+{
+ start_session();
+ session_check();
+}
+
function GetXmlHttpObject()
{
function GetXmlHttpObject()
{
@@
-53,6
+61,8
@@
function start_session()
xinitSession.onreadystatechange=session_started;
xinitSession.open("GET", url);
xinitSession.send(null);
xinitSession.onreadystatechange=session_started;
xinitSession.open("GET", url);
xinitSession.send(null);
+
+ //url_surveillence = setInterval(session_check, 200);
}
function targets_loaded()
}
function targets_loaded()
@@
-94,6
+104,12
@@
function load_targets()
xloadTargets.send(null);
}
xloadTargets.send(null);
}
+
+function update_action (new_action) {
+ document.search.action_type.value = new_action;
+}
+
+
function show_records()
{
if (xshow.readyState != 4)
function show_records()
{
if (xshow.readyState != 4)
@@
-120,13
+136,15
@@
function show_records()
if (start + num < merged)
body.innerHTML += ' <a href="" ' +
if (start + num < merged)
body.innerHTML += ' <a href="" ' +
- 'onclick="startrec=' + (start + 20) +
- ';check_search(); return false;">Next</a>';
+ 'onclick="document.search.startrec.value=' + (start + 20) +
+ ";update_action('page')" +
+ ';check_search(); update_history(); return false;">Next</a>';
if (start > 0)
body.innerHTML += ' <a href="" ' +
if (start > 0)
body.innerHTML += ' <a href="" ' +
- 'onclick="startrec=' + (start - 20) +
- ';check_search(); return false;">Previous</a>';
+ 'onclick="document.search.startrec.value=' + (start - 20) +
+ ";update_action('page')" +
+ ';check_search(); update_history();return false;">Previous</a>';
body.innerHTML += '<br/>';
for (i = 0; i < hits.length; i++)
body.innerHTML += '<br/>';
for (i = 0; i < hits.length; i++)
@@
-153,7
+171,7
@@
function check_search()
clearTimeout(searchtimer);
var url = "search.pz2?" +
"command=show" +
clearTimeout(searchtimer);
var url = "search.pz2?" +
"command=show" +
- "&start=" + startrec +
+ "&start=" + document.search.startrec.value +
"&num=15" +
"&session=" + session +
"&block=1";
"&num=15" +
"&session=" + session +
"&block=1";
@@
-197,13
+215,6
@@
function show_termlist()
body.innerHTML += '<a href="#" onclick="refine_query(this)">' +
namen[0].childNodes[0].nodeValue +
'</a>';
body.innerHTML += '<a href="#" onclick="refine_query(this)">' +
namen[0].childNodes[0].nodeValue +
'</a>';
- /*
- body.innerHTML += ' (';
- var freqn = hits[i].getElementsByTagName("frequency");
- if (freqn[0])
- body.innerHTML += freqn[0].childNodes[0].nodeValue;
- body.innerHTML += ')<br>';
- */
body.innerHTML += '<br>';
}
termtimer = setTimeout(check_termlist, 2000);
body.innerHTML += '<br>';
}
termtimer = setTimeout(check_termlist, 2000);
@@
-307,7
+318,7
@@
function start_search()
document.getElementById("body").innerHTML = '';
update_history();
shown = 0;
document.getElementById("body").innerHTML = '';
update_history();
shown = 0;
- startrec = 0;
+ document.search.startrec.value = 0;
}
}
@@
-369,19
+380,23
@@
function update_history ()
function session_check ()
{
var session = session_read();
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);
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);
}
}
url_surveillence = setInterval(session_check, 200);
}
-
-
-var url_surveillence = setInterval(session_check, 200);
-