From: Sebastian Hammer <quinn@indexdata.com>
Date: Tue, 20 Mar 2007 05:34:00 +0000 (+0000)
Subject: Implemented target facet -- is there any way to get the 'filter' variable into the
X-Git-Tag: stable.27032007~13
X-Git-Url: http://lists.indexdata.dk/?a=commitdiff_plain;h=299df2fbd7f1bf889851ac605d5502848d725e40;p=pazpar2-moved-to-github.git

Implemented target facet -- is there any way to get the 'filter' variable into the
URL to enable the back button in Firefox?
---

diff --git a/www/demo/page_segments.phpi b/www/demo/page_segments.phpi
index 3fe619c..f4add1b 100644
--- a/www/demo/page_segments.phpi
+++ b/www/demo/page_segments.phpi
@@ -1,6 +1,6 @@
 <?php
 
-/* $Id: page_segments.phpi,v 1.20 2007-01-26 18:50:11 quinn Exp $
+/* $Id: page_segments.phpi,v 1.21 2007-03-20 05:34:00 quinn Exp $
  * ---------------------------------------------------
  * Page segments 
  */
@@ -27,7 +27,7 @@ function insert_header () {
 
         <div class="search">  
           <div>
-            <form name="search" onsubmit="start_search(); return false;">
+            <form name="search" onsubmit="clear_filter(); start_search(); return false;">
               <input id="query" type="text" class="search" tabindex="1"
                     maxlength="255" value="" />
               <input type="submit" class="button" value="Search" />
@@ -51,6 +51,14 @@ function insert_header () {
           Narrow your search by using the keywords below:<br />
           <br />
 
+	  <a id="facet_xtargets" class="unselected"
+             onclick="toggle_facet(this)">Targets</a>
+          <span id="facet_xtargets_terms" class="facet"
+               style="display: block;"></span>
+
+	<br/>
+	    
+
           <a id="facet_subject" class="unselected"
              onclick="toggle_facet(this)">Subject</a>
           <span id="facet_subject_terms" class="facet"
@@ -58,10 +66,10 @@ function insert_header () {
 
           <br />
 
-          <a id="facet_author" class="unselected"
+          <a id="facet_author" class="selected"
              onclick="toggle_facet(this)">Author</a>
           <span id="facet_author_terms" class="facet"
-               style="display: block;"></span>
+               style="display: none;"></span>
 
           <br />
 
@@ -70,13 +78,6 @@ function insert_header () {
           <span id="facet_date_terms" class="facet"
                style="display: none;"></span>
 
-          <br />
-
-	  <a id="facet_xtargets" class="selected"
-             onclick="toggle_facet(this)">Targets</a>
-          <span id="facet_xtargets_terms" class="facet"
-               style="display: none;"></span>
-	    
           
         </div>
         <div class="content" id="body">
diff --git a/www/demo/search.js b/www/demo/search.js
index ddd41bd..55445f7 100644
--- a/www/demo/search.js
+++ b/www/demo/search.js
@@ -1,4 +1,4 @@
-/* $Id: search.js,v 1.50 2007-03-20 05:23:06 quinn Exp $
+/* $Id: search.js,v 1.51 2007-03-20 05:34:00 quinn Exp $
  * ---------------------------------------------------
  * Javascript container
  */
@@ -28,12 +28,13 @@ var cur_sort = "relevance";
 var searched = 0;
 var cur_id = -1;
 var cur_rec = 0;
+var filter = '';
 
 function initialize ()
 {
     facet_list = get_available_facets();
     start_session();
-    //session_check();
+    session_check();
     set_sort();
 }
 
@@ -580,6 +581,7 @@ function refine_query (obj) {
     var term = obj.getAttribute('term');
     var cur_termlist = obj.getAttribute('facet');
     var query_cell = document.getElementById('query');
+    var id = obj.getAttribute('target_id');
     
     term = term.replace(/[\(\)]/g, '');
     
@@ -589,6 +591,8 @@ function refine_query (obj) {
 	query_cell.value += ' and au="' + term + '"';
     else if (cur_termlist == 'date')
 	query_cell.value += ' and date="' + term + '"';
+    else if (cur_termlist == 'xtargets')
+	filter ='id=' +  id;
 
     start_search();
 }
@@ -624,25 +628,24 @@ function show_termlists()
 	{
 	    var namen = terms[t].getElementsByTagName("name");
 	    var freqn = terms[t].getElementsByTagName("frequency");
+	    var idn = terms[t].getElementsByTagName("id");
 	    if (namen[0])
 	    {
                 var term = namen[0].childNodes[0].nodeValue;
 		var freq = freqn[0].childNodes[0].nodeValue;
-		var refine_cell;
-		if (listname != 'xtargets')
-		{
-		    refine_cell = create_element('a', term + ' (' + freq + ')');
-		    refine_cell.setAttribute('href', '#');
-		    refine_cell.setAttribute('term', term);
-		    refine_cell.setAttribute('facet', listname);
-		    refine_cell.onclick = function () {
-			refine_query(this);
-			return false;
-		    };
-		}
-		else
-		    refine_cell = create_element('div', term + ' (' + freq + ')');
-		body.appendChild(refine_cell);
+		var id;
+		if (idn[0])
+		    id = idn[0].childNodes[0].nodeValue;
+                var refine_cell = create_element('a', term + ' (' + freq + ')');
+                refine_cell.setAttribute('href', '#');
+                refine_cell.setAttribute('term', term);
+                refine_cell.setAttribute('facet', listname);
+		refine_cell.setAttribute('target_id', id);
+                refine_cell.onclick = function () {
+                    refine_query(this);
+                    return false;
+                };
+                body.appendChild(refine_cell);
 	    }
 	}
     }
@@ -730,6 +733,11 @@ function search_started()
     stattimer = setTimeout(check_stat, 1000);
 }
 
+function clear_filter()
+{
+    filter = '';
+}
+
 function start_search()
 {
     clearTimeout(termtimer);
@@ -746,7 +754,8 @@ function start_search()
     var url = "search.pz2?" +
         "command=search" +
 	"&session=" + session +
-	"&query=" + query;
+	"&query=" + query +
+	"&filter=" + escape(filter);
     xsearch = GetXmlHttpObject();
     xsearch.onreadystatechange=search_started;
     xsearch.open("GET", url);