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

diff --git a/mkdru.client.js b/mkdru.client.js
index 2cf70cb..b8e7f4c 100644
--- a/mkdru.client.js
+++ b/mkdru.client.js
@@ -2,112 +2,214 @@
 var mkdru = {
   // Settings to pass to pz2.js
   usesessions: Drupal.settings.mkdru.use_sessions === '1',
-  showResponseType: 'json',
+  //   showResponseType: 'json',
   // Variables
-  curPage: 1,
-  recPerPage: 20,
-  totalRec: 0,
-  curSort: 'relevance',
-  curFilter: null,
   submitted: false,
+  pz2: null,
+  totalRec: 0,
   sourceMax: Drupal.settings.mkdru.source_max,
   subjectMax: Drupal.settings.mkdru.subject_max,
   authorMax: Drupal.settings.mkdru.author_max,
-  pz2: null,
-  pazpar2Path: Drupal.settings.mkdru.pz2_path
+  pazpar2Path: Drupal.settings.mkdru.pz2_path,
+  // State
+  defaultState: {
+    page: 1,
+    perpage: 20,
+    sort: 'relevance',
+    filter: null,
+    query:null,
+  },
+  state: {},
 };
 
 
 
+// So we can use jQuery BBQ with Drupal 6 and its 1.2.6 jQuery
+if (!$.isArray) $.isArray = function( obj ) {
+  return toString.call(obj) === "[object Array]";
+},
+
+
+
 // pz2.js event handlers:
 mkdru.pz2Init = function () {
-  mkdru.pz2.stat();
-  mkdru.pz2.bytarget();
+  if (mkdru.state.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.state.page,
+                                      Math.ceil(mkdru.totalRec / mkdru.state.perpage));
+  $('.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));
+      i + 1 + mkdru.state.perpage * (mkdru.state.page - 1),
+      "#" + $.param.fragment($.param.fragment(
+        window.location.href, {recid: data.hits[i].recid})) + "\n"
+    );
   }
-  $('#mkdru-results').html(html);
+  $('.mkdru-result-list').html(html);
+  $('.mkdru-results').show();
 };
 
 mkdru.pz2Status = function (data) {
 };
 
 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-sources').html(html);
+  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-source', data.xtargets[i].id);
+  }
+  $('.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-subjects').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-subject', data.subject[i].id);
+  }
+  $('.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-authors').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-author', data.author[i].id);
+  }
+  $('.mkdru-facet-authors').html(html);
 
-    $('.mkdru-facet-link-source').bind('click', function (e) {
-      mkdru.limitTarget(this.getAttribute('target_id'), this.firstChild.nodeValue);
-      return false;
-    });
+  $('.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.limitQuery('su', this.firstChild.nodeValue);
-      return false;
-    });
+  $('.mkdru-facet-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-facet-author').bind('click', function (e) {
+    mkdru.limitQuery('au', this.firstChild.nodeValue);
+    return false;
+  });
 };
 
 mkdru.pz2ByTarget = function (data) {
   
 };
 
