litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changed vocab service unavailable error to error executing search, updated gemet service to handle multiword terms

Browse source
This commit is contained in:
hudajkhan 2013-10-09 15:47:47 -04:00
parent 35d8c9e06f
commit 73cb80152a
3 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
productMods/templates/freemarker/edit/forms/addAssociatedConcept.ftl
View file

@ -162,7 +162,7 @@ var vocabSpecificDisplay = {};
vocabSpecificDisplay["${vocab}"] = "${vocabSpecificDisplay[vocab]}"; vocabSpecificDisplay["${vocab}"] = "${vocabSpecificDisplay[vocab]}";
</#list> </#list>
var i18nStrings = { var i18nStrings = {
vocServiceUnavailable: '${i18n().vocabulary_service_unavailable}', vocServiceUnavailable: '${i18n().vocabulary_service_error}',
noResultsFound: '${i18n().no_serch_results_found}', noResultsFound: '${i18n().no_serch_results_found}',
defaultLabelTypeString: '${i18n().label_type}', defaultLabelTypeString: '${i18n().label_type}',
definitionString: '${i18n().definition_capitalized}', definitionString: '${i18n().definition_capitalized}',

4
src/edu/cornell/mannlib/semservices/service/impl/GemetService.java
View file

@ -7,6 +7,7 @@ import java.io.BufferedReader;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.StringWriter; import java.io.StringWriter;
import java.net.URL; import java.net.URL;
import java.net.URLEncoder;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -270,8 +271,9 @@ public class GemetService implements ExternalConceptService {
*/ */
protected String getConceptsMatchingKeyword(String keyword) throws Exception { protected String getConceptsMatchingKeyword(String keyword) throws Exception {
String result = new String(); String result = new String();
String encodedKeyword = URLEncoder.encode(keyword, "UTF-8");
String serviceUrl = GemetWS_address + "getConceptsMatchingKeyword" + String serviceUrl = GemetWS_address + "getConceptsMatchingKeyword" +
"?keyword=" + keyword + "?keyword=" + encodedKeyword +
"&search_mode=0" + "&search_mode=0" +
"&thesaurus_uri=http://www.eionet.europa.eu/gemet/concept/" + "&thesaurus_uri=http://www.eionet.europa.eu/gemet/concept/" +
"&language=en"; "&language=en";

2
themes/wilma/i18n/all.properties
View file

@ -687,7 +687,7 @@ error_processing_author_request = Error processing request: author not removed
author_capitalized = Author author_capitalized = Author
or_add_new_one = or add a new one. 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. no_serch_results_found = No search results were found.
label_type = Label (Type) label_type = Label (Type)
label_altLabels = Label (Alternate Labels) label_altLabels = Label (Alternate Labels)