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

updates for NIHVIVO-2682 and NIHVIVO-2683

Browse source
This commit is contained in:
stellamit 2011-06-07 20:10:26 +00:00
parent 77a05c331a
commit 7de1f569cf
19 changed files with 1562 additions and 1314 deletions
Download patch file Download diff file Expand all files Collapse all files

2
productMods/edit/forms/addClinicalRoleToPerson.jsp
View file

@ -3,6 +3,8 @@
<jsp:include page="addRoleToPersonTwoStage.jsp">
<jsp:param name="roleActivityTypeLabel" value="clinical activity" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ClinicalRole" />
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" />
<jsp:param name="roleActivityType_literalOptions"

11
productMods/edit/forms/addEditorRoleToPerson.jsp Normal file
View file

@ -0,0 +1,11 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<jsp:include page="addRoleToPersonTwoStage.jsp">
<jsp:param name="roleActivityTypeLabel" value="editor for" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#EditorRole" />
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#forInformationResource" />
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#linkedRole" />
<jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" />
<jsp:param name="roleActivityType_objectClassUri" value="http://purl.org/ontology/bibo/Collection" />
<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />
</jsp:include>

3
productMods/edit/forms/addHeadOfRoleToPerson.jsp
View file

@ -3,7 +3,8 @@
<jsp:include page="addRoleToPersonTwoStage.jsp">
<jsp:param name="roleActivityTypeLabel" value="head of" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#LeaderRole" />
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" />

4
productMods/edit/forms/addMemberRoleToPerson.jsp
View file

@ -2,7 +2,9 @@
<jsp:include page="addRoleToPersonTwoStage.jsp">
<jsp:param name="roleActivityTypeLabel" value="membership" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#MemberRole" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#MemberRole" />
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
<jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" />
<jsp:param name="roleActivityType_objectClassUri" value="http://xmlns.com/foaf/0.1/Organization" />
<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />

25
productMods/edit/forms/addOrganizerRoleToPerson.jsp Normal file
View file

@ -0,0 +1,25 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<jsp:include page="addRoleToPersonTwoStage.jsp">
<jsp:param name="roleActivityTypeLabel" value="organizer of" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#OrganizerRole" />
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" />
<jsp:param name="roleActivityType_literalOptions"
value='["", "Select one"],
[ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ],
[ "http://vivoweb.org/ontology/core#Competition", "Competition" ],
[ "http://http://purl.org/ontology/bibo/Conference", "Conference" ],
[ "http://vivoweb.org/ontology/core#Course", "Course" ],
[ "http://vivoweb.org/ontology/core#Exhibit", "Exhibit" ],
[ "http://vivoweb.org/ontology/core#Meeting", "Meeting" ],
[ "http://http://purl.org/ontology/bibo/Presentation", "Presentation" ],
[ "http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk" ],
[ "http://http://purl.org/ontology/bibo/Workshop", "Workshop" ],
[ "http://vivoweb.org/ontology/core#EventSeries", "Event Series" ],
[ "http://vivoweb.org/ontology/core#ConferenceSeries", "Conference Series" ],
[ "http://vivoweb.org/ontology/core#SeminarSeries", "Seminar Series" ],
[ "http://vivoweb.org/ontology/core#WorkshopSeries", "Workshop Series" ]' />
</jsp:include>

3
productMods/edit/forms/addOutreachRoleToPerson.jsp
View file

@ -3,7 +3,8 @@
<jsp:include page="addRoleToPersonTwoStage.jsp">
<jsp:param name="roleActivityTypeLabel" value="outreach & community service" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#OutreachProviderRole" />
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" />
<jsp:param name="roleActivityType_literalOptions"

4
productMods/edit/forms/addPresenterRoleToPerson.jsp
View file

@ -4,7 +4,9 @@
<jsp:include page="addRoleToPersonTwoStage.jsp">
<jsp:param name="roleActivityTypeLabel" value="presentation" />
<jsp:param name="buttonLabel" value="presentation role" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
<jsp:param name="numDateFields" value="1" />
<jsp:param name="roleExamples" value="Moderator, Speaker, Panelist" />
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />

3
productMods/edit/forms/addResearcherRoleToPerson.jsp
View file

@ -3,7 +3,8 @@
<jsp:include page="addRoleToPersonTwoStage.jsp">
<jsp:param name="roleActivityTypeLabel" value="research activity" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ResearcherRole" />
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" />
<jsp:param name="roleActivityType_literalOptions"

11
productMods/edit/forms/addReviewerRoleToPerson.jsp Normal file
View file

@ -0,0 +1,11 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
<jsp:include page="addRoleToPersonTwoStage.jsp">
<jsp:param name="roleActivityTypeLabel" value="reviewer of" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ReviewerRole" />
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#forInformationResource" />
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#linkedRole" />
<jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" />
<jsp:param name="roleActivityType_objectClassUri" value="http://purl.org/ontology/bibo/Collection" />
<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />
</jsp:include>

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