+mkdru.pz2Record = function (data) {
+  clearTimeout(mkdru.pz2.showTimer);
+  $('.mkdru-results').hide();
+  $('.mkdru-detail').html(Drupal.theme('mkdruDetail', data));
+  $('.mkdru-detail-back').bind('click', function () {$.bbq.removeState('recid');});
+  $('.mkdru-detail').show();
+  clearTimeout(mkdru.pz2.recordTimer);
+};
+
+
+
+// State and URL handling 
+
+// populate state from an object and fill in the blanks with defaults
+mkdru.stateFromObject = function (obj) {
+  for (var key in mkdru.defaultState) {
+    if (typeof(obj[key]) != "undefined") {
+      dump (key + " :: " + obj[key] + "\n");
+      mkdru.state[key] = obj[key];
+    }
+    else {
+      mkdru.state[key] = mkdru.defaultState[key];
+    }
+  }
+};
+
+// populate state from current window's hash string
+mkdru.stateFromHash = function () {
+  mkdru.stateFromObject($.deparam.fragment());
+};
+
+// set current window's hash string from state
+mkdru.hashFromState = function () {
+  // only include non-default settings in the URL
+  var alteredState = {};
+  for (var key in mkdru.defaultState) {
+    if (mkdru.state[key] != mkdru.defaultState[key]) {
+      alteredState[key] = mkdru.state[key];
+    }
+  }
+  $.bbq.pushState(alteredState);
+};
+
+// update mkdru_form theme's ui to match state
+mkdru.uiFromState = function () {
+  for (var key in mkdru.state) {
+    switch(key) {
+    case 'query':
+      $('.mkdru-search input:text').attr('value', mkdru.state[key]);
+      break;
+    case 'perpage':
+      $('.mkdru-perpage').attr('value', mkdru.state[key]);
+      break;
+    case 'sort':
+      $('.mkdru-sort').attr('value', mkdru.state[key]);
+      break;
+    }
+  }
+};
+
+mkdru.hashChange = function () {
+  dump("Submidded? " + mkdru.submitted + "\n");
+  var hash = $.deparam.fragment();
+  if (typeof(hash.recid) !== "undefined") {
+    mkdru.pz2.record(hash.recid);
+  }
+  else {
+    $('.mkdru-detail').hide();
+    $('.mkdru-results').show();
+  }
+};
+
 
 
 // UI functions:
 mkdru.submitQuery = function () {
-  mkdru.submitted = true;
+  mkdru.state.query = $('.mkdru-search input:text').attr('value');
   mkdru.resetPage();
-//   mkdru.pollDropDowns();
+  mkdru.pollDropDowns();
+  mkdru.hashFromState();
   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.state.query, mkdru.state.perpage, mkdru.state.sort,
+      mkdru.state.filter);
 };
 
 mkdru.pollDropDowns = function () {
-  mkdru.recPerPage = $('#mkdru-perpage').value;
-  mkdru.curSort = $('#mkdru-sort').value;
+  mkdru.state.perpage = $('.mkdru-perpage').attr('value');
+  mkdru.state.sort = $('.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.state.perpage, mkdru.state.sort);
+  return false;
 };
 
 mkdru.limitQuery = function (field, value) {
@@ -117,50 +219,56 @@ mkdru.limitQuery = function (field, value) {
   mkdru.submitQuery();
 };
 
-mkdru.limitTarget = function (id, name) {    
+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.state.filter = 'pz:id=' + id;
   mkdru.resetPage();
-//   mkdru.pollDropDowns();
+  mkdru.pollDropDowns();
   mkdru.search();
   return false;
 };
 
 mkdru.resetPage = function () {
-  mkdru.curPage = 1;
+  mkdru.state.page = 1;
   mkdru.totalRec = 0;
 };
 
 mkdru.showPage = function (pageNum) {
-  mkdru.curPage = pageNum;
+  mkdru.state.page = pageNum;
   mkdru.pz2.showPage(pageNum-1);
 };
 
 mkdru.nextPage = function () {
-  if (mkdru.totalRec - mkdru.recPerPage * mkdru.curPage > 0) {
+  if (mkdru.totalRec - mkdru.state.perpage * mkdru.state.page > 0) {
     mkdru.pz2.showNext();
-    mkdru.curPage++;
+    mkdru.state.page++;
+    mkdru.hashFromState();
   }
 };
 
 mkdru.prevPage = function () {
   if (mkdru.pz2.showPrev() != false) {
-    mkdru.curPage--;
+    mkdru.state.page--;
+    mkdru.hashFromState();
   }
 };
 
 
+
 // wait until the DOM is ready, bind events
 // and instantiate pz2 library
 $(document).ready(function () {
+  $(window).bind( 'hashchange', mkdru.hashChange);
   $('.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() });
+
+  dump("NEW PZ2!\n");
   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 +279,23 @@ $(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 } );
+
+  // initialise state to hash string or defaults
+  mkdru.stateFromHash();
+  // and update UI to match
+  mkdru.uiFromState();
+  dump("QUERY:" + mkdru.state.query + "\n");
+  
+  // ting thing
+  if (typeof(Drupal.settings.mkdru.query) !== "undefined") {
+    mkdru.state.query = Drupal.settings.mkdru.query
+  }
+
+  if (mkdru.usesessions) {
+    mkdru.pz2.init();
+  } else if (mkdru.state.query) {
+    mkdru.triggerSearch(); 
+  }
+});