From afdbea1db7624c4c3f6d2cc458dd3af7233879f6 Mon Sep 17 00:00:00 2001
From: bdc34 <bdc34@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 12 Jul 2010 21:15:37 +0000
Subject: [PATCH] Adapting addGrantRoleToPerson.jsp to ontology changes
 NIHVIVO-629

---
 .../edit/forms/addGrantRoleToPerson.jsp       |  4 +--
 .../entity/grantCopiRoleShortView.jsp         |  5 +--
 .../templates/entity/grantPiRoleShortView.jsp |  3 +-
 .../templates/entity/roleShortView.jsp        | 36 ++++++++-----------
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/productMods/edit/forms/addGrantRoleToPerson.jsp b/productMods/edit/forms/addGrantRoleToPerson.jsp
index e29208f7..3ff805ac 100644
--- a/productMods/edit/forms/addGrantRoleToPerson.jsp
+++ b/productMods/edit/forms/addGrantRoleToPerson.jsp
@@ -72,8 +72,8 @@ if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvest
        
 	?person ?rolePredicate ?role.	
 	?role   rdf:type ?roleType .		  
-    ?role   core:relatedRole ?grant .
-    ?grant  core:inRole ?role .
+    ?role   core:roleIn ?grant .
+    ?grant  core:relatedRole ?role .
 </v:jsonset>
 
 <v:jsonset var="n3ForInverse"> 
diff --git a/productMods/templates/entity/grantCopiRoleShortView.jsp b/productMods/templates/entity/grantCopiRoleShortView.jsp
index 96631196..183230d4 100644
--- a/productMods/templates/entity/grantCopiRoleShortView.jsp
+++ b/productMods/templates/entity/grantCopiRoleShortView.jsp
@@ -2,6 +2,7 @@
 
 <jsp:include page="roleShortView.jsp">
 	<jsp:param name="personToRolePredicate" value="http://vivoweb.org/ontology/core#hasCo-PrincipalInvestigatorRole"/>
-	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#roleIn"/>
-	<jsp:param name="roleActivityLabel" value="grant"/>
+	<jsp:param name="roleToPersonPredicate" value="http://vivoweb.org/ontology/core#co-PrincipalInvestigatorRoleOf"/>
+	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole"/>
+	<jsp:param name="roleActivityLabel" value="grant"/>	
 </jsp:include>
diff --git a/productMods/templates/entity/grantPiRoleShortView.jsp b/productMods/templates/entity/grantPiRoleShortView.jsp
index 9de6429b..4119de06 100644
--- a/productMods/templates/entity/grantPiRoleShortView.jsp
+++ b/productMods/templates/entity/grantPiRoleShortView.jsp
@@ -2,6 +2,7 @@
 
 <jsp:include page="roleShortView.jsp">
 	<jsp:param name="personToRolePredicate" value="http://vivoweb.org/ontology/core#hasPrincipalInvestigatorRole"/>
-	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#roleIn"/>
+	<jsp:param name="roleToPersonPredicate" value="http://vivoweb.org/ontology/core#principalInvestigatorRoleOf"/>
+	<jsp:param name="roleActivityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole"/>
 	<jsp:param name="roleActivityLabel" value="grant"/>
 </jsp:include>
diff --git a/productMods/templates/entity/roleShortView.jsp b/productMods/templates/entity/roleShortView.jsp
index 50064ace..acc8627f 100644
--- a/productMods/templates/entity/roleShortView.jsp
+++ b/productMods/templates/entity/roleShortView.jsp
@@ -8,7 +8,8 @@
  This short view is intended to be called to handle short views for roles
  
  The following vars should be set by the jsp that is calling this short view 
- personToRolePredicate: URI of the person to role predicate. 
+ personToRolePredicate: URI of the person to role predicate.
+ roleToPersonPredicate: URI of the role to person predicate. 
  roleActivityToRolePredicate: URI of the activity to role predicate. 
  roleActivityLabel: human readable label of activity.   --%>
  
