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

VIVO-112: another round of updates to support the ISF changes

Browse source
This commit is contained in:
tworrall 2013-08-28 16:58:02 -04:00
parent 978c9ccd5f
commit 59431742e1
10 changed files with 1901 additions and 1848 deletions
Download patch file Download diff file Expand all files Collapse all files

6
productMods/WEB-INF/ontologies/app/loadedAtStartup/PropertyConfig.n3
View file

@ -196,7 +196,7 @@ local:hasResearcherRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddResearcherRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddResearcherRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupresearch> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupresearch> .
m
local:hasInvestigatorRoleContext a :ConfigContext ; local:hasInvestigatorRoleContext a :ConfigContext ;
:hasConfiguration local:hasInvestigatorRoleConfig ; :hasConfiguration local:hasInvestigatorRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
@ -226,7 +226,7 @@ local:hasPrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
local:hasCo-PrincipalInvestigatorRoleContext a :ConfigContext ; local:hasCo-PrincipalInvestigatorRoleContext a :ConfigContext ;
:hasConfiguration local:hasCo-PrincipalInvestigatorRoleConfig ; :hasConfiguration local:hasCo-PrincipalInvestigatorRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
:qualifiedBy <http://vivoweb.org/ontology/core#Co-PrincipalInvestigatorRole> . :qualifiedBy <http://vivoweb.org/ontology/core#CoPrincipalInvestigatorRole> .
local:hasCo-PrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ; local:hasCo-PrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasInvestigatorRole.xml"^^xsd:string ;
@ -278,7 +278,7 @@ local:educationalTrainingConfig a :ObjectPropertyDisplayConfig ;
local:informationResourceInAuthorshipContext a :ConfigContext ; local:informationResourceInAuthorshipContext a :ConfigContext ;
:hasConfiguration local:informationResourceInAuthorshipConfig ; :hasConfiguration local:informationResourceInAuthorshipConfig ;
:configContextFor <http://vivoweb.org/ontology/core#relatedBy> ; :configContextFor <http://vivoweb.org/ontology/core#relatedBy> ;
:qualifiedByDomain <http://purl.org/ontology/bibo/Document> . :qualifiedByDomain <http://purl.org/ontology/bibo/Document> ;
:qualifiedBy <http://vivoweb.org/ontology/core#Authorship> . :qualifiedBy <http://vivoweb.org/ontology/core#Authorship> .
local:informationResourceInAuthorshipConfig a :ObjectPropertyDisplayConfig ; local:informationResourceInAuthorshipConfig a :ObjectPropertyDisplayConfig ;

69
productMods/config/listViewConfig-hasInvestigatorRole.xml
View file

