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

VIVO-112: ISF updates for advising relationship plus a couple of fixes

Browse source
This commit is contained in:
tworrall 2013-09-11 15:50:15 -04:00
parent 17b90964d0
commit e05f5d6fb4
5 changed files with 359 additions and 243 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
productMods/config/listViewConfig-advisorIn.xml
View file

@ -28,10 +28,12 @@
?subject ?property ?advisory ?subject ?property ?advisory
LET ( ?localName := afn:localname(?advisory) ) LET ( ?localName := afn:localname(?advisory) )
OPTIONAL { ?advisory rdfs:label ?advisoryLabel } OPTIONAL { ?advisory rdfs:label ?advisoryLabel }
OPTIONAL { ?advisory core:advisee ?advisee OPTIONAL { ?advisory core:relates ?advisee .
?advisee a foaf:Person .
OPTIONAL { ?advisee rdfs:label ?adviseeLabel } OPTIONAL { ?advisee rdfs:label ?adviseeLabel }
} }
OPTIONAL { ?advisory core:degreeCandidacy ?degree OPTIONAL { ?advisory core:relates ?degree .
?degree a core:AcademicDegree .
OPTIONAL { ?degree rdfs:label ?degreeLabel } OPTIONAL { ?degree rdfs:label ?degreeLabel }
OPTIONAL { ?degree core:abbreviation ?degreeAbbr } OPTIONAL { ?degree core:abbreviation ?degreeAbbr }
} }
@ -51,7 +53,7 @@
} }
} }
FILTER ( ?subject != ?advisee )
} ORDER BY <collated>?subclass</collated> DESC(?dateTimeEnd) } ORDER BY <collated>?subclass</collated> DESC(?dateTimeEnd)
</query-select> </query-select>
@ -70,16 +72,20 @@
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 ?advisory . ?subject ?property ?advisory .
?advisory a core:AdvisingRelationship .
?advisory ?advisoryProperty ?advisoryValue . ?advisory ?advisoryProperty ?advisoryValue .
?advisory rdfs:label ?advisoryLabel ?advisory rdfs:label ?advisoryLabel
} WHERE { } WHERE {
{ {
?subject ?property ?advisory ?subject ?property ?advisory .
?advisory a core:AdvisingRelationship
} UNION { } UNION {
?subject ?property ?advisory . ?subject ?property ?advisory .
?advisory a core:AdvisingRelationship .
?advisory ?advisoryProperty ?advisoryValue ?advisory ?advisoryProperty ?advisoryValue
} UNION { } UNION {
?subject ?property ?advisory . ?subject ?property ?advisory .
?advisory a core:AdvisingRelationship .
?advisory ?advisoryProperty ?advisoryValue . ?advisory ?advisoryProperty ?advisoryValue .
?advisory rdfs:label ?advisoryLabel ?advisory rdfs:label ?advisoryLabel
} }
@ -94,31 +100,45 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?advisory . ?subject ?property ?advisory .
?advisory core:advisee ?advisee . ?advisory a core:AdvisingRelationship .
?advisory core:relates ?advisee .
?advisee a foaf:Person .
?advisee rdfs:label ?adviseeLabel . ?advisee rdfs:label ?adviseeLabel .
?advisory core:degreeCandidacy ?degree . ?advisory core:relates ?degree .
?degree a core:AcademicDegree .
?degree rdfs:label ?degreeLabel . ?degree rdfs:label ?degreeLabel .
?degree core:abbreviation ?degreeAbbr ?degree core:abbreviation ?degreeAbbr
} WHERE { } WHERE {
{ {
?subject ?property ?advisory ?subject ?property ?advisory .
?advisory a core:AdvisingRelationship .
} UNION { } UNION {
?subject ?property ?advisory. ?subject ?property ?advisory.
?advisory core:advisee ?advisee ?advisory a core:AdvisingRelationship .
?advisory core:relates ?advisee .
?advisee a foaf:Person .
} UNION { } UNION {
?subject ?property ?advisory . ?subject ?property ?advisory .
?advisory core:advisee ?advisee . ?advisory a core:AdvisingRelationship .
?advisory core:relates ?advisee .
?advisee a foaf:Person .
?advisee rdfs:label ?adviseeLabel ?advisee rdfs:label ?adviseeLabel
} UNION { } UNION {
?subject ?property ?advisory . ?subject ?property ?advisory .
?advisory core:degreeCandidacy ?degree ?advisory a core:AdvisingRelationship .
?advisory core:relates ?degree .
?degree a core:AcademicDegree .
} UNION { } UNION {
?subject ?property ?advisory . ?subject ?property ?advisory .
?advisory core:degreeCandidacy ?degree . ?advisory a core:AdvisingRelationship .
?advisory core:relates ?degree .
?degree a core:AcademicDegree .
?degree rdfs:label ?degreeLabel ?degree rdfs:label ?degreeLabel
} UNION { } UNION {
?subject ?property ?advisory . ?subject ?property ?advisory .
?advisory core:degreeCandidacy ?degree . ?advisory a core:AdvisingRelationship .
?advisory core:relates ?degree .
?degree a core:AcademicDegree .
?degree rdfs:label ?degreeLabel . ?degree rdfs:label ?degreeLabel .
?degree core:abbreviation ?degreeAbbr ?degree core:abbreviation ?degreeAbbr
} }
@ -128,12 +148,14 @@
<query-construct> <query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?award . ?subject ?property ?advisory .
?advisory a core:AdvisingRelationship .
?award core:dateTimeInterval ?dateTimeInterval . ?award core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart ?dateTimeStartValue core:dateTime ?dateTimeStart
} WHERE { } WHERE {
?subject ?property ?award . ?subject ?property ?advisory .
?advisory a core:AdvisingRelationship .
?award core:dateTimeInterval ?dateTimeInterval . ?award core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeInterval core:start ?dateTimeStartValue .
?dateTimeStartValue core:dateTime ?dateTimeStart ?dateTimeStartValue core:dateTime ?dateTimeStart
@ -143,12 +165,14 @@
<query-construct> <query-construct>
PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt;
CONSTRUCT { CONSTRUCT {
?subject ?property ?award . ?subject ?property ?advisory .
?advisory a core:AdvisingRelationship .
?award core:dateTimeInterval ?dateTimeInterval . ?award core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeEndValue core:dateTime ?dateTimeEnd
} WHERE { } WHERE {
?subject ?property ?award . ?subject ?property ?advisory .
?advisory a core:AdvisingRelationship .
?award core:dateTimeInterval ?dateTimeInterval . ?award core:dateTimeInterval ?dateTimeInterval .
?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeInterval core:end ?dateTimeEndValue .
?dateTimeEndValue core:dateTime ?dateTimeEnd ?dateTimeEndValue core:dateTime ?dateTimeEnd

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

@ -61,6 +61,7 @@ local:authorInAuthorshipConfig a :ObjectPropertyDisplayConfig ;
local:hasServiceProviderRoleContext a :ConfigContext ; local:hasServiceProviderRoleContext a :ConfigContext ;
:hasConfiguration local:hasServiceProviderRoleConfig ; :hasConfiguration local:hasServiceProviderRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://purl.obolibrary.org/obo/ERO_0000012> . :qualifiedBy <http://purl.obolibrary.org/obo/ERO_0000012> .
local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ; local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ;
@ -75,6 +76,7 @@ local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ;
local:hasClinicalRoleContext a :ConfigContext ; local:hasClinicalRoleContext a :ConfigContext ;
:hasConfiguration local:hasClinicalRoleConfig ; :hasConfiguration local:hasClinicalRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#ClinicalRole> . :qualifiedBy <http://vivoweb.org/ontology/core#ClinicalRole> .
local:hasClinicalRoleConfig a :ObjectPropertyDisplayConfig ; local:hasClinicalRoleConfig a :ObjectPropertyDisplayConfig ;
@ -89,6 +91,7 @@ local:hasClinicalRoleConfig a :ObjectPropertyDisplayConfig ;
local:hasLeaderRoleContext a :ConfigContext ; local:hasLeaderRoleContext a :ConfigContext ;
:hasConfiguration local:hasLeaderRoleConfig ; :hasConfiguration local:hasLeaderRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#LeaderRole> . :qualifiedBy <http://vivoweb.org/ontology/core#LeaderRole> .
local:hasLeaderRoleConfig a :ObjectPropertyDisplayConfig ; local:hasLeaderRoleConfig a :ObjectPropertyDisplayConfig ;
@ -103,6 +106,7 @@ local:hasLeaderRoleConfig a :ObjectPropertyDisplayConfig ;
local:hasMemberRoleContext a :ConfigContext ; local:hasMemberRoleContext a :ConfigContext ;
:hasConfiguration local:hasMemberRoleConfig ; :hasConfiguration local:hasMemberRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#MemberRole> . :qualifiedBy <http://vivoweb.org/ontology/core#MemberRole> .
local:hasMemberRoleConfig a :ObjectPropertyDisplayConfig ; local:hasMemberRoleConfig a :ObjectPropertyDisplayConfig ;
@ -117,6 +121,7 @@ local:hasMemberRoleConfig a :ObjectPropertyDisplayConfig ;
local:hasTeacherRoleContext a :ConfigContext ; local:hasTeacherRoleContext a :ConfigContext ;
:hasConfiguration local:hasTeacherRoleConfig ; :hasConfiguration local:hasTeacherRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#TeacherRole> . :qualifiedBy <http://vivoweb.org/ontology/core#TeacherRole> .
local:hasTeacherRoleConfig a :ObjectPropertyDisplayConfig ; local:hasTeacherRoleConfig a :ObjectPropertyDisplayConfig ;
@ -131,6 +136,7 @@ local:hasTeacherRoleConfig a :ObjectPropertyDisplayConfig ;
local:hasEditorRoleContext a :ConfigContext ; local:hasEditorRoleContext a :ConfigContext ;
:hasConfiguration local:hasEditorRoleConfig ; :hasConfiguration local:hasEditorRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#EditorRole> . :qualifiedBy <http://vivoweb.org/ontology/core#EditorRole> .
local:hasEditorRoleConfig a :ObjectPropertyDisplayConfig ; local:hasEditorRoleConfig a :ObjectPropertyDisplayConfig ;
@ -145,6 +151,7 @@ local:hasEditorRoleConfig a :ObjectPropertyDisplayConfig ;
local:hasReviewerRoleContext a :ConfigContext ; local:hasReviewerRoleContext a :ConfigContext ;
:hasConfiguration local:hasReviewerRoleConfig ; :hasConfiguration local:hasReviewerRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#ReviewerRole> . :qualifiedBy <http://vivoweb.org/ontology/core#ReviewerRole> .
local:hasReviewerRoleConfig a :ObjectPropertyDisplayConfig ; local:hasReviewerRoleConfig a :ObjectPropertyDisplayConfig ;
@ -159,6 +166,7 @@ local:hasReviewerRoleConfig a :ObjectPropertyDisplayConfig ;
local:hasOrganizerRoleContext a :ConfigContext ; local:hasOrganizerRoleContext a :ConfigContext ;
:hasConfiguration local:hasOrganizerRoleConfig ; :hasConfiguration local:hasOrganizerRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#OrganizerRole> . :qualifiedBy <http://vivoweb.org/ontology/core#OrganizerRole> .
local:hasOrganizerRoleConfig a :ObjectPropertyDisplayConfig ; local:hasOrganizerRoleConfig a :ObjectPropertyDisplayConfig ;
@ -173,6 +181,7 @@ local:hasOrganizerRoleConfig a :ObjectPropertyDisplayConfig ;
local:hasOutreachProviderRoleContext a :ConfigContext ; local:hasOutreachProviderRoleContext a :ConfigContext ;
:hasConfiguration local:hasOutreachProviderRoleConfig ; :hasConfiguration local:hasOutreachProviderRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#OutreachProviderRole> . :qualifiedBy <http://vivoweb.org/ontology/core#OutreachProviderRole> .
local:hasOutreachProviderRoleConfig a :ObjectPropertyDisplayConfig ; local:hasOutreachProviderRoleConfig a :ObjectPropertyDisplayConfig ;
@ -187,6 +196,7 @@ local:hasOutreachProviderRoleConfig a :ObjectPropertyDisplayConfig ;
local:hasAttendeeRoleContext a :ConfigContext ; local:hasAttendeeRoleContext a :ConfigContext ;
:hasConfiguration local:hasAttendeeRoleConfig ; :hasConfiguration local:hasAttendeeRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#AttendeeRole> . :qualifiedBy <http://vivoweb.org/ontology/core#AttendeeRole> .
local:hasAttendeeRoleConfig a :ObjectPropertyDisplayConfig ; local:hasAttendeeRoleConfig a :ObjectPropertyDisplayConfig ;
@ -201,6 +211,7 @@ local:hasAttendeeRoleConfig a :ObjectPropertyDisplayConfig ;
local:hasResearcherRoleContext a :ConfigContext ; local:hasResearcherRoleContext a :ConfigContext ;
:hasConfiguration local:hasResearcherRoleConfig ; :hasConfiguration local:hasResearcherRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#ResearcherRole> . :qualifiedBy <http://vivoweb.org/ontology/core#ResearcherRole> .
local:hasResearcherRoleConfig a :ObjectPropertyDisplayConfig ; local:hasResearcherRoleConfig a :ObjectPropertyDisplayConfig ;
@ -215,6 +226,7 @@ local:hasResearcherRoleConfig a :ObjectPropertyDisplayConfig ;
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> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#InvestigatorRole> . :qualifiedBy <http://vivoweb.org/ontology/core#InvestigatorRole> .
local:hasInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ; local:hasInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
@ -229,6 +241,7 @@ local:hasInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
local:hasPrincipalInvestigatorRoleContext a :ConfigContext ; local:hasPrincipalInvestigatorRoleContext a :ConfigContext ;
:hasConfiguration local:hasPrincipalInvestigatorRoleConfig ; :hasConfiguration local:hasPrincipalInvestigatorRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#PrincipalInvestigatorRole> . :qualifiedBy <http://vivoweb.org/ontology/core#PrincipalInvestigatorRole> .
local:hasPrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ; local:hasPrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
@ -243,6 +256,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> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#CoPrincipalInvestigatorRole> . :qualifiedBy <http://vivoweb.org/ontology/core#CoPrincipalInvestigatorRole> .
local:hasCo-PrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ; local:hasCo-PrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
@ -257,6 +271,7 @@ local:hasCo-PrincipalInvestigatorRoleConfig a :ObjectPropertyDisplayConfig ;
local:hasPresenterRoleContext a :ConfigContext ; local:hasPresenterRoleContext a :ConfigContext ;
:hasConfiguration local:hasPresenterRoleConfig ; :hasConfiguration local:hasPresenterRoleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000053> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#PresenterRole> . :qualifiedBy <http://vivoweb.org/ontology/core#PresenterRole> .
local:hasPresenterRoleConfig a :ObjectPropertyDisplayConfig ; local:hasPresenterRoleConfig a :ObjectPropertyDisplayConfig ;
@ -271,6 +286,7 @@ local:hasPresenterRoleConfig a :ObjectPropertyDisplayConfig ;
local:awardOrHonorContext a :ConfigContext ; local:awardOrHonorContext a :ConfigContext ;
:hasConfiguration local:awardOrHonorConfig ; :hasConfiguration local:awardOrHonorConfig ;
:configContextFor <http://vivoweb.org/ontology/core#relatedBy> ; :configContextFor <http://vivoweb.org/ontology/core#relatedBy> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#AwardorHonorReceipt> . :qualifiedBy <http://vivoweb.org/ontology/core#AwardorHonorReceipt> .
local:awardOrHonorConfig a :ObjectPropertyDisplayConfig ; local:awardOrHonorConfig a :ObjectPropertyDisplayConfig ;
@ -285,6 +301,7 @@ local:awardOrHonorConfig a :ObjectPropertyDisplayConfig ;
local:educationalTrainingContext a :ConfigContext ; local:educationalTrainingContext a :ConfigContext ;
:hasConfiguration local:educationalTrainingConfig ; :hasConfiguration local:educationalTrainingConfig ;
:configContextFor <http://purl.obolibrary.org/obo/RO_0000056> ; :configContextFor <http://purl.obolibrary.org/obo/RO_0000056> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#EducationalProcess> . :qualifiedBy <http://vivoweb.org/ontology/core#EducationalProcess> .
local:educationalTrainingConfig a :ObjectPropertyDisplayConfig ; local:educationalTrainingConfig a :ObjectPropertyDisplayConfig ;
@ -296,6 +313,22 @@ local:educationalTrainingConfig a :ObjectPropertyDisplayConfig ;
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#vitroPropertyGroupbiography> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbiography> .
local:advisorRoleContext a :ConfigContext ;
:hasConfiguration local:advisorRoleConfig ;
:configContextFor <http://vivoweb.org/ontology/core#relatedBy> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://vivoweb.org/ontology/core#AdvisingRelationship> .
local:advisorRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-advisorIn.xml"^^xsd:string ;
:displayName "advisees" ;
vitro:displayRankAnnot 40;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasAdvisingRelationshipGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupteaching> .
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> ;
@ -310,3 +343,19 @@ local:informationResourceInAuthorshipConfig a :ObjectPropertyDisplayConfig ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAuthorsToInformationResourceGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAuthorsToInformationResourceGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
### vcard properties ###
local:mailingAddressContext a :ConfigContext ;
:hasConfiguration local:mailingAddressConfig ;
:configContextFor <http://vivoweb.org/ontology/core#relatedBy> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://www.w3.org/2006/vcard/ns#Address> .
local:mailingAddressConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-personHasMailingAddress.xml"^^xsd:string ;
:displayName "mailing address" ;
vitro:displayRankAnnot 80;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasMailingAddressGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupaddress> .

2
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddClinicalRoleToPersonGenerator.java
View file

@ -29,7 +29,7 @@ public class AddClinicalRoleToPersonGenerator extends AddRoleToPersonTwoStageGen
return new ConstantFieldOptions( return new ConstantFieldOptions(
"", "Select one", "", "Select one",
"http://vivoweb.org/ontology/core#Project", "Project", "http://vivoweb.org/ontology/core#Project", "Project",
"http://vivoweb.org/ontology/core#Service", "Service" "http://purl.obolibrary.org/obo/ERO_0000005", "Service"
); );
} }

87
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/PersonHasAdvisingRelationshipGenerator.java
View file

@ -28,12 +28,8 @@ public class PersonHasAdvisingRelationshipGenerator extends VivoBaseGenerator im
final static String subjAreaClass = "http://www.w3.org/2004/02/skos/core#Concept"; final static String subjAreaClass = "http://www.w3.org/2004/02/skos/core#Concept";
final static String degreeClass = vivoCore+"AcademicDegree"; final static String degreeClass = vivoCore+"AcademicDegree";
final static String adviseeClass = foaf + "Person"; final static String adviseeClass = foaf + "Person";
final static String advisorInPred = vivoCore + "advisorIn"; final static String adviseeRoleClass = "http://vivoweb.org/ontology/core#AdviseeRole";
final static String adviseeInPred = vivoCore + "adviseeIn"; final static String advisorRoleClass = "http://vivoweb.org/ontology/core#AdvisorRole";
final static String advisorPred = vivoCore + "advisor";
final static String adviseePred = vivoCore + "advisee" ;
final static String subjAreaPred = vivoCore + "hasSubjectArea" ;
final static String degreePred = vivoCore + "degreeCandidacy" ;
final static String advisingRelToInterval = vivoCore + "dateTimeInterval"; final static String advisingRelToInterval = 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";
@ -62,7 +58,7 @@ public class PersonHasAdvisingRelationshipGenerator extends VivoBaseGenerator im
conf.setN3Required( Arrays.asList( n3ForNewAdvisingRelationship, conf.setN3Required( Arrays.asList( n3ForNewAdvisingRelationship,
advisingRelLabelAssertion, advisingRelLabelAssertion,
advisingRelTypeAssertion ) ); advisingRelTypeAssertion ) );
conf.setN3Optional( Arrays.asList( n3ForNewAdviseeAssertion, conf.setN3Optional( Arrays.asList( n3ForNewAdviseeAssertion,
n3ForExistingAdviseeAssertion, n3ForExistingAdviseeAssertion,
degreeAssertion, degreeAssertion,
@ -75,6 +71,8 @@ public class PersonHasAdvisingRelationshipGenerator extends VivoBaseGenerator im
conf.addNewResource("advisingRelationship", DEFAULT_NS_FOR_NEW_RESOURCE); conf.addNewResource("advisingRelationship", DEFAULT_NS_FOR_NEW_RESOURCE);
conf.addNewResource("newAdvisee", DEFAULT_NS_FOR_NEW_RESOURCE); conf.addNewResource("newAdvisee", DEFAULT_NS_FOR_NEW_RESOURCE);
conf.addNewResource("advisorRole", DEFAULT_NS_FOR_NEW_RESOURCE);
conf.addNewResource("adviseeRole", DEFAULT_NS_FOR_NEW_RESOURCE);
conf.addNewResource("newSubjArea", DEFAULT_NS_FOR_NEW_RESOURCE); conf.addNewResource("newSubjArea", DEFAULT_NS_FOR_NEW_RESOURCE);
conf.addNewResource("intervalNode", DEFAULT_NS_FOR_NEW_RESOURCE); conf.addNewResource("intervalNode", DEFAULT_NS_FOR_NEW_RESOURCE);
conf.addNewResource("startNode", DEFAULT_NS_FOR_NEW_RESOURCE); conf.addNewResource("startNode", DEFAULT_NS_FOR_NEW_RESOURCE);
@ -93,6 +91,8 @@ public class PersonHasAdvisingRelationshipGenerator extends VivoBaseGenerator im
conf.addSparqlForExistingLiteral("endField-value", existingEndDateQuery); conf.addSparqlForExistingLiteral("endField-value", existingEndDateQuery);
conf.addSparqlForExistingUris("advisingRelType", advisingRelTypeQuery); conf.addSparqlForExistingUris("advisingRelType", advisingRelTypeQuery);
conf.addSparqlForExistingUris("advisorRole", existingAdvisorRoleQuery);
conf.addSparqlForExistingUris("adviseeRole", existingAdviseeRoleQuery);
conf.addSparqlForExistingUris("existingSubjArea", subjAreaQuery); conf.addSparqlForExistingUris("existingSubjArea", subjAreaQuery);
conf.addSparqlForExistingUris("existingAdvisee", adviseeQuery); conf.addSparqlForExistingUris("existingAdvisee", adviseeQuery);
conf.addSparqlForExistingUris("degree", degreeQuery); conf.addSparqlForExistingUris("degree", degreeQuery);
@ -193,9 +193,14 @@ public class PersonHasAdvisingRelationshipGenerator extends VivoBaseGenerator im
final static String n3ForNewAdvisingRelationship = final static String n3ForNewAdvisingRelationship =
"@prefix vivo: <" + vivoCore + "> . \n\n" + "@prefix vivo: <" + vivoCore + "> . \n\n" +
"?person <" + advisorInPred + "> ?advisingRelationship . \n" + "?person <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
"?advisingRelationship a <" + advisingRelClass + "> . \n" + "?advisingRelationship a <" + advisingRelClass + "> . \n" +
"?advisingRelationship <" + advisorPred + "> ?person . \n" ; "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?person . \n" +
"?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
"?advisorRole a <" + advisorRoleClass + "> . \n" +
"?advisorRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
"?person <http://purl.obolibrary.org/obo/RO_0000053> ?advisorRole . \n" +
"?advisorRole <http://purl.obolibrary.org/obo/RO_0000052> ?person . ";
final static String advisingRelLabelAssertion = final static String advisingRelLabelAssertion =
"?advisingRelationship <"+ label + "> ?advisingRelLabel ."; "?advisingRelationship <"+ label + "> ?advisingRelLabel .";
@ -204,14 +209,24 @@ public class PersonHasAdvisingRelationshipGenerator extends VivoBaseGenerator im
"?advisingRelationship a ?advisingRelType ."; "?advisingRelationship a ?advisingRelType .";
final static String n3ForNewAdviseeAssertion = final static String n3ForNewAdviseeAssertion =
"?advisingRelationship <" + adviseePred + "> ?newAdvisee . \n" + "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?newAdvisee . \n" +
"?newAdvisee <" + adviseeInPred + "> ?advisingRelationship . \n" + "?newAdvisee <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
"?newAdvisee <" + label + "> ?adviseeLabel . \n" + "?newAdvisee <" + label + "> ?adviseeLabel . \n" +
"?newAdvisee a <" + adviseeClass + "> . "; "?newAdvisee a <" + adviseeClass + "> . \n" +
"?newAdvisee <http://purl.obolibrary.org/obo/RO_0000053> ?adviseeRole . \n" +
"?adviseeRole <http://purl.obolibrary.org/obo/RO_0000052> ?newAdvisee . \n" +
"?adviseeRole a <" + adviseeRoleClass + "> . \n" +
"?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
"?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . ";
final static String n3ForExistingAdviseeAssertion = final static String n3ForExistingAdviseeAssertion =
"?advisingRelationship <" + adviseePred + "> ?existingAdvisee . \n" + "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdvisee . \n" +
"?existingAdvisee <" + adviseeInPred + "> ?advisingRelationship . "; "?existingAdvisee <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
"?existingAdvisee <http://purl.obolibrary.org/obo/RO_0000053> ?adviseeRole . \n" +
"?adviseeRole <http://purl.obolibrary.org/obo/RO_0000052> ?existingAdvisee . \n" +
"?adviseeRole a <" + adviseeRoleClass + "> . \n" +
"?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
"?adviseeRole <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . ";
final static String firstNameAssertion = final static String firstNameAssertion =
"@prefix foaf: <" + foaf + "> . \n" + "@prefix foaf: <" + foaf + "> . \n" +
@ -222,19 +237,22 @@ public class PersonHasAdvisingRelationshipGenerator extends VivoBaseGenerator im
"?newAdvisee foaf:lastName ?lastName ."; "?newAdvisee foaf:lastName ?lastName .";
final static String degreeAssertion = final static String degreeAssertion =
"?advisingRelationship <"+ degreePred +"> ?degree ."; "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?degree . \n" +
"?degree <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . ";
//This is for an existing subject area //This is for an existing subject area
//Where we only need the existing subject area label //Where we only need the existing subject area label
final static String n3ForExistingSubjAreaAssertion = final static String n3ForExistingSubjAreaAssertion =
"?advisingRelationship <"+ subjAreaPred +"> ?existingSubjArea ."; "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingSubjArea . \n" +
"?existingSubjArea <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . ";
//For new subject area, we include all new information //For new subject area, we include all new information
//new subject area should always be a new resource //new subject area should always be a new resource
//and the following should only get evaluated //and the following should only get evaluated
//when there is something in the label //when there is something in the label
final static String n3ForNewSubjAreaAssertion = final static String n3ForNewSubjAreaAssertion =
"?advisingRelationship <"+ subjAreaPred +"> ?newSubjArea . \n" + "?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?newSubjArea . \n" +
"?newSubjArea <http://vivoweb.org/ontology/core#relatedBy> ?advisingRelationship . \n" +
"?newSubjArea <"+ label + "> ?subjAreaLabel . \n" + "?newSubjArea <"+ label + "> ?subjAreaLabel . \n" +
"?newSubjArea a <" + subjAreaClass + "> . "; "?newSubjArea a <" + subjAreaClass + "> . ";
@ -264,24 +282,46 @@ public class PersonHasAdvisingRelationshipGenerator extends VivoBaseGenerator im
final static String adviseeQuery = final static String adviseeQuery =
"SELECT ?existingAdvisee WHERE { \n" + "SELECT ?existingAdvisee WHERE { \n" +
" ?advisingRelationship <" + adviseePred + "> ?existingAdvisee . \n" + " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdvisee . \n" +
" ?existingAdvisee a <" + adviseeClass + "> . \n" +
" FILTER (?person != ?existingAdvisee) . \n" +
"}";
final static String existingAdvisorRoleQuery =
"SELECT ?advisorRole WHERE { \n" +
"?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?advisorRole . \n" +
"?advisorRole a <" + advisorRoleClass + "> . \n" +
"}";
final static String existingAdviseeRoleQuery =
"SELECT ?adviseeRole WHERE { \n" +
" ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?adviseeRole . \n" +
" ?adviseeRole a <" + adviseeRoleClass + "> . \n" +
"}"; "}";
final static String adviseeLabelQuery = final static String adviseeLabelQuery =
"SELECT ?existingAdviseeLabel WHERE { \n" + "SELECT ?existingAdviseeLabel WHERE { \n" +
" ?advisingRelationship <" + adviseePred + "> ?existingAdvisee . \n" + " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingAdvisee . \n" +
" ?existingAdvisee a <" + adviseeClass + "> . \n" +
" ?existingAdvisee <" + label + "> ?existingAdviseeLabel . \n" + " ?existingAdvisee <" + label + "> ?existingAdviseeLabel . \n" +
" FILTER (?person != ?existingAdvisee) . \n" +
"}"; "}";
final static String subjAreaQuery = final static String subjAreaQuery =
"SELECT ?existingSubjArea WHERE { \n" + "SELECT ?existingSubjArea WHERE { \n" +
" ?advisingRelationship <" + subjAreaPred + "> ?existingSubjArea . \n" + " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingSubjArea . \n" +
" ?existingSubjArea a <http://www.w3.org/2004/02/skos/core#Concept> . \n" +
" ?existingSubjArea <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType> ?type \n" +
" FILTER (?type != <http://vivoweb.org/ontology/core#AcademicDegree>) . \n" +
"}"; "}";
final static String subjAreaLabelQuery = final static String subjAreaLabelQuery =
"SELECT ?existingSubjAreaLabel WHERE { \n" + "SELECT ?existingSubjAreaLabel WHERE { \n" +
" ?advisingRelationship <" + subjAreaPred + "> ?existingSubjArea . \n" + " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingSubjArea . \n" +
" ?existingSubjArea a <http://www.w3.org/2004/02/skos/core#Concept> . \n" +
" ?existingSubjArea <" + label + "> ?existingSubjAreaLabel . \n" + " ?existingSubjArea <" + label + "> ?existingSubjAreaLabel . \n" +
" ?existingSubjArea <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#mostSpecificType> ?type \n" +
" FILTER (?type != <http://vivoweb.org/ontology/core#AcademicDegree>) . \n" +
"}"; "}";
final static String advisingRelLabelQuery = final static String advisingRelLabelQuery =
@ -291,7 +331,10 @@ public class PersonHasAdvisingRelationshipGenerator extends VivoBaseGenerator im
final static String degreeQuery = final static String degreeQuery =
"SELECT ?existingDegree WHERE {\n"+ "SELECT ?existingDegree WHERE {\n"+
" ?advisingRelationship <"+ degreePred +"> ?existingDegree . }"; " ?advisingRelationship <http://vivoweb.org/ontology/core#relates> ?existingDegree . \n" +
" ?existingDegree a <" + degreeClass + "> . \n" +
"}";
final static String existingStartDateQuery = final static String existingStartDateQuery =
"SELECT ?existingDateStart WHERE { \n" + "SELECT ?existingDateStart WHERE { \n" +