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

NIHVIVO-3266 (list views for roles) NIHVIVO-3206 (data migration)

Browse source
This commit is contained in:
stellamit 2011-10-28 21:42:25 +00:00
parent e2b9d9103a
commit db124422af
10 changed files with 122 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

6
productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf
View file

@ -131,7 +131,11 @@
****************************************************************** ******************************************************************
--> -->
<rdf:Description rdf:about="http://vivoweb.org/ontology/core#relatedRole"> <rdf:Description rdf:about="http://vivoweb.org/ontology/core#realizedRole">
<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#contributingRole">
<display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-relatedRole.xml</display:listViewConfigFile> <display:listViewConfigFile rdf:datatype="http://www.w3.org/2001/XMLSchema#string">listViewConfig-relatedRole.xml</display:listViewConfigFile>
</rdf:Description> </rdf:Description>

2
productMods/WEB-INF/ontologies/update/diff.tab.txt
View file

@ -5,7 +5,7 @@ http://vivoweb.org/ontology/core#subjectAreaFor No Delete Delete
http://vivoweb.org/ontology/core#researchAreaOf No Delete Delete http://vivoweb.org/ontology/core#researchAreaOf No Delete Delete
http://vivoweb.org/ontology/core#roleIn No Delete Delete http://vivoweb.org/ontology/core#roleIn No Delete Delete
http://vivoweb.org/ontology/core#relatedRole No Delete Delete http://vivoweb.org/ontology/core#relatedRole No Delete Delete
http://vivoweb.org/ontology/core#URLLink No Delete Delete http://vivoweb.org/ontology/core#VocabularySourceReference No Delete Delete
http://vivoweb.org/ontology/core#sourceVocabularyReference No Delete Delete http://vivoweb.org/ontology/core#sourceVocabularyReference No Delete Delete
http://vivoweb.org/ontology/core#vocabularyReferenceFor No Delete Delete http://vivoweb.org/ontology/core#vocabularyReferenceFor No Delete Delete
http://vivoweb.org/ontology/core#addressStreet http://vivoweb.org/ontology/core#address1 Yes Map Directly-changed http://vivoweb.org/ontology/core#addressStreet http://vivoweb.org/ontology/core#address1 Yes Map Directly-changed

2
productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/ExternalConcept.sparql
View file

@ -22,6 +22,6 @@ Construct {
{?something vivo:hasResearchArea ?concept} {?something vivo:hasResearchArea ?concept}
?concept rdf:type vivo:SubjectArea . ?concept rdf:type vivo:SubjectArea .
?concept vivo:vocabularySourceReference ?urllink . ?concept vivo:sourceVocabularyReference ?urllink .
?urllink vivo:linkURI ?uri ?urllink vivo:linkURI ?uri
} }

2
productMods/WEB-INF/resources/startup_listeners.txt
View file

@ -32,7 +32,7 @@ edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateUserAccounts
# Invokes process to perform updates to align with ontology changes if needed --> # Invokes process to perform updates to align with ontology changes if needed -->
# Needs to run before submodels are attached and Pellet is set up --> # Needs to run before submodels are attached and Pellet is set up -->
# edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase
edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup

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

@ -26,7 +26,12 @@
?subject ?property ?role ?subject ?property ?role
OPTIONAL { ?role core:roleIn ?activity 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)) LET (?activityName := afn:localname(?activity))
OPTIONAL { ?activity rdfs:label ?activityLabel } OPTIONAL { ?activity rdfs:label ?activityLabel }
} }
@ -101,7 +106,11 @@
?role ?roleProperty ?roleValue ?role ?roleProperty ?roleValue
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?activity . ?role core:roleContributesTo ?activity .
?activity rdfs:label ?activityName
} UNION {
?subject ?property ?role .
?role core:roleRealizedIn ?activity .
?activity rdfs:label ?activityName ?activity rdfs:label ?activityName
} }
} }

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

