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

VIVO-112: more changes for role related forms and addAuthorToPub

Browse source
This commit is contained in:
tworrall 2013-08-29 12:35:35 -04:00
parent 59431742e1
commit cae4fe03c1
4 changed files with 27 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,7 +52,7 @@ local:authorInAuthorshipConfig a :ObjectPropertyDisplayConfig ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPublicationToPersonGenerator"^^xsd:string ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPublicationToPersonGenerator"^^xsd:string ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouppublications> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbibliographic> .
local:hasServiceProviderRoleContext a :ConfigContext ; local:hasServiceProviderRoleContext a :ConfigContext ;
:hasConfiguration local:hasServiceProviderRoleConfig ; :hasConfiguration local:hasServiceProviderRoleConfig ;
@ -65,7 +65,7 @@ local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddServiceProviderRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddServiceProviderRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupservice> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoutreach> .
local:hasClinicalRoleContext a :ConfigContext ; local:hasClinicalRoleContext a :ConfigContext ;
:hasConfiguration local:hasClinicalRoleConfig ; :hasConfiguration local:hasClinicalRoleConfig ;
@ -130,7 +130,7 @@ local:hasEditorRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddEditorRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddEditorRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupservice> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoutreach> .
local:hasReviewerRoleContext a :ConfigContext ; local:hasReviewerRoleContext a :ConfigContext ;
:hasConfiguration local:hasReviewerRoleConfig ; :hasConfiguration local:hasReviewerRoleConfig ;
@ -143,7 +143,7 @@ local:hasReviewerRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddReviewerRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddReviewerRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupservice> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoutreach> .
local:hasOrganizerRoleContext a :ConfigContext ; local:hasOrganizerRoleContext a :ConfigContext ;
:hasConfiguration local:hasOrganizerRoleConfig ; :hasConfiguration local:hasOrganizerRoleConfig ;
@ -156,7 +156,7 @@ local:hasOrganizerRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOrganizerRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOrganizerRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupservice> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoutreach> .
local:hasOutreachProviderRoleContext a :ConfigContext ; local:hasOutreachProviderRoleContext a :ConfigContext ;
:hasConfiguration local:hasOutreachProviderRoleConfig ; :hasConfiguration local:hasOutreachProviderRoleConfig ;
@ -169,7 +169,7 @@ local:hasOutreachProviderRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOutreachProviderRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOutreachProviderRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupservice> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoutreach> .
local:hasAttendeeRoleContext a :ConfigContext ; local:hasAttendeeRoleContext a :ConfigContext ;
:hasConfiguration local:hasAttendeeRoleConfig ; :hasConfiguration local:hasAttendeeRoleConfig ;
@ -247,7 +247,7 @@ local:hasPresenterRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPresenterRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddPresenterRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGrouppublications> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbibliographic> .
local:awardOrHonorContext a :ConfigContext ; local:awardOrHonorContext a :ConfigContext ;
:hasConfiguration local:awardOrHonorConfig ; :hasConfiguration local:awardOrHonorConfig ;
@ -273,7 +273,7 @@ local:educationalTrainingConfig a :ObjectPropertyDisplayConfig ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasEducationalTraining"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasEducationalTraining"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbackground> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbiography> .
local:informationResourceInAuthorshipContext a :ConfigContext ; local:informationResourceInAuthorshipContext a :ConfigContext ;
:hasConfiguration local:informationResourceInAuthorshipConfig ; :hasConfiguration local:informationResourceInAuthorshipConfig ;

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

@ -82,7 +82,7 @@
{ {
?subject ?property ?role . ?subject ?property ?role .
?role a ?objectType . ?role a ?objectType .
?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt;n ?activity . ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity .
?activity rdfs:label ?activityLabel ?activity rdfs:label ?activityLabel
} }
} }

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

@ -22,7 +22,8 @@
?objectType ?objectType
WHERE { WHERE {
?subject ?property ?role . ?subject ?property ?role .
?role a ?objectType ?role a ?objectType .
?role vitro:mostSpecificType ?roleSubclass
OPTIONAL { ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity OPTIONAL { ?role &lt;http://purl.obolibrary.org/obo/BFO_0000054&gt; ?activity
LET (?activityName := afn:localname(?activity)) LET (?activityName := afn:localname(?activity))
@ -53,9 +54,7 @@
} }
} }
# NOT EXISTS { ?role core:hideFromDisplay ?hideThis } # NOT EXISTS { ?role core:hideFromDisplay ?hideThis }
<critical-data-required> FILTER ( bound(?activity) &amp;&amp; ?objectType = ?roleSubclass )
FILTER ( bound(?activity) )
</critical-data-required>
} ORDER BY <collated>?subclass</collated> DESC(?dateTimeEnd) DESC(?dateTimeStart) ?activityLabel ?activityName } ORDER BY <collated>?subclass</collated> DESC(?dateTimeEnd) DESC(?dateTimeStart) ?activityLabel ?activityName
</query-select> </query-select>

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

@ -13,11 +13,13 @@
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 ?authorship a core:Authorship
OPTIONAL { ?authorship core:authorRank ?rank } OPTIONAL { ?authorship core:authorRank ?rank }
OPTIONAL { ?authorship core:relates ?person . OPTIONAL { ?authorship core:relates ?person .
?person a foaf:Person .
?person rdfs:label ?personName ?person rdfs:label ?personName
<collated> <collated>
OPTIONAL { ?person vitro:mostSpecificType ?subclass . OPTIONAL { ?person vitro:mostSpecificType ?subclass .
@ -45,9 +47,12 @@
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
PREFIX rdfs: &lt;http://www.w3.org/2000/01/rdf-schema#&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; PREFIX vitro: &lt;http://vitro.mannlib.cornell.edu/ns/vitro/0.7#&gt;
PREFIX foaf: &lt;http://xmlns.com/foaf/0.1/&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?authorship . ?subject ?property ?authorship .
?authorship ?authorshipProperty ?authorshipValue . ?authorship ?authorshipProperty ?authorshipValue .
?authorship core:relates ?person .
?person a foaf:Person .
?person rdfs:label ?personName . ?person rdfs:label ?personName .
?person vitro:mostSpecificType ?subclass ?person vitro:mostSpecificType ?subclass
} WHERE { } WHERE {
@ -59,10 +64,12 @@
} UNION { } UNION {
?subject ?property ?authorship . ?subject ?property ?authorship .
?authorship core:relates ?person . ?authorship core:relates ?person .
?person a foaf:Person .
?person rdfs:label ?personName ?person rdfs:label ?personName
} UNION { } UNION {
?subject ?property ?authorship . ?subject ?property ?authorship .
?authorship core:relates ?person . ?authorship core:relates ?person .
?person a foaf:Person .
?person rdfs:label ?personName . ?person rdfs:label ?personName .
?person vitro:mostSpecificType ?subclass ?person vitro:mostSpecificType ?subclass
} }