From 65284687c38b453e216fa1c4873443a67ce36513 Mon Sep 17 00:00:00 2001 From: Tim Worrall Date: Wed, 17 Jun 2015 10:06:07 -0400 Subject: [PATCH] modified list views to remove syntax that fetches all properties and values for a subject --- .../config/listViewConfig-advisorIn.xml | 38 ++++------------- .../listViewConfig-authorInAuthorship.xml | 29 ++++++++++--- .../config/listViewConfig-editorship.xml | 37 +++++++++------- .../listViewConfig-educationalTraining.xml | 19 +++++---- .../config/listViewConfig-hasAttendeeRole.xml | 5 --- .../listViewConfig-hasClinicalActivity.xml | 8 ++-- ...wConfig-hasCoPrincipalInvestigatorRole.xml | 5 --- .../listViewConfig-hasInvestigatorRole.xml | 10 ++++- productMods/config/listViewConfig-hasRole.xml | 4 +- ...Config-informationResourceInAuthorship.xml | 8 ++-- ...Config-informationResourceInEditorship.xml | 4 +- ...listViewConfig-organizationForPosition.xml | 9 +++- ...listViewConfig-organizationForTraining.xml | 9 +++- .../listViewConfig-personInPosition.xml | 26 ++++++++---- .../listViewConfig-publicationVenueFor.xml | 19 ++++++++- .../config/listViewConfig-publisherOf.xml | 21 +++++++++- .../config/listViewConfig-relatedRole.xml | 13 ++---- .../listViewConfig-researchActivities.xml | 42 ++++++++++++------- .../listViewConfig-roleContributesTo.xml | 8 ++-- .../config/listViewConfig-roleRealizedIn.xml | 6 ++- 20 files changed, 192 insertions(+), 128 deletions(-) diff --git a/productMods/config/listViewConfig-advisorIn.xml b/productMods/config/listViewConfig-advisorIn.xml index c1d1157a..21f6806e 100644 --- a/productMods/config/listViewConfig-advisorIn.xml +++ b/productMods/config/listViewConfig-advisorIn.xml @@ -74,37 +74,6 @@ } - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - CONSTRUCT { - ?subject ?property ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisorRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel ?advisingRelProperty ?advisingRelValue . - ?advisingRel rdfs:label ?advisingRelLabel . - } WHERE { - { - ?subject ?property ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisorRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship - } UNION { - ?subject ?property ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisorRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - } UNION { - ?subject ?property ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisorRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel rdfs:label ?advisingRelLabel - } - } - - PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX core: <http://vivoweb.org/ontology/core#> @@ -116,6 +85,7 @@ ?advisorRole a core:AdvisorRole . ?advisorRole core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . + ?advisingRel rdfs:label ?advisingRelLabel . ?advisingRel core:relates ?adviseeRole . ?adviseeRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisee . ?advisee a foaf:Person . @@ -131,6 +101,12 @@ ?advisorRole a core:AdvisorRole . ?advisorRole core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . + } UNION { + ?subject ?property ?advisorRole . + ?advisorRole a core:AdvisorRole . + ?advisorRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + ?advisingRel rdfs:label ?advisingRelLabel } UNION { ?subject ?property ?advisorRole . ?advisorRole a core:AdvisorRole . diff --git a/productMods/config/listViewConfig-authorInAuthorship.xml b/productMods/config/listViewConfig-authorInAuthorship.xml index ecdb73af..c15a65b2 100644 --- a/productMods/config/listViewConfig-authorInAuthorship.xml +++ b/productMods/config/listViewConfig-authorInAuthorship.xml @@ -91,7 +91,6 @@ CONSTRUCT { ?subject ?property ?authorship . ?authorship a core:Authorship . - ?authorship ?authorshipProperty ?authorshipValue . ?authorship core:relates ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource rdfs:label ?infoResourceName . @@ -105,7 +104,6 @@ UNION { ?subject ?property ?authorship . ?authorship a core:Authorship . - ?authorship ?authorshipProperty ?authorshipValue } UNION { ?subject ?property ?authorship . ?authorship a core:Authorship . @@ -142,10 +140,12 @@ CONSTRUCT { ?subject ?property ?authorship . ?authorship a core:Authorship . - ?authorship ?authorshipProperty ?authorshipValue . ?authorship core:relates ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource ?infoResourceProperty ?infoResourceValue . + ?infoResource bibo:volume ?volume . + ?infoResource bibo:pageStart ?startPage . + ?infoResource bibo:pageEnd ?endPage . + ?infoResource core:placeOfPublication ?locale . ?infoResource bibo:reproducedIn ?appearsInObj . ?infoResource core:publisher ?publisherObj . ?infoResource core:relatedBy ?editorship . @@ -165,7 +165,6 @@ UNION { ?subject ?property ?authorship . ?authorship a core:Authorship . - ?authorship ?authorshipProperty ?authorshipValue } UNION { ?subject ?property ?authorship . ?authorship a core:Authorship . @@ -176,7 +175,25 @@ ?authorship a core:Authorship . ?authorship core:relates ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource ?infoResourceProperty ?infoResourceValue + ?infoResource bibo:volume ?volume . + } UNION { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageStart ?startPage . + } UNION { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageEnd ?endPage . + } UNION { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource core:placeOfPublication ?locale . } UNION { ?subject ?property ?authorship . ?authorship a core:Authorship . diff --git a/productMods/config/listViewConfig-editorship.xml b/productMods/config/listViewConfig-editorship.xml index c61d8e5d..44aeab26 100644 --- a/productMods/config/listViewConfig-editorship.xml +++ b/productMods/config/listViewConfig-editorship.xml @@ -83,7 +83,6 @@ CONSTRUCT { ?subject ?property ?editorship . ?editorship a core:Editorship . - ?editorship ?editorshipProperty ?editorshipValue . ?editorship core:relates ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource rdfs:label ?infoResourceName . @@ -93,11 +92,6 @@ { ?subject ?property ?editorship . ?editorship a core:Editorship - } - UNION { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship ?editorshipProperty ?editorshipValue } UNION { ?subject ?property ?editorship . ?editorship a core:Editorship . @@ -134,10 +128,12 @@ CONSTRUCT { ?subject ?property ?editorship . ?editorship a core:Editorship . - ?editorship ?editorshipProperty ?editorshipValue . ?editorship core:relates ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource ?infoResourceProperty ?infoResourceValue . + ?infoResource bibo:volume ?volume . + ?infoResource bibo:pageStart ?startPage . + ?infoResource bibo:pageEnd ?endPage . + ?infoResource core:placeOfPublication ?locale . ?infoResource bibo:reproducedIn ?appearsInObj . ?infoResource core:publisher ?publisherObj . ?infoResource core:relatedBy ?editorship . @@ -153,11 +149,6 @@ { ?subject ?property ?editorship . ?editorship a core:Editorship - } - UNION { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship ?editorshipProperty ?editorshipValue } UNION { ?subject ?property ?editorship . ?editorship a core:Editorship . @@ -168,7 +159,25 @@ ?editorship a core:Editorship . ?editorship core:relates ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource ?infoResourceProperty ?infoResourceValue + ?infoResource bibo:volume ?volume . + } UNION { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageStart ?startPage . + } UNION { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageEnd ?endPage . + } UNION { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource core:placeOfPublication ?locale . } UNION { ?subject ?property ?editorship . ?editorship a core:Editorship . diff --git a/productMods/config/listViewConfig-educationalTraining.xml b/productMods/config/listViewConfig-educationalTraining.xml index 97e70fca..09f106ea 100644 --- a/productMods/config/listViewConfig-educationalTraining.xml +++ b/productMods/config/listViewConfig-educationalTraining.xml @@ -70,7 +70,6 @@ CONSTRUCT { ?subject ?property ?edTraining . ?edTraining a core:EducationalProcess . - ?edTraining ?edTrainingProp ?edTrainingValue . ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . ?awardedDegree core:relates ?degree . ?edTraining core:dateTimeInterval ?dateTimeInterval @@ -82,7 +81,17 @@ UNION { ?subject ?property ?edTraining . ?edTraining a core:EducationalProcess . - ?edTraining ?edTrainingProp ?edTrainingValue + ?edTraining core:majorField ?majorField . + } + UNION { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining core:departmentOrSchool ?deptOrSchool . + } + UNION { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining core:supplementalInformation ?info . } UNION { ?subject ?property ?edTraining . @@ -111,7 +120,6 @@ CONSTRUCT { ?subject ?property ?edTraining . ?edTraining a core:EducationalProcess . - ?edTraining ?edTrainingProp ?edTrainingValue . ?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?org . ?org a foaf:Organization . ?org rdfs:label ?orgName . @@ -120,11 +128,6 @@ ?subject ?property ?edTraining . ?edTraining a core:EducationalProcess } - UNION { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining ?edTrainingProp ?edTrainingValue - } UNION { ?subject ?property ?edTraining . ?edTraining a core:EducationalProcess . diff --git a/productMods/config/listViewConfig-hasAttendeeRole.xml b/productMods/config/listViewConfig-hasAttendeeRole.xml index 1bd7bc9c..cb19b916 100644 --- a/productMods/config/listViewConfig-hasAttendeeRole.xml +++ b/productMods/config/listViewConfig-hasAttendeeRole.xml @@ -140,16 +140,11 @@ CONSTRUCT { ?subject ?property ?role . ?role a vivo:AttendeeRole . - ?role ?roleProperty ?roleValue . ?event1 rdfs:label ?event1Label } WHERE { { ?subject ?property ?role . ?role a vivo:AttendeeRole . - } UNION { - ?subject ?property ?role . - ?role a vivo:AttendeeRole . - ?role ?roleProperty ?roleValue } UNION { ?subject ?property ?role . ?role a vivo:AttendeeRole . diff --git a/productMods/config/listViewConfig-hasClinicalActivity.xml b/productMods/config/listViewConfig-hasClinicalActivity.xml index 4ae2e97a..93047367 100644 --- a/productMods/config/listViewConfig-hasClinicalActivity.xml +++ b/productMods/config/listViewConfig-hasClinicalActivity.xml @@ -16,7 +16,7 @@ ?role ?roleLabel ?activity ?activityName - ?activityLabel + ?activityLabel ?dateTimeStart ?dateTimeEnd ?hideThis ?objectType @@ -32,7 +32,7 @@ } OPTIONAL { ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityLabel + ?activity rdfs:label ?activityName ?activity vitro:mostSpecificType ?subclass @@ -92,7 +92,7 @@ CONSTRUCT { ?subject ?property ?role . ?role a core:ClinicalRole . - ?role ?roleProperty ?roleValue . + ?role rdfs:label ?roleLabel . ?activity rdfs:label ?activityName } WHERE { { @@ -101,7 +101,7 @@ } UNION { ?subject ?property ?role . ?role a core:ClinicalRole . - ?role ?roleProperty ?roleValue + ?role rdfs:label ?roleLabel } UNION { ?subject ?property ?role . ?role a core:ClinicalRole . diff --git a/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml b/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml index 0106b629..ec427be1 100644 --- a/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml +++ b/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml @@ -71,7 +71,6 @@ ?subject ?property ?role . ?role a core:CoPrincipalInvestigatorRole . ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?role ?roleProperty ?roleValue . ?activity rdfs:label ?activityLabel . ?activity core:assignedBy ?awardedBy . ?awardedBy rdfs:label ?awardedByLabel . @@ -82,10 +81,6 @@ { ?subject ?property ?role . ?role a core:CoPrincipalInvestigatorRole . - } UNION { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role ?roleProperty ?roleValue } UNION { ?subject ?property ?role . ?role a core:CoPrincipalInvestigatorRole . diff --git a/productMods/config/listViewConfig-hasInvestigatorRole.xml b/productMods/config/listViewConfig-hasInvestigatorRole.xml index 50604248..baa86570 100644 --- a/productMods/config/listViewConfig-hasInvestigatorRole.xml +++ b/productMods/config/listViewConfig-hasInvestigatorRole.xml @@ -69,11 +69,13 @@ PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> CONSTRUCT { ?subject ?property ?role . ?role a core:InvestigatorRole . ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?role ?roleProperty ?roleValue . + ?role vitro:mostSpecificType ?subclass . + ?role core:hideFromDisplay ?hideThis . ?activity rdfs:label ?activityLabel . ?activity core:assignedBy ?awardedBy . ?awardedBy rdfs:label ?awardedByLabel . @@ -87,7 +89,11 @@ } UNION { ?subject ?property ?role . ?role a core:InvestigatorRole . - ?role ?roleProperty ?roleValue + ?role core:hideFromDisplay ?hideThis . + } UNION { + ?subject ?property ?role . + ?role a core:InvestigatorRole . + ?role vitro:mostSpecificType ?subclass . } UNION { ?subject ?property ?role . ?role a core:InvestigatorRole . diff --git a/productMods/config/listViewConfig-hasRole.xml b/productMods/config/listViewConfig-hasRole.xml index 46a53d9f..30de62b7 100644 --- a/productMods/config/listViewConfig-hasRole.xml +++ b/productMods/config/listViewConfig-hasRole.xml @@ -110,7 +110,7 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> CONSTRUCT { ?subject ?property ?role . - ?role ?roleProperty ?roleValue . + ?role rdfs:label ?roleLabel . ?activity rdfs:label ?activityName } WHERE { { @@ -119,7 +119,7 @@ } UNION { ?subject ?property ?role . ?role a ?objectType . - ?role ?roleProperty ?roleValue + ?role rdfs:label ?roleLabel . } UNION { ?subject ?property ?role . ?role a ?objectType . diff --git a/productMods/config/listViewConfig-informationResourceInAuthorship.xml b/productMods/config/listViewConfig-informationResourceInAuthorship.xml index 26c2018c..41326d41 100644 --- a/productMods/config/listViewConfig-informationResourceInAuthorship.xml +++ b/productMods/config/listViewConfig-informationResourceInAuthorship.xml @@ -60,7 +60,7 @@ CONSTRUCT { ?subject ?property ?authorship . ?authorship a core:Authorship . - ?authorship ?authorshipProperty ?authorshipValue . + ?authorship core:rank ?rank . ?authorship core:relates ?author . ?author a foaf:Agent . ?author rdfs:label ?authorName . @@ -73,7 +73,7 @@ } UNION { ?subject ?property ?authorship . ?authorship a core:Authorship . - ?authorship ?authorshipProperty ?authorshipValue + ?authorship core:rank ?rank . } UNION { ?subject ?property ?authorship . ?authorship a core:Authorship . @@ -100,7 +100,7 @@ CONSTRUCT { ?subject ?property ?authorship . ?authorship a core:Authorship . - ?authorship ?authorshipProperty ?authorshipValue . + ?authorship core:rank ?rank . ?authorship core:relates ?author . ?author a vcard:Kind . ?author vcard:hasName ?vName . @@ -116,7 +116,7 @@ } UNION { ?subject ?property ?authorship . ?authorship a core:Authorship . - ?authorship ?authorshipProperty ?authorshipValue + ?authorship core:rank ?rank . } UNION { ?subject ?property ?authorship . ?authorship a core:Authorship . diff --git a/productMods/config/listViewConfig-informationResourceInEditorship.xml b/productMods/config/listViewConfig-informationResourceInEditorship.xml index 425558d1..a0b45ab8 100644 --- a/productMods/config/listViewConfig-informationResourceInEditorship.xml +++ b/productMods/config/listViewConfig-informationResourceInEditorship.xml @@ -43,7 +43,7 @@ CONSTRUCT { ?subject ?property ?editorship . ?editorship a core:Editorship . - ?editorship ?editorshipProperty ?editorshipValue . + ?editorship core:rank ?rank . ?editorship core:relates ?person . ?person a foaf:Person . ?person rdfs:label ?personName . @@ -56,7 +56,7 @@ } UNION { ?subject ?property ?editorship . ?editorship a core:Editorship . - ?editorship ?editorshipProperty ?editorshipValue + ?editorship core:rank ?rank } UNION { ?subject ?property ?editorship . ?editorship a core:Editorship . diff --git a/productMods/config/listViewConfig-organizationForPosition.xml b/productMods/config/listViewConfig-organizationForPosition.xml index 8a85a855..91919058 100644 --- a/productMods/config/listViewConfig-organizationForPosition.xml +++ b/productMods/config/listViewConfig-organizationForPosition.xml @@ -79,7 +79,8 @@ CONSTRUCT { ?subject ?property ?position . ?position a core:Position . - ?position ?positionProperty ?positionValue . + ?position core:hideFromDisplay ?hideThis . + ?position rdfs:label ?positionTitle . ?position core:relates ?person . ?person a foaf:Person . ?person rdfs:label ?personName @@ -90,7 +91,11 @@ } UNION { ?subject ?property ?position . ?position a core:Position . - ?position ?positionProperty ?positionValue + ?position core:hideFromDisplay ?hideThis + } UNION { + ?subject ?property ?position . + ?position a core:Position . + ?position rdfs:label ?positionTitle } UNION { ?subject ?property ?position . ?position core:relates ?person . diff --git a/productMods/config/listViewConfig-organizationForTraining.xml b/productMods/config/listViewConfig-organizationForTraining.xml index a17095f6..a35410de 100644 --- a/productMods/config/listViewConfig-organizationForTraining.xml +++ b/productMods/config/listViewConfig-organizationForTraining.xml @@ -112,7 +112,8 @@ CONSTRUCT { ?subject ?property ?edTraining . ?edTraining a core:EducationalProcess . - ?edTraining ?edTrainingProp ?edTrainingValue . + ?edTraining core:majorField ?majorField . + ?edTraining core:supplementalInformation ?info . ?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?person . ?person a foaf:Person . ?person rdfs:label ?personName @@ -124,7 +125,11 @@ UNION { ?subject ?property ?edTraining . ?edTraining a core:EducationalProcess . - ?edTraining ?edTrainingProp ?edTrainingValue + ?edTraining core:majorField ?majorField . + UNION { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess + ?edTraining core:supplementalInformation ?info . } UNION { ?subject ?property ?edTraining . diff --git a/productMods/config/listViewConfig-personInPosition.xml b/productMods/config/listViewConfig-personInPosition.xml index 6438f459..0e27f3a6 100644 --- a/productMods/config/listViewConfig-personInPosition.xml +++ b/productMods/config/listViewConfig-personInPosition.xml @@ -80,18 +80,28 @@ PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX obo: <http://purl.obolibrary.org/obo/> CONSTRUCT { - ?subject ?property ?position . - ?position ?positionProperty ?positionValue . - ?org rdfs:label ?orgName . - ?org obo:BFO_0000050 ?middleOrg . - ?middleOrg rdfs:label ?middleOrgName . - ?middleOrg obo:BFO_0000050 ?outerOrg . - ?outerOrg rdfs:label ?outerOrgName + ?subject ?property ?position . + ?position rdfs:label ?positionTitle . + ?position core:hrJobTitle ?hrJobTitle . + ?position core:rank ?rank . + ?position core:relates ?org . + ?org rdfs:label ?orgName . + ?org obo:BFO_0000050 ?middleOrg . + ?middleOrg rdfs:label ?middleOrgName . + ?middleOrg obo:BFO_0000050 ?outerOrg . + ?outerOrg rdfs:label ?outerOrgName . } WHERE { { ?subject ?property ?position . ?position a core:Position . - ?position ?positionProperty ?positionValue + } UNION { + ?subject ?property ?position . + ?position a core:Position . + ?position rdfs:label ?positionTitle . + } UNION { + ?subject ?property ?position . + ?position a core:Position . + ?position core:rank ?rank } UNION { ?subject ?property ?position . ?position a core:Position . diff --git a/productMods/config/listViewConfig-publicationVenueFor.xml b/productMods/config/listViewConfig-publicationVenueFor.xml index 55ef130f..0c89b134 100644 --- a/productMods/config/listViewConfig-publicationVenueFor.xml +++ b/productMods/config/listViewConfig-publicationVenueFor.xml @@ -81,7 +81,10 @@ CONSTRUCT { ?subject ?property ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource ?infoResourceProperty ?infoResourceValue . + ?infoResource bibo:volume ?volume . + ?infoResource bibo:pageStart ?startPage . + ?infoResource bibo:pageEnd ?endPage . + ?infoResource core:placeOfPublication ?locale . ?infoResource bibo:reproducedIn ?appearsInObj . ?infoResource core:publisher ?publisherObj . ?infoResource core:relatedBy ?editorship . @@ -97,7 +100,19 @@ } UNION { ?subject ?property ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource ?infoResourceProperty ?infoResourceValue + ?infoResource bibo:volume ?volume . + } UNION { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageStart ?startPage . + } UNION { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageEnd ?endPage . + } UNION { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource core:placeOfPublication ?locale . } UNION { ?subject ?property ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . diff --git a/productMods/config/listViewConfig-publisherOf.xml b/productMods/config/listViewConfig-publisherOf.xml index 5fd05187..ce07c4f4 100644 --- a/productMods/config/listViewConfig-publisherOf.xml +++ b/productMods/config/listViewConfig-publisherOf.xml @@ -105,7 +105,11 @@ CONSTRUCT { ?subject ?property ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource ?infoResourceProperty ?infoResourceValue . + ?infoResource rdfs:label ?infoResourceName . + ?infoResource bibo:volume ?volume . + ?infoResource bibo:pageStart ?startPage . + ?infoResource bibo:pageEnd ?endPage . + ?infoResource core:placeOfPublication ?locale . ?infoResource bibo:reproducedIn ?appearsInObj . ?infoResource core:publisher ?publisherObj . ?infoResource core:relatedBy ?editorship . @@ -120,10 +124,23 @@ { ?subject ?property ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource rdfs:label ?infoResourceName . } UNION { ?subject ?property ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource ?infoResourceProperty ?infoResourceValue + ?infoResource bibo:volume ?volume . + } UNION { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageStart ?startPage . + } UNION { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageEnd ?endPage . + } UNION { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource core:placeOfPublication ?locale . } UNION { ?subject ?property ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . diff --git a/productMods/config/listViewConfig-relatedRole.xml b/productMods/config/listViewConfig-relatedRole.xml index f2d8e3cd..9eab3829 100644 --- a/productMods/config/listViewConfig-relatedRole.xml +++ b/productMods/config/listViewConfig-relatedRole.xml @@ -36,11 +36,6 @@ OPTIONAL { ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . ?indivInRole rdfs:label ?indivLabel } - OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?indivInRole . - } - OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?indivInRole . - ?indivInRole rdfs:label ?indivLabel - } OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:start ?dateTimeStartValue . @@ -63,9 +58,10 @@ CONSTRUCT { ?subject ?property ?role . ?role a ?objectType . - ?role ?roleProperty ?roleValue . + ?role rdfs:label ?roleLabel . ?role vitro:mostSpecificType ?subclass . ?subclass rdfs:label ?roleTypeLabel . + ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . ?indivInRole rdfs:label ?indivLabel } WHERE { { @@ -74,7 +70,7 @@ } UNION { ?subject ?property ?role . ?role a ?objectType . - ?role ?roleProperty ?roleValue + ?role rdfs:label ?roleLabel } UNION { ?subject ?property ?role . ?role a ?objectType . @@ -88,11 +84,10 @@ ?subject ?property ?role . ?role a ?objectType . ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . - ?indivInRole rdfs:label ?indivLabel } UNION { ?subject ?property ?role . ?role a ?objectType . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?indivInRole . + ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . ?indivInRole rdfs:label ?indivLabel } } diff --git a/productMods/config/listViewConfig-researchActivities.xml b/productMods/config/listViewConfig-researchActivities.xml index 1e401b95..e17ca083 100644 --- a/productMods/config/listViewConfig-researchActivities.xml +++ b/productMods/config/listViewConfig-researchActivities.xml @@ -63,12 +63,18 @@ ?role a core:ResearcherRole . ?role core:relatedBy ?activity . ?activity vitro:mostSpecificType ?subclass . - } WHERE { + ?activity rdfs:label ?activityName . + } WHERE { { ?subject ?property ?role . ?role a core:ResearcherRole . ?role core:relatedBy ?activity . ?activity vitro:mostSpecificType ?subclass - } + } UNION { + ?subject ?property ?role . + ?role a core:ResearcherRole . + ?role core:relatedBy ?activity . + ?activity rdfs:label ?activityName . + }} @@ -81,22 +87,30 @@ ?role a core:ResearcherRole . ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . ?activity vitro:mostSpecificType ?subclass . - } WHERE { + ?activity rdfs:label ?activityName . + } WHERE { { ?subject ?property ?role . ?role a core:ResearcherRole . ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . ?activity vitro:mostSpecificType ?subclass - } + } UNION { + ?subject ?property ?role . + ?role a core:ResearcherRole . + ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . + ?activity rdfs:label ?activityName . + } } 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 a core:ResearcherRole . - ?role ?roleProperty ?roleValue . - ?activity rdfs:label ?activityName + ?role rdfs:label ?roleLabel . + ?role core:hideFromDisplay ?hideThis . + ?role vitro:mostSpecificType ?roleSubclass } WHERE { { ?subject ?property ?role . @@ -104,17 +118,15 @@ } UNION { ?subject ?property ?role . ?role a core:ResearcherRole . - ?role ?roleProperty ?roleValue + ?role rdfs:label ?roleLabel . } UNION { ?subject ?property ?role . ?role a core:ResearcherRole . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity rdfs:label ?activityName - } UNION { - ?subject ?property ?role . - ?role a core:ResearcherRole . - ?role core:relatedBy ?activity . - ?activity rdfs:label ?activityName + ?role core:hideFromDisplay ?hideThis . + } UNION { + ?subject ?property ?role . + ?role a core:ResearcherRole . + ?role vitro:mostSpecificType ?roleSubclass . } } diff --git a/productMods/config/listViewConfig-roleContributesTo.xml b/productMods/config/listViewConfig-roleContributesTo.xml index 9bac8394..4ce2ecbf 100644 --- a/productMods/config/listViewConfig-roleContributesTo.xml +++ b/productMods/config/listViewConfig-roleContributesTo.xml @@ -94,8 +94,10 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> CONSTRUCT { ?subject ?property ?role . - ?role ?roleProperty ?roleValue . - ?activity rdfs:label ?activityName + ?role rdfs:label ?roleLabel . + ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . + ?role core:roleContributesTo ?activity . + ?activity rdfs:label ?activityName . } WHERE { { ?subject ?property ?role . @@ -103,7 +105,7 @@ } UNION { ?subject ?property ?role . ?role a ?objectType . - ?role ?roleProperty ?roleValue + ?role rdfs:label ?roleLabel } UNION { ?subject ?property ?role . ?role a ?objectType . diff --git a/productMods/config/listViewConfig-roleRealizedIn.xml b/productMods/config/listViewConfig-roleRealizedIn.xml index a57e828a..a8064dc7 100644 --- a/productMods/config/listViewConfig-roleRealizedIn.xml +++ b/productMods/config/listViewConfig-roleRealizedIn.xml @@ -66,7 +66,9 @@ PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> CONSTRUCT { ?subject ?property ?role . - ?role ?roleProperty ?roleValue . + ?role rdfs:label ?roleLabel . + ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . + ?role core:roleContributesTo ?activity . ?activity rdfs:label ?activityName } WHERE { { @@ -75,7 +77,7 @@ } UNION { ?subject ?property ?role . ?role a ?objectType . - ?role ?roleProperty ?roleValue + ?role rdfs:label ?roleLabel . } UNION { ?subject ?property ?role . ?role a ?objectType .