X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=www%2Fdemo%2Fsearch.js;h=e4f6dab0be2ef582dc7da8b6749835e467108e3d;hb=b9d0a5d83e92790ae3acf181d172dad1188e5fb7;hp=4c9549903fe9a07d1932d39ed2396915e19d83b1;hpb=f78b3fcf9a7f403cd5382470c99086db29c03053;p=pazpar2-moved-to-github.git
diff --git a/www/demo/search.js b/www/demo/search.js
index 4c95499..e4f6dab 100644
--- a/www/demo/search.js
+++ b/www/demo/search.js
@@ -1,4 +1,4 @@
-/* $Id: search.js,v 1.11 2007-01-10 09:50:57 sondberg Exp $
+/* $Id: search.js,v 1.20 2007-01-11 12:47:19 sondberg Exp $
* ---------------------------------------------------
* Javascript container
*/
@@ -60,7 +60,7 @@ function session_started()
return;
var xml = xinitSession.responseXML;
var sesid = xml.getElementsByTagName("session")[0].childNodes[0].nodeValue;
- document.getElementById("status").innerHTML = "Live";
+ assign_text(document.getElementById("status"), 'Live');
session = sesid;
setTimeout(ping_session, 50000);
}
@@ -111,7 +111,8 @@ function targets_loaded()
alert(msg);
return;
}
- document.getElementById("targetstatus").innerHTML = "Targets loaded";
+
+ assign_text(document.getElementById("targetstatus"), 'Targets loaded');
}
function load_targets()
@@ -121,7 +122,7 @@ function load_targets()
clearTimeout(searchtimer);
clearTimeout(stattimer);
clearTimeout(showtimer);
- document.getElementById("stat").innerHTML = "";
+ clear_cell(document.getElementById("stat"));
if (!fn)
{
alert("Please enter a target definition file name");
@@ -131,7 +132,7 @@ function load_targets()
"command=load" +
"&session=" + session +
"&name=" + fn;
- document.getElementById("targetstatus").innerHTML = "Loading targets...";
+ assign_text(document.getElementById("targetstatus"), 'Loading targets...');
xloadTargets = GetXmlHttpObject();
xloadTargets.onreadystatechange=targets_loaded;
xloadTargets.open("GET", url);
@@ -148,6 +149,9 @@ function make_pager (hits, offset, max) {
var html = '';
var off;
var start_offset = offset - page_window * max;
+ var div_elem = document.createElement('div');
+
+ div_elem.className = 'pages';
if (start_offset < 0) {
start_offset = 0;
@@ -156,26 +160,31 @@ function make_pager (hits, offset, max) {
for (off = start_offset;
off < hits && off < (start_offset + 2 * page_window * max);
off += max) {
-
- var class = '';
- if (off < 0)
- off = 0;
-
var p = off / max + 1;
+ var page_elem = create_element('a', p);
+ var newline_node = document.createTextNode(' ');
- if ((offset >= off) && (offset < (off + max)))
- class = ' class="select"';
+ if ((offset >= off) && (offset < (off + max))) {
+ page_elem.className = 'select';
+ }
+
+ page_elem.setAttribute('href', '#');
+ page_elem.setAttribute('off', off);
+ page_elem.onclick = function () {
+ update_offset(this.getAttribute('off'));
+ };
- html += '' + p + '\n';
+ div_elem.appendChild(page_elem);
+ div_elem.appendChild(newline_node);
}
- return html;
+ return div_elem;
}
function update_offset (offset) {
+ clearTimeout(searchtimer);
document.search.startrec.value = offset;
update_action('page');
check_search();
@@ -184,6 +193,33 @@ function update_offset (offset) {
}
+function create_element (name, cdata) {
+ var elem_node = document.createElement(name);
+ var text_node = document.createTextNode(cdata);
+ elem_node.appendChild(text_node);
+
+ return elem_node;
+}
+
+
+function clear_cell (cell) {
+ while (cell.hasChildNodes())
+ cell.removeChild(cell.firstChild);
+}
+
+
+function append_text(cell, text) {
+ text_node = document.createTextNode(text);
+ cell.appendChild(text_node);
+}
+
+
+function assign_text (cell, text) {
+ clear_cell(cell);
+ append_text(cell, text);
+}
+
+
function show_records()
{
if (xshow.readyState != 4)
@@ -192,9 +228,12 @@ function show_records()
var xml = xshow.responseXML;
var body = document.getElementById("body");
var hits = xml.getElementsByTagName("hit");
+
+ clear_cell(body);
+
if (!hits[0]) // We should never get here with blocking operations
{
- body.innerHTML = "No records yet";
+ assign_text(body, 'No records yet');
searchtimer = setTimeout(check_search, 250);
}
else
@@ -205,46 +244,40 @@ function show_records()
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 = '' +
- make_pager(merged, start, recstoshow) +
- '
';
-
- body.innerHTML += 'Records : ' + (start + 1) +
- ' to ' + (start + num) + ' of ' + merged +
- ' (total hits: ' + total + ')
';
-
-/*
- if (start + num < merged)
- body.innerHTML += ' Next';
-
- if (start > 0)
- body.innerHTML += ' Previous';
-
- body.innerHTML += '
';
-*/
- body.innerHTML += '';
+ var pager = make_pager(merged, start,recstoshow);
+ var break_node1 = document.createElement('br');
+ var break_node2 = document.createElement('br');
+ var record_container = document.createElement('div');
+ var interval = create_element('div', 'Records : ' + (start + 1) +
+ ' to ' + (start + num) + ' of ' +
+ merged + ' (total hits: ' +
+ total + ')');
+ interval.className = 'results';
+ record_container.className = 'records';
+
+ body.appendChild(pager);
+ body.appendChild(interval);
+ body.appendChild(break_node1);
+ body.appendChild(break_node2);
+ body.appendChild(record_container);
for (i = 0; i < hits.length; i++)
{
var mk = hits[i].getElementsByTagName("md-title");
- var html = '
';
var field = '';
if (mk[0]) {
field = mk[0].childNodes[0].nodeValue;
+ } else {
+ field = 'N/A';
}
-
- html += field + '';
- body.innerHTML += html;
+
+ var record_cell = create_element('a', field);
+ record_cell.setAttribute('href', '#');
+ record_cell.className = 'record';
+ record_container.appendChild(record_cell);
}
- body.innerHTML += '