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

VIVO-112

Browse source
This commit is contained in:
tworrall 2013-09-23 09:04:22 -04:00
parent 4047b4e8a9
commit fca87953d2
15 changed files with 804 additions and 736 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

171
productMods/config/listViewConfig-hasAttendeeRole.xml
View file

@ -28,7 +28,7 @@
OPTIONAL { ?role rdfs:label ?roleLabel }
OPTIONAL { ?role vivo:roleRealizedIn ?event1
OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1
LET (?event1Name := afn:localname(?event1))
OPTIONAL { ?event1 rdfs:label ?event1Label }
@ -37,18 +37,18 @@
OPTIONAL { ?event2 rdfs:label ?event2Label }
{
?event1 vivo:eventWithin ?event2
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event2
} UNION {
?event2 vivo:includesEvent ?event1
?event2 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1
}
}
OPTIONAL {
{
?event1 vivo:eventWithin ?event3 .
?event3 vivo:eventWithin ?event2
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event3 .
?event3 <http://purl.obolibrary.org/obo/BFO_0000050> ?event2
} UNION {
?event2 vivo:includesEvent ?event3 .
?event3 vivo:includesEvent ?event1
?event2 <http://purl.obolibrary.org/obo/BFO_0000051> ?event3 .
?event3 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1
}
OPTIONAL { ?event2 rdfs:label ?event2Label }
@ -59,18 +59,18 @@
OPTIONAL { ?series rdfs:label ?seriesLabel }
{
?event1 vivo:inEventWithin ?series
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?series
} UNION {
?series vivo:seriesForEvent ?event1
?series <http://purl.obolibrary.org/obo/BFO_0000051> ?event1
}
}
OPTIONAL {
{
?event1 vivo:eventWithin ?event3 .
?event3 vivo:inEventSeries ?series
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event3 .
?event3 <http://purl.obolibrary.org/obo/BFO_0000050> ?series
} UNION {
?event3 vivo:includesEvent ?event1 .
?series vivo:seriesForEvent ?event3
?event3 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 .
?series <http://purl.obolibrary.org/obo/BFO_0000051> ?event3
}
OPTIONAL { ?series rdfs:label ?seriesLabel }
}
@ -112,19 +112,22 @@
CONSTRUCT {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?event1 vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf event:Event .
?subclass owl:equivalentClass event:Event .
} WHERE {
{
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?event1 vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf event:Event
} UNION {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?event1 vitro:mostSpecificType ?subclass .
?subclass owl:equivalentClass event:Event
}
@ -136,17 +139,21 @@
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
CONSTRUCT {
?subject ?property ?role .
?role a ?objectType .
?role ?roleProperty ?roleValue .
?event1 rdfs:label ?event1Label
} WHERE {
{
?subject ?property ?role
?subject ?property ?role .
?role a ?objectType .
} UNION {
?subject ?property ?role .
?role a ?objectType .
?role ?roleProperty ?roleValue
} UNION {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?event1 rdfs:label ?event1Label
}
}
@ -160,33 +167,38 @@
CONSTRUCT {
?subject ?property ?role .
?role a ?objectType .
?event2 a event:Event .
?event1 vivo:eventWithin ?event2 .
?event2 vivo:includesEvent ?event1 .
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event2 .
?event2 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 .
?event2 rdfs:label ?event2Label
} WHERE {
{
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?event2 a event:Event .
?event1 vivo:eventWithin ?event2
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event2
} UNION {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?event2 a event:Event .
?event1 vivo:eventWithin ?event2 .
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event2 .
?event2 rdfs:label ?event2Label
} UNION {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?event2 a event:Event .
?event2 vivo:includesEvent ?event1
?event2 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1
} UNION {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?event2 a event:Event .
?event2 vivo:includesEvent ?event1 .
?event2 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 .
?event2 rdfs:label ?event2Label
}
}
@ -200,38 +212,43 @@
CONSTRUCT {
?subject ?property ?role .
?event3 vivo:eventWithin ?event2 .
?event2 vivo:includesEvent ?event3 .
?role a ?objectType .
?event3 <http://purl.obolibrary.org/obo/BFO_0000050> ?event2 .
?event2 <http://purl.obolibrary.org/obo/BFO_0000051> ?event3 .
?event2 a event:Event .
?event1 vivo:eventWithin ?event3 .
?event3 vivo:includesEvent ?event1 .
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event3 .
?event3 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 .
?event2 rdfs:label ?event2Label
} WHERE {
{
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?event2 a event:Event .
?event1 vivo:eventWithin ?event3 .
?event3 vivo:eventWithin ?event2
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event3 .
?event3 <http://purl.obolibrary.org/obo/BFO_0000050> ?event2
} UNION {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?event2 a event:Event .
?event1 vivo:eventWithin ?event3 .
?event3 vivo:eventWithin ?event2 .
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event3 .
?event3 <http://purl.obolibrary.org/obo/BFO_0000050> ?event2 .
?event2 rdfs:label ?event2Label
} UNION {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?event2 a event:Event .
?event2 vivo:includesEvent ?event3 .
?event3 vivo:includesEvent ?event1
?event2 <http://purl.obolibrary.org/obo/BFO_0000051> ?event3 .
?event3 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1
} UNION {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?event2 a event:Event .
?event2 vivo:includesEvent ?event3 .
?event3 vivo:includesEvent ?event1 .
?event2 <http://purl.obolibrary.org/obo/BFO_0000051> ?event3 .
?event3 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 .
?event2 rdfs:label ?event2Label
}
}
@ -245,33 +262,38 @@
CONSTRUCT {
?subject ?property ?role .
?role a ?objectType .
?series a vivo:EventSeries .
?event1 vivo:inEventSeries ?series .
?series vivo:seriesForEvent ?event1 .
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?series .
?series <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 .
?series rdfs:label ?seriesLabel
} WHERE {
{
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?series a vivo:EventSeries .
?event1 vivo:inEventSeries ?series
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?series
} UNION {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?series a vivo:EventSeries .
?event1 vivo:inEventSeries ?series .
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?series .
?series rdfs:label ?seriesLabel
} UNION {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?series a vivo:EventSeries .
?series vivo:seriesForEvent ?event1
?series <http://purl.obolibrary.org/obo/BFO_0000051> ?event1
} UNION {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?series a vivo:EventSeries .
?series vivo:seriesForEvent ?event1 .
?series <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 .
?series rdfs:label ?seriesLabel
}
}
@ -284,38 +306,43 @@
CONSTRUCT {
?subject ?property ?role .
?workshop vivo:inEventSeries ?series .
?series vivo:seriesForEvent ?event3 .
?role a ?objectType .
?workshop <http://purl.obolibrary.org/obo/BFO_0000050> ?series .
?series <http://purl.obolibrary.org/obo/BFO_0000051> ?event3 .
?series a vivo:EventSeries .
?event1 vivo:eventWithin ?event3 .
?event3 vivo:includesEvent ?event1 .
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event3 .
?event3 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 .
?series rdfs:label ?seriesLabel
} WHERE {
{
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?series a vivo:EventSeries .
?event1 vivo:eventWithin ?event3 .
?event3 vivo:inEventSeries ?series
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event3 .
?event3 <http://purl.obolibrary.org/obo/BFO_0000050> ?series
} UNION {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?series a vivo:EventSeries .
?event1 vivo:eventWithin ?event3 .
?event3 vivo:inEventSeries ?series .
?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event3 .
?event3 <http://purl.obolibrary.org/obo/BFO_0000050> ?series .
?series rdfs:label ?seriesLabel
} UNION {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?series a vivo:EventSeries .
?series vivo:seriesForEvent ?event3 .
?workshop vivo:includesEvent ?event1
?series <http://purl.obolibrary.org/obo/BFO_0000051> ?event3 .
?workshop <http://purl.obolibrary.org/obo/BFO_0000051> ?event1
} UNION {
?subject ?property ?role .
?role vivo:roleRealizedIn ?event1 .
?role a ?objectType .
?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 .
?series a vivo:EventSeries .
?series vivo:seriesForEvent ?event3 .
?event3 vivo:includesEvent ?event1 .
?series <http://purl.obolibrary.org/obo/BFO_0000051> ?event3 .
?event3 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 .
?series rdfs:label ?seriesLabel
}
}
@ -325,11 +352,13 @@
PREFIX vivo: <http://vivoweb.org/ontology/core#>
CONSTRUCT {
?subject ?property ?role .
?role a ?objectType .
?role vivo:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval vivo:start ?dateTimeStartValue .
?dateTimeStartValue vivo:dateTime ?dateTimeStart
} WHERE {
?subject ?property ?role .
?role a ?objectType .
?role vivo:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval vivo:start ?dateTimeStartValue .
?dateTimeStartValue vivo:dateTime ?dateTimeStart
@ -340,11 +369,13 @@
PREFIX vivo: <http://vivoweb.org/ontology/core#>
CONSTRUCT {
?subject ?property ?role .
?role a ?objectType .
?role vivo:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval vivo:end ?dateTimeEndValue .
?dateTimeEndValue vivo:dateTime ?dateTimeEnd
} WHERE {
?subject ?property ?role .
?role a ?objectType .
?role vivo:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval vivo:end ?dateTimeEndValue .
?dateTimeEndValue vivo:dateTime ?dateTimeEnd

164
productMods/config/listViewConfig-hasEditReviewRole.xml
View file

@ -1,164 +0,0 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
<list-view-config>
<query-select>
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
SELECT DISTINCT <collated>?subclass</collated> ?subclassLabel
# send the property to the template, since this view supports multiple role properties
?property
?role
?activity ?activityName
?activityLabel
?infoResource ?infoResourceName
?infoResourceLabel
?dateTimeStart ?dateTimeEnd WHERE {
?subject ?property ?role
OPTIONAL { ?role core:roleContributesTo ?activity
LET (?activityName := afn:localname(?activity))
OPTIONAL { ?activity rdfs:label ?activityLabel }
}
OPTIONAL { ?role core:roleRealizedIn ?activity
LET (?activityName := afn:localname(?activity))
OPTIONAL { ?activity rdfs:label ?activityLabel }
}
# NB Currently we can only retrieve subclass for either the
# infoResource or the activity, but not both. Later, we could have
# the query retrieve both and write a custom preprocessor to merge
# the results into a single subclass column.
?infoResource vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf ?superclass
FILTER ( ( ?property = core:hasEditorRole &amp;&amp; ?superclass = bibo:Collection ) ||
( ?property = core:hasReviewerRole &amp;&amp; ?superclass = core:InformationResource )
)
# Get subclass label for display in uncollated view
?subclass rdfs:label ?subclassLabel
OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
}
OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
}
<critical-data-required>
FILTER ( bound(?infoResource) )
</critical-data-required>
} ORDER BY <collated>?subclass</collated> DESC(?dateTimeEnd) DESC(?dateTimeStart) ?activityLabel ?activityName
</query-select>
<query-construct>
PREFIX bibo: &lt;http://purl.org/ontology/bibo/&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
CONSTRUCT {
?subject ?property ?role .
?role core:roleContributesTo ?infoResource .
?infoResource vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf ?superclass .
?subclass rdfs:label ?subclassLabel
} WHERE {
?subject ?property ?role .
?role core:roleContributesTo ?infoResource .
?infoResource vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf ?superclass .
?subclass rdfs:label ?subclassLabel
FILTER ( ?superclass = bibo:Collection || ?superclass = core:InformationResource )
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
CONSTRUCT {
?subject ?property ?role .
?role ?roleProperty ?roleValue .
?activity rdfs:label ?activityName
} WHERE {
{
?subject ?property ?role
} UNION {
?subject ?property ?role .
?role ?roleProperty ?roleValue
} UNION {
?subject ?property ?role .
?role core:roleContributesTo ?activity .
?activity rdfs:label ?activityName
} UNION {
?subject ?property ?role .
?role core:roleRealizedIn ?activity .
?activity rdfs:label ?activityName
}
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?role .
?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
} WHERE {
?subject ?property ?role .
?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?role .
?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
} WHERE {
?subject ?property ?role .
?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
CONSTRUCT {
?subject ?property ?role .
?role ?roleProperty ?roleValue .
?infoResource rdfs:label ?infoResourceLabel
} WHERE {
{
?subject ?property ?role
} UNION {
?subject ?property ?role .
?role ?roleProperty ?roleValue .
} UNION {
?subject ?property ?role .
?role core:roleContributesTo ?infoResource .
?infoResource rdfs:label ?infoResourceLabel .
}
}
</query-construct>
<template>propStatement-hasEditReviewRole.ftl</template>
</list-view-config>

122
productMods/config/listViewConfig-hasEditorRole.xml Normal file
View file

@ -0,0 +1,122 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
<list-view-config>
<query-select>
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
SELECT DISTINCT <collated> ?subclass </collated>
?role
?subclassLabel
?activity
(afn:localname(?activity) AS ?activityLocal)
?activityName
?dateTimeStart
?dateTimeEnd
WHERE {
?subject ?property ?role
OPTIONAL { ?role core:roleContributesTo ?activity .
?activity vitro:mostSpecificType ?subclass
OPTIONAL { ?activity rdfs:label ?activityName }
OPTIONAL { ?subclass rdfs:label ?subclassLabel }
}
OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
}
OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
}
} ORDER BY <collated> ?subclass </collated> DESC(?dateTimeEnd) DESC(?dateTimeStart) ?activityName
</query-select>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
CONSTRUCT {
?subject ?property ?role .
?role a core:EditorRole .
?role vitro:mostSpecificType ?roleSubclass .
?role core:roleContributesTo ?activity .
?activity rdfs:label ?activityName .
?activity vitro:mostSpecificType ?subclass .
?subclass rdfs:label ?subclassLabel
} WHERE {
{
?subject ?property ?role .
?role a core:EditorRole .
} UNION {
?subject ?property ?role .
?role a core:EditorRole .
?role vitro:mostSpecificType ?roleSubclass
} UNION {
?subject ?property ?role .
?role a core:EditorRole .
?role core:roleContributesTo ?activity
} UNION {
?subject ?property ?role .
?role a core:EditorRole .
?role core:roleContributesTo ?activity .
?activity rdfs:label ?activityName .
} UNION {
?subject ?property ?role .
?role a core:EditorRole .
?role core:roleContributesTo ?activity .
?activity vitro:mostSpecificType ?subclass
} UNION {
?subject ?property ?role .
?role a core:EditorRole .
?role core:roleContributesTo ?activity .
?activity vitro:mostSpecificType ?subclass .
?subclass rdfs:label ?subclassLabel
}
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?role .
?role a core:EditorRole .
?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
} WHERE {
?subject ?property ?role .
?role a core:EditorRole .
?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?role .
?role a core:EditorRole .
?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
} WHERE {
?subject ?property ?role .
?role a core:EditorRole .
?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
</query-construct>
<template>propStatement-hasEditReviewRole.ftl</template>
</list-view-config>

122
productMods/config/listViewConfig-hasReviewerRole.xml Normal file
View file

@ -0,0 +1,122 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<!-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
<list-view-config>
<query-select>
PREFIX afn: &lt;http://jena.hpl.hp.com/ARQ/function#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
SELECT DISTINCT <collated> ?subclass </collated>
?role
?subclassLabel
?activity
(afn:localname(?activity) AS ?activityLocal)
?activityName
?dateTimeStart
?dateTimeEnd
WHERE {
?subject ?property ?role
OPTIONAL { ?role core:roleContributesTo ?activity .
?activity vitro:mostSpecificType ?subclass
OPTIONAL { ?activity rdfs:label ?activityName }
OPTIONAL { ?subclass rdfs:label ?subclassLabel }
}
OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval
OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
}
OPTIONAL { ?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
}
} ORDER BY <collated> ?subclass </collated> DESC(?dateTimeEnd) DESC(?dateTimeStart) ?activityName
</query-select>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
CONSTRUCT {
?subject ?property ?role .
?role a core:ReviewerRole .
?role vitro:mostSpecificType ?roleSubclass .
?role core:roleContributesTo ?activity .
?activity rdfs:label ?activityName .
?activity vitro:mostSpecificType ?subclass .
?subclass rdfs:label ?subclassLabel
} WHERE {
{
?subject ?property ?role .
?role a core:ReviewerRole .
} UNION {
?subject ?property ?role .
?role a core:ReviewerRole .
?role vitro:mostSpecificType ?roleSubclass
} UNION {
?subject ?property ?role .
?role a core:ReviewerRole .
?role core:roleContributesTo ?activity
} UNION {
?subject ?property ?role .
?role a core:ReviewerRole .
?role core:roleContributesTo ?activity .
?activity rdfs:label ?activityName .
} UNION {
?subject ?property ?role .
?role a core:ReviewerRole .
?role core:roleContributesTo ?activity .
?activity vitro:mostSpecificType ?subclass
} UNION {
?subject ?property ?role .
?role a core:ReviewerRole .
?role core:roleContributesTo ?activity .
?activity vitro:mostSpecificType ?subclass .
?subclass rdfs:label ?subclassLabel
}
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?role .
?role a core:ReviewerRole .
?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
} WHERE {
?subject ?property ?role .
?role a core:ReviewerRole .
?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?role .
?role a core:ReviewerRole .
?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
} WHERE {
?subject ?property ?role .
?role a core:ReviewerRole .
?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
</query-construct>
<template>propStatement-hasEditReviewRole.ftl</template>
</list-view-config>

1
productMods/config/listViewConfig-hasRole.xml
View file

@ -60,7 +60,6 @@
?dateTimeEndValue core:dateTime ?dateTimeEnd
}
}
# NOT EXISTS { ?role core:hideFromDisplay ?hideThis }
FILTER ( bound(?activity) &amp;&amp; ?objectType = ?roleSubclass )
} ORDER BY <collated>?subclass</collated> DESC(?dateTimeEnd) DESC(?dateTimeStart) ?activityLabel ?activityName
</query-select>