@ -13,7 +13,7 @@
?person core:hasResearchActivityRole ?newRole.
?newRole rdf:type core:ResearchActivityRole ;
core:relatedRole ?someActivity .
roleToActivityPredicate ?someActivity .
?someActivity rdf:type core:ResearchActivity .
?someActivity rdfs:label "activity title" .
@ -71,7 +71,9 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
role type
predicate inverse
role activity type label (should be singular)
super type of role types for roleActivityType select list generation
super type of role types for roleActivityType select list generation
roleToActivityPredicate
activityToRolePredicate
--%>
<c:set var="roleActivityTypeLabel">${param.roleActivityTypeLabel}</c:set>
@ -81,6 +83,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
<c:set var="roleActivityType_objectClassUri" >${param.roleActivityType_objectClassUri}</c:set>
<c:set var="roleActivityType_literalOptions" >${param.roleActivityType_literalOptions}</c:set>
<c:set var="numDateFields">${! empty param.numDateFields ? param.numDateFields : 2 }</c:set>
<c:set var="roleToActivityPredicate" scope="request">${param.roleToActivityPredicate}</c:set>
<c:set var="activityToRolePredicate">${param.activityToRolePredicate}</c:set>
<%
VitroRequest vreq = new VitroRequest(request);
@ -116,15 +120,17 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
1. Add, there is a subject and a predicate but no role and nothing else.
2. normal edit where everything should already be filled out. There is a subject, a object and an individual on
the other end of the object's core:roleIn stmt.
the other end of the object's roleToActivity stmt.
3. Repair a bad role node. There is a subject, prediate and object but there is no individual on the
other end of the object's core:roleIn stmt. This should be similar to an add but the form should be expanded.
3. Repair a bad role node. There is a subject, predicate and object but there is no individual on the
other end of the object's roleToActivity stmt. This should be similar to an add but the form should be expanded.
4. Really bad node. multiple core:roleIn statements.
4. Really bad node. multiple roleToActivity statements.
*/
EditMode mode = FrontEndEditingUtils.getEditMode(request, "http://vivoweb.org/ontology/core#roleIn");
String roleToActivityPredicate = (String) vreq.getAttribute("roleToActivityPredicate");
System.out.println("sjm: roleToActivityPredicate = " + roleToActivityPredicate);
EditMode mode = FrontEndEditingUtils.getEditMode(request, roleToActivityPredicate);
if( mode == EditMode.ADD ) {
%> <c:set var="editMode" value="add"/><%
@ -166,8 +172,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
?person ?rolePredicate ?role.
?role a <${roleType}> .
?role core:roleIn ?roleActivity .
?roleActivity core:relatedRole ?role .
?role <${roleToActivityPredicate}> ?roleActivity .
?roleActivity <${activityToRolePredicate}> ?role .
</v:jsonset>
<v:jsonset var="n3ForActivityType">
@ -176,8 +182,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
<v:jsonset var="n3ForRoleToActivity">
@prefix core: <${vivoCore}> .
?role core:roleIn ?roleActivity .
?roleActivity core:relatedRole ?role .
?role <${roleToActivityPredicate}> ?roleActivity .
?roleActivity <${activityToRolePredicate}> ?role .
</v:jsonset>
<v:jsonset var="n3ForActivityLabel">
@ -210,13 +216,13 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
PREFIX core: <${vivoCore}>
PREFIX rdfs: <${rdfs}>
SELECT ?existingTitle WHERE {
?role core:roleIn ?existingActivity .
?role <${roleToActivityPredicate}> ?existingActivity .
?existingActivity rdfs:label ?existingTitle . }
</v:jsonset>
<v:jsonset var="activityQuery">
PREFIX core: <${vivoCore}>
SELECT ?existingActivity WHERE { ?role core:roleIn ?existingActivity . }
SELECT ?existingActivity WHERE { ?role <${roleToActivityPredicate}> ?existingActivity . }
</v:jsonset>
<v:jsonset var="roleLabelQuery">
@ -227,7 +233,7 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
<v:jsonset var="activityTypeQuery">
PREFIX core: <${vivoCore}>
SELECT ?existingActivityType WHERE {
?role core:roleIn ?existingActivity .
?role <${roleToActivityPredicate}> ?existingActivity .
?existingActivity a ?existingActivityType .
}
</v:jsonset>
@ -546,7 +552,7 @@ private static final String VIVO_CORE = "http://vivoweb.org/ontology/core#";
private static final String DEFAULT_ACTIVITY_TYPE_QUERY =
"PREFIX core: <" + VIVO_CORE + ">\n" +
"SELECT ?existingActivityType WHERE { \n" +
"?role core:roleIn ?existingActivity . \n" +
"?role <${roleToActivityPredicate}> ?existingActivity . \n" +
"?existingActivity a ?existingActivityType . \n" +
"}";
// The activity type query results must be limited to the values in the activity type select element.
@ -563,7 +569,7 @@ private String getActivityTypeQuery(VitroRequest vreq) {
"PREFIX core: <" + VIVO_CORE + ">\n" +
"PREFIX rdfs: <" + VitroVocabulary.RDFS + ">\n" +
"SELECT ?existingActivityType WHERE {\n" +
"?role core:roleIn ?existingActivity . \n" +
"?role <${roleToActivityPredicate}> ?existingActivity . \n" +
"?existingActivity a ?existingActivityType . \n" +
"?existingActivityType rdfs:subClassOf <" + objectClassUri + "> . \n" +
"}";

2
productMods/edit/forms/addServiceProviderRoleToPerson.jsp
View file

@ -3,6 +3,8 @@
<jsp:include page="addRoleToPersonTwoStage.jsp">
<jsp:param name="roleActivityTypeLabel" value="service to the profession" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ServiceProviderRole" />
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" />

2
productMods/edit/forms/addTeacherRoleToPerson.jsp
View file

@ -3,6 +3,8 @@
<jsp:include page="addRoleToPersonTwoStage.jsp">
<jsp:param name="roleActivityTypeLabel" value="teaching activity" />
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#TeacherRole" />
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#roleIn" />
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#relatedRole" />
<jsp:param name="roleExamples" value="Instructor, Facilitator, Assistant" />
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
<jsp:param name="roleActivityType_objectClassUri" value="" />