X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=www%2Ftest1%2Fsearch.js;h=e1b3b24705ddf501c3f5274183989fc46279d159;hb=b0feb8036d34aa58427e56a26ef196fe8c90ee79;hp=d5df1a6744c0796c73e85deb0f51bbdacc8480c8;hpb=5a2509922bc906df7233657d8af277c70c0f0d5c;p=pazpar2-moved-to-github.git

diff --git a/www/test1/search.js b/www/test1/search.js
index d5df1a6..e1b3b24 100644
--- a/www/test1/search.js
+++ b/www/test1/search.js
@@ -1,4 +1,4 @@
-/* $Id: search.js,v 1.8 2007-01-05 02:12:51 quinn Exp $
+/* $Id: search.js,v 1.14 2007-06-20 19:27:18 adam Exp $
  * ---------------------------------------------------
  * Javascript container
  */
@@ -65,7 +65,7 @@ function session_started()
 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);
@@ -78,7 +78,7 @@ function ping_session()
 {
     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);
 }
 
@@ -126,7 +126,7 @@ function load_targets()
 	alert("Please enter a target definition file name");
 	return;
     }
-    var url="search.pz2?" +
+    var url="/pazpar2/search.pz2?" +
     	"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";
-	searchtimer = setTimeout(check_search, 250);
+	searchtimer = setTimeout(check_search, 2000);
     }
     else
     {
@@ -185,33 +185,34 @@ function show_records()
 	{
 	    body.innerHTML += '<p>';
 	    body.innerHTML += (i + start + 1) + ': ';
-	    var mk = hits[i].getElementsByTagName("title");
+	    var mk = hits[i].getElementsByTagName("md-title");
 	    if (mk[0])
 		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)
-	termtimer = setTimeout(check_termlist, 1000);
+	termtimer = setTimeout(check_termlist, 2000);
 }
 
 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 +
-	"&block=1";
+	"&sort=relevance";
     xshow = GetXmlHttpObject();
     xshow.onreadystatechange=show_records;
     xshow.open("GET", url);
@@ -221,7 +222,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')
@@ -274,7 +275,7 @@ function show_termlist()
 	Number(xml.getElementsByTagName("activeclients")[0].childNodes[0].nodeValue);
     if (!hits[0])
     {
-	termtimer = setTimeout(check_termlist, 1000);
+	termtimer = setTimeout(check_termlist, 2000);
     }
     else
     {
@@ -296,9 +297,10 @@ function show_termlist()
 
 function check_termlist()
 {
-    var url = "search.pz2?" +
+    var url = "/pazpar2/search.pz2?" +
         "command=termlist" +
 	"&session=" + session +
+	"&num=20" +
 	"&name=" + cur_termlist;
     xtermlist = GetXmlHttpObject();
     xtermlist.onreadystatechange=show_termlist;
@@ -341,7 +343,7 @@ function show_stat()
 
 function check_stat()
 {
-    var url = "search.pz2?" +
+    var url = "/pazpar2/search.pz2?" +
         "command=stat" +
 	"&session=" + session;
     xstat = GetXmlHttpObject();
@@ -368,6 +370,7 @@ function search_started()
 
 function start_search()
 {
+    shown = 0;
     clearTimeout(termtimer);
     termtimer = 0;
     clearTimeout(searchtimer);
@@ -382,7 +385,7 @@ function start_search()
 	return;
     }
     var query = escape(document.getElementById('query').value);
-    var url = "search.pz2?" +
+    var url = "/pazpar2/search.pz2?" +
         "command=search" +
 	"&session=" + session +
 	"&query=" + query;
@@ -393,7 +396,6 @@ function start_search()
     document.getElementById("termlist").innerHTML = '';
     document.getElementById("body").innerHTML = '';
     update_history();
-    shown = 0;
     document.search.startrec.value = 0;
 }