Fix dropdowns, start improving markup.

[mkdru-moved-to-drupal.org.git] / mkdru.client.js

diff --git a/mkdru.client.js b/mkdru.client.js
index 1787621..6ee3163 100644 (file)
--- a/mkdru.client.js
+++ b/mkdru.client.js
@@ -1,8 +1,8 @@
 // Set up namespace and some state.
 var mkdru = {
   // Settings to pass to pz2.js
-  usesessions: true,
-  showResponseType: '',
+  usesessions: Drupal.settings.mkdru.use_sessions === '1',
+  showResponseType: 'json',
   // Variables
   curPage: 1,
   recPerPage: 20,
@@ -10,11 +10,11 @@ var mkdru = {
   curSort: 'relevance',
   curFilter: null,
   submitted: false,
-  sourceMax: 16, // facets
-  subjectMax: 10,
-  authorMax: 10,
+  sourceMax: Drupal.settings.mkdru.source_max,
+  subjectMax: Drupal.settings.mkdru.subject_max,
+  authorMax: Drupal.settings.mkdru.author_max,
   pz2: null,
-  pazpar2Path: '/pazpar2/search.pz2',
+  pazpar2Path: Drupal.settings.mkdru.pz2_path
 };
 
 
@@ -27,11 +27,17 @@ mkdru.pz2Init = function () {
 
 mkdru.pz2Show = function (data) {
   mkdru.totalRec = data.merged;
-  $('#mkdru-pager').html(Drupal.theme('mkdruPager', data, mkdru.curPage,
-                                      Math.ceil(mkdru.totalRec / mkdru.recPerPage)));
+
+  var pagerHtml = Drupal.theme('mkdruPager', data, mkdru.curPage,
+                                      Math.ceil(mkdru.totalRec / mkdru.recPerPage));
+  $('.mkdru-pager').html(pagerHtml);
   $('.mkdru-next').bind('click', mkdru.nextPage);
   $('.mkdru-prev').bind('click', mkdru.prevPage);
 
+  var countsHtml = 'Displaying: ' + (data.start + 1) + ' to '
+    + (data.start + data.num) + ' of ' + data.merged + ' (found: ' + data.total + ')';
+  $('.mkdru-counts').html(countsHtml);
+
   var html = "";
   for (var i = 0; i < data.hits.length; i++) {
     html += Drupal.theme('mkdruResult', data.hits[i], 
@@ -46,25 +52,40 @@ mkdru.pz2Status = function (data) {
 
 mkdru.pz2Term = function (data) {
     var html = "";
-    for (var i = 0; i < data.xtargets.length && i < mkdru.SourceMax; i++ ) {
+    for (var i = 0; i < data.xtargets.length && i < mkdru.sourceMax; i++ ) {
       html += Drupal.theme('mkdruTerm', data.xtargets[i].name, data.xtargets[i].freq, 
                            'mkdru-facet-link-source', data.xtargets[i].id);
     }
     $('#mkdru-sources').html(html);
 
     html = "";
-    for (var i = 0; i < data.subject.length && i < mkdru.SubjectMax; i++ ) {
+    for (var i = 0; i < data.subject.length && i < mkdru.subjectMax; i++ ) {
       html += Drupal.theme('mkdruTerm', data.subject[i].name, data.subject[i].freq, 
                            'mkdru-facet-link-subject', data.subject[i].id);
     }
     $('#mkdru-subjects').html(html);
 
     html = "";
-    for (var i = 0; i < data.author.length && i < mkdru.AuthorMax; i++ ) {
+    for (var i = 0; i < data.author.length && i < mkdru.authorMax; i++ ) {
       html += Drupal.theme('mkdruTerm', data.author[i].name, data.author[i].freq, 
                            'mkdru-facet-link-author', data.author[i].id);
     }
     $('#mkdru-authors').html(html);
+
+    $('.mkdru-facet-link-source').bind('click', function (e) {
+      mkdru.limitTarget(this.getAttribute('target_id'), this.firstChild.nodeValue);
+      return false;
+    });
+
+    $('.mkdru-facet-link-subject').bind('click', function (e) {
+      mkdru.limitQuery('su', this.firstChild.nodeValue);
+      return false;
+    });
+
+    $('.mkdru-facet-link-author').bind('click', function (e) {
+      mkdru.limitQuery('au', this.firstChild.nodeValue);
+      return false;
+    });
 };
 
 mkdru.pz2ByTarget = function (data) {
@@ -75,10 +96,12 @@ mkdru.pz2ByTarget = function (data) {
 
 // UI functions:
 mkdru.submitQuery = function () {
-  mkdru.submitted = true;
-//   mkdru.resetPage();
-//   mkdru.pollDropDowns();
+  mkdru.resetPage();
+  mkdru.pollDropDowns();
   mkdru.search();
+  mkdru.submitted = true;
+  $('.mkdru-post-search').show();
+  return false;
 };
 
 mkdru.search = function () {
@@ -87,15 +110,32 @@ mkdru.search = function () {
 };
 
 mkdru.pollDropDowns = function () {
-  mkdru.recPerPage = $('#mkdru-perpage').value;
-  mkdru.curSort = $('#mkdru-sort').value;
+  mkdru.recPerPage = $('#mkdru-perpage').attr('value');
+  mkdru.curSort = $('#mkdru-sort').attr('value');
   if (!mkdru.submitted) return false;
   mkdru.resetPage();
   mkdru.pz2.show(0, mkdru.recPerPage, mkdru.curSort);
+  return false;
 };
 
 mkdru.limitQuery = function (field, value) {
-  
+  $('.mkdru-search input:text').attr('value', function () {
+    return this.value += ' and ' + field + '="' + value + '"';
+  });
+  mkdru.submitQuery();
+};
+
+mkdru.limitTarget = function (id, name) {    
+  var navi = document.getElementById('mkdru-navi');
+  navi.innerHTML = 
+        'Source: <a class="crossout" href="#" onclick="delimitTarget();return false;">'
+        + name + '</a>';
+  navi.innerHTML += '<hr/>';
+  mkdru.curFilter = 'pz:id=' + id;
+  mkdru.resetPage();
+  mkdru.pollDropDowns();
+  mkdru.search();
+  return false;
 };
 
 mkdru.resetPage = function () {
@@ -125,7 +165,7 @@ mkdru.prevPage = function () {
 // wait until the DOM is ready, bind events
 // and instantiate pz2 library
 $(document).ready(function () {
-  $('.mkdru-search input:button').bind('click', mkdru.submitQuery);
+  $('.mkdru-search').bind('submit', mkdru.submitQuery);
   $('.mkdru-search input:text').attr('value', '');
   $('#mkdru-perpage').bind('change', function () { mkdru.pollDropDowns() });
   $('#mkdru-sort').bind('change', function () { mkdru.pollDropDowns() });