X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Fdemo%2Fsearch.js;h=f6e25a337934d34ec156f25d0d5b973242bb9ecf;hb=8c5a209d438791da6342e565df7b987c26a688b9;hp=c996c1b790649db266dd5226b76270f3bba6f628;hpb=1ef02968c63f06e9b5a4a08f5c7474039a9941db;p=pazpar2-moved-to-github.git

diff --git a/www/demo/search.js b/www/demo/search.js
index c996c1b..f6e25a3 100644
--- a/www/demo/search.js
+++ b/www/demo/search.js
@@ -1,4 +1,4 @@
-/* $Id: search.js,v 1.15 2007-01-10 12:20:51 sondberg Exp $
+/* $Id: search.js,v 1.22 2007-01-12 20:11:51 quinn Exp $
  * ---------------------------------------------------
  * Javascript container
  */
@@ -20,7 +20,7 @@ var stattimer;
 var session_cells = Array('query', 'startrec', 'action_type');
 var old_session = session_read();
 var url_surveillence;
-var recstoshow = 15;
+var recstoshow = 20;
 var page_window = 5;  // Number of pages prior to and after the current page
 var facet_list;
 var cur_facet = 0;
@@ -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);
@@ -162,14 +163,17 @@ function make_pager (hits, offset, max) {
         
         var p = off / max + 1;
         var page_elem = create_element('a', p);
-        var newline_node = document.createTextNode('\n');
+        var newline_node = document.createTextNode(' ');
 
         if ((offset >= off) && (offset < (off + max))) {
             page_elem.className = 'select';
         }
 
-        page_elem.setAttribute('href', '#');
-        page_elem.setAttribute('onclick', 'update_offset(' + off + ')');
+        page_elem.setAttribute('off', off);
+        page_elem.style.cursor = 'pointer';
+        page_elem.onclick = function () {
+            update_offset(this.getAttribute('off'));
+        };
 
         div_elem.appendChild(page_elem);
         div_elem.appendChild(newline_node);
@@ -180,6 +184,7 @@ function make_pager (hits, offset, max) {
 
 
 function update_offset (offset) {
+    clearTimeout(searchtimer);
     document.search.startrec.value = offset;
     update_action('page');
     check_search();
@@ -203,6 +208,18 @@ function clear_cell (cell) {
 }
 
 
+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)
@@ -216,7 +233,7 @@ function show_records()
 
     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
@@ -291,14 +308,17 @@ function check_search()
 
 
 function refine_query (obj) {
+    var term = obj.getAttribute('term');
+    var cur_termlist = obj.getAttribute('facet');
     var query_cell = document.getElementById('query');
-    var term = obj.innerHTML;
     
     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();
 }
 
@@ -312,6 +332,7 @@ function show_termlist()
     var i;
     var xml = xtermlist.responseXML;
     var body = facet_list[cur_facet][1];
+    var facet_name = facet_list[cur_facet][0];
     var hits = xml.getElementsByTagName("term");
     var clients =
 	Number(xml.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue);
@@ -327,16 +348,21 @@ function show_termlist()
     }
     else
     {
-	body.innerHTML = '';
+	clear_cell(body);
 	
         for (i = 0; i < hits.length; i++)
 	{
 	    var namen = hits[i].getElementsByTagName("name");
 	    if (namen[0])
-                var refine_cell = create_element('a',
-                                    namen[0].childNodes[0].nodeValue);
+                var term = namen[0].childNodes[0].nodeValue;
+                var refine_cell = create_element('a', term);
                 refine_cell.setAttribute('href', '#');
-                refine_cell.setAttribute('onclick', 'refine_query(this)');
+                refine_cell.setAttribute('term', term);
+                refine_cell.setAttribute('facet', facet_name);
+                refine_cell.onclick = function () {
+                    refine_query(this);
+                    return false;
+                };
                 body.appendChild(refine_cell);
 	}
 
@@ -374,7 +400,7 @@ function show_stat()
     }
     else
     {
-	body.innerHTML = "(";
+	assign_text(body, '(');
 	for (i = 0; i < nodes.length; i++)
 	{
 	    if (nodes[i].nodeType != 1)
@@ -383,9 +409,10 @@ function show_stat()
 	    if (value == 0)
 		continue;
 	    var name = nodes[i].nodeName;
-	    body.innerHTML += ' ' + name + '=' + value;
+	    append_text(body, ' ' + name + '=' + value);
 	}
-	body.innerHTML += ')';
+
+        append_text(body, ')');
 	if (clients > 0)
 	    stattimer = setTimeout(check_stat, 2000);
     }
@@ -442,7 +469,7 @@ function start_search()
     xsearch.onreadystatechange=search_started;
     xsearch.open("GET", url);
     xsearch.send(null);
-    document.getElementById("body").innerHTML = '';
+    clear_cell(document.getElementById("body"));
     update_history();
     shown = 0;
     document.search.startrec.value = 0;