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

Adding inverse properties to addGrantRoleToPerson.jsp NIHVIVO-629

Browse source
This commit is contained in:
bdc34 2010-07-12 00:07:18 +00:00
parent 37f1c4f10c
commit 9167b3e84a
1 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
productMods/edit/forms/addGrantRoleToPerson.jsp
View file

@ -26,15 +26,9 @@ This is intended to create a set of statements like:
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.JavaScript" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.JavaScript" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Css" %> <%@ page import="edu.cornell.mannlib.vitro.webapp.controller.freemarker.UrlBuilder.Css" %>
<%@ page import="org.apache.commons.logging.Log" %>
<%@ page import="org.apache.commons.logging.LogFactory" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"%> <%@ taglib prefix="c" uri="http://java.sun.com/jstl/core"%>
<%@ taglib prefix="v" uri="http://vitro.mannlib.cornell.edu/vitro/tags" %> <%@ taglib prefix="v" uri="http://vitro.mannlib.cornell.edu/vitro/tags" %>
<%!
public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.forms.addAuthorsToInformationResource.jsp");
%>
<% <%
VitroRequest vreq = new VitroRequest(request); VitroRequest vreq = new VitroRequest(request);
WebappDaoFactory wdf = vreq.getWebappDaoFactory(); WebappDaoFactory wdf = vreq.getWebappDaoFactory();
@ -45,9 +39,16 @@ This is intended to create a set of statements like:
String intDatatypeUri = XSD.xint.toString(); String intDatatypeUri = XSD.xint.toString();
vreq.setAttribute("intDatatypeUri", intDatatypeUri); vreq.setAttribute("intDatatypeUri", intDatatypeUri);
vreq.setAttribute("intDatatypeUriJson", MiscWebUtils.escape(intDatatypeUri)); vreq.setAttribute("intDatatypeUriJson", MiscWebUtils.escape(intDatatypeUri));
String predicateUri = (String)request.getAttribute("predicateUri");
ObjectProperty op = wdf.getObjectPropertyDao().getObjectPropertyByURI( predicateUri );
if( op != null && op.getURIInverse() != null ){
%> <c:set var="inversePredicate"><%=op.getURIInverse()%></c:set> <%
}else{
%> <c:set var="inversePredicate"></c:set> <%
}
%> %>
<c:set var="vivoOnt" value="http://vivoweb.org/ontology" />
<%@page import="edu.cornell.mannlib.vitro.webapp.beans.ObjectProperty"%><c:set var="vivoOnt" value="http://vivoweb.org/ontology" />
<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="rdf" value="<%= VitroVocabulary.RDF %>" /> <c:set var="rdf" value="<%= VitroVocabulary.RDF %>" />
@ -69,9 +70,14 @@ if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvest
@prefix core: <${vivoCore}> . @prefix core: <${vivoCore}> .
@prefix rdf: <${rdf}> . @prefix rdf: <${rdf}> .
?person ?rolePredicate ?role. ?person ?rolePredicate ?role.
?role rdf:type ?roleType ; ?role rdf:type ?roleType .
core:relatedRole ?grant . ?role core:relatedRole ?grant .
?grant core:inRole ?role .
</v:jsonset>
<v:jsonset var="n3ForInverse">
?role ?inverseRolePredicate ?person.
</v:jsonset> </v:jsonset>
<v:jsonset var="n3ForNewGrant"> <v:jsonset var="n3ForNewGrant">
@ -101,12 +107,13 @@ PREFIX core: <${vivoCore}> SELECT ?grantURI WHERE {<${subjectUri}> core:hasPrinc
"n3required" : [ "${n3ForGrantRole}" ], "n3required" : [ "${n3ForGrantRole}" ],
"n3optional" : [ "${n3ForNewGrant}" ], "n3optional" : [ "${n3ForNewGrant}" , "${n3ForInverse}" ],
"newResources" : { "role" : "${defaultNamespace}", "newResources" : { "role" : "${defaultNamespace}",
"grant" : "${defaultNamespace}" }, "grant" : "${defaultNamespace}" },
"urisInScope" : { "roleType" : "${roleType}" }, "urisInScope" : { "roleType" : "${roleType}",
"inverseRolePredicate" : "${inversePredicate}" },
"literalsInScope": { }, "literalsInScope": { },
"urisOnForm" : [ "grant" ], "urisOnForm" : [ "grant" ],
"literalsOnForm" : [ "grantLabel" ], "literalsOnForm" : [ "grantLabel" ],
@ -143,8 +150,6 @@ PREFIX core: <${vivoCore}> SELECT ?grantURI WHERE {<${subjectUri}> core:hasPrinc
</c:set> </c:set>
<% <%
log.debug(request.getAttribute("editjson"));
EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,request); EditConfiguration editConfig = EditConfiguration.getConfigFromSession(session,request);
if (editConfig == null) { if (editConfig == null) {
@ -161,8 +166,7 @@ PREFIX core: <${vivoCore}> SELECT ?grantURI WHERE {<${subjectUri}> core:hasPrinc
//this will return the browser to the new grant entity after an edit. //this will return the browser to the new grant entity after an edit.
editConfig.setEntityToReturnTo("?grant"); editConfig.setEntityToReturnTo("?grant");
String subjectUri = vreq.getParameter("subjectUri"); String subjectUri = vreq.getParameter("subjectUri");
String predicateUri = vreq.getParameter("predicateUri");
List<String> customJs = new ArrayList<String>(Arrays.asList(JavaScript.JQUERY_UI.path(), List<String> customJs = new ArrayList<String>(Arrays.asList(JavaScript.JQUERY_UI.path(),
JavaScript.UTILS.path(), JavaScript.UTILS.path(),