From 2159c4ae6aa586b503b592099986debc0119f1f7 Mon Sep 17 00:00:00 2001 From: tworrall Date: Tue, 25 Oct 2011 20:45:13 +0000 Subject: [PATCH] NIHVIVO-2725: replaced rdf:type statements with vitro:mostSpecificType --- productMods/config/listViewConfig-advisorIn.xml | 14 ++++++++------ .../config/listViewConfig-authorInAuthorship.xml | 14 ++++++++------ .../config/listViewConfig-educationalTraining.xml | 15 +++++++++------ .../config/listViewConfig-hasInvestigatorRole.xml | 7 +++++-- ...ViewConfig-informationResourceInAuthorship.xml | 10 ++++++---- .../listViewConfig-organizationForPosition.xml | 10 ++++++++-- .../listViewConfig-organizationForTraining.xml | 10 ++++++++-- .../config/listViewConfig-personInPosition.xml | 10 ++++++++-- productMods/config/listViewConfig-relatedRole.xml | 11 +++++++---- 9 files changed, 67 insertions(+), 34 deletions(-) diff --git a/productMods/config/listViewConfig-advisorIn.xml b/productMods/config/listViewConfig-advisorIn.xml index 7faf4856..3e1f10f7 100644 --- a/productMods/config/listViewConfig-advisorIn.xml +++ b/productMods/config/listViewConfig-advisorIn.xml @@ -36,9 +36,9 @@ OPTIONAL { ?degree core:abbreviation ?degreeAbbr } } - OPTIONAL { ?subclass rdfs:subClassOf core:AdvisingRelationship . - ?advisory a ?subclass - } + OPTIONAL { ?advisory vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:AdvisingRelationship + } OPTIONAL { ?advisory core:dateTimeInterval ?dateTimeInterval OPTIONAL { ?dateTimeInterval core:start ?dateTimeStartValue . @@ -128,13 +128,15 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> CONSTRUCT { ?subject ?property ?advisory . - ?advisory a ?subclass + ?advisory vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:AdvisingRelationship } WHERE { ?subject ?property ?advisory . - ?subclass rdfs:subClassOf core:AdvisingRelationship . - ?advisory a ?subclass + ?advisory vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:AdvisingRelationship } diff --git a/productMods/config/listViewConfig-authorInAuthorship.xml b/productMods/config/listViewConfig-authorInAuthorship.xml index ea402104..534d4bdc 100644 --- a/productMods/config/listViewConfig-authorInAuthorship.xml +++ b/productMods/config/listViewConfig-authorInAuthorship.xml @@ -9,6 +9,7 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX bibo: <http://purl.org/ontology/bibo/> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> SELECT DISTINCT ?subclass ?authorship @@ -46,8 +47,8 @@ } - OPTIONAL { ?subclass rdfs:subClassOf core:InformationResource . - ?infoResource a ?subclass + OPTIONAL { ?infoResource vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:InformationResource } OPTIONAL { ?infoResource core:hasPublicationVenue ?publishedIn . @@ -170,15 +171,16 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> CONSTRUCT { ?subject ?property ?authorship . - ?authorship core:linkedInformationResource ?infoResource . - ?infoResource a ?subclass + ?infoResource vitro:mostSpecificType ?subclass . + ?authorship core:linkedInformationResource ?infoResource } WHERE { ?subject ?property ?authorship . ?authorship core:linkedInformationResource ?infoResource . - ?subclass rdfs:subClassOf core:InformationResource . - ?infoResource a ?subclass + ?infoResource vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:InformationResource } diff --git a/productMods/config/listViewConfig-educationalTraining.xml b/productMods/config/listViewConfig-educationalTraining.xml index 133db8aa..d057ab66 100644 --- a/productMods/config/listViewConfig-educationalTraining.xml +++ b/productMods/config/listViewConfig-educationalTraining.xml @@ -9,6 +9,7 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> SELECT DISTINCT ?subclass ?edTraining @@ -21,8 +22,8 @@ OPTIONAL { ?edTraining core:trainingAtOrganization ?org . ?org rdfs:label ?orgName - OPTIONAL { ?subclass rdfs:subClassOf foaf:Organization . - ?org a ?subclass + OPTIONAL { ?org vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf foaf:Organization } } @@ -94,13 +95,15 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> CONSTRUCT { - ?org a ?subclass + ?subject ?property ?edTraining . + ?org vitro:mostSpecificType ?subclass . + ?edTraining core:trainingAtOrganization ?org } WHERE { ?subject ?property ?edTraining . - ?edTraining core:trainingAtOrganization ?org . - ?org a ?subclass + ?org vitro:mostSpecificType ?subclass . + ?edTraining core:trainingAtOrganization ?org } diff --git a/productMods/config/listViewConfig-hasInvestigatorRole.xml b/productMods/config/listViewConfig-hasInvestigatorRole.xml index f624d841..490b2601 100644 --- a/productMods/config/listViewConfig-hasInvestigatorRole.xml +++ b/productMods/config/listViewConfig-hasInvestigatorRole.xml @@ -27,7 +27,8 @@ OPTIONAL { ?activity rdfs:label ?activityLabel } - ?activity vitro:mostSpecificType ?subclass + ?activity vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:hasInvestigatorRole } OPTIONAL { ?activity core:grantAwardedBy ?awardedBy . @@ -61,10 +62,12 @@ ?subject ?property ?role . ?role core:roleIn ?activity . ?activity vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:hasInvestigatorRole } WHERE { ?subject ?property ?role . ?role core:roleIn ?activity . - ?activity vitro:mostSpecificType ?subclass + ?activity vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:hasInvestigatorRole } diff --git a/productMods/config/listViewConfig-informationResourceInAuthorship.xml b/productMods/config/listViewConfig-informationResourceInAuthorship.xml index af86b5c6..63c3f474 100644 --- a/productMods/config/listViewConfig-informationResourceInAuthorship.xml +++ b/productMods/config/listViewConfig-informationResourceInAuthorship.xml @@ -9,6 +9,7 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> SELECT DISTINCT ?subclass ?authorship @@ -18,7 +19,7 @@ OPTIONAL { ?authorship core:linkedAuthor ?person . ?person rdfs:label ?personName - OPTIONAL { ?person a ?subclass . + OPTIONAL { ?person vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf foaf:Person } @@ -41,12 +42,13 @@ PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> CONSTRUCT { ?subject ?property ?authorship . ?authorship ?authorshipProperty ?authorshipValue . ?person rdfs:label ?personName . - ?person a ?subclass + ?person vitro:mostSpecificType ?subclass } WHERE { { ?subject ?property ?authorship @@ -61,7 +63,7 @@ ?subject ?property ?authorship . ?authorship core:linkedAuthor ?person . ?person rdfs:label ?personName . - ?person a ?subclass + ?person vitro:mostSpecificType ?subclass } } diff --git a/productMods/config/listViewConfig-organizationForPosition.xml b/productMods/config/listViewConfig-organizationForPosition.xml index 42a4d7b6..6bf8fe52 100644 --- a/productMods/config/listViewConfig-organizationForPosition.xml +++ b/productMods/config/listViewConfig-organizationForPosition.xml @@ -8,6 +8,7 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> SELECT DISTINCT ?subclass ?position @@ -19,7 +20,7 @@ ?person rdfs:label ?personName } - OPTIONAL { ?position a ?subclass . + OPTIONAL { ?position vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf core:Position } @@ -42,10 +43,15 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> CONSTRUCT { + ?subject ?property ?position . + ?position vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf core:Position } WHERE { + ?subject ?property ?position . + ?position vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf core:Position } diff --git a/productMods/config/listViewConfig-organizationForTraining.xml b/productMods/config/listViewConfig-organizationForTraining.xml index d69eb123..43ba280b 100644 --- a/productMods/config/listViewConfig-organizationForTraining.xml +++ b/productMods/config/listViewConfig-organizationForTraining.xml @@ -10,6 +10,7 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> SELECT DISTINCT ?subclass ?localName @@ -33,7 +34,7 @@ OPTIONAL { ?degree core:abbreviation ?degreeAbbr } } - OPTIONAL { ?training a ?subclass . + OPTIONAL { ?training vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf core:EducationalTraining } @@ -57,10 +58,15 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> CONSTRUCT { + ?subject ?property ?training . + ?training vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf core:EducationalTraining } WHERE { + ?subject ?property ?training . + ?training vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf core:EducationalTraining } diff --git a/productMods/config/listViewConfig-personInPosition.xml b/productMods/config/listViewConfig-personInPosition.xml index 1f23c8e2..4b04f7f1 100644 --- a/productMods/config/listViewConfig-personInPosition.xml +++ b/productMods/config/listViewConfig-personInPosition.xml @@ -8,6 +8,7 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> SELECT DISTINCT ?subclass ?position @@ -30,7 +31,7 @@ } } - OPTIONAL { ?position a ?subclass . + OPTIONAL { ?position vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf core:Position } @@ -42,10 +43,15 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> CONSTRUCT { + ?subject ?property ?position . + ?position vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf core:Position } WHERE { + ?subject ?property ?position . + ?position vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf core:Position } diff --git a/productMods/config/listViewConfig-relatedRole.xml b/productMods/config/listViewConfig-relatedRole.xml index ae24dbb4..ceca4f6e 100644 --- a/productMods/config/listViewConfig-relatedRole.xml +++ b/productMods/config/listViewConfig-relatedRole.xml @@ -11,6 +11,7 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> SELECT DISTINCT ?subclass # send the property to the template, since this view supports multiple role properties @@ -27,7 +28,7 @@ # We need ?subclass in the uncollated query to get the roleTypeLabel # for roles that have no label (e.g., InvestigatorRole and its subclasses). - OPTIONAL { ?role a ?subclass . + OPTIONAL { ?role vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf core:Role OPTIONAL { ?subclass rdfs:label ?roleTypeLabel } ?roleProp rdfs:subPropertyOf core:roleOf ; @@ -66,10 +67,12 @@ PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> CONSTRUCT { ?subject ?property ?role . ?role ?roleProperty ?roleValue . + ?role vitro:mostSpecificType ?subclass . ?subclass rdfs:label ?roleTypeLabel . ?indivInRole rdfs:label ?indivLabel } WHERE { @@ -77,10 +80,10 @@ ?subject ?property ?role } UNION { ?subject ?property ?role . - ?role ?roleProperty ?roleValue . + ?role ?roleProperty ?roleValue } UNION { ?subject ?property ?role . - ?role a ?subclass . + ?role vitro:mostSpecificType ?subclass } UNION { ?subject ?property ?role . ?role a ?subclass .