47
productMods/config/listViewConfig-relatedRole.xml
View file

@ -20,22 +20,24 @@ http://vivoweb.org/ontology/core#realizedRole and http://vivoweb.org/ontology/co
?roleLabel ?roleTypeLabel
?indivInRole (afn:localname(?indivInRole) AS ?indivName)
?indivLabel
?dateTimeInterval ?dateTimeStart ?dateTimeEnd WHERE {
?dateTimeInterval ?dateTimeStart ?dateTimeEnd ?objectType
WHERE {
?subject ?property ?role
?subject ?property ?role .
?role a ?objectType
OPTIONAL { ?role rdfs:label ?roleLabel }
# We need ?subclass in the uncollated query to get the roleTypeLabel
# for roles that have no label (e.g., InvestigatorRole and its subclasses).
# for roles that have no label.
OPTIONAL { ?role vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf core:Role
OPTIONAL { ?subclass rdfs:label ?roleTypeLabel }
?roleProp rdfs:subPropertyOf core:roleOf ;
rdfs:domain ?subclass .
OPTIONAL { ?role ?roleProp ?indivInRole
OPTIONAL { ?role &lt;http://purl.obolibrary.org/obo/RO_0000052&gt; ?indivInRole
OPTIONAL { ?indivInRole rdfs:label ?indivLabel }
}
OPTIONAL { ?role &lt;http://purl.obolibrary.org/obo/BFO_0000055&gt; ?indivInRole
OPTIONAL { ?indivInRole rdfs:label ?indivLabel }
}
}
OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval
@ -52,46 +54,43 @@ http://vivoweb.org/ontology/core#realizedRole and http://vivoweb.org/ontology/co
} ORDER BY <collated>?subclass</collated> ?indivLabel ?roleLabel ?roleTypeLabel ?indivName
</query-select>
<query-construct>
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subclass rdfs:subClassOf core:Role .
?roleProp rdfs:subPropertyOf core:roleOf .
?roleProp rdfs:domain ?subclass
} WHERE {
?subclass rdfs:subClassOf core:Role .
?roleProp rdfs:subPropertyOf core:roleOf ;
rdfs:domain ?subclass
}
</query-construct>
<query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
CONSTRUCT {
?subject ?property ?role .
?role a ?objectType .
?role ?roleProperty ?roleValue .
?role vitro:mostSpecificType ?subclass .
?subclass rdfs:label ?roleTypeLabel .
?indivInRole rdfs:label ?indivLabel
} WHERE {
{
?subject ?property ?role
?subject ?property ?role .
?role a ?objectType
} UNION {
?subject ?property ?role .
?role a ?objectType .
?role ?roleProperty ?roleValue
} UNION {
?subject ?property ?role .
?role a ?objectType .
?role vitro:mostSpecificType ?subclass
} UNION {
?subject ?property ?role .
?role a ?objectType .
?role vitro:mostSpecificType ?subclass .
?subclass rdfs:label ?roleTypeLabel
} UNION {
?subject ?property ?role .
?role ?roleProp ?indivInRole .
?role a ?objectType .
?role &lt;http://purl.obolibrary.org/obo/RO_0000052&gt; ?indivInRole .
?indivInRole rdfs:label ?indivLabel
} UNION {
?subject ?property ?role .
?role a ?objectType .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000055&gt; ?indivInRole .
?indivInRole rdfs:label ?indivLabel
}
}
@ -101,11 +100,13 @@ http://vivoweb.org/ontology/core#realizedRole and http://vivoweb.org/ontology/co
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT {
?subject ?property ?role .
?role a ?objectType .
?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart
} WHERE {
?subject ?property ?role .
?role a ?objectType .
?role core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart

2
productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
View file

@ -54,7 +54,7 @@
<div id="titleContainer"><span class="display-title-not-editable">${statement.value}</span></div>
<#else>
<span class="display-title-editable">${statement.value}</span>
<@p.editingLinks "${title.name}" statement editable />
<@p.editingLinks "${title.name}" "" statement editable />
</#if>
</#list>
</#if>

2
productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
View file

@ -66,7 +66,7 @@
<div id="titleContainer"><span class="display-title-not-editable">${statement.value}</span></div>
<#else>
<span class="display-title-editable">${statement.value}</span>
<@p.editingLinks "${title.name}" statement editable />
<@p.editingLinks "${title.name}" "" statement editable />
</#if>
</#list>
</#if>

5
productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
View file

@ -15,7 +15,7 @@
<#macro showRole statement property>
<#local linkedIndividual>
<#if statement?has_content && statement.activity?has_content>
<a href="${profileUrl(statement.uri("activity"))}" title="${i18n().activity_name}">${statement.activityLabel!statement.activityName}</a>
<a href="${profileUrl(statement.uri("activity"))}" title="${i18n().activity_name}">${statement.activityLabel!statement.activityName!}</a>
</#if>
</#local>
@ -24,6 +24,5 @@
</#local>
<#-- If property is collated, then subclass label is redundant information -->
${linkedIndividual} <#if ! property.collatedBySubclass>${statement.subclassLabel!}</#if> ${dateTime!}
${linkedIndividual} <#if ! property.collatedBySubclass>&nbsp;(${statement.subclassLabel!})</#if> ${dateTime!}
</#macro>

2
productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl
View file

@ -22,7 +22,7 @@ roleExamples-->
<#assign typeSelectorLabel = "${i18n().reviewer_of}" />
<#assign genericLabel = "${i18n().item_capitalized}" />
<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#InformationResource'}" />
<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Document'}" />
<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">

51
rdf/display/everytime/PropertyConfig.n3
View file

@ -140,7 +140,7 @@ local:hasEditorRoleContext a :ConfigContext ;
:qualifiedBy <http://vivoweb.org/ontology/core#EditorRole> .
local:hasEditorRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:listViewConfigFile "listViewConfig-hasEditorRole.xml"^^xsd:string ;
:displayName "collection or series editor for" ;
vitro:displayRankAnnot 2;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
@ -155,7 +155,7 @@ local:hasReviewerRoleContext a :ConfigContext ;
:qualifiedBy <http://vivoweb.org/ontology/core#ReviewerRole> .
local:hasReviewerRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:listViewConfigFile "listViewConfig-hasReviewerRole.xml"^^xsd:string ;
:displayName "reviewer of" ;
vitro:displayRankAnnot 3;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
@ -200,7 +200,7 @@ local:hasAttendeeRoleContext a :ConfigContext ;
:qualifiedBy <http://vivoweb.org/ontology/core#AttendeeRole> .
local:hasAttendeeRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasRole.xml"^^xsd:string ;
:listViewConfigFile "listViewConfig-hasAttendeeRole.xml"^^xsd:string ;
:displayName "attended" ;
vitro:displayRankAnnot 1;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
@ -434,3 +434,48 @@ local:fullNameConfig a :ObjectPropertyDisplayConfig ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddFullNameToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaddress> .
### properties using default editing form ##
local:eventWithinContext a :ConfigContext ;
:hasConfiguration local:eventWithinConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ;
:qualifiedByDomain <http://purl.org/NET/c4dm/event.owl#Event> ;
:qualifiedBy <http://purl.org/NET/c4dm/event.owl#Event> .
local:eventWithinConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "event within" ;
vitro:displayRankAnnot 1;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:includesEventContext a :ConfigContext ;
:hasConfiguration local:includesEventConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000050> ;
:qualifiedByDomain <http://purl.org/NET/c4dm/event.owl#Event> ;
:qualifiedBy <http://purl.org/NET/c4dm/event.owl#Event> .
local:includesEventConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "includes event" ;
vitro:displayRankAnnot 2;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:inEventSeriesContext a :ConfigContext ;
:hasConfiguration local:inEventSeriesConfig ;
:configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;
:qualifiedByDomain <http://purl.org/NET/c4dm/event.owl#Event> ;
:qualifiedBy <http://purl.org/NET/c4dm/event.owl#EventSeries> .
local:includesEventConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "in event series" ;
vitro:displayRankAnnot 3;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .

90
rdf/display/everytime/vivoListViewConfig.rdf
View file

@ -49,100 +49,16 @@
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#advisorIn">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-advisorIn.xml</display:listViewConfigFile>
</rdf:Description>
<!--
******************************************************************
all roles use same config...is there a better way to specify this?
** core:hasClinicalRole
** core:hasLeaderRole
** core:hasMemberRole
** core:hasOutreachProviderRole
** core:hasServiceProviderRole
** core:hasResearcherRole
** core:hasTeacherRole
** core:hasOrganizerRole
** core:hasAttendeeRole
these three are an exception, and share a separate config
** core:hasInvestigatorRole
** core:hasCo-PrincipalInvestigatorRole
** core:hasPrincipalInvestigatorRole
******************************************************************
-->
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasClinicalRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasLeaderRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasMemberRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasOutreachProviderRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasServiceProviderRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasResearcherRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasTeacherRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasOrganizerRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasEditorRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasEditReviewRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasReviewerRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasEditReviewRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasPresenterRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasPresenterRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasAttendeeRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasAttendeeRole.xml</display:listViewConfigFile>
</rdf:Description>
<!-- The next three roles use a different config -->
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasInvestigatorRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasInvestigatorRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasCo-PrincipalInvestigatorRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasInvestigatorRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#hasPrincipalInvestigatorRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-hasInvestigatorRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#researchAreaOf">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-researchAreaOf.xml</display:listViewConfigFile>
</rdf:Description>
<!--
******************************************************************
end roles (from person) config
******************************************************************
-->
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#realizedRole">
<rdf:Description rdf:about="http://purl.obolibrary.org/obo/BFO_0000055">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-relatedRole.xml</display:listViewConfigFile>
</rdf:Description>
@ -150,10 +66,6 @@
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-relatedRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#linkedRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-relatedRole.xml</display:listViewConfigFile>
</rdf:Description>
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#dateTimeInterval">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-dateTimeInterval.xml</display:listViewConfigFile>
</rdf:Description>

5
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddGrantRoleToPersonGenerator.java
View file

@ -608,9 +608,10 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
if(rangeUri.equals(getPrincipalInvestigatorURI())) {
return getVivoOntologyCoreNamespace() + "PrincipalInvestigatorRole";
}
else if(predicateUri.equals(getCoPrincipalInvestigatorURI())) {
else if(rangeUri.equals(getCoPrincipalInvestigatorURI())) {
return getVivoOntologyCoreNamespace() + "CoPrincipalInvestigatorRole";
} else {
}
else {
return getVivoOntologyCoreNamespace() + "InvestigatorRole";
}
}

8
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java
View file

@ -8,7 +8,7 @@ import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
public class AddReviewerRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
private static String OBJECT_VCLASS_URI = "http://vivoweb.org/ontology/core#InformationResource";
private static String OBJECT_VCLASS_URI = "http://purl.org/ontology/bibo/Document";
@Override
String getTemplate() { return "addReviewerRoleToPerson.ftl"; }
@ -16,11 +16,11 @@ public class AddReviewerRoleToPersonGenerator extends AddRoleToPersonTwoStageGen
//The default activityToRolePredicate and roleToActivityPredicates are
//correct for this subclass so they don't need to be overwritten
@Override
/* @Override
public String getRoleToActivityPredicate(VitroRequest vreq) {
return "<http://vivoweb.org/ontology/core#forInformationResource>";
return "<http://purl.obolibrary.org/obo/BFO_0000054>";
}
*/
//role type will always be set based on particular form
@Override
public String getRoleType() {

2
themes/wilma/templates/individual--foaf-person.ftl
View file

@ -66,7 +66,7 @@
<@p.addLinkWithLabel title editable />
<#list title.statements as statement>
<span class="display-title">${statement.value}</span>
<@p.editingLinks "${title.name}" statement editable />
<@p.editingLinks "${title.name}" "" statement editable />
</#list>
</#if>
<#-- If preferredTitle is unpopulated, display mostSpecificTypes -->