From c7b4cf7e752102ae54076d4bfba5568ce793d970 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 14 Jul 2010 14:12:11 +0000
Subject: [PATCH] NIHVIVO-629 Tweaks

---
 productMods/edit/forms/addGrantRoleToPerson.jsp    | 10 ++++++----
 productMods/edit/forms/addPublicationToAuthor.jsp  |  9 +++++----
 productMods/edit/forms/addRoleToPersonTwoStage.jsp | 10 +++++++---
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/productMods/edit/forms/addGrantRoleToPerson.jsp b/productMods/edit/forms/addGrantRoleToPerson.jsp
index adf891c9..dbf7a06d 100644
--- a/productMods/edit/forms/addGrantRoleToPerson.jsp
+++ b/productMods/edit/forms/addGrantRoleToPerson.jsp
@@ -89,10 +89,7 @@ if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvest
     ?grant rdfs:label ?grantLabel .               
 </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>
 <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="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">
 var customFormData  = {
     sparqlForAcFilter: '${sparqlForAcFilter}',
diff --git a/productMods/edit/forms/addPublicationToAuthor.jsp b/productMods/edit/forms/addPublicationToAuthor.jsp
index 2600911e..9ed6a9c4 100644
--- a/productMods/edit/forms/addPublicationToAuthor.jsp
+++ b/productMods/edit/forms/addPublicationToAuthor.jsp
@@ -102,10 +102,6 @@ SPARQL queries for existing values. --%>
     ?pubUri core:informationResourceInAuthorship ?authorshipUri .               
 </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" />
 <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="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">
 var customFormData  = {
     sparqlForAcFilter: '${sparqlForAcFilter}',
diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
index 32dd7fdd..e4fa1094 100644
--- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp
+++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
@@ -91,9 +91,8 @@
 <c:set var="vivoCore" value="${vivoOnt}/core#" />
 <c:set var="rdfs" value="<%= VitroVocabulary.RDFS %>" />
 <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">
 	@prefix core: <${vivoCore}> .
@@ -221,7 +220,7 @@
     
     <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">
 	        <%-- 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="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">
 var customFormData  = {
     sparqlForAcFilter: '${sparqlForAcFilter}',