@ -23,13 +23,15 @@
?hideThis ?hideThis
WHERE { WHERE {
?subject ?property ?role ?subject ?property ?role .
?role a ?objectType .
?role vitro:mostSpecificType ?subclass
OPTIONAL { ?role core:roleRealizedIn ?activity OPTIONAL { ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity
LET (?activityName := afn:localname(?activity)) LET (?activityName := afn:localname(?activity))
OPTIONAL { ?activity rdfs:label ?activityLabel } OPTIONAL { ?activity rdfs:label ?activityLabel }
} }
OPTIONAL { ?role core:roleContributesTo ?activity OPTIONAL { ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity
LET (?activityName := afn:localname(?activity)) LET (?activityName := afn:localname(?activity))
OPTIONAL { ?activity rdfs:label ?activityLabel } OPTIONAL { ?activity rdfs:label ?activityLabel }
} }
@ -47,7 +49,7 @@
?dateTimeEndValueRole core:dateTime ?dateTimeEndRole ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole
} }
} }
OPTIONAL { ?role core:roleContributesTo ?grant . OPTIONAL { ?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?grant .
?grant core:dateTimeInterval ?dateTimeIntervalGrant ?grant core:dateTimeInterval ?dateTimeIntervalGrant
OPTIONAL { ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . OPTIONAL { ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
@ -57,10 +59,7 @@
} }
} }
OPTIONAL { ?role core:hideFromDisplay ?hideThis } OPTIONAL { ?role core:hideFromDisplay ?hideThis }
# NOT EXISTS { ?role core:hideFromDisplay ?hideThis } FILTER ( bound(?activity) &amp;&amp; ?subclass = ?objectType)
<critical-data-required>
FILTER ( bound(?activity) )
</critical-data-required>
} ORDER BY DESC(?dateTimeEndRole) DESC(?dateTimeStartRole) DESC(?dateTimeEndGrant) DESC(?dateTimeStartGrant) ?activityLabel ?activityName } ORDER BY DESC(?dateTimeEndRole) DESC(?dateTimeStartRole) DESC(?dateTimeEndGrant) DESC(?dateTimeStartGrant) ?activityLabel ?activityName
</query-select> </query-select>
@ -71,16 +70,19 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleRealizedIn ?activity . ?role a ?objectType .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
?activity rdfs:label ?activityLabel ?activity rdfs:label ?activityLabel
} WHERE { } WHERE {
{ {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?activity ?role a ?objectType .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity
} UNION } UNION
{ {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleRealizedIn ?activity . ?role a ?objectType .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt;n ?activity .
?activity rdfs:label ?activityLabel ?activity rdfs:label ?activityLabel
} }
} }
@ -93,16 +95,19 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?activity . ?role a ?objectType .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity rdfs:label ?activityLabel ?activity rdfs:label ?activityLabel
} WHERE { } WHERE {
{ {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?activity ?role a ?objectType .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity
} UNION } UNION
{ {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?activity . ?role a ?objectType .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity rdfs:label ?activityLabel ?activity rdfs:label ?activityLabel
} }
} }
@ -113,6 +118,7 @@
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt; PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role a ?objectType .
?role ?roleProperty ?roleValue . ?role ?roleProperty ?roleValue .
?activity rdfs:label ?activityName . ?activity rdfs:label ?activityName .
?activity core:grantAwardedBy ?awardedBy . ?activity core:grantAwardedBy ?awardedBy .
@ -124,31 +130,38 @@
?subject ?property ?role ?subject ?property ?role
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role a ?objectType .
?role ?roleProperty ?roleValue ?role ?roleProperty ?roleValue
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?activity . ?role a ?objectType .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity rdfs:label ?activityName ?activity rdfs:label ?activityName
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleRealizedIn ?activity . ?role a ?objectType .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
?activity rdfs:label ?activityName ?activity rdfs:label ?activityName
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?activity . ?role a ?objectType .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity core:grantAwardedBy ?awardedBy ?activity core:grantAwardedBy ?awardedBy
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?activity . ?role a ?objectType .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity core:grantAwardedBy ?awardedBy . ?activity core:grantAwardedBy ?awardedBy .
?awardedBy rdfs:label ?awardedByLabel ?awardedBy rdfs:label ?awardedByLabel
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?activity . ?role a ?objectType .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity core:administeredBy ?adminedBy ?activity core:administeredBy ?adminedBy
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?activity . ?role a ?objectType .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?activity .
?activity core:administeredBy ?adminedBy . ?activity core:administeredBy ?adminedBy .
?adminedBy rdfs:label ?adminedByLabel ?adminedBy rdfs:label ?adminedByLabel
} }
@ -159,11 +172,13 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role a ?objectType .
?role core:dateTimeInterval ?dateTimeIntervalRole . ?role core:dateTimeInterval ?dateTimeIntervalRole .
?dateTimeIntervalRole core:start ?dateTimeStartValueRole . ?dateTimeIntervalRole core:start ?dateTimeStartValueRole .
?dateTimeStartValueRole core:dateTime ?dateTimeStartRole ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole
} WHERE { } WHERE {
?subject ?property ?role . ?subject ?property ?role .
?role a ?objectType .
?role core:dateTimeInterval ?dateTimeIntervalRole . ?role core:dateTimeInterval ?dateTimeIntervalRole .
?dateTimeIntervalRole core:start ?dateTimeStartValueRole . ?dateTimeIntervalRole core:start ?dateTimeStartValueRole .
?dateTimeStartValueRole core:dateTime ?dateTimeStartRole ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole
@ -174,11 +189,13 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role a ?objectType .
?role core:dateTimeInterval ?dateTimeIntervalRole . ?role core:dateTimeInterval ?dateTimeIntervalRole .
?dateTimeIntervalRole core:end ?dateTimeEndValueRole . ?dateTimeIntervalRole core:end ?dateTimeEndValueRole .
?dateTimeEndValueRole core:dateTime ?dateTimeEndRole ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole
} WHERE { } WHERE {
?subject ?property ?role . ?subject ?property ?role .
?role a ?objectType .
?role core:dateTimeInterval ?dateTimeIntervalRole . ?role core:dateTimeInterval ?dateTimeIntervalRole .
?dateTimeIntervalRole core:end ?dateTimeEndValueRole . ?dateTimeIntervalRole core:end ?dateTimeEndValueRole .
?dateTimeEndValueRole core:dateTime ?dateTimeEndRole ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole
@ -188,13 +205,15 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?grant . ?role a ?objectType .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?grant .
?grant core:dateTimeInterval ?dateTimeIntervalGrant . ?grant core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
} WHERE { } WHERE {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?grant . ?role a ?objectType .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?grant .
?grant core:dateTimeInterval ?dateTimeIntervalGrant . ?grant core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant .
?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant
@ -205,13 +224,15 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?grant . ?role a ?objectType .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?grant .
?grant core:dateTimeInterval ?dateTimeIntervalGrant . ?grant core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant .
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant
} WHERE { } WHERE {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?grant . ?role a ?objectType .
?role &lt;http://vivoweb.org/ontology/core#relatedBy&gt; ?grant .
?grant core:dateTimeInterval ?dateTimeIntervalGrant . ?grant core:dateTimeInterval ?dateTimeIntervalGrant .
?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant .
?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant

140
productMods/config/listViewConfig-hasPresenterRole.xml
View file

@ -25,11 +25,12 @@
WHERE { WHERE {
?subject ?property ?role ?subject ?property ?role .
?role a vivo:PresenterRole
OPTIONAL { ?role rdfs:label ?roleLabel } OPTIONAL { ?role rdfs:label ?roleLabel }
OPTIONAL { ?role vivo:roleRealizedIn ?presentation OPTIONAL { ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation
LET (?presentationName := afn:localname(?presentation)) LET (?presentationName := afn:localname(?presentation))
OPTIONAL { ?presentation rdfs:label ?presentationLabel } OPTIONAL { ?presentation rdfs:label ?presentationLabel }
@ -38,18 +39,18 @@
OPTIONAL { ?conference rdfs:label ?conferenceLabel } OPTIONAL { ?conference rdfs:label ?conferenceLabel }
{ {
?presentation vivo:eventWithin ?conference ?presentation &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?conference
} UNION { } UNION {
?conference vivo:includesEvent ?presentation ?conference &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?presentation
} }
} }
OPTIONAL { OPTIONAL {
{ {
?presentation vivo:eventWithin ?workshop . ?presentation &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?workshop .
?workshop vivo:eventWithin ?conference ?workshop &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?conference
} UNION { } UNION {
?workshop vivo:includesEvent ?presentation . ?workshop &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?presentation .
?conference vivo:includesEvent ?workshop ?conference &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?workshop
} }
OPTIONAL { ?conference rdfs:label ?conferenceLabel } OPTIONAL { ?conference rdfs:label ?conferenceLabel }
} }
@ -66,10 +67,10 @@
} }
OPTIONAL { OPTIONAL {
{ {
?presentation vivo:eventWithin ?workshop . ?presentation &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?workshop .
?workshop vivo:inEventSeries ?series ?workshop vivo:inEventSeries ?series
} UNION { } UNION {
?workshop vivo:includesEvent ?presentation . ?workshop &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?presentation .
?series vivo:seriesForEvent ?workshop ?series vivo:seriesForEvent ?workshop
} }
OPTIONAL { ?series rdfs:label ?seriesLabel } OPTIONAL { ?series rdfs:label ?seriesLabel }
@ -108,19 +109,22 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?presentation vitro:mostSpecificType ?subclass . ?presentation vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf vivo:Presentation . ?subclass rdfs:subClassOf vivo:Presentation .
?subclass owl:equivalentClass vivo:Presentation . ?subclass owl:equivalentClass vivo:Presentation .
} WHERE { } WHERE {
{ {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?presentation vitro:mostSpecificType ?subclass . ?presentation vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf vivo:Presentation ?subclass rdfs:subClassOf vivo:Presentation
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?presentation vitro:mostSpecificType ?subclass . ?presentation vitro:mostSpecificType ?subclass .
?subclass owl:equivalentClass vivo:Presentation ?subclass owl:equivalentClass vivo:Presentation
} }
@ -132,17 +136,21 @@
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt; PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role a vivo:PresenterRole .
?role ?roleProperty ?roleValue . ?role ?roleProperty ?roleValue .
?presentation rdfs:label ?presentationLabel ?presentation rdfs:label ?presentationLabel
} WHERE { } WHERE {
{ {
?subject ?property ?role ?subject ?property ?role .
?role a vivo:PresenterRole
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role a vivo:PresenterRole .
?role ?roleProperty ?roleValue ?role ?roleProperty ?roleValue
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?presentation rdfs:label ?presentationLabel ?presentation rdfs:label ?presentationLabel
} }
} }
@ -155,33 +163,38 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role a vivo:PresenterRole .
?conference a bibo:Conference . ?conference a bibo:Conference .
?presentation vivo:eventWithin ?conference . ?presentation &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?conference .
?conference vivo:includesEvent ?presentation . ?conference &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?presentation .
?conference rdfs:label ?conferenceLabel ?conference rdfs:label ?conferenceLabel
} WHERE { } WHERE {
{ {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?presentation vivo:eventWithin ?conference ?presentation &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?conference
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?presentation vivo:eventWithin ?conference . ?presentation &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?conference .
?conference rdfs:label ?conferenceLabel ?conference rdfs:label ?conferenceLabel
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?conference vivo:includesEvent ?presentation ?conference &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?presentation
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?conference vivo:includesEvent ?presentation . ?conference &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?presentation .
?conference rdfs:label ?conferenceLabel ?conference rdfs:label ?conferenceLabel
} }
} }
@ -194,38 +207,43 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?workshop vivo:eventWithin ?conference . ?role a vivo:PresenterRole .
?conference vivo:includesEvent ?workshop . ?workshop &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?conference .
?conference &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?workshop .
?conference a bibo:Conference . ?conference a bibo:Conference .
?presentation vivo:eventWithin ?workshop . ?presentation &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?workshop .
?workshop vivo:includesEvent ?presentation . ?workshop &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?presentation .
?conference rdfs:label ?conferenceLabel ?conference rdfs:label ?conferenceLabel
} WHERE { } WHERE {
{ {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?presentation vivo:eventWithin ?workshop . ?presentation &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?workshop .
?workshop vivo:eventWithin ?conference ?workshop &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?conference
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?presentation vivo:eventWithin ?workshop . ?presentation &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?workshop .
?workshop vivo:eventWithin ?conference . ?workshop &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?conference .
?conference rdfs:label ?conferenceLabel ?conference rdfs:label ?conferenceLabel
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?conference vivo:includesEvent ?workshop . ?conference &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?workshop .
?workshop vivo:includesEvent ?presentation ?workshop &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?presentation
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?conference vivo:includesEvent ?workshop . ?conference &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?workshop .
?workshop vivo:includesEvent ?presentation . ?workshop &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?presentation .
?conference rdfs:label ?conferenceLabel ?conference rdfs:label ?conferenceLabel
} }
} }
@ -238,6 +256,7 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role a vivo:PresenterRole .
?series a vivo:EventSeries . ?series a vivo:EventSeries .
?presentation vivo:inEventSeries ?series . ?presentation vivo:inEventSeries ?series .
?series vivo:seriesForEvent ?presentation . ?series vivo:seriesForEvent ?presentation .
@ -246,23 +265,27 @@
{ {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?series a vivo:EventSeries . ?series a vivo:EventSeries .
?presentation vivo:inEventSeries ?series ?presentation vivo:inEventSeries ?series
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?series a vivo:EventSeries . ?series a vivo:EventSeries .
?presentation vivo:inEventSeries ?series . ?presentation vivo:inEventSeries ?series .
?series rdfs:label ?seriesLabel ?series rdfs:label ?seriesLabel
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?series a vivo:EventSeries . ?series a vivo:EventSeries .
?series vivo:seriesForEvent ?presentation ?series vivo:seriesForEvent ?presentation
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?series a vivo:EventSeries . ?series a vivo:EventSeries .
?series vivo:seriesForEvent ?presentation . ?series vivo:seriesForEvent ?presentation .
?series rdfs:label ?seriesLabel ?series rdfs:label ?seriesLabel
@ -277,38 +300,43 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role a vivo:PresenterRole .
?workshop vivo:inEventSeries ?series . ?workshop vivo:inEventSeries ?series .
?series vivo:seriesForEvent ?workshop . ?series vivo:seriesForEvent ?workshop .
?series a vivo:EventSeries . ?series a vivo:EventSeries .
?presentation vivo:eventWithin ?workshop . ?presentation &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?workshop .
?workshop vivo:includesEvent ?presentation . ?workshop &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?presentation .
?series rdfs:label ?seriesLabel ?series rdfs:label ?seriesLabel
} WHERE { } WHERE {
{ {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?series a vivo:EventSeries . ?series a vivo:EventSeries .
?presentation vivo:eventWithin ?workshop . ?presentation &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?workshop .
?workshop vivo:inEventSeries ?series ?workshop vivo:inEventSeries ?series
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?series a vivo:EventSeries . ?series a vivo:EventSeries .
?presentation vivo:eventWithin ?workshop . ?presentation &lt;http://purl.obolibrary.org/obo/BFO_0000050&gt; ?workshop .
?workshop vivo:inEventSeries ?series . ?workshop vivo:inEventSeries ?series .
?series rdfs:label ?seriesLabel ?series rdfs:label ?seriesLabel
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?series a vivo:EventSeries . ?series a vivo:EventSeries .
?series vivo:seriesForEvent ?workshop . ?series vivo:seriesForEvent ?workshop .
?workshop vivo:includesEvent ?presentation ?workshop &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?presentation
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role vivo:roleRealizedIn ?presentation . ?role a vivo:PresenterRole .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?presentation .
?series a vivo:EventSeries . ?series a vivo:EventSeries .
?series vivo:seriesForEvent ?workshop . ?series vivo:seriesForEvent ?workshop .
?workshop vivo:includesEvent ?presentation . ?workshop &lt;http://purl.obolibrary.org/obo/BFO_0000051&gt; ?presentation .
?series rdfs:label ?seriesLabel ?series rdfs:label ?seriesLabel
} }
} }
@ -318,11 +346,13 @@
PREFIX vivo: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX vivo: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role a vivo:PresenterRole .
?role vivo:dateTimeInterval ?dateTimeInterval . ?role vivo:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval vivo:start ?dateTimeStartValue . ?dateTimeInterval vivo:start ?dateTimeStartValue .
?dateTimeStartValue vivo:dateTime ?dateTimeStart ?dateTimeStartValue vivo:dateTime ?dateTimeStart
} WHERE { } WHERE {
?subject ?property ?role . ?subject ?property ?role .
?role a vivo:PresenterRole .
?role vivo:dateTimeInterval ?dateTimeInterval . ?role vivo:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval vivo:start ?dateTimeStartValue . ?dateTimeInterval vivo:start ?dateTimeStartValue .
?dateTimeStartValue vivo:dateTime ?dateTimeStart ?dateTimeStartValue vivo:dateTime ?dateTimeStart

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

@ -19,11 +19,12 @@
?activityLabel ?activityLabel
?dateTimeStart ?dateTimeEnd ?dateTimeStart ?dateTimeEnd
?hideThis ?hideThis
?objectType
WHERE { WHERE {
?subject ?property ?role . ?subject ?property ?role .
?role a ?objectType ?role a ?objectType
OPTIONAL { ?role core:roleRealizedIn ?activity OPTIONAL { ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity
LET (?activityName := afn:localname(?activity)) LET (?activityName := afn:localname(?activity))
OPTIONAL { ?activity rdfs:label ?activityLabel } OPTIONAL { ?activity rdfs:label ?activityLabel }
@ -32,7 +33,7 @@
</collated> </collated>
} }
OPTIONAL { ?role core:roleContributesTo ?activity OPTIONAL { ?role core:relatedBy ?activity
LET (?activityName := afn:localname(?activity)) LET (?activityName := afn:localname(?activity))
OPTIONAL { ?activity rdfs:label ?activityLabel } OPTIONAL { ?activity rdfs:label ?activityLabel }
@ -65,11 +66,11 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?activity . ?role core:relatedBy ?activity .
?activity vitro:mostSpecificType ?subclass . ?activity vitro:mostSpecificType ?subclass .
} WHERE { } WHERE {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?activity . ?role core:relatedBy ?activity .
?activity vitro:mostSpecificType ?subclass ?activity vitro:mostSpecificType ?subclass
} }
</query-construct> </query-construct>
@ -81,11 +82,11 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleRealizedIn ?activity . ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
?activity vitro:mostSpecificType ?subclass . ?activity vitro:mostSpecificType ?subclass .
} WHERE { } WHERE {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleRealizedIn ?activity . ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
?activity vitro:mostSpecificType ?subclass ?activity vitro:mostSpecificType ?subclass
} }
</query-construct> </query-construct>
@ -105,11 +106,11 @@
?role ?roleProperty ?roleValue ?role ?roleProperty ?roleValue
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleContributesTo ?activity . ?role core:relatedBy ?activity .
?activity rdfs:label ?activityName ?activity rdfs:label ?activityName
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleRealizedIn ?activity . ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
?activity rdfs:label ?activityName ?activity rdfs:label ?activityName
} }
} }

