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

Merge r1346 from rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-09-08 13:51:47 +00:00
parent d8789cfc67
commit b4e5a3903b
1 changed files with 31 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

33
productMods/edit/forms/addRoleToPersonTwoStage.jsp
View file

@ -166,6 +166,11 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
?role <${endYearPredicate}> ?endYear . ?role <${endYearPredicate}> ?endYear .
</v:jsonset> </v:jsonset>
<c:set var="descriptionPredicate" value="${vivoCore}description" />
<v:jsonset var="descriptionAssertion">
?role <${descriptionPredicate}> ?roleDescription .
</v:jsonset>
<v:jsonset var="roleLabelAssertion" > <v:jsonset var="roleLabelAssertion" >
?role <${label}> ?roleLabel . ?role <${label}> ?roleLabel .
</v:jsonset> </v:jsonset>
@ -213,6 +218,10 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
SELECT ?existingStartYear WHERE { ?role <${endYearPredicate}> ?existingStartYear .} SELECT ?existingStartYear WHERE { ?role <${endYearPredicate}> ?existingStartYear .}
</v:jsonset> </v:jsonset>
<v:jsonset var="descriptionQuery">
SELECT ?description WHERE { ?role <${descriptionPredicate}> ?description . }
</v:jsonset>
<v:jsonset var="activityQuery"> <v:jsonset var="activityQuery">
PREFIX core: <${vivoCore}> PREFIX core: <${vivoCore}>
SELECT ?existingActivity WHERE { ?role core:roleIn ?existingActivity . } SELECT ?existingActivity WHERE { ?role core:roleIn ?existingActivity . }
@ -241,7 +250,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
"object" : ["role", "${objectUriJson}", "URI" ], "object" : ["role", "${objectUriJson}", "URI" ],
"n3required" : [ "${n3ForNewRole}", "${startYearAssertion}", "${roleLabelAssertion}" ], "n3required" : [ "${n3ForNewRole}", "${startYearAssertion}", "${roleLabelAssertion}" ],
"n3optional" : [ "${n3ForActivityLabel}", "${n3ForActivityType}", "${n3ForInverse}", "${endYearAssertion}" ], "n3optional" : [ "${n3ForActivityLabel}", "${n3ForActivityType}", "${n3ForInverse}", "${endYearAssertion}", "${descriptionAssertion}" ],
"newResources" : { "role" : "${defaultNamespace}", "newResources" : { "role" : "${defaultNamespace}",
"roleActivity" : "${defaultNamespace}" }, "roleActivity" : "${defaultNamespace}" },
@ -249,11 +258,17 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
"urisInScope" : { "inverseRolePredicate" : "${inversePredicate}" }, "urisInScope" : { "inverseRolePredicate" : "${inversePredicate}" },
"literalsInScope": { }, "literalsInScope": { },
"urisOnForm" : [ "roleActivity", "roleActivityType" ], "urisOnForm" : [ "roleActivity", "roleActivityType" ],
"literalsOnForm" : [ "activityLabel", "roleLabel", "startYear", "endYear" ], "literalsOnForm" : [ "activityLabel", "roleLabel", "startYear", "endYear", "roleDescription" ],
"filesOnForm" : [ ], "filesOnForm" : [ ],
"sparqlForLiterals" : { }, "sparqlForLiterals" : { },
"sparqlForUris" : { }, "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}" }, "sparqlForExistingUris" : { "roleActivity":"${activityQuery}" , "roleActivityType":"${activityTypeQuery}" },
"fields" : { "fields" : {
"activityLabel" : { "activityLabel" : {
@ -321,6 +336,17 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
"rangeDatatypeUri" : "${gYearDatatypeUriJson}", "rangeDatatypeUri" : "${gYearDatatypeUriJson}",
"rangeLang" : "", "rangeLang" : "",
"assertions" : ["${endYearAssertion}"] "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> <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:choose>
<c:when test="${numDateFields == 1}"> <c:when test="${numDateFields == 1}">
<v:input type="text" label="Year ${requiredHint} ${yearHint}" id="startYear" size="7"/> <v:input type="text" label="Year ${requiredHint} ${yearHint}" id="startYear" size="7"/>