NIHVIVO-629 Tweaks

This commit is contained in:
rjy7 2010-07-14 14:12:11 +00:00
parent 9a9784c632
commit c7b4cf7e75
3 changed files with 18 additions and 11 deletions

View file

@ -89,10 +89,7 @@ if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvest
?grant rdfs:label ?grantLabel . ?grant rdfs:label ?grantLabel .
</v:jsonset> </v:jsonset>
<%-- Must be all one line for JavaScript. --%>
<c:set var="sparqlForAcFilter">
PREFIX core: <${vivoCore}> SELECT ?grantUri WHERE {<${subjectUri}> core:hasPrincipalInvestigatorRole ?grantRole .?grantRole core:relatedRole ?grantUri .}
</c:set>
<v:jsonset var="grantTypeUriJson">${vivoOnt}#Grant</v:jsonset> <v:jsonset var="grantTypeUriJson">${vivoOnt}#Grant</v:jsonset>
<c:set var="editjson" scope="request"> <c:set var="editjson" scope="request">
@ -206,6 +203,11 @@ PREFIX core: <${vivoCore}> SELECT ?grantUri WHERE {<${subjectUri}> core:hasPrinc
<c:url var="acUrl" value="/autocomplete?tokenize=true&stem=true" /> <c:url var="acUrl" value="/autocomplete?tokenize=true&stem=true" />
<c:url var="sparqlQueryUrl" value="/admin/sparqlquery" /> <c:url var="sparqlQueryUrl" value="/admin/sparqlquery" />
<%-- Must be all one line for JavaScript. --%>
<c:set var="sparqlForAcFilter">
PREFIX core: <${vivoCore}> SELECT ?grantUri WHERE {<${subjectUri}> core:hasPrincipalInvestigatorRole ?grantRole .?grantRole core:relatedRole ?grantUri .}
</c:set>
<script type="text/javascript"> <script type="text/javascript">
var customFormData = { var customFormData = {
sparqlForAcFilter: '${sparqlForAcFilter}', sparqlForAcFilter: '${sparqlForAcFilter}',

View file

@ -102,10 +102,6 @@ SPARQL queries for existing values. --%>
?pubUri core:informationResourceInAuthorship ?authorshipUri . ?pubUri core:informationResourceInAuthorship ?authorshipUri .
</v:jsonset> </v:jsonset>
<%-- Must be all one line for JavaScript. --%>
<c:set var="sparqlForAcFilter">
PREFIX core: <${vivoCore}> SELECT ?pubUri WHERE {<${subjectUri}> core:authorInAuthorship ?authorshipUri .?authorshipUri core:linkedInformationResource ?pubUri .}
</c:set>
<c:set var="publicationsClassGroupUri" value="${vivoOnt}#vitroClassGrouppublications" /> <c:set var="publicationsClassGroupUri" value="${vivoOnt}#vitroClassGrouppublications" />
<v:jsonset var="publicationsClassGroupUriJson">${publicationsClassGroupUri}</v:jsonset> <v:jsonset var="publicationsClassGroupUriJson">${publicationsClassGroupUri}</v:jsonset>
@ -233,6 +229,11 @@ PREFIX core: <${vivoCore}> SELECT ?pubUri WHERE {<${subjectUri}> core:authorInAu
<c:url var="acUrl" value="/autocomplete?tokenize=true&stem=true" /> <c:url var="acUrl" value="/autocomplete?tokenize=true&stem=true" />
<c:url var="sparqlQueryUrl" value="/admin/sparqlquery" /> <c:url var="sparqlQueryUrl" value="/admin/sparqlquery" />
<%-- Must be all one line for JavaScript. --%>
<c:set var="sparqlForAcFilter">
PREFIX core: <${vivoCore}> SELECT ?pubUri WHERE {<${subjectUri}> core:authorInAuthorship ?authorshipUri . ?authorshipUri core:linkedInformationResource ?pubUri .}
</c:set>
<script type="text/javascript"> <script type="text/javascript">
var customFormData = { var customFormData = {
sparqlForAcFilter: '${sparqlForAcFilter}', sparqlForAcFilter: '${sparqlForAcFilter}',

View file

@ -91,9 +91,8 @@
<c:set var="vivoCore" value="${vivoOnt}/core#" /> <c:set var="vivoCore" value="${vivoOnt}/core#" />
<c:set var="rdfs" value="<%= VitroVocabulary.RDFS %>" /> <c:set var="rdfs" value="<%= VitroVocabulary.RDFS %>" />
<c:set var="label" value="${rdfs}label" /> <c:set var="label" value="${rdfs}label" />
<c:set var="defualtNamespace" value=""/> <%--blank triggers default URI generation behavior --%> <c:set var="defaultNamespace" value=""/> <%--blank triggers default URI generation behavior --%>
<c:set var="infoResourceClassUri" value="${vivoCore}InformationResource" />
<v:jsonset var="n3ForNewRole"> <v:jsonset var="n3ForNewRole">
@prefix core: <${vivoCore}> . @prefix core: <${vivoCore}> .
@ -221,7 +220,7 @@
<div id="fullViewOnly"> <div id="fullViewOnly">
<p><v:input type="text" id="label" name="title" label="Title" cssClass="acSelector" size="50" /></p> <p><v:input type="text" id="label" name="title" label="Title" cssClass="acSelector" size="50" /></p>
<div class="acSelection"> <div class="acSelection">
<%-- RY maybe make this a label and input field. See what looks best. --%> <%-- RY maybe make this a label and input field. See what looks best. --%>
@ -238,6 +237,11 @@
<c:url var="acUrl" value="/autocomplete?tokenize=true&stem=true" /> <c:url var="acUrl" value="/autocomplete?tokenize=true&stem=true" />
<c:url var="sparqlQueryUrl" value="/admin/sparqlquery" /> <c:url var="sparqlQueryUrl" value="/admin/sparqlquery" />
<%-- Must be all one line for JavaScript. --%>
<c:set var="sparqlForAcFilter">
SELECT ?indUri WHERE {<${subjectUri}> <${predicateUri}> ?role .?role <...> ?indUri .}
</c:set>
<script type="text/javascript"> <script type="text/javascript">
var customFormData = { var customFormData = {
sparqlForAcFilter: '${sparqlForAcFilter}', sparqlForAcFilter: '${sparqlForAcFilter}',