NIHVIVO-356 Merge from rel-1.0-maint branch: Change activity form to use vitro ns description property instead of vivo core description property
This commit is contained in:
parent
9984b87011
commit
f65c491deb
1 changed files with 2 additions and 1 deletions
|
@ -45,6 +45,7 @@
|
||||||
%>
|
%>
|
||||||
|
|
||||||
<c:set var="vivoCore" value="http://vivoweb.org/ontology/core#" />
|
<c:set var="vivoCore" value="http://vivoweb.org/ontology/core#" />
|
||||||
|
<c:set var="vitroNs" value="<%= VitroVocabulary.vitroURI %>" />
|
||||||
<c:set var="rdfs" value="<%= VitroVocabulary.RDFS %>" />
|
<c:set var="rdfs" value="<%= VitroVocabulary.RDFS %>" />
|
||||||
<c:set var="labelUri" value="${rdfs}label" />
|
<c:set var="labelUri" value="${rdfs}label" />
|
||||||
|
|
||||||
|
@ -92,7 +93,7 @@
|
||||||
?activityUri <${labelUri}> ?label .
|
?activityUri <${labelUri}> ?label .
|
||||||
</v:jsonset>
|
</v:jsonset>
|
||||||
|
|
||||||
<c:set var="descriptionUri" value="${vivoCore}description" />
|
<c:set var="descriptionUri" value="${vitroNs}description" />
|
||||||
<v:jsonset var="descriptionExisting" >
|
<v:jsonset var="descriptionExisting" >
|
||||||
SELECT ?existingDescription WHERE {
|
SELECT ?existingDescription WHERE {
|
||||||
?activityUri <${descriptionUri}> ?existingDescription }
|
?activityUri <${descriptionUri}> ?existingDescription }
|
||||||
|
|
Loading…
Add table
Reference in a new issue