From 29ab9f359c9055aeded05f9ad8286989c768086d Mon Sep 17 00:00:00 2001
From: Sebastian Hammer <quinn@indexdata.com>
Date: Mon, 16 Apr 2007 20:23:24 +0000
Subject: [PATCH] Tuning interface. Tuning Wikipedia searching

---
 etc/masterkey/opencontent.xml |    2 +-
 www/masterkey/js/client.js    |   12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/etc/masterkey/opencontent.xml b/etc/masterkey/opencontent.xml
index 9ec6e12..d6b80fb 100644
--- a/etc/masterkey/opencontent.xml
+++ b/etc/masterkey/opencontent.xml
@@ -8,7 +8,7 @@
 
   <!-- Exact title search for Wikipedia -->
   <set target="opencontent.indexdata.com:210/wikipedia" name="pz:cclmap:term"
-      value="@attr 1=43 @attr 2=102 @attr 6=2"/>
+      value="u=43 6=2"/>
 
   <!-- The following settings apply to all opencontent sites -->
   <set name="pz:cclmap:term" value="u=1016 t=l,r s=al 2=102"/>
diff --git a/www/masterkey/js/client.js b/www/masterkey/js/client.js
index d93de8d..8432e63 100644
--- a/www/masterkey/js/client.js
+++ b/www/masterkey/js/client.js
@@ -1,5 +1,5 @@
 /*
-** $Id: client.js,v 1.17 2007-04-15 03:24:18 quinn Exp $
+** $Id: client.js,v 1.18 2007-04-16 20:23:25 quinn Exp $
 ** MasterKey - pazpar2's javascript client .
 */
 
@@ -24,7 +24,7 @@ var currentDetailedData = null;
 var termStartup = true;
 var advancedOn = false;
 
-var showBriefLocations = true;
+var showBriefLocations = false;
 
 /* wait until the DOM is ready and register basic handlers */
 $(document).ready( function() { 
@@ -182,7 +182,7 @@ function my_onterm(data)
                     listItem.appendTo(listEntries);
                 } else {
                     var listItem = $('<a class="sub" name="'+key+'">'+data[key][i].name
-                            /*+'<span> ('+data[key][i].freq+')</span>'*/+'</a>');
+                            +'<span> ('+data[key][i].freq+')</span>'+'</a>');
                     listItem.click(function(){ refine(this.name, this.firstChild.nodeValue) });
                     listItem.appendTo(listEntries);
                 }
@@ -206,7 +206,7 @@ function my_onterm(data)
                     listItem.appendTo(listEntries);
                 } else {
                     var listItem = $('<a class="sub" name="'+key+'">'+data[key][i].name
-                                /*+'<span> ('+data[key][i].freq+')</span>'*/+'</a>').click(function(){ 
+                                +'<span> ('+data[key][i].freq+')</span>'+'</a>').click(function(){ 
                                                                         refine(this.name, this.firstChild.nodeValue) });
                     listItem.appendTo(listEntries);
                 }
@@ -281,6 +281,8 @@ function drawDetailedRec(detailBox)
 	    var url = recLocation[i]["md-url"];
 	    var description = recLocation[i]["md-description"];
 	    hdtarget.append('<td><b>'+recLocation[i].name+'</b></td>');
+	    if (description)
+		detailTable.append($('<tr><td>&nbsp</td><td>'+description+'</td></tr>'));
 	    if (url) {
 		var tline = $('<tr><td>&nbsp;</td></tr>');
 		var td = $('<td></td>').appendTo(tline);
@@ -290,8 +292,6 @@ function drawDetailedRec(detailBox)
 		tlink.appendTo(td);
 		detailTable.append(tline);
 	    }
-	    if (description)
-		detailTable.append($('<tr><td>&nbsp</td><td>'+description+'</td></tr>'));
 	    hdtarget = undefined;
 	}
     }
-- 
1.7.10.4