9
productMods/config/listViewConfig-informationResourceInAuthorship.xml
View file

@ -14,9 +14,10 @@
SELECT DISTINCT <collated> ?subclass </collated> SELECT DISTINCT <collated> ?subclass </collated>
?authorship ?authorship
?person ?personName WHERE { ?person ?personName WHERE {
?subject ?property ?authorship ?subject ?property ?authorship .
?subject a core:Authorship
OPTIONAL { ?authorship core:authorRank ?rank } OPTIONAL { ?authorship core:authorRank ?rank }
OPTIONAL { ?authorship core:linkedAuthor ?person . OPTIONAL { ?authorship core:relates ?person .
?person rdfs:label ?personName ?person rdfs:label ?personName
<collated> <collated>
OPTIONAL { ?person vitro:mostSpecificType ?subclass . OPTIONAL { ?person vitro:mostSpecificType ?subclass .
@ -57,11 +58,11 @@
?authorship ?authorshipProperty ?authorshipValue ?authorship ?authorshipProperty ?authorshipValue
} UNION { } UNION {
?subject ?property ?authorship . ?subject ?property ?authorship .
?authorship core:linkedAuthor ?person . ?authorship core:relates ?person .
?person rdfs:label ?personName ?person rdfs:label ?personName
} UNION { } UNION {
?subject ?property ?authorship . ?subject ?property ?authorship .
?authorship core:linkedAuthor ?person . ?authorship core:relates ?person .
?person rdfs:label ?personName . ?person rdfs:label ?personName .
?person vitro:mostSpecificType ?subclass ?person vitro:mostSpecificType ?subclass
} }

4
productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
View file

@ -15,9 +15,9 @@
<#local linkedIndividual> <#local linkedIndividual>
<#if statement.award??> <#if statement.award??>
<a href="${profileUrl(statement.uri("award"))}" title="${i18n().award_name}">${statement.awardLabel!statement.localName}</a> <a href="${profileUrl(statement.uri("award"))}" title="${i18n().award_name}">${statement.awardLabel!statement.localName!}</a>
<#else> <#else>
<a href="${profileUrl(statement.uri("awardReceipt"))}" title="${i18n().award_receipt_name}">${statement.receiptLabel!statement.localName}</a> <a href="${profileUrl(statement.uri("awardReceipt"))}" title="${i18n().award_receipt_name}">${statement.receiptLabel!statement.localName!}</a>
</#if> </#if>
</#local> </#local>

2
productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
View file

@ -47,6 +47,6 @@
</#if> </#if>
</#local> </#local>
${linkedIndividual} ${awardOrAdminBy} ${dateTime!} ${statement.subclass!} ${linkedIndividual} ${awardOrAdminBy} ${dateTime!}
</#if> </#if>
</#macro> </#macro>

4
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAuthorsToInformationResourceGenerator.java
View file

@ -101,8 +101,8 @@ public class AddAuthorsToInformationResourceGenerator extends VivoBaseGenerator
private String getN3NewAuthorship() { private String getN3NewAuthorship() {
return getN3PrefixString() + return getN3PrefixString() +
"?authorshipUri a core:Authorship ;\n" + "?authorshipUri a core:Authorship ;\n" +
" core:linkedInformationResource ?infoResource .\n" + " core:relates ?infoResource .\n" +
"?infoResource core:informationResourceInAuthorship ?authorshipUri ."; "?infoResource core:relatedBy ?authorshipUri .";
} }
private String getN3AuthorshipRank() { private String getN3AuthorshipRank() {

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

@ -604,19 +604,19 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
**/ **/
//role type will always be set based on particular form //role type will always be set based on particular form
public String getRoleType(VitroRequest vreq) { public String getRoleType(VitroRequest vreq) {
String predicateUri = EditConfigurationUtils.getPredicateUri(vreq); String rangeUri = EditConfigurationUtils.getRangeUri(vreq);
if(predicateUri.equals(getHasPrincipalInvestigatorURI())) { if(rangeUri.equals(getPrincipalInvestigatorURI())) {
return getVivoOntologyCoreNamespace() + "PrincipalInvestigatorRole"; return getVivoOntologyCoreNamespace() + "PrincipalInvestigatorRole";
} }
else if(predicateUri.equals(getHasCoPrincipalInvestigatorURI())) { else if(predicateUri.equals(getCoPrincipalInvestigatorURI())) {
return getVivoOntologyCoreNamespace() + "CoPrincipalInvestigatorRole"; return getVivoOntologyCoreNamespace() + "CoPrincipalInvestigatorRole";
} else { } else {
return getVivoOntologyCoreNamespace() + "InvestigatorRole"; return getVivoOntologyCoreNamespace() + "InvestigatorRole";
} }
} }
private Object getHasCoPrincipalInvestigatorURI() { private Object getCoPrincipalInvestigatorURI() {
return getVivoOntologyCoreNamespace() + "hasCo-PrincipalInvestigatorRole"; return getVivoOntologyCoreNamespace() + "CoPrincipalInvestigatorRole";
} }
@ -625,8 +625,8 @@ public class AddGrantRoleToPersonGenerator implements EditConfigurationGenerator
return "http://vivoweb.org/ontology/core#"; return "http://vivoweb.org/ontology/core#";
} }
private Object getHasPrincipalInvestigatorURI() { private Object getPrincipalInvestigatorURI() {
return getVivoOntologyCoreNamespace() + "hasPrincipalInvestigatorRole"; return getVivoOntologyCoreNamespace() + "PrincipalInvestigatorRole";
} }

12
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddPresenterRoleToPersonGenerator.java
View file

@ -26,12 +26,12 @@ public class AddPresenterRoleToPersonGenerator extends VivoBaseGenerator impleme
final static String presentationClass = vivoCore + "Presentation"; final static String presentationClass = vivoCore + "Presentation";
final static String roleClass = vivoCore + "PresenterRole"; final static String roleClass = vivoCore + "PresenterRole";
final static String conferenceClass = bibo + "Conference"; final static String conferenceClass = bibo + "Conference";
final static String hasRolePred = vivoCore + "hasPresenterRole"; final static String hasRolePred = "http://purl.obolibrary.org/obo/RO_0000053";
final static String roleOfPred = vivoCore + "presenterRoleOf"; final static String roleOfPred = "http://purl.obolibrary.org/obo/RO_0000052";
final static String roleRealizedInPred = vivoCore + "roleRealizedIn"; final static String roleRealizedInPred = "http://purl.obolibrary.org/obo/BFO_0000054";
final static String realizedRolePred = vivoCore + "realizedRole"; final static String realizedRolePred = "http://purl.obolibrary.org/obo/BFO_0000055";
final static String includesEventPred = vivoCore + "includesEvent"; final static String includesEventPred = "http://purl.obolibrary.org/obo/BFO_0000051";
final static String eventWithinPred = vivoCore + "eventWithin"; final static String eventWithinPred = "http://purl.obolibrary.org/obo/BFO_0000050";
final static String roleToInterval = vivoCore + "dateTimeInterval"; final static String roleToInterval = vivoCore + "dateTimeInterval";
final static String intervalType = vivoCore + "DateTimeInterval"; final static String intervalType = vivoCore + "DateTimeInterval";
final static String intervalToStart = vivoCore + "start"; final static String intervalToStart = vivoCore + "start";