From 73cb80152a3c5b23d431c6e7a9d9bd283215411d Mon Sep 17 00:00:00 2001
From: hudajkhan <hjk54@cornell.edu>
Date: Wed, 9 Oct 2013 15:47:47 -0400
Subject: [PATCH] changed vocab service unavailable error to error executing
 search, updated gemet service to handle multiword terms

---
 .../templates/freemarker/edit/forms/addAssociatedConcept.ftl  | 2 +-
 .../mannlib/semservices/service/impl/GemetService.java        | 4 +++-
 themes/wilma/i18n/all.properties                              | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl b/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
index eda9ba17..4c029385 100644
--- a/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
+++ b/productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
@@ -162,7 +162,7 @@ var vocabSpecificDisplay = {};
 vocabSpecificDisplay["${vocab}"] = "${vocabSpecificDisplay[vocab]}";
 </#list>
 var i18nStrings = {
-    vocServiceUnavailable: '${i18n().vocabulary_service_unavailable}',
+    vocServiceUnavailable: '${i18n().vocabulary_service_error}',
     noResultsFound: '${i18n().no_serch_results_found}',
     defaultLabelTypeString: '${i18n().label_type}',
     definitionString: '${i18n().definition_capitalized}',
diff --git a/src/edu/cornell/mannlib/semservices/service/impl/GemetService.java b/src/edu/cornell/mannlib/semservices/service/impl/GemetService.java
index 1fe52b2f..82399ad2 100644
--- a/src/edu/cornell/mannlib/semservices/service/impl/GemetService.java
+++ b/src/edu/cornell/mannlib/semservices/service/impl/GemetService.java
@@ -7,6 +7,7 @@ import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.io.StringWriter;
 import java.net.URL;
+import java.net.URLEncoder;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -270,8 +271,9 @@ public class GemetService implements ExternalConceptService  {
     */
    protected String getConceptsMatchingKeyword(String keyword) throws Exception {
       String result = new String();
+      String encodedKeyword = URLEncoder.encode(keyword, "UTF-8"); 
       String serviceUrl = GemetWS_address + "getConceptsMatchingKeyword" +
-      "?keyword="  + keyword +
+      "?keyword="  + encodedKeyword +
       "&search_mode=0" +
       "&thesaurus_uri=http://www.eionet.europa.eu/gemet/concept/" +
       "&language=en";
diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties
index 21575109..f44baabf 100644
--- a/themes/wilma/i18n/all.properties
+++ b/themes/wilma/i18n/all.properties
@@ -687,7 +687,7 @@ error_processing_author_request = Error processing request: author not removed
 author_capitalized = Author
 or_add_new_one = or add a new one.
 
-vocabulary_service_unavailable = The vocabulary service is unavailable. Please try again later.
+vocabulary_service_error = An error was encountered in executing this search. 
 no_serch_results_found = No search results were found.
 label_type = Label (Type)
 label_altLabels = Label (Alternate Labels)