X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=www%2Ftest1%2Fsearch.js;h=5f04eccd80a94b4aa59ce3b776679c2917d47b01;hb=fbc4cc60726cfd5cb7c830b51dabb9effa582e7d;hp=94f0752630ddfa2778311976052a31449b381982;hpb=8ca1269eac32c1ddc19d16dc4f74e9a1e3e0b8f9;p=pazpar2-moved-to-github.git

diff --git a/www/test1/search.js b/www/test1/search.js
index 94f0752..5f04ecc 100644
--- 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.12 2007-06-11 13:33:04 adam Exp $
  * ---------------------------------------------------
  * Javascript container
  */
@@ -190,13 +190,14 @@ function show_records()
 		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 (clients == 0)
+		shown = -1;
 	}
     }
     if (!termtimer)
@@ -211,7 +212,7 @@ function check_search()
 	"&start=" + document.search.startrec.value +
 	"&num=" + recstoshow +
 	"&session=" + session +
-	"&sort=title:1" +
+	"&sort=relevance" +
 	"&block=1";
     xshow = GetXmlHttpObject();
     xshow.onreadystatechange=show_records;
@@ -222,7 +223,7 @@ function check_search()
 
 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')
@@ -300,6 +301,7 @@ function check_termlist()
     var url = "search.pz2?" +
         "command=termlist" +
 	"&session=" + session +
+	"&num=20" +
 	"&name=" + cur_termlist;
     xtermlist = GetXmlHttpObject();
     xtermlist.onreadystatechange=show_termlist;
@@ -369,6 +371,7 @@ function search_started()
 
 function start_search()
 {
+    shown = 0;
     clearTimeout(termtimer);
     termtimer = 0;
     clearTimeout(searchtimer);
@@ -394,7 +397,6 @@ function start_search()
     document.getElementById("termlist").innerHTML = '';
     document.getElementById("body").innerHTML = '';
     update_history();
-    shown = 0;
     document.search.startrec.value = 0;
 }