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

diff --git a/www/test1/search.js b/www/test1/search.js
index 6c605a1..5f04ecc 100644
--- a/www/test1/search.js
+++ b/www/test1/search.js
@@ -1,4 +1,4 @@
-/* $Id: search.js,v 1.7 2007-01-04 22:03:56 quinn Exp $
+/* $Id: search.js,v 1.12 2007-06-11 13:33:04 adam Exp $
  * ---------------------------------------------------
  * Javascript container
  */
@@ -21,7 +21,7 @@ var session_cells = Array('query', 'startrec', 'action_type');
 var old_session = session_read();
 var url_surveillence;
 var recstoshow = 15;
-
+var cur_termlist = "subject";
 
 function initialize ()
 {
@@ -185,18 +185,19 @@ 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)
@@ -211,6 +212,7 @@ function check_search()
 	"&start=" + document.search.startrec.value +
 	"&num=" + recstoshow +
 	"&session=" + session +
+	"&sort=relevance" +
 	"&block=1";
     xshow = GetXmlHttpObject();
     xshow.onreadystatechange=show_records;
@@ -221,13 +223,46 @@ function check_search()
 
 function refine_query (obj) {
     var query_cell = document.getElementById('query');
-    var subject = obj.innerHTML;
+    var term = obj.firstChild.nodeValue;
     
-    subject = subject.replace(/[\(\)]/g, '');
-    query_cell.value += ' and su=(' + subject + ')';
+    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();
 }
 
+function set_termlist(termlist)
+{
+    cur_termlist = termlist;
+    check_termlist();
+    if (termtimer)
+    {
+	clearTimeout(termtimer);
+	termtimer = 0;
+    }
+}
+
+function show_termlistoptions(body)
+{
+    var opts = Array(
+        Array('subject', 'Subject'),
+	Array('author', 'Author')
+    );
+
+    for (i in opts)
+    {
+	if (opts[i][0] == cur_termlist)
+	    body.innerHTML += opts[i][1];
+	else
+	    body.innerHTML += '<a href="" onclick="set_termlist(\'' + opts[i][0] +
+		'\'); return false">' + opts[i][1] + '</a>';
+	body.innerHTML += ' ';
+    }
+    body.innerHTML += '<p>';
+}
+
 function show_termlist()
 {
     if (xtermlist.readyState != 4)
@@ -242,11 +277,11 @@ function show_termlist()
     if (!hits[0])
     {
 	termtimer = setTimeout(check_termlist, 1000);
-        
     }
     else
     {
 	body.innerHTML = "<b>Limit results:</b><br>";
+	show_termlistoptions(body);
 	for (i = 0; i < hits.length; i++)
 	{
 	    var namen = hits[i].getElementsByTagName("name");
@@ -266,7 +301,8 @@ function check_termlist()
     var url = "search.pz2?" +
         "command=termlist" +
 	"&session=" + session +
-	"&name=" + "subject";
+	"&num=20" +
+	"&name=" + cur_termlist;
     xtermlist = GetXmlHttpObject();
     xtermlist.onreadystatechange=show_termlist;
     xtermlist.open("GET", url);
@@ -335,6 +371,7 @@ function search_started()
 
 function start_search()
 {
+    shown = 0;
     clearTimeout(termtimer);
     termtimer = 0;
     clearTimeout(searchtimer);
@@ -360,7 +397,6 @@ function start_search()
     document.getElementById("termlist").innerHTML = '';
     document.getElementById("body").innerHTML = '';
     update_history();
-    shown = 0;
     document.search.startrec.value = 0;
 }