@ -22,7 +22,16 @@
?subject ?property ?role ?subject ?property ?role
OPTIONAL { ?role core:roleIn ?activity OPTIONAL { ?role core:roleRealizedIn ?activity
LET (?activityName := afn:localname(?activity))
OPTIONAL { ?activity rdfs:label ?activityLabel }
<collated>
?activity vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf core:hasInvestigatorRole
</collated>
}
OPTIONAL { ?role core:roleContributesTo ?activity
LET (?activityName := afn:localname(?activity)) LET (?activityName := afn:localname(?activity))
OPTIONAL { ?activity rdfs:label ?activityLabel } OPTIONAL { ?activity rdfs:label ?activityLabel }
@ -60,12 +69,30 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?activity . ?role core:roleRealizedIn ?activity .
?activity vitro:mostSpecificType ?subclass . ?activity vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf core:hasInvestigatorRole ?subclass rdfs:subClassOf core:hasInvestigatorRole
} WHERE { } WHERE {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?activity . ?role core:roleRealizedIn ?activity .
?activity vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf core:hasInvestigatorRole
}
</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 core:roleContributesTo ?activity .
?activity vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf core:hasInvestigatorRole
} WHERE {
?subject ?property ?role .
?role core:roleContributesTo ?activity .
?activity vitro:mostSpecificType ?subclass . ?activity vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf core:hasInvestigatorRole ?subclass rdfs:subClassOf core:hasInvestigatorRole
} }
@ -90,24 +117,28 @@
?role ?roleProperty ?roleValue ?role ?roleProperty ?roleValue
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?activity . ?role core:roleContributesTo ?activity .
?activity rdfs:label ?activityName ?activity rdfs:label ?activityName
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?activity . ?role core:roleRealizedIn ?activity .
?activity rdfs:label ?activityName
} UNION {
?subject ?property ?role .
?role core:roleContributesTo ?activity .
?activity core:grantAwardedBy ?awardedBy ?activity core:grantAwardedBy ?awardedBy
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?activity . ?role core:roleContributesTo ?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:roleIn ?activity . ?role core:roleContributesTo ?activity .
?activity core:administeredBy ?adminedBy ?activity core:administeredBy ?adminedBy
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?activity . ?role core:roleContributesTo ?activity .
?activity core:administeredBy ?adminedBy . ?activity core:administeredBy ?adminedBy .
?adminedBy rdfs:label ?adminedByLabel ?adminedBy rdfs:label ?adminedByLabel
} }

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

