From b4e5a3903b5facad2007bafe800934fdb4cb7210 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 8 Sep 2010 13:51:47 +0000
Subject: [PATCH] Merge r1346 from rel-1.1-maint

---
 .../edit/forms/addRoleToPersonTwoStage.jsp    | 35 ++++++++++++++++---
 1 file changed, 31 insertions(+), 4 deletions(-)

diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
index b7d36252..02a4cbe3 100644
--- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp
+++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
@@ -166,6 +166,11 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
     ?role <${endYearPredicate}> ?endYear .
 </v:jsonset>
 
+<c:set var="descriptionPredicate" value="${vivoCore}description" />
+<v:jsonset var="descriptionAssertion">
+    ?role  <${descriptionPredicate}> ?roleDescription .
+</v:jsonset>
+
 <v:jsonset var="roleLabelAssertion" >
     ?role <${label}> ?roleLabel .
 </v:jsonset>
@@ -213,6 +218,10 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
   SELECT ?existingStartYear WHERE { ?role  <${endYearPredicate}> ?existingStartYear .}
 </v:jsonset>
 
+<v:jsonset var="descriptionQuery">
+    SELECT ?description WHERE { ?role <${descriptionPredicate}> ?description . }
+</v:jsonset>
+
 <v:jsonset var="activityQuery">
   PREFIX core: <${vivoCore}>  
   SELECT ?existingActivity WHERE { ?role  core:roleIn ?existingActivity . }
@@ -241,19 +250,25 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
     "object"    : ["role", "${objectUriJson}", "URI" ],
     
     "n3required"    : [ "${n3ForNewRole}", "${startYearAssertion}", "${roleLabelAssertion}" ],        
-    "n3optional"    : [ "${n3ForActivityLabel}", "${n3ForActivityType}", "${n3ForInverse}", "${endYearAssertion}" ],        
-                                                                                        
+    "n3optional"    : [ "${n3ForActivityLabel}", "${n3ForActivityType}", "${n3ForInverse}", "${endYearAssertion}", "${descriptionAssertion}" ],        
+                                                                                            
     "newResources"  : { "role" : "${defaultNamespace}",
                         "roleActivity" : "${defaultNamespace}" },
 
     "urisInScope"    : { "inverseRolePredicate" : "${inversePredicate}" },
     "literalsInScope": { },
     "urisOnForm"     : [ "roleActivity", "roleActivityType" ],
-    "literalsOnForm" : [ "activityLabel", "roleLabel", "startYear", "endYear" ],
+    "literalsOnForm" : [ "activityLabel", "roleLabel", "startYear", "endYear", "roleDescription" ],
     "filesOnForm"    : [ ],
     "sparqlForLiterals" : { },
     "sparqlForUris" : {  },
-    "sparqlForExistingLiterals" : { "activityLabel":"${activityLabelQuery}", "roleLabel":"${roleLabelQuery}", "startYear":"${startYearQuery}", "endYear":"${endYearQuery}" },
+    "sparqlForExistingLiterals" : { 
+        "activityLabel"     : "${activityLabelQuery}", 
+        "roleLabel"         : "${roleLabelQuery}", 
+        "startYear"         : "${startYearQuery}", 
+        "endYear"           : "${endYearQuery}",
+        "roleDescription"   : "${descriptionQuery}"
+    },
     "sparqlForExistingUris" : { "roleActivity":"${activityQuery}" , "roleActivityType":"${activityTypeQuery}" },
     "fields" : {
       "activityLabel" : {
@@ -321,6 +336,17 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
          "rangeDatatypeUri" : "${gYearDatatypeUriJson}",
          "rangeLang"        : "",         
          "assertions"       : ["${endYearAssertion}"]
+      },
+      "roleDescription" : {
+         "newResource"      : "false",
+         "validators"       : [ ],
+         "optionsType"      : "UNDEFINED",
+         "literalOptions"   : [ ],
+         "predicateUri"     : "",
+         "objectClassUri"   : "",
+         "rangeDatatypeUri" : "",
+         "rangeLang"        : "",         
+         "assertions"       : ["${descriptionAssertion}"]
       }
   }
 }
@@ -411,6 +437,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
 	
 	        <p><v:input type="text" id="roleLabel" label="Role in ### ${requiredHint}" size="50" /></p>
 	        
+	        <v:input type="text" id="roleDescription" label="Role Description" size="50" />
 	        <c:choose>
 	            <c:when test="${numDateFields == 1}">
 	                <v:input type="text" label="Year ${requiredHint} ${yearHint}" id="startYear" size="7"/>