@@ -22,12 +23,10 @@
  			    	<%-- SUBJECT is a Person, so get info from other part of the role --%>
 				    <c:when test="${predicateUri == param.personToRolePredicate}">
 					    <c:choose>
-                            <c:when test="${!empty individual.objectPropertyMap['http://vivoweb.org/ontology/core#relatedRole']}">
-					            <c:set var="roleActivity" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#relatedRole'].objectPropertyStatements[0].object}" />
+                            <c:when test="${!empty individual.objectPropertyMap['http://vivoweb.org/ontology/core#roleIn']}">
+					            <c:set var="roleActivity" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#roleIn'].objectPropertyStatements[0].object}" />
 					            <c:set var="name"  value="${roleActivity.name}"/>
-                                <c:set var="moniker" value="${roleActivity.moniker}"/>
-                                <%--<c:set var="year" value="${roleActivity.dataPropertyMap['http://vivoweb.org/ontology/core#year'].dataPropertyStatements[0].data}"/> --%>
-                                <c:set var="label" value="${moniker} ${year}"/>
+                                <c:set var="label" value="${roleActivity.moniker}"/>
                                 <c:set var="uri" value="${roleActivity.URI}"/>
                             </c:when>
  				            <c:otherwise><%-- this Role is not linked to a anything yet; use name as a placeholder and add link to the Role so user can add more information --%>
@@ -50,25 +49,20 @@
 				    	<c:choose>
 				    	
 				    	    <%-- there is a related Person --%>
-				    		<c:when test="${!empty individual.objectPropertyMap['http://vivoweb.org/ontology/core#linkedAuthor']}">
-				    		    <c:set var="author" value="${individual.objectPropertyMap['http://vivoweb.org/ontology/core#linkedAuthor'].objectPropertyStatements[0].object}" />
-					    		<c:set var="name" value="${author.name}"/>
-                                <c:set var="label" value="${author.dataPropertyMap['http://vivoweb.org/ontology/core#preferredTitle'].dataPropertyStatements[0].data}" />
-                                <c:set var="uri" value="${author.URI}"/>
-					    	</c:when>
+				    		<c:when test="${!empty individual.objectPropertyMap[ param.roleToPersonPredicate ]}">				    		
+				    		    <c:set var="person" value="${individual.objectPropertyMap[ param.roleToPersonPredicate ].objectPropertyStatements[0].object}" />
+					    		<c:set var="name" value="${person.name}"/>
+<%--                                <c:set var="label" value="${person.dataPropertyMap['http://vivoweb.org/ontology/core#preferredTitle'].dataPropertyStatements[0].data}" />  --%>
+                                <c:set var="uri" value="${person.URI}"/>
+					    	</c:when>					    						    	
 					    	
-					    	<%-- only an author name has been specified --%>
-					    	<c:when test="${!empty individual.dataPropertyMap['http://vivoweb.org/ontology/core#authorNameAsListed'].dataPropertyStatements[0].data}">					    					
-                                <c:set var="name" value="<strong>${individual.dataPropertyMap['http://vivoweb.org/ontology/core#authorNameAsListed'].dataPropertyStatements[0].data}</strong>"/>
-					    	</c:when>
-					    	
-					    	<%-- no related Person yet (likely from before custom form available) --%>
-					    	<c:otherwise>
+					    	<%-- this is a Role with out a Person (likely from before custom form available) --%>
+					    	<c:otherwise>					    	
                                 <c:choose>
                                     <c:when test="${!empty individual.name}"><c:set var="name" value="${individual.name}"/></c:when>
-                                    <c:otherwise><c:set var="name" value="unlabeled authorship"/></c:otherwise>
+                                    <c:otherwise><c:set var="name" value="unlabeled ${param.roleActivityLabel} to person relation"/></c:otherwise>
                                </c:choose>                    
-                               <c:set var="label" value="(no author linked yet)"/>
+                               <c:set var="label" value="(no person linked yet)"/>
                                <c:set var="uri" value="${individual.URI}"/>
 					        </c:otherwise>
 					    </c:choose>