X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=mkdru.client.js;h=59f14a04461f4781c2428940e7d8d3ca15e33065;hb=4dc6c6e000a97be8761ef72caa7796f44afd76e9;hp=03f950715247c326c3adba90f5581486f718a14b;hpb=3cb6b390f4a99238e077e2c776e77e6b1ddb9814;p=mkdru-moved-to-drupal.org.git

diff --git a/mkdru.client.js b/mkdru.client.js
index 03f9507..59f14a0 100644
--- a/mkdru.client.js
+++ b/mkdru.client.js
@@ -2,34 +2,43 @@
 var mkdru = {
   // Settings to pass to pz2.js
   useSessions: Drupal.settings.mkdru.use_sessions === '1',
-  //   showResponseType: 'json',
   // Variables
   active: false,
   pz2: null,
   totalRec: 0,
   pagerRange: 6,
   pazpar2Path: Drupal.settings.mkdru.pz2_path,
+  facetContainerSelector: Drupal.settings.mkdru.facetContainerSelector,
   // Facets
   facets: {
     source: {
+      displayName: Drupal.settings.mkdru.source_dname || "Source",
+      orderWeight: Drupal.settings.mkdru.source_weight || 1,
       pz2Name: 'xtargets',
-      max: Drupal.settings.mkdru.source_max
+      max: Drupal.settings.mkdru.source_max || 10
     },
     subject: {
+      displayName: Drupal.settings.mkdru.subject_dname || "Subject",
+      orderWeight: Drupal.settings.mkdru.source_weight || 2,
       pz2Name: 'subject',
-      max: Drupal.settings.mkdru.subject_max
+      max: Drupal.settings.mkdru.subject_max || 10,
+      multiLimit: true,
+      limiter: 'su'
     },
     author: {
+      displayName: Drupal.settings.mkdru.author_dname || "Author",
+      orderWeight: Drupal.settings.mkdru.source_weight || 3,
       pz2Name: 'author',
-      max: Drupal.settings.mkdru.author_max
+      max: Drupal.settings.mkdru.author_max || 10,
+      multiLimit: false,
+      limiter: 'au'
     }
   },
-  // State
+  // State; Keys limit_{facet key} will also be initialised
   defaultState: {
     page: 1,
     perpage: 20,
     sort: 'relevance',
-    filter: null,
     query:'',
     recid:null
   },
@@ -83,7 +92,6 @@ mkdru.pz2Init = function () {
     mkdru.search();
   }
   mkdru.pz2.stat();
-  //mkdru.pz2.bytarget();
 };
 
 mkdru.pz2Show = function (data) {
@@ -112,23 +120,47 @@ mkdru.pz2Status = function (data) {
   $('.mkdru-status').html(Drupal.theme('mkdruStatus', data.activeclients, data.clients));
 };
 
-mkdru.pz2Term = function (data) {
-  for (var facet in mkdru.facets) {
-    // facet is limited
-    if (mkdru.state['limit_' + facet]) {
-      $('.mkdru-facet-' + facet).html(Drupal.theme('mkdruFacetLimit',
-                                 data[mkdru.facets[facet].pz2Name][0],
-                                 mkdru.hashAddDelOne(null, null, 'limit_' + facet)));
+mkdru.contains = function (hash, key, value) {
+  if (hash[key]) {
+    if (hash[key].length) {
+      for (var i=0; i<hash[key].length; i++) {
+        if (hash[key][i] === value) {
+          return true;
+        }
+      }
     } else {
-      $('.mkdru-facet-' + facet).html(Drupal.theme('mkdruFacet',
-                                 data[mkdru.facets[facet].pz2Name],
-                                 facet, mkdru.facets[facet].max));
+      return hash[key] === value;
     }
   }
-};
+  return false;
+}
 
-mkdru.pz2ByTarget = function (data) {
-  
+mkdru.pz2Term = function (data) {
+  // map all facets against selected, for simple rendering 
+  var hash = $.deparam.fragment();
+  for (var key in hash) {
+    if (key.indexOf('limit') == 0 && hash[key]) 
+      //always wrap in array
+      hash[key.substr(6)] = hash[key].split(/;+/);
+    delete hash[key];
+  }
+  for (var facet in mkdru.facets) {
+    var terms = data[mkdru.facets[facet].pz2Name];
+    for (var i=0; i<terms.length; i++) {
+      var term = terms[i];
+      var value = facet == "source" ? term.id : term.name;
+      if (mkdru.contains(hash, facet, value)) { //enabled
+        term.toggleLink = mkdru.removeLimit(facet, value);
+        term.selected = true;
+      } else { //disabled
+        term.toggleLink = mkdru.addLimit(facet, value);
+        term.selected = false;
+      }
+    }
+    $('.mkdru-facet-' + facet).html(
+        Drupal.theme('mkdruFacet', terms, facet, mkdru.facets[facet].max, 
+          hash[facet]));
+  }
 };
 
 mkdru.pz2Record = function (data) {
@@ -187,29 +219,82 @@ mkdru.uiFromState = function () {
 };
 
 mkdru.hashChange = function () {
+  // TING hack, switching tabs resets the hash but does not re-load the page
+  // simply ignore new hash and set it to the old state
+  var hash = $.param.fragment();
+  if (hash.indexOf('addon-result') == 0 || hash.indexOf('content-result') == 0
+      || hash.indexOf('ting-result') == 0) {
+    mkdru.hashFromState();
+    return;
+  }
+  // do we need to restart the search?
+  var searchTrigger = false;
+  // shallow copy of state so we can see what changed.
+  var oldState = $.extend({}, mkdru.state);
   mkdru.stateFromHash();
-  // Request for details
-  if (mkdru.state.recid) {
+  // only have to compare values since all keys are initialised
+  for (key in mkdru.state) {
+    var changed = (mkdru.state[key] != oldState[key]);
+    if (key.substring(0,5) === 'limit' && changed)
+      searchTrigger = true;
+    if (key === 'page' && changed)
+      mkdru.pz2.showPage(mkdru.state.page-1);
+    if (key === 'query' && changed)
+      searchTrigger = true;
+  }
+  if (searchTrigger)
+    mkdru.search();
+  // request for record detail
+  if (mkdru.state.recid && (mkdru.state.recid != oldState.recid)) {
     mkdru.pz2.record(mkdru.state.recid);
   }
-  // Other internal link
   else {
-    // may need to run search again to limit targets
-    for (key in mkdru.state) {
-      if (key.substring(0,5) === 'limit' && mkdru.state[key]) {
-        mkdru.search();
+    $('.mkdru-detail').hide();
+    $('.mkdru-results').show();
+  }
+};
+
+// return link to limit facet
+mkdru.addLimit = function (facet, limit) {
+  var newHash = $.deparam.fragment();
+  delete newHash['page'];
+  if ((typeof(newHash['limit_' + facet]) === 'undefined')
+       || !mkdru.facets[facet].multiLimit) {
+    newHash['limit_' + facet] = limit;
+  }
+  else {
+    newHash['limit_' + facet] += ';' + limit;
+  }
+  return $.param.fragment("#", newHash);
+};
+
+// return link to remove limit from facet
+mkdru.removeLimit = function (facet, limit) {
+  var newHash = $.deparam.fragment();
+  delete newHash['page'];
+  if (!newHash['limit_' + facet].indexOf(';')
+      || !mkdru.facets[facet].multiLimit) {
+    delete newHash['limit_' + facet];
+  }
+  else {
+    var limits = newHash['limit_' + facet].split(';');
+    for (var i = 0; i < limits.length; i++) {
+      if (limits[i] == limit) {
+        limits.splice(i, 1);
+        if (limits.length < 1)
+          delete newHash['limit_' + facet];
+        else
+          newHash['limit_' + facet] = limits.join(';');
         break;
       }
     }
-    mkdru.pz2.showPage(mkdru.state.page-1);
-    $('.mkdru-detail').hide();
-    $('.mkdru-results').show();
   }
+  return $.param.fragment("#", newHash);
 };
 
 
 
-//form submit handler
+// form submit handler
 mkdru.submitQuery = function () {
   // new query, back to defaults (shallow copy)
   mkdru.state = $.extend({}, mkdru.defaultState);
@@ -221,7 +306,7 @@ mkdru.submitQuery = function () {
   return false;
 };
 
-//criteria drop-down (perpage, sort) handler
+// criteria drop-down (perpage, sort) handler
 mkdru.submitCriteria = function () {
   mkdru.pollDropDowns();
   //search is not ON, do nothing
@@ -238,17 +323,25 @@ mkdru.search = function () {
   var query = mkdru.state.query;
 
   // facet limit implementation
-  if (mkdru.state.limit_source) {
-    filter = 'pz:id=' + mkdru.state.limit_source;
-  }
-  if (mkdru.state.limit_subject) {
-    query += ' and su="' + mkdru.state.limit_subject + '"';
-  }
-  if (mkdru.state.limit_author) {
-    query += ' and au="' + mkdru.state.limit_author + '"';
+  for (var facet in mkdru.facets) {
+    // facet is limited
+    if (mkdru.state['limit_' + facet]) {
+      if (facet == "source") {
+        filter = 'pz:id=' + mkdru.state.limit_source;
+      }
+      else {
+        var limits = mkdru.state['limit_' + facet].split(/;+/);
+        for (var i = 0; i < limits.length; i++) {
+          // ex. query + and au="{limit_author}"
+          if (limits[i]) 
+            query += ' and ' + mkdru.facets[facet]['limiter'] + '="'
+                  + limits[i] + '"';
+        }
+      }
+    }
   }
+
   mkdru.pz2.search(query, mkdru.state.perpage, mkdru.state.sort, filter);
-  //inform others that the search is ON
   mkdru.active = true;
 };
 
@@ -258,7 +351,7 @@ mkdru.pollDropDowns = function () {
 };
 
 mkdru.generatePager = function () {
- // make sure page param is a number, otherwise pageing frwd will be broken
+  // cast page parameter to numeric so we can add to it
   if (typeof mkdru.state.page == "string") {
     mkdru.state.page = Number(mkdru.state.page);
   }
@@ -266,7 +359,7 @@ mkdru.generatePager = function () {
   var first = (mkdru.state.page - mkdru.pagerRange > 0)
       ? mkdru.state.page - mkdru.pagerRange : 1;
   var last = first + 2 * mkdru.pagerRange < total
-      ? first + 2 * mkdru.pagerRange : total;  
+      ? first + 2 * mkdru.pagerRange : total;
   var prev = null;
   var next = null;
   var pages = [];
@@ -307,6 +400,12 @@ $(document).ready(function () {
     mkdru.defaultState['limit_' + key] = null;
   }
 
+  // if signaled, prepare facet container client-side
+  if (mkdru.facetContainerSelector) {
+    $(mkdru.facetContainerSelector).html(Drupal.theme('mkdruFacetContainer',
+      mkdru.facets));
+  }
+
   mkdru.pz2 = new pz2( { "onshow": mkdru.pz2Show,
               "showtime": 500, //each timer (show, stat, term, bytarget) can be specified this way
               "pazpar2path": mkdru.pazpar2Path,
@@ -314,11 +413,11 @@ $(document).ready(function () {
               "onstat": mkdru.pz2Status,
               "onterm": mkdru.pz2Term,
               "termlist": termlist.join(','),
-              "onbytarget": mkdru.pz2ByTarget,
               "usesessions" : mkdru.useSessions,
               "showResponseType": mkdru.showResponseType,
               "onrecord": mkdru.pz2Record,
               "autoInit": false } );
+  mkdru.pz2.showFastCount = 1;
 
   // initialise state to hash string or defaults
   mkdru.stateFromHash();
@@ -328,8 +427,10 @@ $(document).ready(function () {
   // ting thing
   if (typeof(Drupal.settings.mkdru.query) !== "undefined") {
     mkdru.state.query = Drupal.settings.mkdru.query
+    //force the hash to contain query
+    mkdru.hashFromState();
   }
-  
+
   //not running against SP? init, otherwise authenticate
   if (mkdru.useSessions) {
     mkdru.pz2.init();
@@ -365,4 +466,4 @@ $(document).ready(function () {
     );
   }
 });
-})(jQuery);
\ No newline at end of file
+})(jQuery);