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

[VIVO-1367] Update AGROVOC URL

Browse source
This commit is contained in:
Graham Triggs 2017-09-13 20:27:27 +01:00
parent 930507a694
commit 5ba226bde7
2 changed files with 38 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
api/src/main/java/edu/cornell/mannlib/semservices/service/impl/AgrovocService.java
View file

@ -58,9 +58,9 @@ public class AgrovocService implements ExternalConceptService {
protected final String dbpedia_endpoint = " http://dbpedia.org/sparql";
// URL to get all the information for a concept
protected final String conceptSkosMosBase = "http://aims.fao.org/skosmos/rest/v1/";
protected final String conceptSkosMosBase = "http://artemide.art.uniroma2.it:8081/skosmos/rest/v1/";
protected final String conceptsSkosMosSearch = conceptSkosMosBase + "search?";
protected final String conceptSkosMosURL = conceptSkosMosBase + "/agrovoc/data?";
protected final String conceptSkosMosURL = conceptSkosMosBase + "data?";
@Override
public List<Concept> getConcepts(String term) throws Exception {
List<Concept> conceptList = new ArrayList<Concept>();

60
webapp/src/main/webapp/templates/freemarker/edit/forms/addAssociatedConcept.ftl
View file

@ -42,40 +42,48 @@
</script>
<#if (existingConcepts?size > 0)>
<li class="conceptHeadings conceptsListContainer">
<div class="row">
<div class="column conceptLabelInfo">
<h4>Concept (Type)</h4>
</div>
<div class="column conceptVocabSource">
<h4>Vocabulary Source</h4>
</div>
<div class="column conceptRemoval">&nbsp;
</div>
</div>
<div class="container">
<div class="row">
<div class="col-12">
<div class="column conceptLabelInfo">
<h4>Concept (Type)</h4>
</div>
<div class="column conceptVocabSource">
<h4>Vocabulary Source</h4>
</div>
<div class="column conceptRemoval">&nbsp;
</div>
</div>
</div>
</div>
</li>
</#if>
<#list existingConcepts as existingConcept>
<li class="existingConcept conceptsListContainer">
<div class="container">
<div class="row">
<div class="column conceptLabelInfo"> ${existingConcept.conceptLabel}
<#if existingConcept.conceptSemanticTypeLabel?has_content>
(${existingConcept.conceptSemanticTypeLabel})
</#if>
</div>
<div class="column conceptVocabSource">
<#if existingConcept.vocabURI?has_content && existingConcept.vocabLabel?has_content>
${existingConcept.vocabLabel}
<#else>
&nbsp;
<#--We still want the column to be there even if no vocabulary source is present-->
</#if>
</div>
<div class="column conceptRemoval">
<a href="${urls.base}/edit/primitiveRdfEdit" class="remove" title="${i18n().remove_capitalized}">${i18n().remove_capitalized}</a>
<div class="col-12">
<div class="column conceptLabelInfo"> ${existingConcept.conceptLabel}
<#if existingConcept.conceptSemanticTypeLabel?has_content>
(${existingConcept.conceptSemanticTypeLabel})
</#if>
</div>
<div class="column conceptVocabSource">
<#if existingConcept.vocabURI?has_content && existingConcept.vocabLabel?has_content>
${existingConcept.vocabLabel}
<#else>
&nbsp;
<#--We still want the column to be there even if no vocabulary source is present-->
</#if>
</div>
<div class="column conceptRemoval">
<a href="${urls.base}/edit/primitiveRdfEdit" class="remove" title="${i18n().remove_capitalized}">${i18n().remove_capitalized}</a>
</div>
</div>
</div>
</div>
</div>
</li>
<script type="text/javascript">