X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=mkdruding2.js;h=8321feb73a6722c6ce02e4cbe0ba3e6493267c3c;hb=2d7709f9501bfcc16dfcf5790ab48aa4d199bea0;hp=a0a8ba47056344ba6d7224aed18741b6df0f32ac;hpb=5b0f6ca50c8bfb556dd248bb3488844141a8ff30;p=mkdruding1.git

diff --git a/mkdruding2.js b/mkdruding2.js
index a0a8ba4..8321feb 100644
--- a/mkdruding2.js
+++ b/mkdruding2.js
@@ -1,10 +1,13 @@
 Drupal.theme.mkdruResult = function(hit, num, detailLink) {
+  var link = choose_url(hit);
+  if (!link) link = choose_url(hit['location'][0]);
   var html = "";
   html += '<li class="search-result" id="rec_' + hit.recid + '" >'
-    + '<h3 class="title">'
-    + '<a href="' + hit['location'][0]['md-electronic-url'] 
-    + '" target="_blank" >'
-    + hit["md-title"] + '</a></h3>';
+    + '<h3 class="title">';
+  if (link) html += '<a href="'+link+'" target="_blank" >';
+  html += hit["md-title"];
+  if (link) html += '</a>';
+  html += '</h3>';
   html += '<div class="search-snippet-info">'
      + '<p class="search-snippet"></p>'
      + '<div class="ting-object clearfix">'
@@ -60,7 +63,7 @@ Drupal.theme.mkdruFacet = function (terms, facet, max, selections) {
   var html = "";
   for (var i = 0; i < terms.length && i < max; i++ ) {
     var term = terms[i];
-    html += '<a href="'+term.hashQuery+'"';
+    html += '<a href="'+term.toggleLink+'"';
     if (term.selected) html += ' class="cross"><strong';
     html += '>'+terms[i].name; 
     if (term.selected) html += "</strong>";
@@ -70,9 +73,14 @@ Drupal.theme.mkdruFacet = function (terms, facet, max, selections) {
   if (terms.length == 0 && selections && selections.length) {
     for (var i=0; i<selections.length; i++) {
       if (selections[i]) {
+        // since we have no target name (only id) go for the basename
+        // FIXME get the proper target name
+        var name = facet == "source" ? selections[i].replace(/.*[\/\\]/, "")
+          .replace(/\?.*/, '')
+          : selections[i];
         html += '<a class="cross" href="'
           + mkdru.removeLimit(facet, selections[i])
-          + '"><strong>'+selections[i]+'</strong></a><span> (0)</span><br/>';
+          + '"><strong>'+name+'</strong></a><span> (0)</span><br/>';
       }
     }
   }