From 531deb054530c1fcdb68cdc76f91383434879a47 Mon Sep 17 00:00:00 2001
From: Jesse Eichar <jesse.eichar@camptocamp.com>
Date: Wed, 20 Jun 2012 08:00:11 +0200
Subject: [PATCH] fix for refine search

---
 updateFromProd.sh                                           | 4 ++--
 .../java/org/fao/geonet/kernel/search/LuceneSearcher.java   | 3 ++-
 web/src/main/webapp/scripts/mapfishIntegration/geocat.js    | 6 +++---
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/updateFromProd.sh b/updateFromProd.sh
index 6d8774c1a20..5ab6dc936aa 100755
--- a/updateFromProd.sh
+++ b/updateFromProd.sh
@@ -6,12 +6,12 @@ DUMP_FILE="dump-`date '+%y%m%d-%H%M'`.sql.gz"
 
 copy () {
   ssh -A  ssh0.bgdi.admin.ch "scp -r deploy@ec2-46-137-6-225.eu-west-1.compute.amazonaws.com:/srv/tomcat/geocat/work/geonetwork/$1  ."
-  ssh -A  ssh0.bgdi.admin.ch "scp -r $1 ec2-46-137-20-48.eu-west-1.compute.amazonaws.com:/var/www/tc-geocat/private/geocat.ch.deploy/hooks/geocat/data"
+  ssh -A  ssh0.bgdi.admin.ch "scp -r $1 ec2-46-137-20-48.eu-west-1.compute.amazonaws.com:/var/www/vhosts/tc-geocat/private/geocat.ch.deploy/hooks/geocat/data"
   ssh -A  ssh0.bgdi.admin.ch "rm -rf $1"
 }
 ssh -A  ssh0.bgdi.admin.ch "ssh admin@db0.bgdi.admin.ch pg_dump -U www-data -E UTF-8 -Z 9 geocat2 > $DUMP_FILE"
 ssh -A  ssh0.bgdi.admin.ch "scp admin@db0.bgdi.admin.ch:$DUMP_FILE ."
-ssh -A  ssh0.bgdi.admin.ch "scp $DUMP_FILE ec2-46-137-20-48.eu-west-1.compute.amazonaws.com:/var/www/tc-geocat/private/geocat.ch.deploy/hooks/geocat/initialDump.sql.gz"
+ssh -A  ssh0.bgdi.admin.ch "scp $DUMP_FILE ec2-46-137-20-48.eu-west-1.compute.amazonaws.com:/var/www/vhosts/tc-geocat/private/geocat.ch.deploy/hooks/geocat/initialDump.sql.gz"
 ssh -A  ssh0.bgdi.admin.ch "rm $DUMP_FILE"
 
 copy logos
diff --git a/web/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java b/web/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java
index 2cc99e7bee1..b5639b41370 100644
--- a/web/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java
+++ b/web/src/main/java/org/fao/geonet/kernel/search/LuceneSearcher.java
@@ -1235,7 +1235,8 @@ private static Element addSortedSummaryKeys(Element elSummary, String langCode,
                 
                 Element childElem = new Element(name);
                 childElem.setAttribute("count", Integer.toString(keyCount));
-                childElem.setAttribute("name", translator.translate(keyword));
+                childElem.setAttribute("title", translator.translate(keyword));
+                childElem.setAttribute("name", keyword);
                 childElem.setAttribute("indexKey", indexKey);
 
                 rootElem.addContent(childElem);
diff --git a/web/src/main/webapp/scripts/mapfishIntegration/geocat.js b/web/src/main/webapp/scripts/mapfishIntegration/geocat.js
index 2bf7e38c232..8e31a1d4cd7 100644
--- a/web/src/main/webapp/scripts/mapfishIntegration/geocat.js
+++ b/web/src/main/webapp/scripts/mapfishIntegration/geocat.js
@@ -2339,9 +2339,9 @@ var geocat = {
                '  </xsl:template>';
     },
 
-    basicLabelFormat: '<xsl:value-of select="@name" /> (<xsl:value-of select="@count" />)',
-    denominatorLabelFormat: '1/<xsl:value-of select="@name" /> (<xsl:value-of select="@count" />)',
-    dateLabelFormat: '<xsl:value-of select="@name" /> (<xsl:value-of select="@count" />)',
+    basicLabelFormat: '<xsl:value-of select="@title" /> (<xsl:value-of select="@count" />)',
+    denominatorLabelFormat: '1/<xsl:value-of select="@title" /> (<xsl:value-of select="@count" />)',
+    dateLabelFormat: '<xsl:value-of select="@title" /> (<xsl:value-of select="@count" />)',
     sortArryAsc: function(array) {
         var end = array.slice(1).sort(function(a,b){
             var al = a[0].toLowerCase()+a[1].toLowerCase();