From 2bf820d038f1a22cec9655d9508d3793161dd98b Mon Sep 17 00:00:00 2001 From: hjkhjk54 Date: Wed, 30 Nov 2011 18:54:48 +0000 Subject: [PATCH] updates to include license tag --- productMods/edit/forms/js/addConcept.js | 10 +++++----- src/edu/cornell/mannlib/semservices/bo/Concept.java | 2 ++ src/edu/cornell/mannlib/semservices/bo/Day.java | 2 ++ src/edu/cornell/mannlib/semservices/bo/Time.java | 2 ++ .../semservices/service/ExternalConceptService.java | 2 ++ .../semservices/service/impl/AgrovocService.java | 2 ++ .../mannlib/semservices/service/impl/UMLSService.java | 2 ++ .../cornell/mannlib/semservices/util/ClassUtils.java | 3 +++ .../mannlib/semservices/util/DateConverter.java | 3 +++ .../cornell/mannlib/semservices/util/DateUtils.java | 2 ++ .../cornell/mannlib/semservices/util/DayConverter.java | 2 ++ .../semservices/util/MetadataNamespaceContext.java | 2 ++ .../cornell/mannlib/semservices/util/ObjectUtils.java | 2 ++ .../mannlib/semservices/util/TimeConverter.java | 2 ++ .../mannlib/semservices/util/TimestampConverter.java | 2 ++ .../util/XMLGregorianCalendarConverter.java | 3 +++ src/edu/cornell/mannlib/semservices/util/XMLUtils.java | 2 ++ 17 files changed, 40 insertions(+), 5 deletions(-) diff --git a/productMods/edit/forms/js/addConcept.js b/productMods/edit/forms/js/addConcept.js index 8202d73b..8167d16b 100644 --- a/productMods/edit/forms/js/addConcept.js +++ b/productMods/edit/forms/js/addConcept.js @@ -48,7 +48,6 @@ var addConceptForm = { //input for search term form this.searchTerm = $('#searchTerm'); this.searchSubmit = $('#searchButton'); - this.vocabSource = $('#source'); //Hidden inputs for eventual submission this.externalConceptURI = $('#conceptNode'); this.externalConceptLabel = $('#conceptLabel'); @@ -120,11 +119,13 @@ var addConceptForm = { submitSearchTerm: function() { //Get value of search term var searchValue = this.searchTerm.val(); - var vocabSourceValue = this.vocabSource.val(); + var vocabSourceValue = $('input:radio[name="source"]:checked').val(); var dataServiceUrl = addConceptForm.dataServiceUrl + "?searchTerm=" + encodeURIComponent(searchValue) + "&source=" + encodeURIComponent(vocabSourceValue); $.getJSON(dataServiceUrl, function(results) { - if ( results.array.length == 0 ) { - alert("results not correct length"); + var htmlAdd = ""; + + if ( results== null || results.array == null || results.array.length == 0 ) { + htmlAdd = "

No search results

"; } else { //array is an array of objects representing concept information //loop through and find all the best matches @@ -133,7 +134,6 @@ var addConceptForm = { var numberMatches = bestMatchResults.length; var i; //For each result, display - var htmlAdd = ""; if(numberMatches > 0) { htmlAdd = "