diff --git a/productMods/config/listViewConfig-adviseeIn.xml b/productMods/config/listViewConfig-adviseeIn.xml index ff660d3b..b4a908e2 100644 --- a/productMods/config/listViewConfig-adviseeIn.xml +++ b/productMods/config/listViewConfig-adviseeIn.xml @@ -4,7 +4,7 @@ - + PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX bibo: <http://purl.org/ontology/bibo/> @@ -14,188 +14,177 @@ PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> SELECT DISTINCT ?subclass - ?adviseeRole - ?advisingRel - ?advisingRelLabel - ?localName - ?advisor - ?advisorLabel - ?degreeLabel - ?degreeAbbr - ?dateTimeStart - ?dateTimeEnd + ?adviseeRole + ?advisingRel + ?advisingRelLabel + ?localName + ?advisor + ?advisorLabel + ?degreeLabel + ?degreeAbbr + ?dateTimeStart + ?dateTimeEnd - WHERE { - ?subject ?property ?adviseeRole . - ?adviseeRole core:relatedBy ?advisingRel . - LET ( ?localName := afn:localname(?advisingRel) ) - OPTIONAL { ?advisingRel rdfs:label ?advisingRelLabel } - OPTIONAL { ?advisingRel core:relates ?advisorRole . - ?advisorRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisor . - ?advisor a foaf:Person . - ?advisor rdfs:label ?advisorLabel - } - OPTIONAL { ?advisingRel core:degreeCandidacy ?degree . - ?degree rdfs:label ?degreeLabel . - } - OPTIONAL { ?advisingRel core:degreeCandidacy ?degree . - ?degree core:abbreviation ?degreeAbbr . - } - - OPTIONAL { ?advisingRel vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:AdvisingRelationship - } - - OPTIONAL { ?advisingRel core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - OPTIONAL { ?advisingRel core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - - } ORDER BY ?subclass DESC(?dateTimeEnd) - - - - 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 { - ?advisingRel vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:AdvisingRelationship - } WHERE { + WHERE + { ?subject ?property ?adviseeRole . ?adviseeRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:AdvisingRelationship - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - CONSTRUCT { - ?subject ?property ?adviseeRole . - ?adviseeRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel rdfs:label ?advisingRelLabel . - } WHERE { + LET ( ?localName := afn:localname(?advisingRel) ) + OPTIONAL { ?advisingRel rdfs:label ?advisingRelLabel } + OPTIONAL { - ?subject ?property ?adviseeRole . - ?adviseeRole a core:AdviseeRole . - ?adviseeRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship - } UNION { - ?subject ?property ?adviseeRole . - ?adviseeRole a core:AdviseeRole . - ?adviseeRole 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#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX foaf: <http://xmlns.com/foaf/0.1/> + ?advisingRel core:relates ?advisorRole . + ?advisorRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisor . + ?advisor a foaf:Person . + ?advisor rdfs:label ?advisorLabel + } + OPTIONAL + { + ?advisingRel core:degreeCandidacy ?degree . + ?degree rdfs:label ?degreeLabel . + } + OPTIONAL + { + ?advisingRel core:degreeCandidacy ?degree . + ?degree core:abbreviation ?degreeAbbr . + } + + OPTIONAL + { + ?advisingRel vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:AdvisingRelationship + } + + OPTIONAL + { + ?advisingRel core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart + } + OPTIONAL + { + ?advisingRel core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd + } - CONSTRUCT { + } ORDER BY ?subclass DESC(?dateTimeEnd) + + + + 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 ?adviseeRole . + + ?adviseeRole a core:AdviseeRole . + ?adviseeRole core:relatedBy ?advisingRel . + + ?advisingRel a core:AdvisingRelationship . + ?advisingRel vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:AdvisingRelationship . + ?advisingRel rdfs:label ?advisingRelLabel . + ?advisingRel core:dateTimeInterval ?dateTimeInterval . + + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + + ?advisingRel core:degreeCandidacy ?degree . + ?degree rdfs:label ?degreeLabel . + ?degree core:abbreviation ?degreeAbbr . + + ?advisingRel core:relates ?advisorRole . + ?advisorRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisor . + ?advisor a foaf:Person . + ?advisor rdfs:label ?advisorLabel . + ?advisor <http://purl.obolibrary.org/obo/RO_0000053> ?advisorRole . + ?advisorRole a core:AdvisorRole . + } + WHERE + { + { + ?subject ?property ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + ?adviseeRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + } + UNION + { + ?subject ?property ?adviseeRole . + ?adviseeRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + ?advisingRel vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:AdvisingRelationship + } + UNION + { + ?subject ?property ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + ?adviseeRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + ?advisingRel rdfs:label ?advisingRelLabel . + } + UNION + { + ?subject ?property ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + ?adviseeRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + ?advisingRel core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + UNION + { + ?subject ?property ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + ?adviseeRole a core:AdviseeRole . + ?adviseeRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + ?advisingRel core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + } + UNION + { + ?subject ?property ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + ?adviseeRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + ?advisingRel core:degreeCandidacy ?degree . + ?degree rdfs:label ?degreeLabel . + } + UNION + { + ?subject ?property ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + ?adviseeRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + ?advisingRel core:degreeCandidacy ?degree . + ?degree core:abbreviation ?degreeAbbr + } + UNION + { ?subject ?property ?adviseeRole . ?adviseeRole a core:AdviseeRole . ?adviseeRole core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . ?advisingRel core:relates ?advisorRole . + ?advisorRole a core:AdvisorRole . ?advisorRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisor . ?advisor a foaf:Person . - ?advisor rdfs:label ?advisorLabel . ?advisor <http://purl.obolibrary.org/obo/RO_0000053> ?advisorRole . ?advisorRole a core:AdvisorRole . - ?advisingRel core:degreeCandidacy ?degree . - ?degree rdfs:label ?degreeLabel . - ?degree core:abbreviation ?degreeAbbr - } WHERE { - { - ?subject ?property ?adviseeRole . - ?adviseeRole a core:AdviseeRole . - ?adviseeRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - } UNION { - ?subject ?property ?adviseeRole . - ?adviseeRole a core:AdviseeRole . - ?adviseeRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:relates ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisorRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisor . - ?advisor a foaf:Person . - ?advisor <http://purl.obolibrary.org/obo/RO_0000053> ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisor rdfs:label ?advisorLabel - } UNION { - ?subject ?property ?adviseeRole . - ?adviseeRole a core:AdviseeRole . - ?adviseeRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:degreeCandidacy ?degree . - ?degree rdfs:label ?degreeLabel . - } UNION { - ?subject ?property ?adviseeRole . - ?adviseeRole a core:AdviseeRole . - ?adviseeRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:degreeCandidacy ?degree . - ?degree core:abbreviation ?degreeAbbr - } - } + ?advisor rdfs:label ?advisorLabel + } + } - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?adviseeRole . - ?adviseeRole a core:AdviseeRole . - ?adviseeRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?adviseeRole . - ?adviseeRole a core:AdviseeRole . - ?adviseeRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?adviseeRole . - ?adviseeRole a core:AdviseeRole . - ?adviseeRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?adviseeRole . - ?adviseeRole a core:AdviseeRole . - ?adviseeRole a core:AdviseeRole . - ?adviseeRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - - diff --git a/productMods/config/listViewConfig-advisorIn.xml b/productMods/config/listViewConfig-advisorIn.xml index 437503d4..ae2ef824 100644 --- a/productMods/config/listViewConfig-advisorIn.xml +++ b/productMods/config/listViewConfig-advisorIn.xml @@ -14,170 +14,175 @@ PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> SELECT DISTINCT ?subclass - ?advisorRole - ?advisingRel - ?advisingRelLabel - ?localName - ?advisee - ?adviseeLabel - ?degreeLabel - ?degreeAbbr - ?dateTimeStart - ?dateTimeEnd + ?advisorRole + ?advisingRel + ?advisingRelLabel + ?localName + ?advisee + ?adviseeLabel + ?degreeLabel + ?degreeAbbr + ?dateTimeStart + ?dateTimeEnd - WHERE { - ?subject ?property ?advisorRole . - ?advisorRole core:relatedBy ?advisingRel . - LET ( ?localName := afn:localname(?advisingRel) ) - OPTIONAL { ?advisingRel rdfs:label ?advisingRelLabel } - OPTIONAL { ?advisingRel core:relates ?adviseeRole . - ?adviseeRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisee . - ?advisee a foaf:Person . - ?advisee rdfs:label ?adviseeLabel - } - OPTIONAL { ?advisingRel core:degreeCandidacy ?degree . - ?degree rdfs:label ?degreeLabel . - } - OPTIONAL { ?advisingRel core:degreeCandidacy ?degree . - ?degree core:abbreviation ?degreeAbbr - } - - OPTIONAL { ?advisingRel vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:AdvisingRelationship - } - - OPTIONAL { ?advisingRel core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - OPTIONAL { ?advisingRel core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - - } ORDER BY ?subclass DESC(?dateTimeEnd) - - - - 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 { - ?advisingRel vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:AdvisingRelationship - } WHERE { + WHERE + { ?subject ?property ?advisorRole . ?advisorRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:AdvisingRelationship - } - - - - PREFIX bibo: <http://purl.org/ontology/bibo/> - 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/> - - CONSTRUCT { - ?subject ?property ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisorRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel rdfs:label ?advisingRelLabel . + LET ( ?localName := afn:localname(?advisingRel) ) + OPTIONAL { ?advisingRel rdfs:label ?advisingRelLabel } + OPTIONAL + { ?advisingRel core:relates ?adviseeRole . ?adviseeRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisee . ?advisee a foaf:Person . - ?advisee rdfs:label ?adviseeLabel . - ?advisee <http://purl.obolibrary.org/obo/RO_0000053> ?adviseeRole . - ?adviseeRole a core:AdviseeRole . + ?advisee rdfs:label ?adviseeLabel + } + OPTIONAL { ?advisingRel core:degreeCandidacy ?degree . ?degree rdfs:label ?degreeLabel . + } + OPTIONAL + { + ?advisingRel core:degreeCandidacy ?degree . ?degree core:abbreviation ?degreeAbbr - } 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 . - ?advisingRel rdfs:label ?advisingRelLabel - } UNION { - ?subject ?property ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisorRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:relates ?adviseeRole . - ?adviseeRole a core:AdviseeRole . - ?adviseeRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisee . - ?advisee a foaf:Person . - ?advisee <http://purl.obolibrary.org/obo/RO_0000053> ?adviseeRole . - ?adviseeRole a core:AdviseeRole . - ?advisee rdfs:label ?adviseeLabel - } UNION { - ?subject ?property ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisorRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:degreeCandidacy ?degree . - ?degree rdfs:label ?degreeLabel . - } UNION { - ?subject ?property ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisorRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:degreeCandidacy ?degree . - ?degree core:abbreviation ?degreeAbbr - } } - + + OPTIONAL + { + ?advisingRel vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:AdvisingRelationship + } + + OPTIONAL + { + ?advisingRel core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart + } + OPTIONAL + { + ?advisingRel core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd + } + + } ORDER BY ?subclass DESC(?dateTimeEnd) + - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { + 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#> + PREFIX foaf: <http://xmlns.com/foaf/0.1/> + + CONSTRUCT + { + ?subject ?property ?advisorRole . + ?advisorRole a core:AdvisorRole . + ?advisorRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + ?advisingRel rdfs:label ?advisingRelLabel . + + ?advisingRel vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:AdvisingRelationship . + + ?advisingRel core:degreeCandidacy ?degree . + ?degree rdfs:label ?degreeLabel . + ?degree core:abbreviation ?degreeAbbr . + + ?advisingRel core:dateTimeInterval ?dateTimeInterval . + + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + + ?advisingRel core:relates ?adviseeRole . + ?adviseeRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisee . + ?advisee a foaf:Person . + ?advisee rdfs:label ?adviseeLabel . + ?advisee <http://purl.obolibrary.org/obo/RO_0000053> ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + } 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 . + ?advisingRel rdfs:label ?advisingRelLabel + } + UNION + { + ?subject ?property ?advisorRole . + ?advisorRole a core:AdvisorRole . + ?advisorRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + ?advisingRel vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:AdvisingRelationship + } + UNION + { + ?subject ?property ?advisorRole . + ?advisorRole a core:AdvisorRole . + ?advisorRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + ?advisingRel core:degreeCandidacy ?degree . + ?degree rdfs:label ?degreeLabel . + } + UNION + { + ?subject ?property ?advisorRole . + ?advisorRole a core:AdvisorRole . + ?advisorRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + ?advisingRel core:degreeCandidacy ?degree . + ?degree core:abbreviation ?degreeAbbr . + } + UNION + { ?subject ?property ?advisorRole . ?advisorRole a core:AdvisorRole . ?advisorRole core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . ?advisingRel core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + UNION + { ?subject ?property ?advisorRole . ?advisorRole a core:AdvisorRole . ?advisorRole core:relatedBy ?advisingRel . ?advisingRel a core:AdvisingRelationship . ?advisingRel core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . } + UNION + { + ?subject ?property ?advisorRole . + ?advisorRole a core:AdvisorRole . + ?advisorRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + ?advisingRel core:relates ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + ?adviseeRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisee . + ?advisee a foaf:Person . + ?advisee <http://purl.obolibrary.org/obo/RO_0000053> ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + ?advisee rdfs:label ?adviseeLabel + } + } - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisorRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisorRole core:relatedBy ?advisingRel . - ?advisingRel a core:AdvisingRelationship . - ?advisingRel core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - - diff --git a/productMods/config/listViewConfig-authorInAuthorship.xml b/productMods/config/listViewConfig-authorInAuthorship.xml index ef3e3764..87b3608e 100644 --- a/productMods/config/listViewConfig-authorInAuthorship.xml +++ b/productMods/config/listViewConfig-authorInAuthorship.xml @@ -28,48 +28,48 @@ WHERE { ?subject ?property ?authorship . + ?authorship a core:Authorship . ?authorship core:relates ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource rdfs:label ?infoResourceName . - + OPTIONAL { ?infoResource vitro:mostSpecificType ?subclass } OPTIONAL { ?infoResource bibo:volume ?volume } OPTIONAL { ?infoResource bibo:pageStart ?startPage } OPTIONAL { ?infoResource bibo:pageEnd ?endPage } OPTIONAL { ?infoResource core:placeOfPublication ?locale } - OPTIONAL { + OPTIONAL + { ?infoResource bibo:reproducedIn ?appearsInObj . - ?appearsInObj rdfs:label ?appearsIn + ?appearsInObj rdfs:label ?appearsIn . } - - OPTIONAL { + OPTIONAL + { ?infoResource core:publisher ?publisherObj . - ?publisherObj rdfs:label ?publisher + ?publisherObj rdfs:label ?publisher . } - - OPTIONAL { + OPTIONAL + { + ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . + ?partOfObj rdfs:label ?partOf . + } + OPTIONAL + { + ?infoResource core:hasPublicationVenue ?publishedIn . + ?publishedIn rdfs:label ?journal . + } + OPTIONAL + { + ?infoResource core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + } + OPTIONAL + { ?infoResource core:relatedBy ?editorship . ?editorship a core:Editorship . ?editorship core:relates ?editorObj . - ?editorObj rdfs:label ?editor - } - - OPTIONAL { - ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . - ?partOfObj rdfs:label ?partOf - } - - OPTIONAL { ?infoResource vitro:mostSpecificType ?subclass } - OPTIONAL { - ?infoResource core:hasPublicationVenue ?publishedIn . - ?publishedIn rdfs:label ?journal - } - - OPTIONAL { - ?infoResource core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime + ?editorObj rdfs:label ?editor . } OPTIONAL { ?authorship core:hideFromDisplay ?hideThis } - FILTER ( bound(?infoResource) ) diff --git a/productMods/config/listViewConfig-awardOrHonor.xml b/productMods/config/listViewConfig-awardOrHonor.xml index 326a5295..025dd969 100644 --- a/productMods/config/listViewConfig-awardOrHonor.xml +++ b/productMods/config/listViewConfig-awardOrHonor.xml @@ -4,7 +4,7 @@ - + PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX core: <http://vivoweb.org/ontology/core#> @@ -13,122 +13,132 @@ PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> SELECT DISTINCT ?awardReceipt - ?receiptLabel - ?award - ?awardLabel - ?assignedBy - ?assignedByLabel - ?dateTimeStart - ?dateTimeEnd - ?dateTime + ?receiptLabel + ?award + ?awardLabel + ?assignedBy + ?assignedByLabel + ?dateTimeStart + ?dateTimeEnd + ?dateTime - WHERE { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - OPTIONAL { ?awardReceipt rdfs:label ?receiptLabel } - OPTIONAL { ?awardReceipt core:relates ?award . - ?award a core:Award . - ?award core:relatedBy ?awardReceipt . - ?award rdfs:label ?awardLabel - } - OPTIONAL { ?awardReceipt core:assignedBy ?assignedBy . - ?assignedBy rdfs:label ?assignedByLabel - } - OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - OPTIONAL { ?awardReceipt core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime - } - } ORDER BY DESC(?dateTime) DESC(?dateTimeEnd) - - - - PREFIX bibo: <http://purl.org/ontology/bibo/> - 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/> - - CONSTRUCT { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - ?awardReceipt rdfs:label ?receiptLabel . - ?awardReceipt core:relates ?award . - ?award a core:Award . - ?award core:relatedBy ?awardReceipt . - ?award rdfs:label ?awardLabel . - ?awardReceipt core:assignedBy ?assignedBy . - ?assignedBy rdfs:label ?assignedByLabel . - ?awardReceipt core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime - } WHERE { + WHERE + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + OPTIONAL { ?awardReceipt rdfs:label ?receiptLabel } + OPTIONAL { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - } UNION { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - ?awardReceipt rdfs:label ?receiptLabel - } UNION { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - ?awardReceipt rdfs:label ?receiptLabel . ?awardReceipt core:relates ?award . ?award a core:Award . ?award core:relatedBy ?awardReceipt . - ?award rdfs:label ?awardLabel - } UNION { + ?award rdfs:label ?awardLabel . + } + OPTIONAL + { + ?awardReceipt core:assignedBy ?assignedBy . + ?assignedBy rdfs:label ?assignedByLabel . + } + OPTIONAL + { + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + OPTIONAL + { + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + } + OPTIONAL + { + ?awardReceipt core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + } + } ORDER BY DESC(?dateTime) DESC(?dateTimeEnd) + + + + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + CONSTRUCT + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt rdfs:label ?receiptLabel . + + ?awardReceipt core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + + ?awardReceipt core:assignedBy ?assignedBy . + ?assignedBy rdfs:label ?assignedByLabel . + + ?awardReceipt core:relates ?award . + ?award a core:Award . + ?award core:relatedBy ?awardReceipt . + ?award rdfs:label ?awardLabel . + } + WHERE + { + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + } + UNION + { ?subject ?property ?awardReceipt . ?awardReceipt a core:AwardReceipt . ?awardReceipt rdfs:label ?receiptLabel . - ?awardReceipt core:assignedBy ?assignedBy . - ?assignedBy rdfs:label ?assignedByLabel - } UNION { + } + UNION + { ?subject ?property ?awardReceipt . ?awardReceipt a core:AwardReceipt . ?awardReceipt core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime + ?dateTimeValue core:dateTime ?dateTime . + } + UNION + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + UNION + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + } + UNION + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:assignedBy ?assignedBy . + ?assignedBy rdfs:label ?assignedByLabel . + } + UNION + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:relates ?award . + ?award a core:Award . + ?award core:relatedBy ?awardReceipt . + ?award rdfs:label ?awardLabel . } } - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - ?awardReceipt core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - ?awardReceipt core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - ?awardReceipt core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - ?awardReceipt core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - diff --git a/productMods/config/listViewConfig-awardOrHonorGiven.xml b/productMods/config/listViewConfig-awardOrHonorGiven.xml index c8a6477d..32510e52 100644 --- a/productMods/config/listViewConfig-awardOrHonorGiven.xml +++ b/productMods/config/listViewConfig-awardOrHonorGiven.xml @@ -4,7 +4,7 @@ - + PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX core: <http://vivoweb.org/ontology/core#> @@ -13,125 +13,139 @@ PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> SELECT DISTINCT ?awardReceipt - ?receiptLabel - ?award - ?awardLabel - ?givenTo - ?givenToLabel - ?dateTimeStart - ?dateTimeEnd - ?dateTime + ?receiptLabel + ?award + ?awardLabel + ?givenTo + ?givenToLabel + ?dateTimeStart + ?dateTimeEnd + ?dateTime - WHERE { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - OPTIONAL { ?awardReceipt rdfs:label ?receiptLabel } - OPTIONAL { ?awardReceipt core:relates ?award . - ?award a core:Award . - ?award core:relatedBy ?awardReceipt . - ?award rdfs:label ?awardLabel - } - OPTIONAL { ?awardReceipt core:relates ?givenTo . - ?givenTo a foaf:Person . - ?givenTo rdfs:label ?givenToLabel - } - OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - OPTIONAL { ?awardReceipt core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - OPTIONAL { ?awardReceipt core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime - } - } ORDER BY DESC(?dateTime) DESC(?dateTimeEnd) - - - - PREFIX bibo: <http://purl.org/ontology/bibo/> - 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/> - - CONSTRUCT { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - ?awardReceipt rdfs:label ?receiptLabel . + WHERE + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + OPTIONAL { ?awardReceipt rdfs:label ?receiptLabel } + OPTIONAL + { ?awardReceipt core:relates ?award . ?award a core:Award . - ?award core:relatedBy ?awardReceipt . + ?award core:relatedBy ?awardReceipt . ?award rdfs:label ?awardLabel . + } + OPTIONAL + { ?awardReceipt core:relates ?givenTo . ?givenTo a foaf:Person . ?givenTo rdfs:label ?givenToLabel . - ?awardReceipt core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime - } WHERE { + } + OPTIONAL + { + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + OPTIONAL + { + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + } + OPTIONAL + { + ?awardReceipt core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + } + } ORDER BY DESC(?dateTime) DESC(?dateTimeEnd) + + + + 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/> + CONSTRUCT + { + ?subject ?property ?awardReceipt . + + ?awardReceipt a core:AwardReceipt . + ?awardReceipt rdfs:label ?receiptLabel . + + ?awardReceipt core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + + ?awardReceipt core:relates ?givenTo . + ?givenTo a foaf:Person . + ?givenTo rdfs:label ?givenToLabel . + + ?awardReceipt core:relates ?award . + ?award a core:Award . + ?award core:relatedBy ?awardReceipt . + ?award rdfs:label ?awardLabel . + } + WHERE + { { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - } UNION { ?subject ?property ?awardReceipt . ?awardReceipt a core:AwardReceipt . - ?awardReceipt rdfs:label ?receiptLabel - } UNION { + } + UNION + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt rdfs:label ?receiptLabel . + } + UNION + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + } + UNION + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + UNION + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + } + UNION + { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt rdfs:label ?receiptLabel . + ?awardReceipt core:relates ?givenTo . + ?givenTo a foaf:Person . + ?givenTo rdfs:label ?givenToLabel . + } + UNION + { ?subject ?property ?awardReceipt . ?awardReceipt a core:AwardReceipt . ?awardReceipt rdfs:label ?receiptLabel . ?awardReceipt core:relates ?award . ?award a core:Award . ?award core:relatedBy ?awardReceipt . - ?award rdfs:label ?awardLabel - } UNION { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - ?awardReceipt rdfs:label ?receiptLabel . - ?awardReceipt core:relates ?givenTo . - ?givenTo a foaf:Person . - ?givenTo rdfs:label ?givenToLabel - } UNION { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - ?awardReceipt core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime + ?award rdfs:label ?awardLabel . } } - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - ?awardReceipt core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - ?awardReceipt core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - ?awardReceipt core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?awardReceipt . - ?awardReceipt a core:AwardReceipt . - ?awardReceipt core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - diff --git a/productMods/config/listViewConfig-dateTimeInterval.xml b/productMods/config/listViewConfig-dateTimeInterval.xml index b3d208c3..fbd8d1ee 100644 --- a/productMods/config/listViewConfig-dateTimeInterval.xml +++ b/productMods/config/listViewConfig-dateTimeInterval.xml @@ -4,91 +4,89 @@ - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + + 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#> - + SELECT DISTINCT ?dateTimeInterval ?label - ?valueStart ?valueStartName - ?dateTimeStart - ?precisionStart - ?valueEnd ?valueEndName - ?dateTimeEnd - ?precisionEnd WHERE { + ?valueStart ?valueStartName + ?dateTimeStart + ?precisionStart + ?valueEnd ?valueEndName + ?dateTimeEnd + ?precisionEnd + + WHERE + { ?subject ?property ?dateTimeInterval - - OPTIONAL { ?dateTimeInterval core:start ?valueStart - LET (?valueStartName := afn:localname(?valueStart)) - OPTIONAL { ?valueStart core:dateTime ?dateTimeStart } - OPTIONAL { ?valueStart core:dateTimePrecision ?dateTimePrecisionStart - LET (?precisionStart := afn:localname(?dateTimePrecisionStart)) - } - } - OPTIONAL { ?dateTimeInterval core:end ?valueEnd - LET (?valueEndName := afn:localname(?valueEnd)) - OPTIONAL { ?valueEnd core:dateTime ?dateTimeEnd } - OPTIONAL { ?valueEnd core:dateTimePrecision ?dateTimePrecisionEnd - LET (?precisionEnd := afn:localname(?dateTimePrecisionEnd)) - } + + OPTIONAL + { + ?dateTimeInterval core:start ?valueStart + LET (?valueStartName := afn:localname(?valueStart)) + + OPTIONAL { ?valueStart core:dateTime ?dateTimeStart } + OPTIONAL + { + ?valueStart core:dateTimePrecision ?dateTimePrecisionStart + LET (?precisionStart := afn:localname(?dateTimePrecisionStart)) + } + } + OPTIONAL + { + ?dateTimeInterval core:end ?valueEnd + LET (?valueEndName := afn:localname(?valueEnd)) + OPTIONAL { ?valueEnd core:dateTime ?dateTimeEnd } + OPTIONAL + { + ?valueEnd core:dateTimePrecision ?dateTimePrecisionEnd + LET (?precisionEnd := afn:localname(?dateTimePrecisionEnd)) + } } OPTIONAL {?dateTimeInterval rdfs:label ?label} - + - FILTER ( bound(?dateTimeStart) || bound(?dateTimeEnd) ) + FILTER ( bound(?dateTimeStart) || bound(?dateTimeEnd) ) - } + } 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#> - CONSTRUCT { + CONSTRUCT + { ?subject ?property ?dateTimeInterval . - ?dateTimeInterval core:start ?valueStart . - ?dateTimeInterval core:end ?valueEnd . - ?dateTimeInterval rdfs:label ?label - } WHERE { + ?dateTimeInterval rdfs:label ?label . + ?dateTimeInterval core:start ?sStart . + ?dateTimeInterval core:end ?sEnd . + ?sStart ?p ?o . + ?sEnd ?p ?o . + } + WHERE + { { - ?subject ?property ?dateTimeInterval - } - UNION { - ?subject ?property ?dateTimeInterval . - ?dateTimeInterval core:start ?valueStart + ?subject core:dateTimeInterval ?dateTimeInterval . } - UNION { - ?subject ?property ?dateTimeInterval . - ?dateTimeInterval core:end ?valueEnd + UNION + { + ?subject core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval rdfs:label ?label . } - UNION { + UNION + { ?subject ?property ?dateTimeInterval . - ?dateTimeInterval rdfs:label ?label + ?dateTimeInterval core:start ?sStart . + ?sStart ?p ?o . + } + UNION + { + ?subject ?property ?dateTimeInterval . + ?dateTimeInterval core:end ?sEnd . + ?sEnd ?p ?o . } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - - CONSTRUCT { - ?valueStart ?p ?o - } WHERE { - ?subject ?property ?dateTimeInterval . - ?dateTimeInterval core:start ?valueStart . - ?valueStart ?p ?o - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - - CONSTRUCT { - ?valueEnd ?p ?o - } WHERE { - ?subject ?property ?dateTimeInterval . - ?dateTimeInterval core:end ?valueEnd . - ?valueEnd ?p ?o } diff --git a/productMods/config/listViewConfig-default.xml b/productMods/config/listViewConfig-default.xml index 8cecba90..8404ca7e 100644 --- a/productMods/config/listViewConfig-default.xml +++ b/productMods/config/listViewConfig-default.xml @@ -6,105 +6,108 @@ See guidelines at https://wiki.duraspace.org/x/eYXVAw --> - + PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> - 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#> PREFIX obo: <http://purl.obolibrary.org/obo/> PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - - SELECT ?subclass - ?object - ?label - ?localName - ?type - ?objectType - ?title WHERE { - - ?subject ?property ?object . - ?object a ?objectType . - LET (?localName := afn:localname(?object)) - - OPTIONAL { ?object rdfs:label ?label } - OPTIONAL { + SELECT ?subclass + ?object + ?label + ?localName + ?type + ?objectType + ?title + WHERE + { + ?subject ?property ?object . + ?object a ?objectType . + LET (?localName := afn:localname(?object)) + + OPTIONAL + { + ?object rdfs:label ?label . + } + + OPTIONAL + { # Get mostSpecificType only for Persons ?object vitro:mostSpecificType ?subclass . ?subclass rdfs:label ?type . + # Display only a mostSpecificType that belongs to a classgroup. - ?subclass vitro:inClassGroup ?classGroup . - ?classGroup a vitro:ClassGroup + # CONSTRUCT will apply this filter + # ?subclass vitro:inClassGroup ?classGroup . + # ?classGroup a vitro:ClassGroup . } - - OPTIONAL { ?object obo:ARG_2000028 ?vcard . - ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title - } - - - FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) - - + + OPTIONAL + { + ?object obo:ARG_2000028 ?vcard . + ?vcard vcard:hasTitle ?titleObj . + ?titleObj vcard:title ?title . + } + + + FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) + + # Order by ?type is important, because if the object has more than one mostSpecificType, # they all get returned, but postprocessing culls out all but one. Ordering by ?type # will ensure that at least we'll get the same one every time. - } ORDER BY ?subclass ASC( ?label ) ASC( ?localName ) ?type + } ORDER BY ?subclass ASC( ?label ) ASC( ?localName ) ?type - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - - CONSTRUCT { - ?subject ?property ?object . - ?object a ?objectType . - ?object rdfs:label ?label . - } WHERE { - { - ?subject ?property ?object . - ?object a ?objectType . - } UNION { - ?subject ?property ?object . - ?object rdfs:label ?label . - } - } - - 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#> PREFIX obo: <http://purl.obolibrary.org/obo/> PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - CONSTRUCT { + CONSTRUCT + { ?subject ?property ?object . - ?object a ?objectType . + ?object a ?objectType . + ?object rdfs:label ?label . ?object vitro:mostSpecificType ?subclass . - ?subclass vitro:inClassGroup ?classGroup . - ?classGroup a vitro:ClassGroup . ?subclass rdfs:label ?type . - ?object obo:ARG_2000028 ?vcard . + ?object obo:ARG_2000028 ?vcard . ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title - } WHERE { - { + ?titleObj vcard:title ?title . + } + WHERE + { + { ?subject ?property ?object . - ?object a ?objectType . - } UNION { + ?object a ?objectType . + } + UNION + { + ?subject ?property ?object . + ?object rdfs:label ?label . + } + UNION + { ?subject ?property ?object . ?object vitro:mostSpecificType ?subclass . ?subclass rdfs:label ?type . + + # Display only a mostSpecificType that belongs to a classgroup. ?subclass vitro:inClassGroup ?classGroup . - ?classGroup a vitro:ClassGroup - } UNION { + ?classGroup a vitro:ClassGroup . + } + UNION + { ?subject ?property ?object . ?object obo:ARG_2000028 ?vcard . ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title - } + ?titleObj vcard:title ?title . + } } diff --git a/productMods/config/listViewConfig-editorship.xml b/productMods/config/listViewConfig-editorship.xml index 736c1c0c..d49df5ea 100644 --- a/productMods/config/listViewConfig-editorship.xml +++ b/productMods/config/listViewConfig-editorship.xml @@ -4,235 +4,242 @@ - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX bibo: <http://purl.org/ontology/bibo/> + PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> - - SELECT DISTINCT ?subclass - ?editorship - ?infoResource ?infoResourceName - ?dateTime - ?journal - ?volume - ?startPage - ?endPage - ?publisher - ?locale - ?appearsIn - ?partOf - WHERE { - ?subject ?property ?editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource rdfs:label ?infoResourceName . - - OPTIONAL { ?infoResource bibo:volume ?volume } - OPTIONAL { ?infoResource bibo:pageStart ?startPage } - OPTIONAL { ?infoResource bibo:pageEnd ?endPage } - OPTIONAL { ?infoResource core:placeOfPublication ?locale } - OPTIONAL { ?infoResource bibo:reproducedIn ?appearsInObj . - ?appearsInObj rdfs:label ?appearsIn - } - OPTIONAL { ?infoResource core:publisher ?publisherObj . - ?publisherObj rdfs:label ?publisher - } - OPTIONAL { ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . - ?partOfObj rdfs:label ?partOf - } - OPTIONAL { ?infoResource core:hasPublicationVenue ?publishedIn . - ?publishedIn rdfs:label ?journal - } - OPTIONAL { ?infoResource vitro:mostSpecificType ?subclass } - OPTIONAL { ?infoResource core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime - } - + SELECT DISTINCT ?subclass + ?editorship + ?infoResource ?infoResourceName + ?dateTime + ?journal + ?volume + ?startPage + ?endPage + ?publisher + ?locale + ?appearsIn + ?partOf + WHERE + { + ?subject ?property ?editorship . + ?editorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource rdfs:label ?infoResourceName . + + OPTIONAL { ?infoResource bibo:volume ?volume } + OPTIONAL { ?infoResource bibo:pageStart ?startPage } + OPTIONAL { ?infoResource bibo:pageEnd ?endPage } + OPTIONAL { ?infoResource core:placeOfPublication ?locale } + OPTIONAL { ?infoResource vitro:mostSpecificType ?subclass } + OPTIONAL + { + ?infoResource bibo:reproducedIn ?appearsInObj . + ?appearsInObj rdfs:label ?appearsIn . + } + OPTIONAL + { + ?infoResource core:publisher ?publisherObj . + ?publisherObj rdfs:label ?publisher . + } + OPTIONAL + { + ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . + ?partOfObj rdfs:label ?partOf . + } + OPTIONAL + { + ?infoResource core:hasPublicationVenue ?publishedIn . + ?publishedIn rdfs:label ?journal . + } + OPTIONAL + { + ?infoResource core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + } + + FILTER ( bound(?infoResource) ) - - } ORDER BY ?subclass DESC(?dateTime) ?infoResourceName + + } ORDER BY ?subclass DESC(?dateTime) ?infoResourceName PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX bibo: <http://purl.org/ontology/bibo/> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - CONSTRUCT { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource vitro:mostSpecificType ?subclass - } WHERE { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource vitro:mostSpecificType ?subclass - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX bibo: <http://purl.org/ontology/bibo/> - CONSTRUCT { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource rdfs:label ?infoResourceName . - ?infoResource core:hasPublicationVenue ?publishedIn . - ?publishedIn rdfs:label ?journal - } WHERE { - { - ?subject ?property ?editorship . - ?editorship a core:Editorship - } UNION { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> - } UNION { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource rdfs:label ?infoResourceName - } UNION { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource core:hasPublicationVenue ?publishedIn - } UNION { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource core:hasPublicationVenue ?publishedIn . - ?publishedIn rdfs:label ?journal - } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX foaf: <http://xmlns.com/foaf/0.1/> - CONSTRUCT { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?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 . - ?editorship a core:Editorship . - ?editorship core:relates ?editorObj . - ?editorObj a foaf:Person . - ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . - ?appearsInObj rdfs:label ?appearsIn . - ?publisherObj rdfs:label ?publisher . - ?editorObj rdfs:label ?editor . - ?partOfObj rdfs:label ?partOf - } WHERE { - { - ?subject ?property ?editorship . - ?editorship a core:Editorship - } UNION { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - } UNION { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?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 . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource bibo:reproducedIn ?appearsInObj . - ?appearsInObj rdfs:label ?appearsIn - } UNION { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource core:publisher ?publisherObj . - ?publisherObj rdfs:label ?publisher - } UNION { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource core:relatedBy ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?editorObj . - ?editorObj a foaf:Person . - ?editorObj rdfs:label ?editor - } UNION { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . - ?partOfObj rdfs:label ?partOf - } - } - + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX bibo: <http://purl.org/ontology/bibo/> - CONSTRUCT { - ?subject ?property ?editorship . - ?editorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource rdfs:label ?infoResourceName . - ?infoResource core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime - } WHERE { + CONSTRUCT + { ?subject ?property ?editorship . ?editorship a core:Editorship . ?editorship core:relates ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource rdfs:label ?infoResourceName . + ?infoResource vitro:mostSpecificType ?subclass . + ?infoResource core:placeOfPublication ?locale . + ?infoResource bibo:volume ?volume . + ?infoResource bibo:pageStart ?startPage . + ?infoResource bibo:pageEnd ?endPage . + + ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . + ?partOfObj rdfs:label ?partOf . + + ?infoResource core:publisher ?publisherObj . + ?publisherObj rdfs:label ?publisher . + + ?infoResource bibo:reproducedIn ?appearsInObj . + ?appearsInObj rdfs:label ?appearsIn . + ?infoResource core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime + ?dateTimeValue core:dateTime ?dateTime . + + ?infoResource core:hasPublicationVenue ?publishedIn . + ?publishedIn rdfs:label ?journal . + + ?infoResource core:relatedBy ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?editorObj . + ?editorObj a foaf:Person . + ?editorObj rdfs:label ?editor . + } + WHERE + { + { + ?subject ?property ?editorship . + ?editorship a core:Editorship + } + UNION + { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + } + UNION + { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource vitro:mostSpecificType ?subclass . + } + UNION + { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource rdfs:label ?infoResourceName + } + UNION + { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . + ?partOfObj rdfs:label ?partOf . + } + 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 . + ?editorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?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:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + } + UNION + { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:reproducedIn ?appearsInObj . + ?appearsInObj rdfs:label ?appearsIn . + } + UNION + { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource core:publisher ?publisherObj . + ?publisherObj rdfs:label ?publisher . + } + UNION + { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource core:hasPublicationVenue ?publishedIn . + ?publishedIn rdfs:label ?journal + } + UNION + { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?infoResource . + ?infoResource a bibo:Book . + ?infoResource core:relatedBy ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?editorObj . + ?editorObj a foaf:Person . + ?editorObj rdfs:label ?editor . + } + UNION + { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?infoResource . + ?infoResource a bibo:BookSection . + ?infoResource core:relatedBy ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?editorObj . + ?editorObj a foaf:Person . + ?editorObj rdfs:label ?editor . + } } - + diff --git a/productMods/config/listViewConfig-educationalTraining.xml b/productMods/config/listViewConfig-educationalTraining.xml index 01aeccc6..eb2f5fcf 100644 --- a/productMods/config/listViewConfig-educationalTraining.xml +++ b/productMods/config/listViewConfig-educationalTraining.xml @@ -4,206 +4,196 @@ - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - - SELECT DISTINCT ?subclass - ?edTraining - ?org ?orgName - ?degreeName ?degreeAbbr - ?majorField ?deptOrSchool ?info - ?dateTimeStart ?dateTimeEnd - WHERE { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess - OPTIONAL { ?edTraining vitro:mostSpecificType ?subclass . } - OPTIONAL { ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . - ?awardedDegree core:relates ?degree . - ?degree a core:AcademicDegree . - ?degree rdfs:label ?degreeName - } - OPTIONAL { ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . - ?awardedDegree core:relates ?degree . - ?degree a core:AcademicDegree . - ?degree core:abbreviation ?degreeAbbr - } - OPTIONAL { ?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?org . - ?org a foaf:Organization . - ?org rdfs:label ?orgName - } - OPTIONAL { ?edTraining core:majorField ?majorField } - OPTIONAL { ?edTraining core:departmentOrSchool ?deptOrSchool } - OPTIONAL { ?edTraining core:supplementalInformation ?info } - OPTIONAL { ?edTraining core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - OPTIONAL { ?edTraining core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - } ORDER BY ?subclass DESC(?dateTimeEnd) DESC(?dateTimeStart) + + SELECT DISTINCT ?subclass + ?edTraining + ?org ?orgName + ?degreeName ?degreeAbbr + ?majorField ?deptOrSchool ?info + ?dateTimeStart ?dateTimeEnd + WHERE + { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess + OPTIONAL { ?edTraining vitro:mostSpecificType ?subclass . } + OPTIONAL + { + ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . + ?awardedDegree core:relates ?degree . + ?degree a core:AcademicDegree . + ?degree rdfs:label ?degreeName . + } + OPTIONAL + { + ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . + ?awardedDegree core:relates ?degree . + ?degree a core:AcademicDegree . + ?degree core:abbreviation ?degreeAbbr . + } + OPTIONAL + { + ?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?org . + ?org a foaf:Organization . + ?org rdfs:label ?orgName . + } + OPTIONAL { ?edTraining core:majorField ?majorField } + OPTIONAL { ?edTraining core:departmentOrSchool ?deptOrSchool } + OPTIONAL { ?edTraining core:supplementalInformation ?info } + OPTIONAL + { + ?edTraining core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + OPTIONAL + { + ?edTraining core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + } + } ORDER BY ?subclass DESC(?dateTimeEnd) DESC(?dateTimeStart) - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - CONSTRUCT { - ?edTraining vitro:mostSpecificType ?subclass - } WHERE { + CONSTRUCT + { ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . ?edTraining vitro:mostSpecificType ?subclass . - } - - - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> - - CONSTRUCT { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . - ?awardedDegree core:relates ?degree . - ?edTraining core:dateTimeInterval ?dateTimeInterval . ?edTraining core:majorField ?majorField . ?edTraining core:departmentOrSchool ?deptOrSchool . ?edTraining core:supplementalInformation ?info . - } WHERE { + + ?edTraining core:dateTimeInterval ?dateTimeInterval . + + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + + ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . + ?awardedDegree core:relates ?degree . + + ?degree a core:AcademicDegree . + ?degree rdfs:label ?degreeName . + ?degree core:abbreviation ?degreeAbbr . + + ?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?org . + ?org a foaf:Organization . + ?org rdfs:label ?orgName . + } + WHERE + { { ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess + ?edTraining a core:EducationalProcess . } - UNION { + UNION + { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining vitro:mostSpecificType ?subclass . + } + UNION + { ?subject ?property ?edTraining . ?edTraining a core:EducationalProcess . ?edTraining core:majorField ?majorField . } - UNION { + UNION + { ?subject ?property ?edTraining . ?edTraining a core:EducationalProcess . ?edTraining core:departmentOrSchool ?deptOrSchool . } - UNION { + UNION + { ?subject ?property ?edTraining . ?edTraining a core:EducationalProcess . ?edTraining core:supplementalInformation ?info . } - UNION { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . - } - UNION { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . - ?awardedDegree core:relates ?degree - } - UNION { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining core:dateTimeInterval ?dateTimeInterval - } - } - - - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX foaf: <http://xmlns.com/foaf/0.1/> - - CONSTRUCT { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?org . - ?org a foaf:Organization . - ?org rdfs:label ?orgName . - } WHERE { + UNION { ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess + ?edTraining a core:EducationalProcess . + ?edTraining core:dateTimeInterval ?dateTimeInterval . } - UNION { + UNION + { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + UNION + { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + } + UNION + { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . + } + UNION + { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . + ?awardedDegree core:relates ?degree . + } + UNION + { ?subject ?property ?edTraining . ?edTraining a core:EducationalProcess . ?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?org . ?org a foaf:Organization . - } - UNION { + } + UNION + { ?subject ?property ?edTraining . ?edTraining a core:EducationalProcess . ?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?org . ?org a foaf:Organization . - ?org rdfs:label ?orgName - } - } - - - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> - - CONSTRUCT { + ?org rdfs:label ?orgName . + } + UNION + { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . + ?awardedDegree core:relates ?degree . ?degree a core:AcademicDegree . ?degree rdfs:label ?degreeName . - ?degree core:abbreviation ?degreeAbbr - } WHERE { - { + } + UNION + { ?subject ?property ?edTraining . ?edTraining a core:EducationalProcess . ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . ?awardedDegree core:relates ?degree . ?degree a core:AcademicDegree . - ?degree rdfs:label ?degreeName - } UNION { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . - ?awardedDegree core:relates ?degree . - ?degree a core:AcademicDegree . - ?degree core:abbreviation ?degreeAbbr + ?degree core:abbreviation ?degreeAbbr . } } - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> - - CONSTRUCT { - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart . - } WHERE { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart . - } - - - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> - - CONSTRUCT { - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - - diff --git a/productMods/config/listViewConfig-fauxPropertyDefault.xml b/productMods/config/listViewConfig-fauxPropertyDefault.xml index d2b55c25..d4ae97cb 100644 --- a/productMods/config/listViewConfig-fauxPropertyDefault.xml +++ b/productMods/config/listViewConfig-fauxPropertyDefault.xml @@ -6,107 +6,108 @@ See guidelines at https://wiki.duraspace.org/x/eYXVAw --> - + PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> - 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#> PREFIX obo: <http://purl.obolibrary.org/obo/> PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - + SELECT ?subclass - ?object - ?label - ?localName - ?type - ?objectType - ?title WHERE { - + ?object + ?label + ?localName + ?type + ?objectType + ?title + WHERE + { ?subject ?property ?object . ?object a ?objectType - LET (?localName := afn:localname(?object)) - - OPTIONAL { ?object rdfs:label ?label } + LET (?localName := afn:localname(?object)) - OPTIONAL { + OPTIONAL { ?object rdfs:label ?label } + + OPTIONAL + { # Get mostSpecificType only for Persons ?object a foaf:Person . ?object vitro:mostSpecificType ?typeUri . ?typeUri rdfs:label ?type . + # Display only a mostSpecificType that belongs to a classgroup. - ?typeUri vitro:inClassGroup ?classGroup . - ?classGroup a vitro:ClassGroup + # CONSTRUCT will apply this filter + # ?typeUri vitro:inClassGroup ?classGroup . + # ?classGroup a vitro:ClassGroup . } - - OPTIONAL { ?object obo:ARG_2000028 ?vcard . - ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title - } - - - OPTIONAL { ?object a ?subclass } - FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) - - + + OPTIONAL + { + ?object obo:ARG_2000028 ?vcard . + ?vcard vcard:hasTitle ?titleObj . + ?titleObj vcard:title ?title . + } + + + OPTIONAL { ?object a ?subclass } + FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) + + # Order by ?type is important, because if the object has more than one mostSpecificType, # they all get returned, but postprocessing culls out all but one. Ordering by ?type # will ensure that at least we'll get the same one every time. - } ORDER BY ?subclass ASC( ?label ) ASC( ?localName ) ?type + } ORDER BY ?subclass ASC( ?label ) ASC( ?localName ) ?type - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - - CONSTRUCT { - ?subject ?property ?object . - ?object a ?subclass . - ?object rdfs:label ?label . - } WHERE { - { - ?subject ?property ?object . - } UNION { - ?subject ?property ?object . - ?object a ?subclass . - } UNION { - ?subject ?property ?object . - ?object rdfs:label ?label . - } - } - - 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#> PREFIX obo: <http://purl.obolibrary.org/obo/> PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> CONSTRUCT { ?subject ?property ?object . + ?object a ?subclass . + ?object rdfs:label ?label . ?object vitro:mostSpecificType ?typeUri . ?typeUri vitro:inClassGroup ?classGroup . ?classGroup a vitro:ClassGroup . ?typeUri rdfs:label ?type . - ?object obo:ARG_2000028 ?vcard . + ?object obo:ARG_2000028 ?vcard . ?vcard vcard:hasTitle ?titleObj . ?titleObj vcard:title ?title } WHERE { - { + { ?subject ?property ?object . - } UNION { + } + UNION + { + ?subject ?property ?object . + ?object a ?subclass . + } + UNION + { + ?subject ?property ?object . + ?object rdfs:label ?label . + } + UNION + { ?subject ?property ?object . ?object vitro:mostSpecificType ?typeUri . ?typeUri rdfs:label ?type . ?typeUri vitro:inClassGroup ?classGroup . - ?classGroup a vitro:ClassGroup - } UNION { + ?classGroup a vitro:ClassGroup . + } + UNION + { ?subject ?property ?object . - ?object obo:ARG_2000028 ?vcard . + ?object obo:ARG_2000028 ?vcard . ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title - } + ?titleObj vcard:title ?title . + } } diff --git a/productMods/config/listViewConfig-hasClinicalActivity.xml b/productMods/config/listViewConfig-hasClinicalActivity.xml index 8a330c00..dc06bfc0 100644 --- a/productMods/config/listViewConfig-hasClinicalActivity.xml +++ b/productMods/config/listViewConfig-hasClinicalActivity.xml @@ -4,154 +4,139 @@ - + 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#> - + SELECT DISTINCT ?subclass - # send the property to the template, since this view supports multiple role properties - ?property - ?role - ?roleLabel - ?activity ?activityName - ?activityLabel - ?dateTimeStart ?dateTimeEnd - ?hideThis - ?objectType - WHERE { + # send the property to the template, since this view supports multiple role properties + ?property + ?role + ?roleLabel + ?activity ?activityName + ?activityLabel + ?dateTimeStart ?dateTimeEnd + ?hideThis + ?objectType + WHERE + { ?subject ?property ?role . ?role a core:ClinicalRole . - - OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity rdfs:label ?activityLabel - - - ?activity vitro:mostSpecificType ?subclass - - } - OPTIONAL { ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityName - - - ?activity vitro:mostSpecificType ?subclass - - } - OPTIONAL { ?role rdfs:label ?roleLabel } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart + + OPTIONAL + { + ?role core:relates ?activity . + ?activity rdfs:label ?activityLabel + + + ?activity vitro:mostSpecificType ?subclass + } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd + OPTIONAL { ?role rdfs:label ?roleLabel } + OPTIONAL + { + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart + } + OPTIONAL + { + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd } } ORDER BY ?subclass DESC(?dateTimeEnd) DESC(?dateTimeStart) ?activityLabel ?activityName - - - 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 ?role . - ?role a core:ClinicalRole . - ?role core:roleContributesTo ?activity . - ?activity vitro:mostSpecificType ?subclass . - } WHERE { - ?subject ?property ?role . - ?role a core:ClinicalRole . - ?role core:roleContributesTo ?activity . - ?activity vitro:mostSpecificType ?subclass - } - - - 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 ?role . - ?role a core:ClinicalRole . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity vitro:mostSpecificType ?subclass . - } WHERE { - ?subject ?property ?role . - ?role a core:ClinicalRole . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity vitro:mostSpecificType ?subclass - } - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - CONSTRUCT { + 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:ClinicalRole . - ?role rdfs:label ?roleLabel . - ?activity rdfs:label ?activityName - } WHERE { + ?role rdfs:label ?roleLabel . + + ?role core:dateTimeInterval ?dateTimeInterval . + + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + + ?role core:relates ?activity . + ?activity vitro:mostSpecificType ?subclass . + ?activity rdfs:label ?activityName + } + WHERE + { { ?subject ?property ?role . ?role a core:ClinicalRole . - } UNION { + } + UNION + { ?subject ?property ?role . ?role a core:ClinicalRole . - ?role rdfs:label ?roleLabel - } UNION { + ?role rdfs:label ?roleLabel . + } + UNION + { ?subject ?property ?role . ?role a core:ClinicalRole . - ?role core:relates ?activity . - ?activity rdfs:label ?activityName - } UNION { + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + UNION + { ?subject ?property ?role . ?role a core:ClinicalRole . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity rdfs:label ?activityName - } UNION { + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + } + UNION + { ?subject ?property ?role . ?role a core:ClinicalRole . ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityName + ?activity vitro:mostSpecificType ?subclass . } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:ClinicalRole . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?role . - ?role a core:ClinicalRole . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:ClinicalRole . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?role . - ?role a core:ClinicalRole . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } + UNION + { + ?subject ?property ?role . + ?role a core:ClinicalRole . + ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . + ?activity vitro:mostSpecificType ?subclass . + } + UNION + { + ?subject ?property ?role . + ?role a core:ClinicalRole . + ?role core:relates ?activity . + ?activity rdfs:label ?activityName . + } + UNION + { + ?subject ?property ?role . + ?role a core:ClinicalRole . + ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . + ?activity rdfs:label ?activityName . + } + UNION + { + ?subject ?property ?role . + ?role a core:ClinicalRole . + ?role core:roleContributesTo ?activity . + ?activity rdfs:label ?activityName . + } + } diff --git a/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml b/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml index 102989af..4648fca4 100644 --- a/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml +++ b/productMods/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml @@ -4,60 +4,73 @@ - + PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> 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#> - - SELECT DISTINCT - ?role - ?activity ?activityName - ?activityLabel - ?awardedBy - ?adminedBy - ?awardedByLabel - ?adminedByLabel - ?dateTimeStartRole ?dateTimeEndRole - ?dateTimeStartGrant ?dateTimeEndGrant - ?hideThis + + SELECT DISTINCT + ?role + ?activity ?activityName + ?activityLabel + ?awardedBy + ?adminedBy + ?awardedByLabel + ?adminedByLabel + ?dateTimeStartRole ?dateTimeEndRole + ?dateTimeStartGrant ?dateTimeEndGrant + ?hideThis WHERE { - ?subject ?property ?role . ?role a core:CoPrincipalInvestigatorRole . - - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity rdfs:label ?activityLabel . - LET (?activityName := afn:localname(?activity)) - } - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:assignedBy ?awardedBy . - ?awardedBy rdfs:label ?awardedByLabel + + OPTIONAL + { + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity rdfs:label ?activityLabel . + LET (?activityName := afn:localname(?activity)) . } - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:relates ?adminedByRole . - ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . - ?adminedBy rdfs:label ?adminedByLabel + OPTIONAL + { + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Grant . + ?activity core:assignedBy ?awardedBy . + ?awardedBy rdfs:label ?awardedByLabel . } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . - ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole + OPTIONAL + { + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Grant . + ?activity core:relates ?adminedByRole . + ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . + ?adminedBy rdfs:label ?adminedByLabel . } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . - ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole + OPTIONAL + { + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . + ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole . } - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant + OPTIONAL + { + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . + ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole . } - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant + OPTIONAL + { + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant . + } + OPTIONAL + { + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant . } OPTIONAL { ?role core:hideFromDisplay ?hideThis } } ORDER BY DESC(?dateTimeEndRole) DESC(?dateTimeStartRole) DESC(?dateTimeEndGrant) DESC(?dateTimeStartGrant) ?activityLabel ?activityName @@ -65,154 +78,149 @@ 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/> - CONSTRUCT { + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX foaf: <http://xmlns.com/foaf/0.1/> + CONSTRUCT + { ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?role core:relatedBy ?activity . ?role core:hideFromDisplay ?hideThis . + + ?role core:dateTimeInterval ?dateTimeIntervalRole . + + ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . + ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole . + + ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . + ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole . + + ?activity a core:Grant . ?activity rdfs:label ?activityLabel . + + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant . + + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant . + ?activity core:assignedBy ?awardedBy . ?awardedBy rdfs:label ?awardedByLabel . + ?activity core:relates ?adminedByRole . ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . - ?adminedBy rdfs:label ?adminedByLabel - } WHERE { + ?adminedBy rdfs:label ?adminedByLabel . + } + WHERE + { { ?subject ?property ?role . ?role a core:CoPrincipalInvestigatorRole . - } UNION { + } + UNION + { ?subject ?property ?role . ?role a core:CoPrincipalInvestigatorRole . ?role core:hideFromDisplay ?hideThis . - } UNION { + } + UNION + { ?subject ?property ?role . ?role a core:CoPrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity rdfs:label ?activityLabel - } UNION { + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . + ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole . + } + UNION + { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . + ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole . + } + UNION + { ?subject ?property ?role . ?role a core:CoPrincipalInvestigatorRole . ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:assignedBy ?awardedBy . - ?awardedBy a foaf:Organization . - ?awardedBy rdfs:label ?awardedByLabel - } UNION { + ?activity a core:Grant . + ?activity rdfs:label ?activityLabel . + } + UNION + { ?subject ?property ?role . ?role a core:CoPrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?role core:elatedBy ?activity . + ?activity a core:Contract . + ?activity rdfs:label ?activityLabel + } + UNION + { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role core:relatedBy ?activity . + ?activity a core:Grant . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant . + } + UNION + { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role core:relatedBy ?activity . + ?activity a core:Contract . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant . + } + UNION + { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role core:relatedBy ?activity . + ?activity a core:Grant . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant . + } + UNION + { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role core:relatedBy ?activity . + ?activity a core:Contract . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant . + } + UNION + { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Grant . + ?activity core:assignedBy ?awardedBy . + ?awardedBy a foaf:Organization . + ?awardedBy rdfs:label ?awardedByLabel . + } + UNION + { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . ?activity a core:Grant . ?activity core:relates ?adminedByRole . ?adminedByRole a core:AdminsitratorRole. ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . ?adminedBy a foaf:Organization . - ?adminedBy rdfs:label ?adminedByLabel - } UNION { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Contract . - ?activity rdfs:label ?activityLabel + ?adminedBy rdfs:label ?adminedByLabel . } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . - ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole - } WHERE { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . - ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . - ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole - } WHERE { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . - ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole - } - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant - } WHERE { - { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant - } UNION { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Contract . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant - } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant - } WHERE { - { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant - } UNION { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Contract . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant - } - } + } diff --git a/productMods/config/listViewConfig-hasInvestigatorRole.xml b/productMods/config/listViewConfig-hasInvestigatorRole.xml index cab15c64..7e01c265 100644 --- a/productMods/config/listViewConfig-hasInvestigatorRole.xml +++ b/productMods/config/listViewConfig-hasInvestigatorRole.xml @@ -4,61 +4,74 @@ - + PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> 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#> - - SELECT DISTINCT - ?role - ?activity ?activityName - ?activityLabel - ?awardedBy - ?adminedBy - ?awardedByLabel - ?adminedByLabel - ?dateTimeStartRole ?dateTimeEndRole - ?dateTimeStartGrant ?dateTimeEndGrant - ?hideThis + + SELECT DISTINCT + ?role + ?activity ?activityName + ?activityLabel + ?awardedBy + ?adminedBy + ?awardedByLabel + ?adminedByLabel + ?dateTimeStartRole ?dateTimeEndRole + ?dateTimeStartGrant ?dateTimeEndGrant + ?hideThis WHERE { - ?subject ?property ?role . ?role a core:InvestigatorRole . ?role vitro:mostSpecificType ?subclass - - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity rdfs:label ?activityLabel . - LET (?activityName := afn:localname(?activity)) - } - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:assignedBy ?awardedBy . - ?awardedBy rdfs:label ?awardedByLabel + + OPTIONAL + { + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity rdfs:label ?activityLabel . + LET (?activityName := afn:localname(?activity)) } - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:relates ?adminedByRole . - ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . - ?adminedBy rdfs:label ?adminedByLabel + OPTIONAL + { + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Grant . + ?activity core:assignedBy ?awardedBy . + ?awardedBy rdfs:label ?awardedByLabel } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . - ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole + OPTIONAL + { + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Grant . + ?activity core:relates ?adminedByRole . + ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . + ?adminedBy rdfs:label ?adminedByLabel } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . - ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole + OPTIONAL + { + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . + ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole } - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant + OPTIONAL + { + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . + ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole } - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant + OPTIONAL + { + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant + } + OPTIONAL + { + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant } OPTIONAL { ?role core:hideFromDisplay ?hideThis } FILTER ( ?subclass = core:InvestigatorRole) @@ -67,159 +80,157 @@ 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 { + 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 vitro:mostSpecificType ?subclass . - ?role core:hideFromDisplay ?hideThis . + ?role vitro:mostSpecificType ?subclass . + ?role core:hideFromDisplay ?hideThis . + + ?role core:dateTimeInterval ?dateTimeIntervalRole . + + ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . + ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole . + + ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . + ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole . + + ?role core:relatedBy ?activity . + + ?activity a core:Grant . ?activity rdfs:label ?activityLabel . + + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant . + + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant . + ?activity core:assignedBy ?awardedBy . ?awardedBy rdfs:label ?awardedByLabel . + ?activity core:relates ?adminedByRole . ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . - ?adminedBy rdfs:label ?adminedByLabel - } WHERE { + ?adminedBy rdfs:label ?adminedByLabel . + } + WHERE + { { ?subject ?property ?role . - ?role a core:InvestigatorRole . - } UNION { + ?role a core:InvestigatorRole . + } + UNION + { + ?subject ?property ?role . + ?role a core:InvestigatorRole . + ?role vitro:mostSpecificType ?subclass . + } + UNION + { ?subject ?property ?role . ?role a core:InvestigatorRole . ?role core:hideFromDisplay ?hideThis . - } UNION { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role vitro:mostSpecificType ?subclass . - } UNION { + } + UNION + { ?subject ?property ?role . ?role a core:InvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . + ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole . + } + UNION + { + ?subject ?property ?role . + ?role a core:InvestigatorRole . + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . + ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole . + } + UNION + { + ?subject ?property ?role . + ?role a core:InvestigatorRole . + ?role core:relatedBy ?activity . ?activity a core:Grant . - ?activity rdfs:label ?activityLabel - } UNION { + ?activity rdfs:label ?activityLabel . + } + UNION + { ?subject ?property ?role . ?role a core:InvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . + ?role core:relatedBy ?activity . + ?activity a core:Contract . + ?activity rdfs:label ?activityLabel . + } + UNION + { + ?subject ?property ?role . + ?role a core:InvestigatorRole . + ?role core:relatedBy ?activity . + ?activity a core:Grant . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant . + } + UNION + { + ?subject ?property ?role . + ?role a core:InvestigatorRole . + ?role core:relatedBy ?activity . + ?activity a core:Contract . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant . + } + UNION + { + ?subject ?property ?role . + ?role a core:InvestigatorRole . + ?role core:relatedBy ?activity . + ?activity a core:Grant . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant . + } + UNION + { + ?subject ?property ?role . + ?role a core:InvestigatorRole . + ?role core:relatedBy ?activity . + ?activity a core:Contract . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant . + } + UNION + { + ?subject ?property ?role . + ?role a core:InvestigatorRole . + ?role core:relatedBy ?activity . + ?activity a core:Grant . ?activity core:assignedBy ?awardedBy . ?awardedBy a foaf:Organization . - ?awardedBy rdfs:label ?awardedByLabel - } UNION { + ?awardedBy rdfs:label ?awardedByLabel . + } + UNION + { ?subject ?property ?role . ?role a core:InvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?role core:relatedBy ?activity . ?activity a core:Grant . ?activity core:relates ?adminedByRole . ?adminedByRole a core:AdminsitratorRole. ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . ?adminedBy a foaf:Organization . - ?adminedBy rdfs:label ?adminedByLabel - } UNION { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Contract . - ?activity rdfs:label ?activityLabel + ?adminedBy rdfs:label ?adminedByLabel . } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . - ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole - } WHERE { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . - ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . - ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole - } WHERE { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . - ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole - } - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant - } WHERE { - { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant - } UNION { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Contract . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant - } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant - } WHERE { - { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant - } UNION { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Contract . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant - } - } + } diff --git a/productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml b/productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml index ac71e9b6..88f37a91 100644 --- a/productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml +++ b/productMods/config/listViewConfig-hasPrincipalInvestigatorRole.xml @@ -4,221 +4,222 @@ - + PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> 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#> - - SELECT DISTINCT - ?role - ?activity ?activityName - ?activityLabel - ?awardedBy - ?adminedBy - ?awardedByLabel - ?adminedByLabel - ?dateTimeStartRole ?dateTimeEndRole - ?dateTimeStartGrant ?dateTimeEndGrant - ?hideThis - WHERE { - + + SELECT DISTINCT + ?role + ?activity ?activityName + ?activityLabel + ?awardedBy + ?adminedBy + ?awardedByLabel + ?adminedByLabel + ?dateTimeStartRole ?dateTimeEndRole + ?dateTimeStartGrant ?dateTimeEndGrant + ?hideThis + + WHERE + { ?subject ?property ?role . ?role a core:PrincipalInvestigatorRole . - - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity rdfs:label ?activityLabel . - LET (?activityName := afn:localname(?activity)) - } - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:assignedBy ?awardedBy . - ?awardedBy rdfs:label ?awardedByLabel + + OPTIONAL + { + ?role core:relatedBy ?activity . + ?activity rdfs:label ?activityLabel . + LET (?activityName := afn:localname(?activity)) . } - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:relates ?adminedByRole . - ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . - ?adminedBy rdfs:label ?adminedByLabel + OPTIONAL + { + ?role core:relatedBy ?activity . + ?activity a core:Grant . + ?activity core:assignedBy ?awardedBy . + ?awardedBy rdfs:label ?awardedByLabel . } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . - ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole + OPTIONAL + { + ?role core:relatedBy ?activity . + ?activity a core:Grant . + ?activity core:relates ?adminedByRole . + ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . + ?adminedBy rdfs:label ?adminedByLabel . } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . - ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole + OPTIONAL + { + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . + ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole . } - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant + OPTIONAL + { + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . + ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole . } - OPTIONAL { ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant + OPTIONAL + { + ?role core:relatedBy ?activity . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant . + } + OPTIONAL + { + ?role core:relatedBy ?activity . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant . } OPTIONAL { ?role core:hideFromDisplay ?hideThis } } ORDER BY DESC(?dateTimeEndRole) DESC(?dateTimeStartRole) DESC(?dateTimeEndGrant) DESC(?dateTimeStartGrant) ?activityLabel ?activityName - + } UNION { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . + ?role rdfs:label ?roleLabel . + --> 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/> - CONSTRUCT { + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX foaf: <http://xmlns.com/foaf/0.1/> + + CONSTRUCT + { ?subject ?property ?role . ?role a core:PrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . ?role core:hideFromDisplay ?hideThis . + ?role core:relatedBy ?activity . + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . + ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole . + ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . + ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole . ?activity rdfs:label ?activityLabel . + ?activity a core:Grant . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . ?activity core:assignedBy ?awardedBy . ?awardedBy rdfs:label ?awardedByLabel . ?activity core:relates ?adminedByRole . ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . - ?adminedBy rdfs:label ?adminedByLabel - } WHERE { + ?adminedBy rdfs:label ?adminedByLabel . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant . + ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant . + } + WHERE + { { ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . - } UNION { + ?role a core:PrincipalInvestigatorRole . + } + UNION + { ?subject ?property ?role . ?role a core:PrincipalInvestigatorRole . ?role core:hideFromDisplay ?hideThis . - } UNION { + } + UNION + { ?subject ?property ?role . ?role a core:PrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?role core:relatedBy ?activity . ?activity a core:Grant . - ?activity rdfs:label ?activityLabel - } UNION { + ?activity rdfs:label ?activityLabel . + } + UNION + { ?subject ?property ?role . ?role a core:PrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . + ?role core:relatedBy ?activity . + ?activity a core:Contract . + ?activity rdfs:label ?activityLabel . + } + UNION + { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . + ?role core:relatedBy ?activity . + ?activity a core:Grant . ?activity core:assignedBy ?awardedBy . ?awardedBy a foaf:Organization . - ?awardedBy rdfs:label ?awardedByLabel - } UNION { + ?awardedBy rdfs:label ?awardedByLabel . + } + UNION + { ?subject ?property ?role . ?role a core:PrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?role core:relatedBy ?activity . ?activity a core:Grant . ?activity core:relates ?adminedByRole . ?adminedByRole a core:AdminsitratorRole. ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . ?adminedBy a foaf:Organization . - ?adminedBy rdfs:label ?adminedByLabel - } UNION { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Contract . - ?activity rdfs:label ?activityLabel + ?adminedBy rdfs:label ?adminedByLabel . } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . - ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . - ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole - } WHERE { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . - ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . - ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . - ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . - ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole - } WHERE { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . - ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . - ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole - } - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant - } WHERE { + UNION { ?subject ?property ?role . ?role a core:PrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant - } UNION { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Contract . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . - ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . + ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole . } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . - ?activity core:dateTimeInterval ?dateTimeIntervalGrant . - ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant - } WHERE { + UNION { ?subject ?property ?role . ?role a core:PrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . + ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole . + } + UNION + { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . + ?role core:relatedBy ?activity . + ?activity a core:Grant . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant . + } + UNION + { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . + ?role core:relatedBy ?activity . + ?activity a core:Contract . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant . + } + UNION + { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . + ?role core:relatedBy ?activity . ?activity a core:Grant . ?activity core:dateTimeInterval ?dateTimeIntervalGrant . ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant - } UNION { + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant . + } + UNION + { ?subject ?property ?role . ?role a core:PrincipalInvestigatorRole . - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?role core:relatedBy ?activity . ?activity a core:Contract . ?activity core:dateTimeInterval ?dateTimeIntervalGrant . ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . - ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant + ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant . } - } + } diff --git a/productMods/config/listViewConfig-informationResourceInAuthorship.xml b/productMods/config/listViewConfig-informationResourceInAuthorship.xml index 26072736..c9aea300 100644 --- a/productMods/config/listViewConfig-informationResourceInAuthorship.xml +++ b/productMods/config/listViewConfig-informationResourceInAuthorship.xml @@ -4,150 +4,130 @@ - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - PREFIX fn: <http://www.w3.org/2005/xpath-functions#> - + PREFIX fn: <http://www.w3.org/2005/xpath-functions#> + SELECT DISTINCT ?subclass - ?authorship - ?author ?authorName + ?authorship + ?author ?authorName WHERE { - ?subject ?property ?authorship . - OPTIONAL { ?authorship core:rank ?rank } - OPTIONAL { ?authorship core:relates ?author . - ?author a foaf:Agent . - ?author rdfs:label ?authorName - - OPTIONAL { ?authorship core:relates ?author . - ?author a foaf:Agent . - ?author vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf foaf:Agent - } - } - OPTIONAL { ?authorship core:relates ?author . - ?author a vcard:Kind . - ?author vcard:hasName ?vName . - ?vName vcard:familyName ?lastName . - OPTIONAL { ?vName vcard:givenName ?firstName . } - OPTIONAL { ?vName core:middleName ?middleName . } - bind ( COALESCE(?firstName, "") As ?firstName1) . - bind ( COALESCE(?middleName, "") As ?middleName1) . - bind ( COALESCE(?lastName, "") As ?lastName1) . - bind (concat(str(?lastName1 + ", "),str(?firstName1 + " "),str(?middleName1)) as ?authorName) . - - OPTIONAL { ?authorship core:relates ?author . - ?author a vcard:Kind . - ?author vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf vcard:Kind - } - } - - FILTER ( bound(?author) ) - - } ORDER BY ?subclass ?rank (fn:lower-case(?authorName)) - - - - 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#> - PREFIX foaf: <http://xmlns.com/foaf/0.1/> - CONSTRUCT { ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:rank ?rank . - ?authorship core:relates ?author . - ?author a foaf:Agent . - ?author rdfs:label ?authorName . - ?author vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf foaf:Agent - } WHERE { - { - ?subject ?property ?authorship . - ?authorship a core:Authorship - } UNION { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:rank ?rank . - } UNION { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?author . - ?author a foaf:Agent . - ?author rdfs:label ?authorName - } UNION { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?author . + OPTIONAL { ?authorship core:rank ?rank } + OPTIONAL { ?authorship core:relates ?author . ?author a foaf:Agent . - ?author rdfs:label ?authorName . - ?author vitro:mostSpecificType ?subclass . + ?author rdfs:label ?authorName . + + OPTIONAL { ?authorship core:relates ?author . + ?author a foaf:Agent . + ?author vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf foaf:Agent . + } } - } - + OPTIONAL { ?authorship core:relates ?author . + ?author a vcard:Kind . + ?author vcard:hasName ?vName . + ?vName vcard:familyName ?lastName . + OPTIONAL { ?vName vcard:givenName ?firstName . } + OPTIONAL { ?vName core:middleName ?middleName . } + bind ( COALESCE(?firstName, "") As ?firstName1) . + bind ( COALESCE(?middleName, "") As ?middleName1) . + bind ( COALESCE(?lastName, "") As ?lastName1) . + bind (concat(str(?lastName1 + ", "),str(?firstName1 + " "),str(?middleName1)) as ?authorName) . + + OPTIONAL { ?authorship core:relates ?author . + ?author a vcard:Kind . + ?author vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf vcard:Kind . + } + } + + FILTER ( bound(?author) ) + + } ORDER BY ?subclass ?rank (fn:lower-case(?authorName)) + 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#> - PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - CONSTRUCT { + 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#> + PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> + CONSTRUCT { ?subject ?property ?authorship . + ?authorship a core:Authorship . ?authorship core:rank ?rank . - ?authorship core:relates ?author . - ?author a vcard:Kind . - ?author vcard:hasName ?vName . - ?vName vcard:familyName ?lastName . - ?vName vcard:givenName ?firstName . - ?vName core:middleName ?middleName . - ?author vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf vcard:Kind + + ?authorship core:relates ?authorAgent . + ?authorAgent a foaf:Agent . + ?authorAgent rdfs:label ?authorName . + ?authorAgent vitro:mostSpecificType ?authorAgentMST . + ?authorAgentMST rdfs:subClassOf foaf:Agent . + + ?authorship core:relates ?authorVCard . + ?authorVCard a vcard:Kind . + ?authorVCard vitro:mostSpecificType ?authorVCardMST . + ?authorVCardMST rdfs:subClassOf vcard:Kind . + + ?authorVCard vcard:hasName ?vName . + ?vName vcard:familyName ?lastName . + ?vName vcard:givenName ?firstName . + ?vName core:middleName ?middleName . } WHERE { { ?subject ?property ?authorship . - ?authorship a core:Authorship + ?authorship a core:Authorship } UNION { ?subject ?property ?authorship . ?authorship a core:Authorship . - ?authorship core:rank ?rank . + ?authorship core:rank ?rank . } UNION { ?subject ?property ?authorship . ?authorship a core:Authorship . - ?authorship core:relates ?author . - ?author a vcard:Kind . + ?authorship core:relates ?authorAgent . + ?authorAgent a foaf:Agent . + ?authorAgent vitro:mostSpecificType ?authorAgentMST . + } UNION { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:relates ?authorAgent . + ?authorAgent a foaf:Agent . + ?authorAgent rdfs:label ?authorName + } UNION { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:relates ?authorVCard . + ?authorVCard a vcard:Kind . + ?authorVCard vitro:mostSpecificType ?authorVCardMST . + } UNION { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:relates ?authorVCard . + ?authorVCard a vcard:Kind . + ?authorVCard vcard:hasName ?vName . + ?vName vcard:familyName ?lastName . + } UNION { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:relates ?authorVCard . + ?authorVCard a vcard:Kind . + ?authorVCard vcard:hasName ?vName . + ?vName vcard:givenName ?firstName . + } UNION { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:relates ?authorVCard . + ?authorVCard a vcard:Kind . ?author vcard:hasName ?vName . - ?vName vcard:familyName ?lastName . - } UNION { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?author . - ?author a vcard:Kind . - ?author vcard:hasName ?vName . - ?vName vcard:familyName ?lastName . - ?vName vcard:givenName ?firstName . - } UNION { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?author . - ?author a vcard:Kind . - ?author vcard:hasName ?vName . - ?vName vcard:familyName ?lastName . - ?vName vcard:givenName ?firstName . - ?vName core:middleName ?middleName . - } UNION { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?author . - ?author a vcard:Kind . - ?author vitro:mostSpecificType ?subclass . + ?vName core:middleName ?middleName . } - } + } - + diff --git a/productMods/config/listViewConfig-organizationForPosition.xml b/productMods/config/listViewConfig-organizationForPosition.xml index 922861cd..7b1c8030 100644 --- a/productMods/config/listViewConfig-organizationForPosition.xml +++ b/productMods/config/listViewConfig-organizationForPosition.xml @@ -4,7 +4,7 @@ - + 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#> @@ -12,131 +12,138 @@ PREFIX fn: <http://www.w3.org/2005/xpath-functions#> SELECT DISTINCT ?subclass - ?position - ?positionTitle - ?person ?personName - ?dateTimeStart ?dateTimeEnd - ?hideThis - WHERE { - ?subject ?property ?position - OPTIONAL { ?position core:relates ?person . - ?person a foaf:Person . - ?person rdfs:label ?personName - } - - OPTIONAL { ?position vitro:mostSpecificType ?subclass . - OPTIONAL { ?subclass vitro:displayRankAnnot ?displayRank . } - } - + ?position + ?positionTitle + ?person ?personName + ?dateTimeStart ?dateTimeEnd + ?hideThis + WHERE + { + ?subject ?property ?position + OPTIONAL + { + ?position core:relates ?person . + ?person a foaf:Person . + ?person rdfs:label ?personName . + } + + OPTIONAL + { + ?position vitro:mostSpecificType ?subclass . + OPTIONAL + { + ?subclass vitro:displayRankAnnot ?displayRank . + } + } + OPTIONAL { ?position rdfs:label ?positionTitle } OPTIONAL { ?position core:hideFromDisplay ?hideThis } - OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart + OPTIONAL + { + ?position core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart } - OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd + OPTIONAL + { + ?position core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd } # Get current positions only: end date is either null or not in the past - FILTER ( !bound(?dateTimeEnd) || - substr(str(?dateTimeEnd), 1, 4) >= substr(str(now()), 1, 4) ) - - FILTER ( bound(?person) ) - - FILTER ( ?displayRank < 500 ) + FILTER ( !bound(?dateTimeEnd) || substr(str(?dateTimeEnd), 1, 4) >= substr(str(now()), 1, 4) ) + + FILTER ( bound(?person) ) + + FILTER ( ?displayRank < 500 ) } ORDER BY ?subclass (fn:lower-case(?personName)) - - - 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 { - ?subject ?property ?position . - ?position a core:Position . - ?position vitro:mostSpecificType ?subclass . - ?subclass vitro:displayRankAnnot ?displayRank - } WHERE { - { - ?subject ?property ?position . - ?position a core:Position . - ?position vitro:mostSpecificType ?subclass - } UNION { - ?subject ?property ?position . - ?position a core:Position . - ?position vitro:mostSpecificType ?subclass . - ?subclass vitro:displayRankAnnot ?displayRank - } - } - - + 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/> - CONSTRUCT { + PREFIX foaf: <http://xmlns.com/foaf/0.1/> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> + + CONSTRUCT + { ?subject ?property ?position . + ?position a core:Position . + ?position rdfs:label ?positionTitle . ?position core:hideFromDisplay ?hideThis . - ?position rdfs:label ?positionTitle . + + ?position vitro:mostSpecificType ?subclass . + ?subclass vitro:displayRankAnnot ?displayRank . + + ?position core:dateTimeInterval ?dateTimeInterval . + + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + ?position core:relates ?person . ?person a foaf:Person . - ?person rdfs:label ?personName - } WHERE { + ?person rdfs:label ?personName . + } + WHERE + { { - ?subject ?property ?position . - ?position a core:Position . - } UNION { - ?subject ?property ?position . - ?position a core:Position . - ?position core:hideFromDisplay ?hideThis - } UNION { - ?subject ?property ?position . - ?position a core:Position . - ?position rdfs:label ?positionTitle - } UNION { - ?subject ?property ?position . - ?position core:relates ?person . - ?person a foaf:Person . - ?person rdfs:label ?personName + ?subject ?property ?position . + ?position a core:Position . } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?position . - ?position a core:Position . - ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?position . - ?position a core:Position . - ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } + UNION + { + ?subject ?property ?position . + ?position a core:Position . + ?position core:hideFromDisplay ?hideThis . + } + UNION + { + ?subject ?property ?position . + ?position a core:Position . + ?position vitro:mostSpecificType ?subclass . + } + UNION + { + ?subject ?property ?position . + ?position a core:Position . + ?position vitro:mostSpecificType ?subclass . + ?subclass vitro:displayRankAnnot ?displayRank . + } + UNION + { + ?subject ?property ?position . + ?position a core:Position . + ?position rdfs:label ?positionTitle . + } + UNION + { + ?subject ?property ?position . + ?position a core:Position . + ?position core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + UNION + { + ?subject ?property ?position . + ?position a core:Position . + ?position core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + } + UNION + { + ?subject ?property ?position . + ?position core:relates ?person . + ?person a foaf:Person . + ?person rdfs:label ?personName . + } + } - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?position . - ?position a core:Position . - ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?position . - ?position a core:Position . - ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - - diff --git a/productMods/config/listViewConfig-personInPosition.xml b/productMods/config/listViewConfig-personInPosition.xml index 771ab61c..6c7e7f34 100644 --- a/productMods/config/listViewConfig-personInPosition.xml +++ b/productMods/config/listViewConfig-personInPosition.xml @@ -4,159 +4,184 @@ - + 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#> PREFIX obo: <http://purl.obolibrary.org/obo/> - - SELECT DISTINCT ?subclass - ?position - ?positionTitle - ?hrJobTitle - ?rank - ?org ?orgName - ?middleOrg ?middleOrgName - ?outerOrg ?outerOrgName - ?dateTimeStart ?dateTimeEnd - WHERE { + + SELECT DISTINCT ?subclass + ?position + ?positionTitle + ?hrJobTitle + ?rank + ?org ?orgName + ?middleOrg ?middleOrgName + ?outerOrg ?outerOrgName + ?dateTimeStart ?dateTimeEnd + WHERE + { ?subject ?property ?position . - OPTIONAL { ?position core:relates ?org . - ?org rdfs:label ?orgName - } - OPTIONAL { ?position core:relates ?org . - ?org rdfs:label ?orgName . - ?org obo:BFO_0000050 ?middleOrg . - ?middleOrg rdfs:label ?middleOrgName - } - OPTIONAL { ?position core:relates ?org . - ?org rdfs:label ?orgName . - ?org obo:BFO_0000050 ?middleOrg . - ?middleOrg obo:BFO_0000050 ?outerOrg . - ?outerOrg rdfs:label ?outerOrgName - } - OPTIONAL { ?position rdfs:label ?positionTitle } - OPTIONAL { ?position core:hrJobTitle ?hrJobTitle } - OPTIONAL { ?position core:rank ?rank } - OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - - OPTIONAL { ?position vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:Position - } - - - FILTER ( bound(?org) ) - - } ORDER BY ?subclass DESC(?dateTimeEnd) ?rank - - - - 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 { - ?subject ?property ?position . - ?position vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:Position - } WHERE { - ?subject ?property ?position . - ?position a core:Position . - ?position vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:Position - } - - - - 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 obo: <http://purl.obolibrary.org/obo/> - CONSTRUCT { - ?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 { + OPTIONAL { - ?subject ?property ?position . - ?position a core:Position . - } 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 . - ?position core:relates ?org . - ?org a foaf:Organization . - ?org rdfs:label ?orgName - } UNION { - ?subject ?property ?position . - ?position a core:Position . ?position core:relates ?org . - ?org a foaf:Organization . + ?org rdfs:label ?orgName . + } + OPTIONAL + { + ?position core:relates ?org . + ?org rdfs:label ?orgName . ?org obo:BFO_0000050 ?middleOrg . - ?middleOrg rdfs:label ?middleOrgName - } UNION { - ?subject ?property ?position . - ?position a core:Position . + ?middleOrg rdfs:label ?middleOrgName . + } + OPTIONAL + { ?position core:relates ?org . - ?org a foaf:Organization . + ?org rdfs:label ?orgName . ?org obo:BFO_0000050 ?middleOrg . ?middleOrg obo:BFO_0000050 ?outerOrg . - ?outerOrg rdfs:label ?outerOrgName + ?outerOrg rdfs:label ?outerOrgName . } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?position . - ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart . - } WHERE { - ?subject ?property ?position . - ?position a core:Position . - ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart . - } - + OPTIONAL + { + ?position rdfs:label ?positionTitle . + } + OPTIONAL + { + ?position core:hrJobTitle ?hrJobTitle . + } + OPTIONAL + { + ?position core:rank ?rank . + } + OPTIONAL + { + ?position core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + OPTIONAL + { + ?position core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + } + + + OPTIONAL + { + ?position vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:Position . + } + + + FILTER ( bound(?org) ) + + } ORDER BY ?subclass DESC(?dateTimeEnd) ?rank + - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?position . + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX foaf: <http://xmlns.com/foaf/0.1/> + PREFIX obo: <http://purl.obolibrary.org/obo/> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> + + CONSTRUCT + { + ?subject ?property ?position . + ?position rdfs:label ?positionTitle . + ?position vitro:mostSpecificType ?subclass . + ?position core:hrJobTitle ?hrJobTitle . + ?subclass rdfs:subClassOf core:Position . ?position core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?position . - ?position a core:Position . - ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + ?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 . + } + 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 . + ?position core:hrJobTitle ?hrJobTitle . + } + UNION + { + ?subject ?property ?position . + ?position a core:Position . + ?position vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:Position . + } + UNION + { + ?subject ?property ?position . + ?position a core:Position . + ?position core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + UNION + { + ?subject ?property ?position . + ?position a core:Position . + ?position core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + } + UNION + { + ?subject ?property ?position . + ?position a core:Position . + ?position core:relates ?org . + ?org a foaf:Organization . + ?org rdfs:label ?orgName . + } + UNION + { + ?subject ?property ?position . + ?position a core:Position . + ?position core:relates ?org . + ?org a foaf:Organization . + ?org obo:BFO_0000050 ?middleOrg . + ?middleOrg rdfs:label ?middleOrgName . + } + UNION + { + ?subject ?property ?position . + ?position a core:Position . + ?position core:relates ?org . + ?org a foaf:Organization . + ?org obo:BFO_0000050 ?middleOrg . + ?middleOrg obo:BFO_0000050 ?outerOrg . + ?outerOrg rdfs:label ?outerOrgName . + } + } - + diff --git a/productMods/config/listViewConfig-publicationVenueFor.xml b/productMods/config/listViewConfig-publicationVenueFor.xml index 6e1e87fa..dcacf0c7 100644 --- a/productMods/config/listViewConfig-publicationVenueFor.xml +++ b/productMods/config/listViewConfig-publicationVenueFor.xml @@ -4,123 +4,126 @@ - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX bibo: <http://purl.org/ontology/bibo/> + PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> - - SELECT DISTINCT ?subclass - ?infoResource ?infoResourceName - ?dateTime - ?volume - ?startPage - ?endPage - ?locale - WHERE { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource rdfs:label ?infoResourceName . - - OPTIONAL { ?infoResource bibo:volume ?volume } - OPTIONAL { ?infoResource bibo:pageStart ?startPage } - OPTIONAL { ?infoResource bibo:pageEnd ?endPage } - OPTIONAL { ?infoResource core:placeOfPublication ?locale } - OPTIONAL { ?infoResource vitro:mostSpecificType ?subclass } - OPTIONAL { ?infoResource core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime - } - + SELECT DISTINCT ?subclass + ?infoResource ?infoResourceName + ?dateTime + ?volume + ?startPage + ?endPage + ?locale + WHERE + { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource rdfs:label ?infoResourceName . + + OPTIONAL { ?infoResource bibo:volume ?volume } + OPTIONAL { ?infoResource bibo:pageStart ?startPage } + OPTIONAL { ?infoResource bibo:pageEnd ?endPage } + OPTIONAL { ?infoResource core:placeOfPublication ?locale } + OPTIONAL { ?infoResource vitro:mostSpecificType ?subclass } + OPTIONAL + { + ?infoResource core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime + } + + FILTER ( bound(?infoResource) ) - - } ORDER BY ?subclass DESC(?dateTime) ?infoResourceName + + } ORDER BY ?subclass DESC(?dateTime) ?infoResourceName PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX bibo: <http://purl.org/ontology/bibo/> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - CONSTRUCT { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource vitro:mostSpecificType ?subclass - } WHERE { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource vitro:mostSpecificType ?subclass - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX bibo: <http://purl.org/ontology/bibo/> - CONSTRUCT { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource rdfs:label ?infoResourceName . - } WHERE { - { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> - } UNION { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource rdfs:label ?infoResourceName - } } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX bibo: <http://purl.org/ontology/bibo/> PREFIX foaf: <http://xmlns.com/foaf/0.1/> - CONSTRUCT { + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> + + CONSTRUCT + { ?subject ?property ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?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 vitro:mostSpecificType ?subclass . + ?infoResource rdfs:label ?infoResourceName . + ?infoResource bibo:volume ?volume . + ?infoResource bibo:pageStart ?startPage . + ?infoResource bibo:pageEnd ?endPage . + ?infoResource core:placeOfPublication ?locale . + ?infoResource core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + ?infoResource core:relatedBy ?editorship . ?editorship a core:Editorship . ?editorship core:relates ?editorObj . ?editorObj a foaf:Person . - ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . ?editorObj rdfs:label ?editor . - } WHERE { + } + WHERE + { + { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource vitro:mostSpecificType ?subclass . + } + UNION + { + ?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 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> . + ?infoResource rdfs:label ?infoResourceName . + ?infoResource core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + } + UNION + { + ?subject ?property ?infoResource . + ?infoResource a bibo:Book . + ?infoResource core:relatedBy ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?editorObj . + ?editorObj a foaf:Person . + ?editorObj rdfs:label ?editor + } + UNION { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - } UNION { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?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 bibo:Book . - ?infoResource core:relatedBy ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?editorObj . - ?editorObj a foaf:Person . - ?editorObj rdfs:label ?editor - } UNION { ?subject ?property ?infoResource . ?infoResource a bibo:BookSection . ?infoResource core:relatedBy ?editorship . @@ -129,27 +132,8 @@ ?editorObj a foaf:Person . ?editorObj rdfs:label ?editor } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX bibo: <http://purl.org/ontology/bibo/> - CONSTRUCT { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource rdfs:label ?infoResourceName . - ?infoResource core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime - } WHERE { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource rdfs:label ?infoResourceName . - ?infoResource core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime } - + diff --git a/productMods/config/listViewConfig-publisherOf.xml b/productMods/config/listViewConfig-publisherOf.xml index 6bc96b51..4e3a3c10 100644 --- a/productMods/config/listViewConfig-publisherOf.xml +++ b/productMods/config/listViewConfig-publisherOf.xml @@ -4,190 +4,195 @@ - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX bibo: <http://purl.org/ontology/bibo/> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - PREFIX foaf: <http://xmlns.com/foaf/0.1/> - - SELECT DISTINCT ?subclass - ?infoResource ?infoResourceName - ?dateTime - ?journal - ?volume - ?startPage - ?endPage - ?locale - ?appearsIn - ?partOf - WHERE { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource rdfs:label ?infoResourceName . - - OPTIONAL { ?infoResource bibo:volume ?volume } - OPTIONAL { ?infoResource bibo:pageStart ?startPage } - OPTIONAL { ?infoResource bibo:pageEnd ?endPage } - OPTIONAL { ?infoResource core:placeOfPublication ?locale } - OPTIONAL { ?infoResource bibo:reproducedIn ?appearsInObj . - ?appearsInObj rdfs:label ?appearsIn - } - OPTIONAL { ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . - ?partOfObj rdfs:label ?partOf - } - OPTIONAL { ?infoResource core:hasPublicationVenue ?publishedIn . - ?publishedIn rdfs:label ?journal - } - OPTIONAL { ?infoResource vitro:mostSpecificType ?subclass } - OPTIONAL { ?infoResource core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime - } - - - FILTER ( bound(?infoResource) ) - - } ORDER BY ?subclass DESC(?dateTime) ?infoResourceName - - - + + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX bibo: <http://purl.org/ontology/bibo/> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - CONSTRUCT { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource vitro:mostSpecificType ?subclass - } WHERE { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource vitro:mostSpecificType ?subclass - } - + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> + PREFIX foaf: <http://xmlns.com/foaf/0.1/> - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX bibo: <http://purl.org/ontology/bibo/> - CONSTRUCT { + SELECT DISTINCT ?subclass + ?infoResource ?infoResourceName + ?dateTime + ?journal + ?volume + ?startPage + ?endPage + ?locale + ?appearsIn + ?partOf + WHERE + { ?subject ?property ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource rdfs:label ?infoResourceName . - ?infoResource core:hasPublicationVenue ?publishedIn . - ?publishedIn rdfs:label ?journal - } WHERE { + + OPTIONAL { ?infoResource vitro:mostSpecificType ?subclass } + OPTIONAL { ?infoResource bibo:volume ?volume } + OPTIONAL { ?infoResource bibo:pageStart ?startPage } + OPTIONAL { ?infoResource bibo:pageEnd ?endPage } + OPTIONAL { ?infoResource core:placeOfPublication ?locale } + OPTIONAL { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> - } UNION { - ?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 core:hasPublicationVenue ?publishedIn - } UNION { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource core:hasPublicationVenue ?publishedIn . - ?publishedIn rdfs:label ?journal + ?infoResource bibo:reproducedIn ?appearsInObj . + ?appearsInObj rdfs:label ?appearsIn . } - } - + OPTIONAL + { + ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . + ?partOfObj rdfs:label ?partOf . + } + OPTIONAL + { + ?infoResource core:hasPublicationVenue ?publishedIn . + ?publishedIn rdfs:label ?journal . + } + OPTIONAL + { + ?infoResource core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + } + + + FILTER ( bound(?infoResource) ) + + } ORDER BY ?subclass DESC(?dateTime) ?infoResourceName + - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX bibo: <http://purl.org/ontology/bibo/> - PREFIX foaf: <http://xmlns.com/foaf/0.1/> - CONSTRUCT { + PREFIX core: <http://vivoweb.org/ontology/core#> + PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + PREFIX bibo: <http://purl.org/ontology/bibo/> + PREFIX foaf: <http://xmlns.com/foaf/0.1/> + PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> + + CONSTRUCT + { ?subject ?property ?infoResource . ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource rdfs:label ?infoResourceName . - ?infoResource bibo:volume ?volume . - ?infoResource bibo:pageStart ?startPage . - ?infoResource bibo:pageEnd ?endPage . - ?infoResource core:placeOfPublication ?locale . + ?infoResource vitro:mostSpecificType ?subclass . + ?infoResource rdfs:label ?infoResourceName . + ?infoResource bibo:volume ?volume . + ?infoResource bibo:pageStart ?startPage . + ?infoResource bibo:pageEnd ?endPage . + ?infoResource core:placeOfPublication ?locale . + ?infoResource core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + + ?infoResource core:hasPublicationVenue ?publishedIn . + ?publishedIn rdfs:label ?journal . + ?infoResource bibo:reproducedIn ?appearsInObj . - ?infoResource core:publisher ?publisherObj . + ?appearsInObj rdfs:label ?appearsIn . + + ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . + ?partOfObj rdfs:label ?partOf . + ?infoResource core:relatedBy ?editorship . ?editorship a core:Editorship . ?editorship core:relates ?editorObj . ?editorObj a foaf:Person . - ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . - ?appearsInObj rdfs:label ?appearsIn . ?editorObj rdfs:label ?editor . - ?partOfObj rdfs:label ?partOf - } WHERE { + } + WHERE + { + { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + } + UNION + { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource vitro:mostSpecificType ?subclass . + } + UNION + { + ?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 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> . + ?infoResource rdfs:label ?infoResourceName . + ?infoResource core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + } + UNION + { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource core:hasPublicationVenue ?publishedIn . + } + UNION + { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource core:hasPublicationVenue ?publishedIn . + ?publishedIn rdfs:label ?journal . + } + UNION + { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:reproducedIn ?appearsInObj . + ?appearsInObj rdfs:label ?appearsIn . + } + UNION + { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . + ?partOfObj rdfs:label ?partOf . + } + UNION + { + ?subject ?property ?infoResource . + ?infoResource a bibo:Book . + ?infoResource core:relatedBy ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?editorObj . + ?editorObj a foaf:Person . + ?editorObj rdfs:label ?editor . + } + UNION { - ?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 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> . - ?infoResource bibo:reproducedIn ?appearsInObj . - ?appearsInObj rdfs:label ?appearsIn - } UNION { - ?subject ?property ?infoResource . - ?infoResource a bibo:Book . - ?infoResource core:relatedBy ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?editorObj . - ?editorObj a foaf:Person . - ?editorObj rdfs:label ?editor - } UNION { ?subject ?property ?infoResource . ?infoResource a bibo:BookSection . ?infoResource core:relatedBy ?editorship . ?editorship a core:Editorship . ?editorship core:relates ?editorObj . ?editorObj a foaf:Person . - ?editorObj rdfs:label ?editor - } UNION { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource <http://purl.obolibrary.org/obo/BFO_0000050> ?partOfObj . - ?partOfObj rdfs:label ?partOf - } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX bibo: <http://purl.org/ontology/bibo/> - CONSTRUCT { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource rdfs:label ?infoResourceName . - ?infoResource core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime - } WHERE { - ?subject ?property ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource rdfs:label ?infoResourceName . - ?infoResource core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime + ?editorObj rdfs:label ?editor . + } } - + diff --git a/productMods/config/listViewConfig-rangeUnion.xml b/productMods/config/listViewConfig-rangeUnion.xml index 740d832f..92dbccdb 100644 --- a/productMods/config/listViewConfig-rangeUnion.xml +++ b/productMods/config/listViewConfig-rangeUnion.xml @@ -6,99 +6,102 @@ See guidelines at https://wiki.duraspace.org/x/eYXVAw --> - + PREFIX afn: <http://jena.hpl.hp.com/ARQ/function#> PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX foaf: <http://xmlns.com/foaf/0.1/> - 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#> PREFIX obo: <http://purl.obolibrary.org/obo/> PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - - SELECT ?subclass - ?object - ?label - ?localName - ?type - ?title WHERE { - - ?subject ?property ?object . - LET (?localName := afn:localname(?object)) - - OPTIONAL { ?object rdfs:label ?label } - OPTIONAL { + SELECT ?subclass + ?object + ?label + ?localName + ?type + ?title + WHERE + { + ?subject ?property ?object . + LET (?localName := afn:localname(?object)) + + OPTIONAL { ?object rdfs:label ?label } + + OPTIONAL + { # Get mostSpecificType only for Persons ?object vitro:mostSpecificType ?subclass . ?subclass rdfs:label ?type . + # Display only a mostSpecificType that belongs to a classgroup. - ?subclass vitro:inClassGroup ?classGroup . - ?classGroup a vitro:ClassGroup + #?subclass vitro:inClassGroup ?classGroup . + #?classGroup a vitro:ClassGroup } - - OPTIONAL { ?object obo:ARG_2000028 ?vcard . - ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title - } - - - FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) - - + + OPTIONAL + { + ?object obo:ARG_2000028 ?vcard . + ?vcard vcard:hasTitle ?titleObj . + ?titleObj vcard:title ?title + } + + + FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) + + # Order by ?type is important, because if the object has more than one mostSpecificType, # they all get returned, but postprocessing culls out all but one. Ordering by ?type # will ensure that at least we'll get the same one every time. - } ORDER BY ?subclass ASC( ?label ) ASC( ?localName ) ?type + } ORDER BY ?subclass ASC( ?label ) ASC( ?localName ) ?type - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - - CONSTRUCT { - ?subject ?property ?object . - ?object rdfs:label ?label . - } WHERE { - { - ?subject ?property ?object . - } UNION { - ?subject ?property ?object . - ?object rdfs:label ?label . - } - } - - 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#> PREFIX obo: <http://purl.obolibrary.org/obo/> PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - CONSTRUCT { + CONSTRUCT + { ?subject ?property ?object . + ?object rdfs:label ?label . ?object vitro:mostSpecificType ?subclass . ?subclass vitro:inClassGroup ?classGroup . ?classGroup a vitro:ClassGroup . ?subclass rdfs:label ?type . - ?object obo:ARG_2000028 ?vcard . + ?object obo:ARG_2000028 ?vcard . ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title - } WHERE { - { + ?titleObj vcard:title ?title . + } + WHERE + { + { ?subject ?property ?object . - } UNION { + } + UNION + { + ?subject ?property ?object . + ?object rdfs:label ?label . + } + UNION + { ?subject ?property ?object . ?object vitro:mostSpecificType ?subclass . ?subclass rdfs:label ?type . + + # Display only a mostSpecificType that belongs to a classgroup. ?subclass vitro:inClassGroup ?classGroup . - ?classGroup a vitro:ClassGroup - } UNION { + ?classGroup a vitro:ClassGroup . + } + UNION + { ?subject ?property ?object . - ?object obo:ARG_2000028 ?vcard . + ?object obo:ARG_2000028 ?vcard . ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title - } + ?titleObj vcard:title ?title . + } } diff --git a/productMods/config/listViewConfig-researchActivities.xml b/productMods/config/listViewConfig-researchActivities.xml index 22c90b8f..d955b3d7 100644 --- a/productMods/config/listViewConfig-researchActivities.xml +++ b/productMods/config/listViewConfig-researchActivities.xml @@ -4,164 +4,157 @@ - + 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#> - + SELECT DISTINCT ?subclass - # send the property to the template, since this view supports multiple role properties - ?property - ?role - ?roleLabel - ?activity ?activityName - ?activityLabel - ?dateTimeStart ?dateTimeEnd - ?hideThis - ?objectType - WHERE { + # send the property to the template, since this view supports multiple role properties + ?property + ?role + ?roleLabel + ?activity ?activityName + ?activityLabel + ?dateTimeStart ?dateTimeEnd + ?hideThis + ?objectType + WHERE + { ?subject ?property ?role . ?role a core:ResearcherRole . - ?role vitro:mostSpecificType ?roleSubclass - - OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity rdfs:label ?activityLabel - - - ?activity vitro:mostSpecificType ?subclass - - } - OPTIONAL { ?role core:relatedBy ?activity . - ?activity rdfs:label ?activityLabel - - - ?activity vitro:mostSpecificType ?subclass - - } + ?role vitro:mostSpecificType ?roleSubclass . + + OPTIONAL + { + ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . + ?activity rdfs:label ?activityLabel . + + + ?activity vitro:mostSpecificType ?subclass . + + } + OPTIONAL + { + ?role core:relatedBy ?activity . + ?activity rdfs:label ?activityLabel . + + + ?activity vitro:mostSpecificType ?subclass . + + } OPTIONAL { ?role rdfs:label ?roleLabel } OPTIONAL { ?role core:hideFromDisplay ?hideThis } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart + OPTIONAL + { + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd + OPTIONAL + { + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . } FILTER ( ?roleSubclass = core:ResearcherRole) } ORDER BY ?subclass DESC(?dateTimeEnd) DESC(?dateTimeStart) ?activityLabel ?activityName - - - 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 ?role . - ?role a core:ResearcherRole . - ?role core:relatedBy ?activity . - ?activity vitro:mostSpecificType ?subclass . - ?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 . - }} - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> + 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 { + CONSTRUCT + { ?subject ?property ?role . + ?role a core:ResearcherRole . + ?role vitro:mostSpecificType ?roleSubclass . + ?role rdfs:label ?roleLabel . + ?role core:hideFromDisplay ?hideThis . + + ?role core:dateTimeInterval ?dateTimeInterval . + + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . ?activity vitro:mostSpecificType ?subclass . - ?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 vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:ResearcherRole . - ?role rdfs:label ?roleLabel . - ?role core:hideFromDisplay ?hideThis . - ?role vitro:mostSpecificType ?roleSubclass - } WHERE { + ?activity rdfs:label ?activityName . + } + WHERE + { { ?subject ?property ?role . ?role a core:ResearcherRole . - } UNION { + } + UNION + { ?subject ?property ?role . ?role a core:ResearcherRole . - ?role rdfs:label ?roleLabel . - } UNION { + ?role vitro:mostSpecificType ?roleSubclass . + } + UNION + { ?subject ?property ?role . ?role a core:ResearcherRole . ?role core:hideFromDisplay ?hideThis . - } UNION { - ?subject ?property ?role . - ?role a core:ResearcherRole . - ?role vitro:mostSpecificType ?roleSubclass . } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:ResearcherRole . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?role . - ?role a core:ResearcherRole . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:ResearcherRole . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?role . - ?role a core:ResearcherRole . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } + UNION + { + ?subject ?property ?role . + ?role a core:ResearcherRole . + ?role rdfs:label ?roleLabel . + } + UNION + { + ?subject ?property ?role . + ?role a core:ResearcherRole . + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + UNION + { + ?subject ?property ?role . + ?role a core:ResearcherRole . + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd + } + UNION + { + ?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 . + } + UNION + { + ?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 . + } + }