@ -28,7 +28,7 @@
OPTIONAL { ?role rdfs:label ?roleLabel } OPTIONAL { ?role rdfs:label ?roleLabel }
OPTIONAL { ?role core:roleIn ?presentation OPTIONAL { ?role core:roleRealizedIn ?presentation
LET (?presentationName := afn:localname(?presentation)) LET (?presentationName := afn:localname(?presentation))
OPTIONAL { ?presentation rdfs:label ?presentationLabel } OPTIONAL { ?presentation rdfs:label ?presentationLabel }
@ -86,19 +86,19 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?presentation . ?role core:roleRealizedIn ?presentation .
?presentation vitro:mostSpecificType ?subclass . ?presentation vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf core:Presentation . ?subclass rdfs:subClassOf core:Presentation .
?subclass owl:equivalentClass core:Presentation . ?subclass owl:equivalentClass core:Presentation .
} WHERE { } WHERE {
{ {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?presentation . ?role core:roleRealizedIn ?presentation .
?presentation vitro:mostSpecificType ?subclass . ?presentation vitro:mostSpecificType ?subclass .
?subclass rdfs:subClassOf core:Presentation ?subclass rdfs:subClassOf core:Presentation
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?presentation . ?role core:roleRealizedIn ?presentation .
?presentation vitro:mostSpecificType ?subclass . ?presentation vitro:mostSpecificType ?subclass .
?subclass owl:equivalentClass core:Presentation ?subclass owl:equivalentClass core:Presentation
} }
@ -120,7 +120,7 @@
?role ?roleProperty ?roleValue ?role ?roleProperty ?roleValue
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?presentation . ?role core:roleRealizedIn ?presentation .
?presentation rdfs:label ?presentationLabel ?presentation rdfs:label ?presentationLabel
} }
} }
@ -141,23 +141,23 @@
{ {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?presentation . ?role core:roleRealizedIn ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?presentation core:eventWithin ?conference ?presentation core:eventWithin ?conference
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?presentation . ?role core:roleRealizedIn ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?presentation core:eventWithin ?conference . ?presentation core:eventWithin ?conference .
?conference rdfs:label ?conferenceLabel ?conference rdfs:label ?conferenceLabel
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?presentation . ?role core:roleRealizedIn ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?conference core:includesEvent ?presentation ?conference core:includesEvent ?presentation
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?presentation . ?role core:roleRealizedIn ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?conference core:includesEvent ?presentation . ?conference core:includesEvent ?presentation .
?conference rdfs:label ?conferenceLabel ?conference rdfs:label ?conferenceLabel
@ -181,26 +181,26 @@
} WHERE { } WHERE {
{ {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?presentation . ?role core:roleRealizedIn ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?presentation core:eventWithin ?workshop . ?presentation core:eventWithin ?workshop .
?workshop core:eventWithin ?conference ?workshop core:eventWithin ?conference
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?presentation . ?role core:roleRealizedIn ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?presentation core:eventWithin ?workshop . ?presentation core:eventWithin ?workshop .
?workshop core:eventWithin ?conference . ?workshop core:eventWithin ?conference .
?conference rdfs:label ?conferenceLabel ?conference rdfs:label ?conferenceLabel
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?presentation . ?role core:roleRealizedIn ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?conference core:includesEvent ?workshop . ?conference core:includesEvent ?workshop .
?workshop core:includesEvent ?presentation ?workshop core:includesEvent ?presentation
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?presentation . ?role core:roleRealizedIn ?presentation .
?conference a bibo:Conference . ?conference a bibo:Conference .
?conference core:includesEvent ?workshop . ?conference core:includesEvent ?workshop .
?workshop core:includesEvent ?presentation . ?workshop core:includesEvent ?presentation .

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

@ -21,7 +21,16 @@
?subject ?property ?role ?subject ?property ?role
OPTIONAL { ?role core:roleIn ?activity OPTIONAL { ?role core:roleRealizedIn ?activity
LET (?activityName := afn:localname(?activity))
OPTIONAL { ?activity rdfs:label ?activityLabel }
<collated>
?activity vitro:mostSpecificType ?subclass
</collated>
}
OPTIONAL { ?role core:roleContributesTo ?activity
LET (?activityName := afn:localname(?activity)) LET (?activityName := afn:localname(?activity))
OPTIONAL { ?activity rdfs:label ?activityLabel } OPTIONAL { ?activity rdfs:label ?activityLabel }
@ -52,11 +61,27 @@
CONSTRUCT { CONSTRUCT {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?activity . ?role core:roleContributesTo ?activity .
?activity vitro:mostSpecificType ?subclass . ?activity vitro:mostSpecificType ?subclass .
} WHERE { } WHERE {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?activity . ?role core:roleContributesTo ?activity .
?activity vitro:mostSpecificType ?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 core:roleRealizedIn ?activity .
?activity vitro:mostSpecificType ?subclass .
} WHERE {
?subject ?property ?role .
?role core:roleRealizedIn ?activity .
?activity vitro:mostSpecificType ?subclass ?activity vitro:mostSpecificType ?subclass
} }
</query-construct> </query-construct>
@ -76,7 +101,11 @@
?role ?roleProperty ?roleValue ?role ?roleProperty ?roleValue
} UNION { } UNION {
?subject ?property ?role . ?subject ?property ?role .
?role core:roleIn ?activity . ?role core:roleContributesTo ?activity .
?activity rdfs:label ?activityName
} UNION {
?subject ?property ?role .
?role core:roleRealizedIn ?activity .
?activity rdfs:label ?activityName ?activity rdfs:label ?activityName
} }
} }

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

@ -3,8 +3,8 @@
<!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt --> <!-- See guidelines in vitro/doc/list_view_configuration_guidelines.txt -->
<!-- List view config for http://vivoweb.org/ontology/core#relatedRole and <!-- List view config for http://vivoweb.org/ontology/core#contributingRole,
http://vivoweb.org/ontology/core#linkedRole --> http://vivoweb.org/ontology/core#realizedRole and http://vivoweb.org/ontology/core#linkedRole -->
<list-view-config> <list-view-config>
<query-select> <query-select>

4
src/org/vivoweb/webapp/util/ModelUtils.java
View file

@ -26,9 +26,9 @@ public class ModelUtils {
private static Set<String> processClass = new HashSet<String>(); private static Set<String> processClass = new HashSet<String>();
static { static {
processClass.add("http://vivoweb.org/ontology/core#Process"); processClass.add("http://vivoweb.org/ontology/core#Project");
processClass.add("http://purl.org/NET/c4dm/event.owl#Event"); processClass.add("http://purl.org/NET/c4dm/event.owl#Event");
processClass.add("http://xmlns.com/foaf/0.1/Agent"); processClass.add("http://vivoweb.org/ontology/core#EventSeries");
} }
/* /*