X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=mkdru.client.js;h=95c9bf5c44e6c1fbb9e7dd111047d5051d847f7f;hb=92f23f8e3751e247fea54584fb84fb9266bb4ec9;hp=2cf70cb7d8ef9119efa14e94ca10ce508741b38c;hpb=9bb075c111afad0a4dc12d6b9bee8b21b532500c;p=mkdru-moved-to-drupal.org.git

diff --git a/mkdru.client.js b/mkdru.client.js
index 2cf70cb..95c9bf5 100644
--- a/mkdru.client.js
+++ b/mkdru.client.js
@@ -21,24 +21,32 @@ var mkdru = {
 
 // pz2.js event handlers:
 mkdru.pz2Init = function () {
-  mkdru.pz2.stat();
-  mkdru.pz2.bytarget();
+  if (mkdru.query) mkdru.triggerSearch();
+  //mkdru.pz2.stat();
+  //mkdru.pz2.bytarget();
 };
 
 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], 
                          i + 1 + mkdru.recPerPage * 
                          (mkdru.curPage - 1));
   }
-  $('#mkdru-results').html(html);
+  $('.mkdru-result-list').html(html);
+  $('.mkdru-results').show();
 };
 
 mkdru.pz2Status = function (data) {
@@ -48,35 +56,35 @@ mkdru.pz2Term = function (data) {
     var html = "";
     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-facet-source', data.xtargets[i].id);
     }
-    $('#mkdru-sources').html(html);
+    $('.mkdru-facet-sources').html(html);
 
     html = "";
     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-facet-subject', data.subject[i].id);
     }
-    $('#mkdru-subjects').html(html);
+    $('.mkdru-facet-subjects').html(html);
 
     html = "";
     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-facet-author', data.author[i].id);
     }
-    $('#mkdru-authors').html(html);
+    $('.mkdru-facet-authors').html(html);
 
-    $('.mkdru-facet-link-source').bind('click', function (e) {
+    $('.mkdru-facet-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-facet-subject').bind('click', function (e) {
       mkdru.limitQuery('su', this.firstChild.nodeValue);
       return false;
     });
 
-    $('.mkdru-facet-link-author').bind('click', function (e) {
+    $('.mkdru-facet-author').bind('click', function (e) {
       mkdru.limitQuery('au', this.firstChild.nodeValue);
       return false;
     });
@@ -90,24 +98,31 @@ mkdru.pz2ByTarget = function (data) {
 
 // UI functions:
 mkdru.submitQuery = function () {
-  mkdru.submitted = true;
+  mkdru.query = $('.mkdru-search input:text').attr('value');
   mkdru.resetPage();
-//   mkdru.pollDropDowns();
+  mkdru.pollDropDowns();
   mkdru.search();
+  mkdru.submitted = true;
   return false;
 };
 
+mkdru.triggerSearch = function () {
+  mkdru.search();
+  mkdru.submitted = true;
+};
+
 mkdru.search = function () {
-  mkdru.pz2.search($('.mkdru-search input:text').attr('value'),
-                   mkdru.recPerPage, mkdru.curSort, mkdru.curFilter);
+  mkdru.pz2.search(mkdru.query, mkdru.recPerPage, mkdru.curSort,
+      mkdru.curFilter);
 };
 
 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);
+  mkdru.resetPage();
+  mkdru.pz2.show(0, mkdru.recPerPage, mkdru.curSort);
+  return false;
 };
 
 mkdru.limitQuery = function (field, value) {
@@ -125,7 +140,7 @@ mkdru.limitTarget = function (id, name) {
   navi.innerHTML += '<hr/>';
   mkdru.curFilter = 'pz:id=' + id;
   mkdru.resetPage();
-//   mkdru.pollDropDowns();
+  mkdru.pollDropDowns();
   mkdru.search();
   return false;
 };
@@ -159,8 +174,8 @@ mkdru.prevPage = function () {
 $(document).ready(function () {
   $('.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() });
+  $('.mkdru-perpage').bind('change', function () { mkdru.pollDropDowns() });
+  $('.mkdru-sort').bind('change', function () { mkdru.pollDropDowns() });
   mkdru.pz2 = new pz2( { "onshow": mkdru.pz2Show,
               "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way
               "pazpar2path": mkdru.pazpar2path,
@@ -171,5 +186,12 @@ $(document).ready(function () {
               "onbytarget": mkdru.pz2ByTarget,
               "usesessions" : mkdru.usesessions,
               "showResponseType": mkdru.showResponseType,
-              "onrecord": mkdru.pz2Record } );
-});
\ No newline at end of file
+              "onrecord": mkdru.pz2Record,
+              "autoInit": false } );
+  mkdru.query = Drupal.settings.mkdru.query;
+  if (mkdru.usesessions) {
+    mkdru.pz2.init();
+  } else if (mkdru.query) {
+    mkdru.triggerSearch(); 
+  }
+});