diff --git a/webapp/src/main/webapp/config/listViewConfig-additionalEmail.xml b/webapp/src/main/webapp/config/listViewConfig-additionalEmail.xml index d808a87d..dbb8f48d 100644 --- a/webapp/src/main/webapp/config/listViewConfig-additionalEmail.xml +++ b/webapp/src/main/webapp/config/listViewConfig-additionalEmail.xml @@ -13,24 +13,15 @@ WHERE { ?subject ?property ?vcard . ?vcard vcard:hasEmail ?email . - ?email vcard:email ?emailAddress - MINUS {?email a vcard:Work} + ?email vcard:email ?emailAddress . + MINUS { + ?subject ?property ?vcard . + ?vcard vcard:hasEmail ?email . + ?email a vcard:Work . + } } - - - PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - CONSTRUCT { - ?subject ?property ?vcard . - ?vcard vcard:hasEmail ?email . - ?email ?emailProperty ?emailValue - } WHERE { - ?subject ?property ?vcard . - ?vcard vcard:hasEmail ?email . - ?email ?emailProperty ?emailValue - } - - + edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.MaintainDuplicatesObjectPropertyDataPostProcessor diff --git a/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml b/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml index 374a7576..c4658aaf 100644 --- a/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml +++ b/webapp/src/main/webapp/config/listViewConfig-adviseeIn.xml @@ -28,163 +28,74 @@ WHERE { ?subject ?property ?adviseeRole . + ?adviseeRole a core:AdviseeRole . ?adviseeRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . LET ( ?localName := afn:localname(?advisingRel) ) - OPTIONAL { ?advisingRel rdfs:label ?advisingRelLabel } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + ?adviseeRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + ?advisingRel rdfs:label ?advisingRelLabel . + } + OPTIONAL { + ?subject ?property ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + ?adviseeRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . ?advisingRel core:relates ?advisorRole . ?advisorRole <http://purl.obolibrary.org/obo/RO_0000052> ?advisor . ?advisor a foaf:Person . - ?advisor rdfs:label ?advisorLabel + ?advisor rdfs:label ?advisorLabel . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + ?adviseeRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . ?advisingRel core:degreeCandidacy ?degree . ?degree rdfs:label ?degreeLabel . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + ?adviseeRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . ?advisingRel core:degreeCandidacy ?degree . ?degree core:abbreviation ?degreeAbbr . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?adviseeRole . + ?adviseeRole a core:AdviseeRole . + ?adviseeRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . ?advisingRel vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:AdvisingRelationship + ?subclass rdfs:subClassOf core:AdvisingRelationship . } - OPTIONAL - { + OPTIONAL { + ?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 + ?dateTimeStartValue core:dateTime ?dateTimeStart . } - OPTIONAL - { + OPTIONAL { + ?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 + ?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 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 <http://purl.obolibrary.org/obo/RO_0000053> ?advisorRole . - ?advisorRole a core:AdvisorRole . - ?advisor rdfs:label ?advisorLabel - } - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml b/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml index ea742f5a..d5963924 100644 --- a/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml +++ b/webapp/src/main/webapp/config/listViewConfig-advisorIn.xml @@ -28,161 +28,75 @@ WHERE { ?subject ?property ?advisorRole . + ?advisorRole a core:AdvisorRole . ?advisorRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . 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 { + ?subject ?property ?advisorRole . + ?advisorRole a core:AdvisorRole . + ?advisorRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . + ?advisingRel rdfs:label ?advisingRelLabel . } OPTIONAL { + ?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 rdfs:label ?adviseeLabel . + } + OPTIONAL { + ?subject ?property ?advisorRole . + ?advisorRole a core:AdvisorRole . + ?advisorRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . ?advisingRel core:degreeCandidacy ?degree . ?degree rdfs:label ?degreeLabel . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?advisorRole . + ?advisorRole a core:AdvisorRole . + ?advisorRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . ?advisingRel core:degreeCandidacy ?degree . - ?degree core:abbreviation ?degreeAbbr + ?degree core:abbreviation ?degreeAbbr . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?advisorRole . + ?advisorRole a core:AdvisorRole . + ?advisorRole core:relatedBy ?advisingRel . + ?advisingRel a core:AdvisingRelationship . ?advisingRel vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:AdvisingRelationship + ?subclass rdfs:subClassOf core:AdvisingRelationship . } - OPTIONAL - { + OPTIONAL { + ?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 + ?dateTimeStartValue core:dateTime ?dateTimeStart . } - OPTIONAL - { + OPTIONAL { + ?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 + ?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#> - 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 . - } - UNION - { - ?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 . - } - 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 - } - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-authorInAuthorship.xml b/webapp/src/main/webapp/config/listViewConfig-authorInAuthorship.xml index 5db8e495..b02165da 100644 --- a/webapp/src/main/webapp/config/listViewConfig-authorInAuthorship.xml +++ b/webapp/src/main/webapp/config/listViewConfig-authorInAuthorship.xml @@ -32,279 +32,138 @@ 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 bibo:doi ?doi } - OPTIONAL { ?infoResource bibo:pmid ?pmid } - OPTIONAL { ?infoResource bibo:isbn10 ?isbn10 } - OPTIONAL { ?infoResource bibo:isbn13 ?isbn13 } - OPTIONAL { ?infoResource bibo:oclc ?oclc } - OPTIONAL { ?infoResource core:placeOfPublication ?locale } - OPTIONAL - { + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> ; + rdfs:label ?infoResourceName . + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource vitro:mostSpecificType ?subclass . + } + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:volume ?volume . + } + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageStart ?startPage . + } + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageEnd ?endPage . + } + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:doi ?doi . + } + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pmid ?pmid . + } + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:isbn10 ?isbn10 . + } + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:isbn13 ?isbn13 . + } + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:oclc ?oclc . + } + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource core:placeOfPublication ?locale . + } + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource bibo:reproducedIn ?appearsInObj . ?appearsInObj rdfs:label ?appearsIn . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource core:publisher ?publisherObj . ?publisherObj rdfs:label ?publisher . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + 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 . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource core:hasPublicationVenue ?publishedIn . ?publishedIn rdfs:label ?journal . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource core:dateTimeValue ?dateTimeValue . ?dateTimeValue core:dateTime ?dateTime . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship ; + 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 . } - OPTIONAL { ?authorship core:hideFromDisplay ?hideThis } + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:hideFromDisplay ?hideThis . + } } 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/> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - CONSTRUCT - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:hideFromDisplay ?hideThis . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource vitro:mostSpecificType ?subclass . - ?infoResource rdfs:label ?infoResourceName . - ?infoResource bibo:volume ?volume . - ?infoResource bibo:pageStart ?startPage . - ?infoResource bibo:pageEnd ?endPage . - ?infoResource bibo:doi ?doi . - ?infoResource bibo:pmid ?pmid . - ?infoResource bibo:isbn10 ?isbn10 . - ?infoResource bibo:isbn13 ?isbn13 . - ?infoResource bibo:oclc ?oclc . - ?infoResource core:placeOfPublication ?locale . - ?infoResource bibo:reproducedIn ?appearsInObj . - ?appearsInObj rdfs:label ?appearsIn . - - ?infoResource core:publisher ?publisherObj . - ?publisherObj rdfs:label ?publisher . - - ?infoResource core:hasPublicationVenue ?publishedIn . - ?publishedIn rdfs:label ?journal . - - ?infoResource core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime . - - ?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 . - ?editorObj rdfs:label ?editor . - } - WHERE - { - { - ?subject ?property ?authorship . - ?authorship a core:Authorship - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:hideFromDisplay ?hideThis . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource vitro:mostSpecificType ?subclass . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource rdfs:label ?infoResourceName - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource bibo:volume ?volume . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource bibo:pageStart ?startPage . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource bibo:pageEnd ?endPage . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource bibo:doi ?doi . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource bibo:pmid ?pmid . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource bibo:isbn10 ?isbn10 . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource bibo:isbn13 ?isbn13 . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource bibo:oclc ?oclc . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource core:placeOfPublication ?locale . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource bibo:reproducedIn ?appearsInObj . - ?appearsInObj rdfs:label ?appearsIn . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource core:publisher ?publisherObj . - ?publisherObj rdfs:label ?publisher . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship core:relates ?infoResource . - ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . - ?infoResource core:hasPublicationVenue ?publishedIn . - ?publishedIn rdfs:label ?journal . - } - UNION - { - ?subject ?property ?authorship . - ?authorship a core:Authorship . - ?authorship 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 ?authorship . - ?authorship a core:Authorship . - ?authorship 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 ?authorship . - ?authorship a core:Authorship . - ?authorship 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/webapp/src/main/webapp/config/listViewConfig-awardOrHonor.xml b/webapp/src/main/webapp/config/listViewConfig-awardOrHonor.xml index c5337daa..584992c3 100644 --- a/webapp/src/main/webapp/config/listViewConfig-awardOrHonor.xml +++ b/webapp/src/main/webapp/config/listViewConfig-awardOrHonor.xml @@ -26,119 +26,47 @@ { ?subject ?property ?awardReceipt . ?awardReceipt a core:AwardReceipt . - OPTIONAL { ?awardReceipt rdfs:label ?receiptLabel } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt rdfs:label ?receiptLabel . + } + OPTIONAL { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . ?awardReceipt core:relates ?award . ?award a core:Award . ?award core:relatedBy ?awardReceipt . ?award rdfs:label ?awardLabel . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . ?awardReceipt core:assignedBy ?assignedBy . ?assignedBy rdfs:label ?assignedByLabel . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . ?awardReceipt core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeStartValue core:dateTime ?dateTimeStart . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . ?awardReceipt core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeEndValue core:dateTime ?dateTimeEnd . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . ?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 . - } - 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 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 . - } - } - diff --git a/webapp/src/main/webapp/config/listViewConfig-awardOrHonorGiven.xml b/webapp/src/main/webapp/config/listViewConfig-awardOrHonorGiven.xml index 7d97fac5..8c5b9388 100644 --- a/webapp/src/main/webapp/config/listViewConfig-awardOrHonorGiven.xml +++ b/webapp/src/main/webapp/config/listViewConfig-awardOrHonorGiven.xml @@ -26,126 +26,48 @@ { ?subject ?property ?awardReceipt . ?awardReceipt a core:AwardReceipt . - OPTIONAL { ?awardReceipt rdfs:label ?receiptLabel } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . + ?awardReceipt rdfs:label ?receiptLabel . + } + OPTIONAL { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . ?awardReceipt core:relates ?award . ?award a core:Award . ?award core:relatedBy ?awardReceipt . ?award rdfs:label ?awardLabel . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . ?awardReceipt core:relates ?givenTo . ?givenTo a foaf:Person . ?givenTo rdfs:label ?givenToLabel . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . ?awardReceipt core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeStartValue core:dateTime ?dateTimeStart . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . ?awardReceipt core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeEndValue core:dateTime ?dateTimeEnd . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?awardReceipt . + ?awardReceipt a core:AwardReceipt . ?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 - { - ?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 . - } - } - diff --git a/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml b/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml index c8a99511..65fecfbe 100644 --- a/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml +++ b/webapp/src/main/webapp/config/listViewConfig-dateTimeInterval.xml @@ -19,32 +19,45 @@ WHERE { - ?subject ?property ?dateTimeInterval + ?subject ?property ?dateTimeInterval . - OPTIONAL - { - ?dateTimeInterval core:start ?valueStart + OPTIONAL { + ?subject ?property ?dateTimeInterval . + ?dateTimeInterval core:start ?valueStart . LET (?valueStartName := afn:localname(?valueStart)) - OPTIONAL { ?valueStart core:dateTime ?dateTimeStart } - OPTIONAL - { - ?valueStart core:dateTimePrecision ?dateTimePrecisionStart + OPTIONAL { + ?subject ?property ?dateTimeInterval . + ?dateTimeInterval core:start ?valueStart . + ?valueStart core:dateTime ?dateTimeStart . + } + OPTIONAL { + ?subject ?property ?dateTimeInterval . + ?dateTimeInterval core:start ?valueStart . + ?valueStart core:dateTimePrecision ?dateTimePrecisionStart . LET (?precisionStart := afn:localname(?dateTimePrecisionStart)) } } - OPTIONAL - { - ?dateTimeInterval core:end ?valueEnd + OPTIONAL { + ?subject ?property ?dateTimeInterval . + ?dateTimeInterval core:end ?valueEnd . LET (?valueEndName := afn:localname(?valueEnd)) - OPTIONAL { ?valueEnd core:dateTime ?dateTimeEnd } - OPTIONAL - { - ?valueEnd core:dateTimePrecision ?dateTimePrecisionEnd + OPTIONAL { + ?subject ?property ?dateTimeInterval . + ?dateTimeInterval core:end ?valueEnd . + ?valueEnd core:dateTime ?dateTimeEnd . + } + OPTIONAL { + ?subject ?property ?dateTimeInterval . + ?dateTimeInterval core:end ?valueEnd . + ?valueEnd core:dateTimePrecision ?dateTimePrecisionEnd . LET (?precisionEnd := afn:localname(?dateTimePrecisionEnd)) } } - OPTIONAL {?dateTimeInterval rdfs:label ?label} + OPTIONAL { + ?subject ?property ?dateTimeInterval . + ?dateTimeInterval rdfs:label ?label . + } FILTER ( bound(?dateTimeStart) || bound(?dateTimeEnd) ) @@ -52,43 +65,5 @@ } - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - - CONSTRUCT - { - ?subject ?property ?dateTimeInterval . - ?dateTimeInterval rdfs:label ?label . - ?dateTimeInterval core:start ?sStart . - ?dateTimeInterval core:end ?sEnd . - ?sStart ?p ?o . - ?sEnd ?p ?o . - } - WHERE - { - { - ?subject core:dateTimeInterval ?dateTimeInterval . - } - UNION - { - ?subject core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval rdfs:label ?label . - } - UNION - { - ?subject ?property ?dateTimeInterval . - ?dateTimeInterval core:start ?sStart . - ?sStart ?p ?o . - } - UNION - { - ?subject ?property ?dateTimeInterval . - ?dateTimeInterval core:end ?sEnd . - ?sEnd ?p ?o . - } - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml b/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml index 3ae4be3b..249836ee 100644 --- a/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml +++ b/webapp/src/main/webapp/config/listViewConfig-dateTimeValue.xml @@ -11,30 +11,22 @@ SELECT DISTINCT ?dateTimeValue (afn:localname(?dateTimePrecision) AS ?precision) - ?dateTime WHERE { - ?subject ?property ?dateTimeValue - OPTIONAL { ?dateTimeValue core:dateTime ?dateTime } - OPTIONAL { ?dateTimeValue core:dateTimePrecision ?dateTimePrecision } + ?dateTime + WHERE { + ?subject ?property ?dateTimeValue . + OPTIONAL { + ?subject ?property ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + } + OPTIONAL { + ?subject ?property ?dateTimeValue . + ?dateTimeValue core:dateTimePrecision ?dateTimePrecision . + } FILTER ( bound(?dateTime) ) } - - CONSTRUCT { - ?subject ?property ?dateTimeValue . - ?dateTimeValue ?p ?o . - } WHERE { - { - ?subject ?property ?dateTimeValue - } - UNION { - ?subject ?property ?dateTimeValue . - ?dateTimeValue ?p ?o . - } - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-default.xml b/webapp/src/main/webapp/config/listViewConfig-default.xml index ab99b449..ac2128c8 100644 --- a/webapp/src/main/webapp/config/listViewConfig-default.xml +++ b/webapp/src/main/webapp/config/listViewConfig-default.xml @@ -27,30 +27,30 @@ ?subject ?property ?object . LET (?localName := afn:localname(?object)) - OPTIONAL - { + OPTIONAL { + ?subject ?property ?object . ?object rdfs:label ?label . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?object . ?object vitro:mostSpecificType ?specificObjectType . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?object . + # Get mostSpecificType only for Persons ?object vitro:mostSpecificType ?subclass . ?subclass rdfs:label ?type . # Display only a mostSpecificType that belongs to a classgroup. - # CONSTRUCT will apply this filter - # ?subclass vitro:inClassGroup ?classGroup . - # ?classGroup a vitro:ClassGroup . + ?subclass vitro:inClassGroup ?classGroup . + ?classGroup a vitro:ClassGroup . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?object . ?object obo:ARG_2000028 ?vcard . ?vcard vcard:hasTitle ?titleObj . ?titleObj vcard:title ?title . @@ -66,57 +66,5 @@ } ORDER BY ?subclass ASC( ?label ) ASC( ?localName ) ?type - - 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 obo: <http://purl.obolibrary.org/obo/> - PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - - CONSTRUCT - { - ?subject ?property ?object . - ?object rdfs:label ?label . - ?object vitro:mostSpecificType ?subclass . - ?subclass rdfs:label ?type . - ?object obo:ARG_2000028 ?vcard . - ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title . - } - WHERE - { - { - ?subject ?property ?object . - } - UNION - { - ?subject ?property ?object . - ?object rdfs:label ?label . - } - UNION - { - ?subject ?property ?object . - ?object vitro:mostSpecificType ?subclass . - } - 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 - { - ?subject ?property ?object . - ?object obo:ARG_2000028 ?vcard . - ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title . - } - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-degreeEarned.xml b/webapp/src/main/webapp/config/listViewConfig-degreeEarned.xml index 4511964f..6dd9e478 100644 --- a/webapp/src/main/webapp/config/listViewConfig-degreeEarned.xml +++ b/webapp/src/main/webapp/config/listViewConfig-degreeEarned.xml @@ -15,38 +15,19 @@ ?degreeAbbr WHERE { ?subject ?property ?awardedDegree . + ?awardedDegree a core:AwardedDegree . ?awardedDegree core:relates ?degree . - ?degree rdfs:label ?degreeName + ?degree rdfs:label ?degreeName . - OPTIONAL { ?degree core:abbreviation ?degreeAbbr } + OPTIONAL { + ?subject ?property ?awardedDegree . + ?awardedDegree a core:AwardedDegree . + ?awardedDegree core:relates ?degree . + ?degree a core:AcademicDegree . + ?degree core:abbreviation ?degreeAbbr . + } } - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> - - CONSTRUCT { - ?subject ?property ?awardedDegree . - ?awardedDegree core:relates ?degree . - ?degree rdfs:label ?degreeName . - ?degree core:abbreviation ?degreeAbbr - } WHERE { - { - ?subject ?property ?awardedDegree . - ?awardedDegree a core:AwardedDegree . - ?awardedDegree core:relates ?degree . - ?degree a core:AcademicDegree . - ?degree rdfs:label ?degreeName - } UNION { - ?subject ?property ?awardedDegree . - ?awardedDegree a core:AwardedDegree . - ?awardedDegree core:relates ?degree . - ?degree a core:AcademicDegree . - ?degree core:abbreviation ?degreeAbbr - } - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-doi.xml b/webapp/src/main/webapp/config/listViewConfig-doi.xml index 7a749c02..5df4045c 100644 --- a/webapp/src/main/webapp/config/listViewConfig-doi.xml +++ b/webapp/src/main/webapp/config/listViewConfig-doi.xml @@ -10,21 +10,10 @@ SELECT ?value WHERE { - - ?subject ?property ?value - FILTER isLiteral(?value) - + ?subject ?property ?value . + FILTER isLiteral(?value) } ORDER BY ?value - - - CONSTRUCT { - ?subject ?property ?value - } WHERE { - ?subject ?property ?value - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-editorship.xml b/webapp/src/main/webapp/config/listViewConfig-editorship.xml index 6f0b110c..0d0bf485 100644 --- a/webapp/src/main/webapp/config/listViewConfig-editorship.xml +++ b/webapp/src/main/webapp/config/listViewConfig-editorship.xml @@ -26,37 +26,83 @@ WHERE { ?subject ?property ?editorship . + ?editorship a core: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 - { + OPTIONAL { + ?subject ?property ?editorship . + ?editorship a core:Editorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:volume ?volume . + } + OPTIONAL { + ?subject ?property ?editorship . + ?editorship a core:Editorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageStart ?startPage . + } + OPTIONAL { + ?subject ?property ?editorship . + ?editorship a core:Editorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageEnd ?endPage . + } + OPTIONAL { + ?subject ?property ?editorship . + ?editorship a core:Editorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource core:placeOfPublication ?locale . + } + OPTIONAL { + ?subject ?property ?editorship . + ?editorship a core:Editorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource vitro:mostSpecificType ?subclass . + } + OPTIONAL { + ?subject ?property ?editorship . + ?editorship a core:Editorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource bibo:reproducedIn ?appearsInObj . ?appearsInObj rdfs:label ?appearsIn . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?editorship . + ?editorship a core:Editorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource core:publisher ?publisherObj . ?publisherObj rdfs:label ?publisher . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?editorship . + ?editorship a core: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 . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?editorship . + ?editorship a core:Editorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource core:hasPublicationVenue ?publishedIn . ?publishedIn rdfs:label ?journal . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?editorship . + ?editorship a core:Editorship ; + core:relates ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource core:dateTimeValue ?dateTimeValue . ?dateTimeValue core:dateTime ?dateTime . } @@ -67,179 +113,5 @@ } 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/> - 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 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 . - - ?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/webapp/src/main/webapp/config/listViewConfig-educationalTraining.xml b/webapp/src/main/webapp/config/listViewConfig-educationalTraining.xml index ecb389d8..676c9aa5 100644 --- a/webapp/src/main/webapp/config/listViewConfig-educationalTraining.xml +++ b/webapp/src/main/webapp/config/listViewConfig-educationalTraining.xml @@ -19,39 +19,60 @@ WHERE { ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess - OPTIONAL { ?edTraining vitro:mostSpecificType ?subclass . } - OPTIONAL - { + ?edTraining a core:EducationalProcess . + OPTIONAL { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining vitro:mostSpecificType ?subclass . + } + OPTIONAL { + ?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 . } - OPTIONAL - { + OPTIONAL { + ?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 . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . ?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 - { + OPTIONAL { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining core:majorField ?majorField . + } + OPTIONAL { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining core:departmentOrSchool ?deptOrSchool . + } + OPTIONAL { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining core:supplementalInformation ?info . + } + OPTIONAL { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . ?edTraining core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeStartValue core:dateTime ?dateTimeStart . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . ?edTraining core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:end ?dateTimeEndValue . ?dateTimeEndValue core:dateTime ?dateTimeEnd . @@ -59,141 +80,5 @@ } ORDER BY ?subclass DESC(?dateTimeEnd) DESC(?dateTimeStart) - - 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 - { - ?subject ?property ?edTraining . - - ?edTraining a core:EducationalProcess . - ?edTraining vitro:mostSpecificType ?subclass . - ?edTraining core:majorField ?majorField . - ?edTraining core:departmentOrSchool ?deptOrSchool . - ?edTraining core:supplementalInformation ?info . - - ?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 . - } - 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 - { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining core:departmentOrSchool ?deptOrSchool . - } - UNION - { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining core:supplementalInformation ?info . - } - UNION - { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining core:dateTimeInterval ?dateTimeInterval . - } - 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 - { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?org . - ?org a foaf:Organization . - ?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 . - } - 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 . - } - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml b/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml index f494b183..2ac5658d 100644 --- a/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml +++ b/webapp/src/main/webapp/config/listViewConfig-fauxPropertyDefault.xml @@ -25,13 +25,19 @@ WHERE { ?subject ?property ?object . - ?object a ?objectType + ?object a ?objectType . LET (?localName := afn:localname(?object)) - OPTIONAL { ?object rdfs:label ?label } + OPTIONAL { + ?subject ?property ?object . + ?object a ?objectType . + ?object rdfs:label ?label . + } + + OPTIONAL { + ?subject ?property ?object . + ?object a ?objectType . - OPTIONAL - { # Get mostSpecificType only for Persons ?object a foaf:Person . ?object vitro:mostSpecificType ?typeUri . @@ -43,15 +49,20 @@ # ?classGroup a vitro:ClassGroup . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?object . + ?object a ?objectType . ?object obo:ARG_2000028 ?vcard . ?vcard vcard:hasTitle ?titleObj . ?titleObj vcard:title ?title . } - OPTIONAL { ?object a ?subclass } + OPTIONAL { + ?subject ?property ?object . + ?object a ?objectType . + ?object a ?subclass . + } FILTER ( afn:namespace(?subclass) != "http://vitro.mannlib.cornell.edu/ns/vitro/0.7#" ) @@ -61,55 +72,5 @@ } ORDER BY ?subclass ASC( ?label ) ASC( ?localName ) ?type - - 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 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 . - ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title - } WHERE { - { - ?subject ?property ?object . - } - 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 - { - ?subject ?property ?object . - ?object obo:ARG_2000028 ?vcard . - ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title . - } - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-faxNumber.xml b/webapp/src/main/webapp/config/listViewConfig-faxNumber.xml index 24d4a5f5..f6ec1fda 100644 --- a/webapp/src/main/webapp/config/listViewConfig-faxNumber.xml +++ b/webapp/src/main/webapp/config/listViewConfig-faxNumber.xml @@ -13,25 +13,10 @@ ?subject ?property ?vcard . ?vcard vcard:hasTelephone ?phone . ?phone a vcard:Fax . - ?phone vcard:telephone ?number + ?phone vcard:telephone ?number . } - - - PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - CONSTRUCT { - ?subject ?property ?vcard . - ?vcard vcard:hasTelephone ?phone . - ?phone a vcard:Fax . - ?phone ?phoneProperty ?phoneValue - } WHERE { - ?subject ?property ?vcard . - ?vcard vcard:hasTelephone ?phone . - ?phone a vcard:Fax . - ?phone ?phoneProperty ?phoneValue - } - - + edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.MaintainDuplicatesObjectPropertyDataPostProcessor diff --git a/webapp/src/main/webapp/config/listViewConfig-fullName.xml b/webapp/src/main/webapp/config/listViewConfig-fullName.xml index 68bd65c6..fac875a0 100644 --- a/webapp/src/main/webapp/config/listViewConfig-fullName.xml +++ b/webapp/src/main/webapp/config/listViewConfig-fullName.xml @@ -16,32 +16,35 @@ ?prefix WHERE { ?subject ?property ?vcard . - ?vcard vcard:hasName ?fullName - OPTIONAL { ?fullName vcard:givenName ?firstName } - OPTIONAL { ?fullName core:middleName ?middleName } - OPTIONAL { ?fullName vcard:familyName ?lastName } - OPTIONAL { ?fullName vcard:honorificSuffix ?suffix } - OPTIONAL { ?fullName vcard:honorificPrefix ?prefix } + ?vcard vcard:hasName ?fullName . + OPTIONAL { + ?subject ?property ?vcard . + ?vcard vcard:hasName ?fullName . + ?fullName vcard:givenName ?firstName . + } + OPTIONAL { + ?subject ?property ?vcard . + ?vcard vcard:hasName ?fullName . + ?fullName core:middleName ?middleName . + } + OPTIONAL { + ?subject ?property ?vcard . + ?vcard vcard:hasName ?fullName . + ?fullName vcard:familyName ?lastName . + } + OPTIONAL { + ?subject ?property ?vcard . + ?vcard vcard:hasName ?fullName . + ?fullName vcard:honorificSuffix ?suffix . + } + OPTIONAL { + ?subject ?property ?vcard . + ?vcard vcard:hasName ?fullName . + ?fullName vcard:honorificPrefix ?prefix . + } } - - - PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - CONSTRUCT { - ?subject ?property ?vcard . - ?vcard vcard:hasName ?fullName . - ?fullName ?fullNameProperty ?fullNameValue - } WHERE { - { - ?subject ?property ?vcard - } UNION { - ?subject ?property ?vcard . - ?vcard vcard:hasName ?fullName . - ?fullName ?fullNameProperty ?fullNameValue - } - } - - + edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.MaintainDuplicatesObjectPropertyDataPostProcessor diff --git a/webapp/src/main/webapp/config/listViewConfig-grantAdministeredBy.xml b/webapp/src/main/webapp/config/listViewConfig-grantAdministeredBy.xml index 3e71b954..d2254f73 100644 --- a/webapp/src/main/webapp/config/listViewConfig-grantAdministeredBy.xml +++ b/webapp/src/main/webapp/config/listViewConfig-grantAdministeredBy.xml @@ -15,43 +15,18 @@ ?organizationLabel WHERE { - ?subject ?property ?administratorRole . - ?administratorRole a core:AdministratorRole . - OPTIONAL { ?administratorRole obo:RO_0000052 ?organization . - ?organization a foaf:Organization . - ?organization obo:RO_0000053 ?administratorRole . - ?organization rdfs:label ?organizationLabel . - } - } ORDER BY ?organizationLabel - - - - 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 obo: <http://purl.obolibrary.org/obo/> - - CONSTRUCT { - ?subject ?property ?administratorRole . - ?administratorRole a core:AdministratorRole . - ?administratorRole obo:RO_0000052 ?organization . - ?organization a foaf:Organization . - ?organization obo:RO_0000053 ?administratorRole . - ?organization rdfs:label ?organizationLabel . - } WHERE { - { - ?subject ?property ?administratorRole . - ?administratorRole a core:AdministratorRole . - } UNION { - ?subject ?property ?administratorRole . - ?administratorRole a core:AdministratorRole . + ?subject ?property ?administratorRole . + ?administratorRole a core:AdministratorRole . + OPTIONAL { + ?subject ?property ?administratorRole . + ?administratorRole a core:AdministratorRole . ?administratorRole obo:RO_0000052 ?organization . ?organization a foaf:Organization . ?organization obo:RO_0000053 ?administratorRole . ?organization rdfs:label ?organizationLabel . } - } - - + } ORDER BY ?organizationLabel + + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml b/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml index 30966afb..5dc30ebe 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasAssociatedConcept.xml @@ -14,55 +14,21 @@ WHERE { ?subject ?property ?concept . LET (?conceptName := afn:localname(?concept)) - optional {?concept rdfs:label ?conceptLabel} - optional {?concept rdfs:isDefinedBy ?vocabularySource - optional { ?vocabularySource rdfs:label ?vocabularySourceName}} + OPTIONAL { + ?subject ?property ?concept . + ?concept rdfs:label ?conceptLabel . + } + OPTIONAL { + ?subject ?property ?concept . + ?concept rdfs:isDefinedBy ?vocabularySource . + OPTIONAL { + ?subject ?property ?concept . + ?concept rdfs:isDefinedBy ?vocabularySource . + ?vocabularySource rdfs:label ?vocabularySourceName . + } + } } ORDER BY ?conceptLabel ?conceptName - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - CONSTRUCT { - ?subject ?property ?concept . - } WHERE { - ?subject ?property ?concept . - } - - - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - CONSTRUCT { - ?subject ?property ?concept . - ?concept rdfs:label ?conceptLabel - } WHERE { - ?subject ?property ?concept . - ?concept rdfs:label ?conceptLabel - } - - - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - CONSTRUCT { - ?subject ?property ?concept . - ?concept rdfs:isDefinedBy ?vocabularySource - } WHERE { - ?subject ?property ?concept . - ?concept rdfs:isDefinedBy ?vocabularySource - } - - - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - CONSTRUCT { - ?subject ?property ?concept . - ?concept rdfs:isDefinedBy ?vocabularySource . - ?vocabularySource rdfs:label ?vocabularySourceName - } WHERE { - ?subject ?property ?concept . - ?concept rdfs:isDefinedBy ?vocabularySource . - ?vocabularySource rdfs:label ?vocabularySourceName - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml index 897b08b3..2fa70797 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasAttendeeRole.xml @@ -24,75 +24,75 @@ WHERE { - ?subject ?property ?role + ?subject ?property ?role . - OPTIONAL { ?role rdfs:label ?roleLabel } + OPTIONAL { ?role rdfs:label ?roleLabel . } - OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 + OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?event1 . LET (?event1Name := afn:localname(?event1)) - OPTIONAL { ?event1 rdfs:label ?event1Label } + OPTIONAL { ?event1 rdfs:label ?event1Label . } OPTIONAL { ?event2 a event:Event . - OPTIONAL { ?event2 rdfs:label ?event2Label } + OPTIONAL { ?event2 rdfs:label ?event2Label . } { - ?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event2 + ?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event2 . } UNION { - ?event2 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 + ?event2 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 . } } OPTIONAL { { ?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event3 . - ?event3 <http://purl.obolibrary.org/obo/BFO_0000050> ?event2 + ?event3 <http://purl.obolibrary.org/obo/BFO_0000050> ?event2 . } UNION { ?event2 <http://purl.obolibrary.org/obo/BFO_0000051> ?event3 . - ?event3 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 + ?event3 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 . } - OPTIONAL { ?event3 rdfs:label ?event3Label } + OPTIONAL { ?event3 rdfs:label ?event3Label . } } OPTIONAL { ?series a vivo:EventSeries . - OPTIONAL { ?series rdfs:label ?seriesLabel } + OPTIONAL { ?series rdfs:label ?seriesLabel . } { - ?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?series + ?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?series . } UNION { - ?series <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 + ?series <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 . } } OPTIONAL { { ?event1 <http://purl.obolibrary.org/obo/BFO_0000050> ?event3 . - ?event3 <http://purl.obolibrary.org/obo/BFO_0000050> ?series + ?event3 <http://purl.obolibrary.org/obo/BFO_0000050> ?series . } UNION { ?event3 <http://purl.obolibrary.org/obo/BFO_0000051> ?event1 . - ?series <http://purl.obolibrary.org/obo/BFO_0000051> ?event3 + ?series <http://purl.obolibrary.org/obo/BFO_0000051> ?event3 . } - OPTIONAL { ?series rdfs:label ?seriesLabel } + OPTIONAL { ?series rdfs:label ?seriesLabel . } } ?event1 vitro:mostSpecificType ?subclass . { - ?subclass rdfs:subClassOf event:Event + ?subclass rdfs:subClassOf event:Event . } UNION { - ?subclass owl:equivalentClass event:Event + ?subclass owl:equivalentClass event:Event . } } - OPTIONAL { ?role vivo:dateTimeInterval ?dateTimeInterval + OPTIONAL { ?role vivo:dateTimeInterval ?dateTimeInterval . OPTIONAL { ?dateTimeInterval vivo:start ?dateTimeStartValue . - ?dateTimeStartValue vivo:dateTime ?dateTimeStart + ?dateTimeStartValue vivo:dateTime ?dateTimeStart . } OPTIONAL { ?dateTimeInterval vivo:end ?dateTimeEndValue . - ?dateTimeEndValue vivo:dateTime ?dateTimeEnd + ?dateTimeEndValue vivo:dateTime ?dateTimeEnd . } } diff --git a/webapp/src/main/webapp/config/listViewConfig-hasClinicalActivity.xml b/webapp/src/main/webapp/config/listViewConfig-hasClinicalActivity.xml index df35bbcb..9cdba6e0 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasClinicalActivity.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasClinicalActivity.xml @@ -24,120 +24,49 @@ ?subject ?property ?role . ?role a core:ClinicalRole . - OPTIONAL - { - ?role core:relates ?activity . - ?activity rdfs:label ?activityLabel + OPTIONAL { + ?subject ?property ?role . + ?role a core:ClinicalRole . + ?role core:roleContributesTo ?activity . + ?activity rdfs:label ?activityLabel . - ?activity vitro:mostSpecificType ?subclass + ?activity vitro:mostSpecificType ?subclass . } - OPTIONAL { ?role rdfs:label ?roleLabel } - OPTIONAL - { - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart + OPTIONAL { + ?subject ?property ?role . + ?role a core:ClinicalRole . + ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . + ?activity rdfs:label ?activityLabel . + + + ?activity vitro:mostSpecificType ?subclass . + } - 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 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 - { - ?subject ?property ?role . - ?role a core:ClinicalRole . + OPTIONAL { + ?subject ?property ?role . + ?role a core:ClinicalRole . ?role rdfs:label ?roleLabel . } - UNION + OPTIONAL { - ?subject ?property ?role . - ?role a core:ClinicalRole . + ?subject ?property ?role . + ?role a core:ClinicalRole . ?role core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeStartValue core:dateTime ?dateTimeStart . } - UNION + OPTIONAL { - ?subject ?property ?role . - ?role a core:ClinicalRole . + ?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 core:roleContributesTo ?activity . - ?activity vitro:mostSpecificType ?subclass . - } - 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 . - } - } - + } ORDER BY ?subclass DESC(?dateTimeEnd) DESC(?dateTimeStart) ?activityLabel ?activityName + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml index 8028cef2..720a3879 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasCoPrincipalInvestigatorRole.xml @@ -7,6 +7,7 @@ PREFIX afn: <http://jena.apache.org/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 vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> @@ -25,194 +26,34 @@ ?subject ?property ?role . ?role a core:CoPrincipalInvestigatorRole . - OPTIONAL - { - ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + OPTIONAL { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role core:relatedBy ?activity . + ?activity a core:Contract . ?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 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:start ?dateTimeStartValueRole . - ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole . - } - 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: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 - - - - 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 ?role . - - ?role a core:CoPrincipalInvestigatorRole . - ?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 - { - { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - } - UNION - { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role core:hideFromDisplay ?hideThis . - } - UNION - { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?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 . + OPTIONAL { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role core:relatedBy ?activity . ?activity a core:Grant . ?activity rdfs:label ?activityLabel . + LET (?activityName := afn:localname(?activity)) . } - UNION - { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . - ?role core:elatedBy ?activity . - ?activity a core:Contract . - ?activity rdfs:label ?activityLabel - } - UNION - { - ?subject ?property ?role . - ?role a core:CoPrincipalInvestigatorRole . + OPTIONAL { + ?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 . + OPTIONAL { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role core:relatedBy ?activity . ?activity a core:Grant . ?activity core:relates ?adminedByRole . ?adminedByRole a core:AdminsitratorRole. @@ -220,8 +61,63 @@ ?adminedBy a foaf:Organization . ?adminedBy rdfs:label ?adminedByLabel . } - } - + OPTIONAL { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . + ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole . + } + OPTIONAL { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . + ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole . + } + OPTIONAL { + ?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 . + } + OPTIONAL { + ?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 . + } + OPTIONAL { + ?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 . + } + OPTIONAL { + ?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 . + } + OPTIONAL { + ?subject ?property ?role . + ?role a core:CoPrincipalInvestigatorRole . + ?role core:hideFromDisplay ?hideThis . + } + } ORDER BY DESC(?dateTimeEndRole) DESC(?dateTimeStartRole) DESC(?dateTimeEndGrant) DESC(?dateTimeStartGrant) ?activityLabel ?activityName + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml index 857aec25..0586eab0 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasEditorRole.xml @@ -19,100 +19,37 @@ ?dateTimeStart ?dateTimeEnd WHERE { - - ?subject ?property ?role - OPTIONAL { ?role core:roleContributesTo ?activity . - ?activity vitro:mostSpecificType ?subclass . - ?subclass rdfs:label ?subclassLabel - } - OPTIONAL { ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityName - } - 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 - } - + ?subject ?property ?role . + ?role a core:EditorRole . + OPTIONAL { + ?subject ?property ?role . + ?role a core:EditorRole . + ?role core:roleContributesTo ?activity . + ?activity vitro:mostSpecificType ?subclass . + ?subclass rdfs:label ?subclassLabel . + } + OPTIONAL { + ?subject ?property ?role . + ?role a core:EditorRole . + ?role core:roleContributesTo ?activity . + ?activity rdfs:label ?activityName . + } + OPTIONAL { + ?subject ?property ?role . + ?role a core:EditorRole . + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + OPTIONAL { + ?subject ?property ?role . + ?role a core:EditorRole . + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + } } ORDER BY ?subclass DESC(?dateTimeEnd) DESC(?dateTimeStart) ?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:EditorRole . - ?role vitro:mostSpecificType ?roleSubclass . - ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityName . - ?activity vitro:mostSpecificType ?subclass . - ?subclass rdfs:label ?subclassLabel - } WHERE { - { - ?subject ?property ?role . - ?role a core:EditorRole . - } UNION { - ?subject ?property ?role . - ?role a core:EditorRole . - ?role vitro:mostSpecificType ?roleSubclass - } UNION { - ?subject ?property ?role . - ?role a core:EditorRole . - ?role core:roleContributesTo ?activity - } UNION { - ?subject ?property ?role . - ?role a core:EditorRole . - ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityName . - } UNION { - ?subject ?property ?role . - ?role a core:EditorRole . - ?role core:roleContributesTo ?activity . - ?activity vitro:mostSpecificType ?subclass . - ?subclass rdfs:label ?subclassLabel - } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:EditorRole . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?role . - ?role a core:EditorRole . - ?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:EditorRole . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?role . - ?role a core:EditorRole . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - diff --git a/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml index 7f1d20b7..f4549c46 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasInvestigatorRole.xml @@ -7,6 +7,7 @@ PREFIX afn: <http://jena.apache.org/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 vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> @@ -23,206 +24,53 @@ ?hideThis WHERE { ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role vitro:mostSpecificType ?subclass + ?role vitro:mostSpecificType core:InvestigatorRole . - OPTIONAL - { + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:InvestigatorRole . ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Contract . ?activity rdfs:label ?activityLabel . LET (?activityName := afn:localname(?activity)) } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:InvestigatorRole . ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . - ?activity a core:Grant . + ?activity a core:Contract . ?activity core:assignedBy ?awardedBy . - ?awardedBy rdfs:label ?awardedByLabel - } - 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:start ?dateTimeStartValueRole . - ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole - } - 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: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) - } ORDER BY DESC(?dateTimeEndRole) DESC(?dateTimeStartRole) DESC(?dateTimeEndGrant) DESC(?dateTimeStartGrant) ?activityLabel ?activityName - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX foaf: <http://xmlns.com/foaf/0.1/> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - CONSTRUCT { - ?subject ?property ?role . - - ?role a core:InvestigatorRole . - ?role 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 - { - { - ?subject ?property ?role . - ?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 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 - { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?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 - { - ?subject ?property ?role . - ?role a core:InvestigatorRole . - ?role core:relatedBy ?activity . + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:InvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Contract . + ?activity core:relates ?adminedByRole . + ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . + ?adminedBy rdfs:label ?adminedByLabel . + } + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:InvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Grant . + ?activity rdfs:label ?activityLabel . + LET (?activityName := afn:localname(?activity)) + } + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:InvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity a core:Grant . + ?activity core:assignedBy ?awardedBy . + ?awardedBy rdfs:label ?awardedByLabel . + } + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:InvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . ?activity a core:Grant . ?activity core:relates ?adminedByRole . ?adminedByRole a core:AdminsitratorRole. @@ -230,8 +78,63 @@ ?adminedBy a foaf:Organization . ?adminedBy rdfs:label ?adminedByLabel . } - } - + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:InvestigatorRole . + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . + ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole . + } + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:InvestigatorRole . + ?role core:dateTimeInterval ?dateTimeIntervalRole . + ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . + ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole . + } + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:InvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?activity a core:Contract . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant . + } + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType 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 . + } + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:InvestigatorRole . + ?role <http://vivoweb.org/ontology/core#relatedBy> ?activity . + ?activity core:dateTimeInterval ?dateTimeIntervalGrant . + ?activity a core:Grant . + ?dateTimeIntervalGrant core:start ?dateTimeStartValueGrant . + ?dateTimeStartValueGrant core:dateTime ?dateTimeStartGrant . + } + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType 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 . + } + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:InvestigatorRole . + ?role core:hideFromDisplay ?hideThis . + } + } ORDER BY DESC(?dateTimeEndRole) DESC(?dateTimeStartRole) DESC(?dateTimeEndGrant) DESC(?dateTimeStartGrant) ?activityLabel ?activityName + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml index 1e58f394..d83fb462 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasPresenterRole.xml @@ -23,257 +23,88 @@ ?workshop ?dateTime - WHERE { - - ?subject ?property ?role . - ?role a vivo:PresenterRole - - OPTIONAL { ?role rdfs:label ?roleLabel } - - OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . - ?presentation a vivo:Presentation . - ?presentation rdfs:label ?presentationLabel . - LET (?presentationName := afn:localname(?presentation)) - } - OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . - ?presentation a vivo:Presentation . - ?presentation <http://purl.obolibrary.org/obo/BFO_0000050> ?conference . - ?conference <http://purl.obolibrary.org/obo/BFO_0000051> ?presentation . - ?conference a bibo:Conference . - ?conference rdfs:label ?conferenceLabel - } - OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . - ?presentation a vivo:Presentation . - ?presentation <http://purl.obolibrary.org/obo/BFO_0000050> ?workshop . - ?workshop <http://purl.obolibrary.org/obo/BFO_0000051> ?presentation . - ?workshop <http://purl.obolibrary.org/obo/BFO_0000050> ?conference . - ?conference <http://purl.obolibrary.org/obo/BFO_0000051> ?workshop . - ?conference rdfs:label ?conferenceLabel - } - OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . - ?presentation a vivo:Presentation . - ?presentation <http://purl.obolibrary.org/obo/BFO_0000050> ?series . - ?series <http://purl.obolibrary.org/obo/BFO_0000051> ?presentation . - ?series rdfs:label ?seriesLabel - } - OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . - ?presentation a vivo:Presentation . - ?presentation <http://purl.obolibrary.org/obo/BFO_0000050> ?workshop . - ?workshop <http://purl.obolibrary.org/obo/BFO_0000051> ?presentation . - ?workshop <http://purl.obolibrary.org/obo/BFO_0000050> ?series . - ?series <http://purl.obolibrary.org/obo/BFO_0000051> ?workshop . - ?series rdfs:label ?seriesLabel - } - - OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . - ?presentation a vivo:Presentation . - ?presentation vitro:mostSpecificType ?subclass . - } - - - OPTIONAL { ?role vivo:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval vivo:start ?dateTimeStartValue . - ?dateTimeStartValue vivo:dateTime ?dateTime - } - - - FILTER ( bound(?presentation) ) - - - } ORDER BY ?subclass DESC(?dateTime) ?presentationLabel ?presentationName - - - - PREFIX vivo: <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 { + WHERE { ?subject ?property ?role . ?role a vivo:PresenterRole . - ?role rdfs:label ?roleLabel . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . - ?presentation a vivo:Presentation . - ?presentation rdfs:label ?presentationLabel . - ?presentation vitro:mostSpecificType ?subclass . - } WHERE { - { - ?subject ?property ?role . - ?role a vivo:PresenterRole - } UNION { - ?subject ?property ?role . - ?role a vivo:PresenterRole . + + OPTIONAL { + ?subject ?property ?role . + ?role a vivo:PresenterRole . ?role rdfs:label ?roleLabel . - } UNION { - ?subject ?property ?role . - ?role a vivo:PresenterRole . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . - ?presentation a vivo:Presentation . - ?presentation rdfs:label ?presentationLabel - } UNION { - ?subject ?property ?role . - ?role a vivo:PresenterRole . + } + OPTIONAL { + ?subject ?property ?role . + ?role a vivo:PresenterRole . ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . ?presentation a vivo:Presentation . - ?presentation vitro:mostSpecificType ?subclass . + ?presentation rdfs:label ?presentationLabel . + LET (?presentationName := afn:localname(?presentation)) } - } - - - - PREFIX bibo: <http://purl.org/ontology/bibo/> - PREFIX vivo: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - - CONSTRUCT { - ?subject ?property ?role . - ?role a vivo:PresenterRole . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . - ?presentation a vivo:Presentation . - ?presentation <http://purl.obolibrary.org/obo/BFO_0000050> ?conference . - ?conference a bibo:Conference . - ?conference <http://purl.obolibrary.org/obo/BFO_0000051> ?presentation . - ?conference rdfs:label ?conferenceLabel - } WHERE { - - { - ?subject ?property ?role . - ?role a vivo:PresenterRole . - } UNION { - ?subject ?property ?role . - ?role a vivo:PresenterRole . + OPTIONAL { + ?subject ?property ?role . + ?role a vivo:PresenterRole . ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . ?presentation a vivo:Presentation . ?presentation <http://purl.obolibrary.org/obo/BFO_0000050> ?conference . ?conference <http://purl.obolibrary.org/obo/BFO_0000051> ?presentation . ?conference a bibo:Conference . - ?conference rdfs:label ?conferenceLabel + ?conference rdfs:label ?conferenceLabel . } - } - - - - PREFIX bibo: <http://purl.org/ontology/bibo/> - PREFIX vivo: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - - CONSTRUCT { - ?subject ?property ?role . - ?role a vivo:PresenterRole . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . - ?presentation a vivo:Presentation . - ?presentation <http://purl.obolibrary.org/obo/BFO_0000050> ?workshop . - ?workshop <http://purl.obolibrary.org/obo/BFO_0000051> ?presentation . - ?workshop a bibo:Workshop . - ?workshop <http://purl.obolibrary.org/obo/BFO_0000050> ?conference . - ?conference <http://purl.obolibrary.org/obo/BFO_0000051> ?workshop . - ?conference a bibo:Conference . - ?conference rdfs:label ?conferenceLabel - } WHERE { - { - ?subject ?property ?role . - ?role a vivo:PresenterRole . - } UNION { - ?subject ?property ?role . - ?role a vivo:PresenterRole . + OPTIONAL { + ?subject ?property ?role . + ?role a vivo:PresenterRole . ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . ?presentation a vivo:Presentation . ?presentation <http://purl.obolibrary.org/obo/BFO_0000050> ?workshop . - ?conference a bibo:Conference . ?workshop <http://purl.obolibrary.org/obo/BFO_0000051> ?presentation . - ?workshop a bibo:Workshop . ?workshop <http://purl.obolibrary.org/obo/BFO_0000050> ?conference . ?conference <http://purl.obolibrary.org/obo/BFO_0000051> ?workshop . - ?conference a bibo:Conference . - ?conference rdfs:label ?conferenceLabel + ?conference rdfs:label ?conferenceLabel . } - } - - - - PREFIX bibo: <http://purl.org/ontology/bibo/> - PREFIX vivo: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - - CONSTRUCT { - ?subject ?property ?role . - ?role a vivo:PresenterRole . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . - ?presentation a vivo:Presentation . - ?series a vivo:EventSeries . - ?presentation <http://purl.obolibrary.org/obo/BFO_0000050> ?series . - ?series <http://purl.obolibrary.org/obo/BFO_0000051> ?presentation . - ?series rdfs:label ?seriesLabel - } WHERE { - - { - ?subject ?property ?role . - ?role a vivo:PresenterRole . - } UNION { - ?subject ?property ?role . - ?role a vivo:PresenterRole . + OPTIONAL { + ?subject ?property ?role . + ?role a vivo:PresenterRole . ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . ?presentation a vivo:Presentation . - ?series a vivo:EventSeries . ?presentation <http://purl.obolibrary.org/obo/BFO_0000050> ?series . ?series <http://purl.obolibrary.org/obo/BFO_0000051> ?presentation . - ?series rdfs:label ?seriesLabel + ?series rdfs:label ?seriesLabel . } - } - - - - PREFIX bibo: <http://purl.org/ontology/bibo/> - PREFIX vivo: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - - CONSTRUCT { - ?subject ?property ?role . - ?role a vivo:PresenterRole . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . - ?presentation a vivo:Presentation . - ?presentation <http://purl.obolibrary.org/obo/BFO_0000050> ?workshop . - ?workshop <http://purl.obolibrary.org/obo/BFO_0000051> ?presentation . - ?workshop a bibo:Workshop . - ?workshop <http://purl.obolibrary.org/obo/BFO_0000050> ?series . - ?series <http://purl.obolibrary.org/obo/BFO_0000051> ?workshop . - ?series a vivo:EventSeries . - ?series rdfs:label ?seriesLabel - } WHERE { - { - ?subject ?property ?role . - ?role a vivo:PresenterRole . - } UNION { - ?subject ?property ?role . - ?role a vivo:PresenterRole . + OPTIONAL { + ?subject ?property ?role . + ?role a vivo:PresenterRole . ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . ?presentation a vivo:Presentation . ?presentation <http://purl.obolibrary.org/obo/BFO_0000050> ?workshop . ?workshop <http://purl.obolibrary.org/obo/BFO_0000051> ?presentation . - ?workshop a bibo:Workshop . ?workshop <http://purl.obolibrary.org/obo/BFO_0000050> ?series . ?series <http://purl.obolibrary.org/obo/BFO_0000051> ?workshop . - ?series a vivo:EventSeries . - ?series rdfs:label ?seriesLabel + ?series rdfs:label ?seriesLabel . } - } - + + OPTIONAL { + ?subject ?property ?role . + ?role a vivo:PresenterRole . + ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?presentation . + ?presentation a vivo:Presentation . + ?presentation vitro:mostSpecificType ?subclass . + } + + + OPTIONAL { + ?subject ?property ?role . + ?role a vivo:PresenterRole . + ?role vivo:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval vivo:start ?dateTimeStartValue . + ?dateTimeStartValue vivo:dateTime ?dateTime . + } + + + FILTER ( bound(?presentation) ) + + + } ORDER BY ?subclass DESC(?dateTime) ?presentationLabel ?presentationName + - - PREFIX vivo: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a vivo:PresenterRole . - ?role vivo:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval vivo:start ?dateTimeStartValue . - ?dateTimeStartValue vivo:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?role . - ?role a vivo:PresenterRole . - ?role vivo:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval vivo:start ?dateTimeStartValue . - ?dateTimeStartValue vivo:dateTime ?dateTimeStart - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml index 0f45cffc..c120ea34 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasPrincipalInvestigatorRole.xml @@ -7,6 +7,7 @@ PREFIX afn: <http://jena.apache.org/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 vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> @@ -27,134 +28,50 @@ ?subject ?property ?role . ?role a core:PrincipalInvestigatorRole . - OPTIONAL - { + OPTIONAL { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . ?role core:relatedBy ?activity . + ?activity a core:Contract . ?activity rdfs:label ?activityLabel . LET (?activityName := afn:localname(?activity)) . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . ?role core:relatedBy ?activity . - ?activity a core:Grant . + ?activity a core:Contract . ?activity core:assignedBy ?awardedBy . ?awardedBy rdfs:label ?awardedByLabel . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . ?role core:relatedBy ?activity . - ?activity a core:Grant . + ?activity a core:Contract . ?activity core:relates ?adminedByRole . ?adminedByRole <http://purl.obolibrary.org/obo/RO_0000052> ?adminedBy . ?adminedBy rdfs:label ?adminedByLabel . } - OPTIONAL - { - ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . - ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole . - } - OPTIONAL - { - ?role core:dateTimeInterval ?dateTimeIntervalRole . - ?dateTimeIntervalRole core:end ?dateTimeEndValueRole . - ?dateTimeEndValueRole core:dateTime ?dateTimeEndRole . - } - 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 - - - - 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 ?role . - ?role a core:PrincipalInvestigatorRole . - ?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 . - ?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 - { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . - ?role core:hideFromDisplay ?hideThis . - } - UNION - { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . + OPTIONAL { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . ?role core:relatedBy ?activity . ?activity a core:Grant . ?activity rdfs:label ?activityLabel . + LET (?activityName := afn:localname(?activity)) . } - UNION - { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . - ?role core:relatedBy ?activity . - ?activity a core:Contract . - ?activity rdfs:label ?activityLabel . - } - UNION - { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . + OPTIONAL { + ?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 - { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . + OPTIONAL { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . ?role core:relatedBy ?activity . ?activity a core:Grant . ?activity core:relates ?adminedByRole . @@ -163,64 +80,63 @@ ?adminedBy a foaf:Organization . ?adminedBy rdfs:label ?adminedByLabel . } - UNION - { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . + OPTIONAL { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . ?role core:dateTimeInterval ?dateTimeIntervalRole . ?dateTimeIntervalRole core:start ?dateTimeStartValueRole . ?dateTimeStartValueRole core:dateTime ?dateTimeStartRole . } - UNION - { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . + OPTIONAL { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . ?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 . + OPTIONAL { + ?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 - { - ?subject ?property ?role . - ?role a core:PrincipalInvestigatorRole . + OPTIONAL { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . ?role core:relatedBy ?activity . ?activity a core:Contract . ?activity core:dateTimeInterval ?dateTimeIntervalGrant . ?dateTimeIntervalGrant core:end ?dateTimeEndValueGrant . ?dateTimeEndValueGrant core:dateTime ?dateTimeEndGrant . } - } - + OPTIONAL { + ?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 . + } + OPTIONAL { + ?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 . + } + OPTIONAL { + ?subject ?property ?role . + ?role a core:PrincipalInvestigatorRole . + ?role core:hideFromDisplay ?hideThis . + } + } ORDER BY DESC(?dateTimeEndRole) DESC(?dateTimeStartRole) DESC(?dateTimeEndGrant) DESC(?dateTimeStartGrant) ?activityLabel ?activityName + diff --git a/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml index 5ed07a31..76642ecc 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasReviewerRole.xml @@ -19,97 +19,39 @@ ?dateTimeStart ?dateTimeEnd WHERE { + ?subject ?property ?role . + ?role a core:ReviewerRole . - ?subject ?property ?role - OPTIONAL { ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityName . - } - - OPTIONAL { ?role core:roleContributesTo ?activity . - ?activity vitro:mostSpecificType ?subclass . - ?subclass rdfs:label ?subclassLabel - } - 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 { + ?subject ?property ?role . + ?role a core:ReviewerRole . + ?role core:roleContributesTo ?activity . + ?activity rdfs:label ?activityName . + } + OPTIONAL { + ?subject ?property ?role . + ?role a core:ReviewerRole . + ?role core:roleContributesTo ?activity . + ?activity vitro:mostSpecificType ?subclass . + ?subclass rdfs:label ?subclassLabel . + } + OPTIONAL { + ?subject ?property ?role . + ?role a core:ReviewerRole . + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + OPTIONAL { + ?subject ?property ?role . + ?role a core:ReviewerRole . + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + } } ORDER BY ?subclass DESC(?dateTimeEnd) DESC(?dateTimeStart) ?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:ReviewerRole . - ?role vitro:mostSpecificType ?roleSubclass . - ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityName . - ?activity vitro:mostSpecificType ?subclass . - ?subclass rdfs:label ?subclassLabel - } WHERE { - { - ?subject ?property ?role . - ?role a core:ReviewerRole . - } UNION { - ?subject ?property ?role . - ?role a core:ReviewerRole . - ?role vitro:mostSpecificType ?roleSubclass - } UNION { - ?subject ?property ?role . - ?role a core:ReviewerRole . - ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityName . - } UNION { - ?subject ?property ?role . - ?role a core:ReviewerRole . - ?role core:roleContributesTo ?activity . - ?activity vitro:mostSpecificType ?subclass . - ?subclass rdfs:label ?subclassLabel - } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a core:ReviewerRole . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?role . - ?role a core:ReviewerRole . - ?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:ReviewerRole . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?role . - ?role a core:ReviewerRole . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - diff --git a/webapp/src/main/webapp/config/listViewConfig-hasRole.xml b/webapp/src/main/webapp/config/listViewConfig-hasRole.xml index 138f0ca3..1b9bbbe5 100644 --- a/webapp/src/main/webapp/config/listViewConfig-hasRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-hasRole.xml @@ -23,150 +23,46 @@ ?subject ?property ?role . ?role a ?objectType . - OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity rdfs:label ?activityLabel - - - ?activity vitro:mostSpecificType ?subclass - + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . + ?activity rdfs:label ?activityLabel . + + ?activity vitro:mostSpecificType ?subclass . + } - OPTIONAL { ?role core:relates ?activity . - ?activity rdfs:label ?activityLabel + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role core:roleContributesTo ?activity . + ?activity rdfs:label ?activityLabel . - - ?activity vitro:mostSpecificType ?subclass - + + ?activity vitro:mostSpecificType ?subclass . + } - OPTIONAL { ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityLabel - - - ?activity vitro:mostSpecificType ?subclass - - } - OPTIONAL { ?role rdfs:label ?roleLabel } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role rdfs:label ?roleLabel . } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?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 core:relates ?activity . - ?activity vitro:mostSpecificType ?subclass . - } WHERE { - ?subject ?property ?role . - ?role core:relates ?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 core:roleContributesTo ?activity . - ?activity vitro:mostSpecificType ?subclass . - } WHERE { - ?subject ?property ?role . - ?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 <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity vitro:mostSpecificType ?subclass . - } WHERE { - ?subject ?property ?role . - ?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 { - ?subject ?property ?role . - ?role rdfs:label ?roleLabel . - ?activity rdfs:label ?activityName - } WHERE { - { - ?subject ?property ?role . - ?role a ?objectType . - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role rdfs:label ?roleLabel . - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role core:relates ?activity . - ?activity rdfs:label ?activityName - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity rdfs:label ?activityName - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityName - } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?role . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?role . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - diff --git a/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml b/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml index 9a3a10a6..58100245 100644 --- a/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml +++ b/webapp/src/main/webapp/config/listViewConfig-informationResourceInAuthorship.xml @@ -17,30 +17,60 @@ ?author ?authorName WHERE { ?subject ?property ?authorship . - OPTIONAL { ?authorship core:rank ?rank } - OPTIONAL { ?authorship core:relates ?author . + ?authorship a core:Authorship . + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:rank ?rank . + } + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:relates ?author . ?author a foaf:Agent . ?author rdfs:label ?authorName . - - OPTIONAL { ?authorship core:relates ?author . - ?author a foaf:Agent . + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:relates ?author . + ?author a foaf:Agent . ?author vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf foaf:Agent . } } - OPTIONAL { ?authorship core:relates ?author . + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?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 . } + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:relates ?author . + ?author a vcard:Kind . + ?author vcard:hasName ?vName . + ?vName vcard:givenName ?firstName . + } + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:relates ?author . + ?author a vcard:Kind . + ?author vcard:hasName ?vName . + ?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 . + OPTIONAL { + ?subject ?property ?authorship . + ?authorship a core:Authorship . + ?authorship core:relates ?author . + ?author a vcard:Kind . ?author vitro:mostSpecificType ?subclass . ?subclass rdfs:subClassOf vcard:Kind . } @@ -51,67 +81,5 @@ } 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 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 ?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 ?vNameProperty ?vNameValue . - } 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 ?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 ?vNameProperty ?vNameValue . - } - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-informationResourceInEditorship.xml b/webapp/src/main/webapp/config/listViewConfig-informationResourceInEditorship.xml index 33482e33..1b3ef35f 100644 --- a/webapp/src/main/webapp/config/listViewConfig-informationResourceInEditorship.xml +++ b/webapp/src/main/webapp/config/listViewConfig-informationResourceInEditorship.xml @@ -15,63 +15,35 @@ ?editorship ?person ?personName WHERE { - ?subject ?property ?editorship . - OPTIONAL { ?editorship core:rank ?rank } - OPTIONAL { ?editorship core:relates ?person . - ?person a foaf:Person . - ?person rdfs:label ?personName - } - - OPTIONAL { ?editorship core:relates ?person . - ?person a foaf:Person . - ?person vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf foaf:Person - } - + ?subject ?property ?editorship . + ?editorship a core:Editorship . + OPTIONAL { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:rank ?rank . + } + OPTIONAL { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?person . + ?person a foaf:Person . + ?person rdfs:label ?personName . + } + + OPTIONAL { + ?subject ?property ?editorship . + ?editorship a core:Editorship . + ?editorship core:relates ?person . + ?person a foaf:Person . + ?person vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf foaf:Person . + } + FILTER ( bound(?person) ) } ORDER BY ?subclass ?rank (fn:lower-case(?personName)) - - 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 ?editorship . - ?editorship a core:Editorship . - ?editorship core:rank ?rank . - ?editorship core:relates ?person . - ?person a foaf:Person . - ?person rdfs:label ?personName . - ?person vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf foaf:Person - } WHERE { - { - ?subject ?property ?editorship . - ?editorship a core:Editorship - } UNION { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:rank ?rank - } UNION { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?person . - ?person a foaf:Person . - ?person rdfs:label ?personName - } UNION { - ?subject ?property ?editorship . - ?editorship a core:Editorship . - ?editorship core:relates ?person . - ?person a foaf:Person . - ?person rdfs:label ?personName . - ?person vitro:mostSpecificType ?subclass . - } - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml b/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml index b3af3b38..d4d93eb0 100644 --- a/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml +++ b/webapp/src/main/webapp/config/listViewConfig-issuedCredential.xml @@ -24,125 +24,45 @@ ?dateTime WHERE { - ?subject ?property ?issuedCredential . - ?issuedCredential a core:IssuedCredential . - LET (?issuedCredentialLocal := afn:localname(?issuedCredential)) - OPTIONAL {?issuedCredential rdfs:label ?issuedCredentialLabel } - OPTIONAL { ?issuedCredential core:relates ?credential . - ?credential a core:Credential . - ?credential core:relatedBy ?issuedCredential . - ?credential rdfs:label ?credentialLabel . - LET (?credentialLocal := afn:localname(?credential)) - } - OPTIONAL { ?issuedCredential core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - OPTIONAL { ?issuedCredential core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - OPTIONAL { ?issuedCredential core:dateIssued ?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 ?issuedCredential . - ?issuedCredential a core:IssuedCredential . - ?issuedCredential rdfs:label ?issuedCredentialLabel . - ?issuedCredential core:relates ?credential . - ?credential a core:Credential . - ?credential core:relatedBy ?issuedCredential . - ?credential rdfs:label ?credentialLabel . - } WHERE { - { - ?subject ?property ?issuedCredential . - ?issuedCredential a core:IssuedCredential . - } UNION { - ?subject ?property ?issuedCredential . - ?issuedCredential a core:IssuedCredential . - ?issuedCredential rdfs:label ?issuedCredentialLabel . - } UNION { - ?subject ?property ?issuedCredential . - ?issuedCredential a core:IssuedCredential . - ?issuedCredential core:relates ?credential . - ?credential a core:Credential . - ?credential core:relatedBy ?issuedCredential - } UNION { - ?subject ?property ?issuedCredential . - ?issuedCredential a core:IssuedCredential . - ?issuedCredential core:relates ?credential . - ?credential a core:Credential . - ?credential core:relatedBy ?issuedCredential . - ?credential rdfs:label ?credentialLabel - } UNION { - ?subject ?property ?issuedCredential . - ?issuedCredential a core:IssuedCredential . - ?issuedCredential core:relates ?credential . - ?credential a core:Credential . - ?credential core:relatedBy ?issuedCredential . - ?credential rdfs:label ?credentialLabel . - } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?issuedCredential . - ?issuedCredential a core:IssuedCredential . - ?issuedCredential core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?issuedCredential . - ?issuedCredential a core:IssuedCredential . - ?issuedCredential core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?issuedCredential . - ?issuedCredential a core:IssuedCredential . - ?issuedCredential core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?issuedCredential . - ?issuedCredential a core:IssuedCredential . - ?issuedCredential core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - CONSTRUCT { - ?subject ?property ?issuedCredential . - ?issuedCredential a core:IssuedCredential . - ?issuedCredential core:dateIssued ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime - } WHERE { ?subject ?property ?issuedCredential . ?issuedCredential a core:IssuedCredential . - ?issuedCredential core:dateIssued ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime - } - - + LET (?issuedCredentialLocal := afn:localname(?issuedCredential)) + OPTIONAL { + ?subject ?property ?issuedCredential . + ?issuedCredential a core:IssuedCredential . + ?issuedCredential rdfs:label ?issuedCredentialLabel . + } + OPTIONAL { + ?subject ?property ?issuedCredential . + ?issuedCredential a core:IssuedCredential . + ?issuedCredential core:relates ?credential . + ?credential a core:Credential . + ?credential core:relatedBy ?issuedCredential . + ?credential rdfs:label ?credentialLabel . + LET (?credentialLocal := afn:localname(?credential)) + } + OPTIONAL { + ?subject ?property ?issuedCredential . + ?issuedCredential a core:IssuedCredential . + ?issuedCredential core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + OPTIONAL { + ?subject ?property ?issuedCredential . + ?issuedCredential a core:IssuedCredential . + ?issuedCredential core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + } + OPTIONAL { + ?subject ?property ?issuedCredential . + ?issuedCredential a core:IssuedCredential . + ?issuedCredential core:dateIssued ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime . + } + } ORDER BY DESC(?dateTime) DESC(?dateTimeEnd) + + diff --git a/webapp/src/main/webapp/config/listViewConfig-mailingAddress.xml b/webapp/src/main/webapp/config/listViewConfig-mailingAddress.xml index 72878233..ac9e40b6 100644 --- a/webapp/src/main/webapp/config/listViewConfig-mailingAddress.xml +++ b/webapp/src/main/webapp/config/listViewConfig-mailingAddress.xml @@ -16,36 +16,36 @@ WHERE { ?subject ?property ?vcard . - ?vcard vcard:hasAddress ?address - OPTIONAL { ?address vcard:streetAddress ?street } - OPTIONAL { ?address vcard:locality ?locality } - OPTIONAL { ?address vcard:region ?region } - OPTIONAL { ?address vcard:postalCode ?postalCode } - OPTIONAL { ?address vcard:country ?country } + ?vcard vcard:hasAddress ?address . + OPTIONAL { + ?subject ?property ?vcard . + ?vcard vcard:hasAddress ?address . + ?address vcard:streetAddress ?street . + } + OPTIONAL { + ?subject ?property ?vcard . + ?vcard vcard:hasAddress ?address . + ?address vcard:locality ?locality . + } + OPTIONAL { + ?subject ?property ?vcard . + ?vcard vcard:hasAddress ?address . + ?address vcard:region ?region . + } + OPTIONAL { + ?subject ?property ?vcard . + ?vcard vcard:hasAddress ?address . + ?address vcard:postalCode ?postalCode . + } + OPTIONAL { + ?subject ?property ?vcard . + ?vcard vcard:hasAddress ?address . + ?address vcard:country ?country . + } } ORDER BY ?country ?region ?street - - - PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - CONSTRUCT { - ?subject ?property ?vcard . - ?vcard vcard:hasAddress ?address . - ?address ?addressProperty ?addressValue - } WHERE { - { - ?subject ?property ?vcard - } UNION { - ?subject ?property ?vcard . - ?vcard vcard:hasAddress ?address - } UNION { - ?subject ?property ?vcard . - ?vcard vcard:hasAddress ?address . - ?address ?addressProperty ?addressValue - } - } - - + edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.MaintainDuplicatesObjectPropertyDataPostProcessor diff --git a/webapp/src/main/webapp/config/listViewConfig-orcidId.xml b/webapp/src/main/webapp/config/listViewConfig-orcidId.xml index 7cdb448b..e9bd44dd 100644 --- a/webapp/src/main/webapp/config/listViewConfig-orcidId.xml +++ b/webapp/src/main/webapp/config/listViewConfig-orcidId.xml @@ -9,18 +9,9 @@ SELECT ?value WHERE { - ?subject ?property ?value + ?subject ?property ?value . } - - - CONSTRUCT { - ?subject ?property ?value - } WHERE { - ?subject ?property ?value - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-organizationAdministersGrant.xml b/webapp/src/main/webapp/config/listViewConfig-organizationAdministersGrant.xml index e79ea7ac..fb960762 100644 --- a/webapp/src/main/webapp/config/listViewConfig-organizationAdministersGrant.xml +++ b/webapp/src/main/webapp/config/listViewConfig-organizationAdministersGrant.xml @@ -14,42 +14,18 @@ ?grant ?grantLabel - WHERE { - ?subject ?property ?administratorRole . - ?administratorRole a core:AdministratorRole . - OPTIONAL { ?administratorRole core:relatedBy ?grant . - ?grant core:relates ?administratorRole . - ?grant rdfs:label ?grantLabel . - } - } ORDER BY ?grantLabel - - - - 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 obo: <http://purl.obolibrary.org/obo/> - - CONSTRUCT { - ?subject ?property ?administratorRole . - ?administratorRole a core:AdministratorRole . + WHERE + { + ?subject ?property ?administratorRole . + ?administratorRole a core:AdministratorRole . + OPTIONAL { + ?subject ?property ?administratorRole . + ?administratorRole a core:AdministratorRole . ?administratorRole core:relatedBy ?grant . - ?grant core:relates ?administratorRole . - ?grant rdfs:label ?grantLabel . - } WHERE { - { - ?subject ?property ?administratorRole . - ?administratorRole a core:AdministratorRole . - } UNION { - ?subject ?property ?administratorRole . - ?administratorRole a core:AdministratorRole . - ?administratorRole core:relatedBy ?grant . - ?grant a core:Grant . - ?grant core:relates ?administratorRole . ?grant rdfs:label ?grantLabel . } - } - - + } ORDER BY ?grantLabel + + diff --git a/webapp/src/main/webapp/config/listViewConfig-organizationAwardsGrant.xml b/webapp/src/main/webapp/config/listViewConfig-organizationAwardsGrant.xml index 34d2c3e6..fd6d2547 100644 --- a/webapp/src/main/webapp/config/listViewConfig-organizationAwardsGrant.xml +++ b/webapp/src/main/webapp/config/listViewConfig-organizationAwardsGrant.xml @@ -14,35 +14,19 @@ ?label WHERE { - ?subject ?property ?grantOrContract . - OPTIONAL { ?grantOrContract rdfs:label ?label . - } - } ORDER BY ?label - - - - 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 obo: <http://purl.obolibrary.org/obo/> - - CONSTRUCT { - ?subject ?property ?grantOrContract . - ?grantOrContract rdfs:label ?label . - } WHERE { - { - ?subject ?property ?grantOrContract . - } UNION { - ?subject ?property ?grantOrContract . + ?subject ?property ?grantOrContract . + OPTIONAL { + ?subject ?property ?grantOrContract . ?grantOrContract a core:Grant . ?grantOrContract rdfs:label ?label . - } UNION { - ?subject ?property ?grantOrContract . + } + OPTIONAL { + ?subject ?property ?grantOrContract . ?grantOrContract a core:Contract . ?grantOrContract rdfs:label ?label . } - } - - + } ORDER BY ?label + + diff --git a/webapp/src/main/webapp/config/listViewConfig-organizationForPosition.xml b/webapp/src/main/webapp/config/listViewConfig-organizationForPosition.xml index d7680741..9565578a 100644 --- a/webapp/src/main/webapp/config/listViewConfig-organizationForPosition.xml +++ b/webapp/src/main/webapp/config/listViewConfig-organizationForPosition.xml @@ -19,9 +19,12 @@ ?hideThis WHERE { - ?subject ?property ?position - OPTIONAL - { + ?subject ?property ?position . + ?position a core:Position . + + OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . ?position core:relates ?person . ?person a foaf:Person . ?person rdfs:label ?personName . @@ -29,26 +32,42 @@ OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . ?position vitro:mostSpecificType ?subclass . OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . + ?position vitro:mostSpecificType ?subclass . ?subclass vitro:displayRankAnnot ?displayRank . } } - OPTIONAL { ?position rdfs:label ?positionTitle } - OPTIONAL { ?position core:hideFromDisplay ?hideThis } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . + ?position rdfs:label ?positionTitle . + } + OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . + ?position core:hideFromDisplay ?hideThis . + } + OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . ?position core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart + ?dateTimeStartValue core:dateTime ?dateTimeStart . } OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . ?position core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd + ?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) ) @@ -59,91 +78,5 @@ } ORDER BY ?subclass (fn:lower-case(?personName)) - - 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 ?position . - - ?position a core:Position . - ?position rdfs:label ?positionTitle . - ?position core:hideFromDisplay ?hideThis . - - ?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 - { - { - ?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 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 . - } - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-organizationForTraining.xml b/webapp/src/main/webapp/config/listViewConfig-organizationForTraining.xml index bf958bd3..45265b9e 100644 --- a/webapp/src/main/webapp/config/listViewConfig-organizationForTraining.xml +++ b/webapp/src/main/webapp/config/listViewConfig-organizationForTraining.xml @@ -18,187 +18,63 @@ ?degreeName ?degreeAbbr ?majorField ?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> ?person . - ?person a foaf:Person . - ?person rdfs:label ?personName - } - OPTIONAL { ?edTraining core:majorField ?majorField } - 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 - } + WHERE { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + OPTIONAL { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining vitro:mostSpecificType ?subclass . + } + OPTIONAL { + ?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 . + } + OPTIONAL { + ?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 . + } + OPTIONAL { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?person . + ?person a foaf:Person . + ?person rdfs:label ?personName . + } + OPTIONAL { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining core:majorField ?majorField . + } + OPTIONAL { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining core:supplementalInformation ?info . + } + OPTIONAL { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?edTraining core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + OPTIONAL { + ?subject ?property ?edTraining . + ?edTraining a core:EducationalProcess . + ?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 core: <http://vivoweb.org/ontology/core#> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - - CONSTRUCT { - ?edTraining vitro:mostSpecificType ?subclass - } WHERE { - ?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 ?edTrainingProp ?edTrainingValue . - ?edTraining <http://purl.obolibrary.org/obo/RO_0002234> ?awardedDegree . - ?awardedDegree core:relates ?degree . - ?edTraining core:dateTimeInterval ?dateTimeInterval - } WHERE { - { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess - } - UNION { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining ?edTrainingProp ?edTrainingValue - } - UNION { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?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 core:majorField ?majorField . - ?edTraining core:supplementalInformation ?info . - ?edTraining <http://purl.obolibrary.org/obo/RO_0000057> ?person . - ?person a foaf:Person . - ?person rdfs:label ?personName - } WHERE { - { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess - } - UNION { - ?subject ?property ?edTraining . - ?edTraining a core:EducationalProcess . - ?edTraining core:majorField ?majorField . - } - 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_0000057> ?person . - ?person a foaf:Person . - ?person rdfs:label ?personName - } - } - - - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> - - CONSTRUCT { - ?degree a core:AcademicDegree . - ?degree rdfs:label ?degreeName . - ?degree core:abbreviation ?degreeAbbr - } WHERE { - { - ?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 - } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?edTraining . - ?edTraining core:dateTimeInterval ?dateTimeInterval . - ?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 core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?edTraining . - ?edTraining core:dateTimeInterval ?dateTimeInterval . - ?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/webapp/src/main/webapp/config/listViewConfig-personInPosition.xml b/webapp/src/main/webapp/config/listViewConfig-personInPosition.xml index 11e18b5b..9a578c49 100644 --- a/webapp/src/main/webapp/config/listViewConfig-personInPosition.xml +++ b/webapp/src/main/webapp/config/listViewConfig-personInPosition.xml @@ -7,6 +7,7 @@ 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 obo: <http://purl.obolibrary.org/obo/> @@ -22,166 +23,76 @@ WHERE { ?subject ?property ?position . - OPTIONAL - { + ?position a core:Position . + OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . ?position core:relates ?org . + ?org a foaf:Organization . ?org rdfs:label ?orgName . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . ?position core:relates ?org . + ?org a foaf:Organization . ?org rdfs:label ?orgName . ?org obo:BFO_0000050 ?middleOrg . ?middleOrg rdfs:label ?middleOrgName . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . ?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 . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . ?position rdfs:label ?positionTitle . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . ?position core:hrJobTitle ?hrJobTitle . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . ?position core:rank ?rank . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . ?position core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeStartValue core:dateTime ?dateTimeStart . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?position . + ?position a core:Position . ?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 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 . - ?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 . + OPTIONAL { + ?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 . - } - } - + + + FILTER ( bound(?org) ) + + } ORDER BY ?subclass DESC(?dateTimeEnd) ?rank + diff --git a/webapp/src/main/webapp/config/listViewConfig-preferredTitle.xml b/webapp/src/main/webapp/config/listViewConfig-preferredTitle.xml index 13962524..8f79c172 100644 --- a/webapp/src/main/webapp/config/listViewConfig-preferredTitle.xml +++ b/webapp/src/main/webapp/config/listViewConfig-preferredTitle.xml @@ -13,31 +13,11 @@ WHERE { ?subject ?property ?vcard . ?vcard vcard:hasTitle ?title . - ?title vcard:title ?preferredTitle + ?title vcard:title ?preferredTitle . } - - - PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - CONSTRUCT { - ?subject ?property ?vcard . - ?vcard vcard:hasTitle ?title . - ?title ?titleProperty ?titleValue - } WHERE { - { - ?subject ?property ?vcard - } UNION { - ?subject ?property ?vcard . - ?vcard vcard:hasTitle ?title - } UNION { - ?subject ?property ?vcard . - ?vcard vcard:hasTitle ?title . - ?title ?titleProperty ?titleValue - } - } - - + edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.MaintainDuplicatesObjectPropertyDataPostProcessor diff --git a/webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml b/webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml index 5d86edf2..0a34cd09 100644 --- a/webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml +++ b/webapp/src/main/webapp/config/listViewConfig-primaryEmail.xml @@ -13,26 +13,11 @@ ?subject ?property ?vcard . ?vcard vcard:hasEmail ?email . ?email a vcard:Work . - ?email vcard:email ?emailAddress + ?email vcard:email ?emailAddress . } - - - PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - CONSTRUCT { - ?subject ?property ?vcard . - ?vcard vcard:hasEmail ?email . - ?email a vcard:Work . - ?email ?emailProperty ?emailValue - } WHERE { - ?subject ?property ?vcard . - ?vcard vcard:hasEmail ?email . - ?email a vcard:Work . - ?email ?emailProperty ?emailValue - } - - + edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.MaintainDuplicatesObjectPropertyDataPostProcessor diff --git a/webapp/src/main/webapp/config/listViewConfig-publicationVenueFor.xml b/webapp/src/main/webapp/config/listViewConfig-publicationVenueFor.xml index 45bcf692..f83ae2fc 100644 --- a/webapp/src/main/webapp/config/listViewConfig-publicationVenueFor.xml +++ b/webapp/src/main/webapp/config/listViewConfig-publicationVenueFor.xml @@ -24,15 +24,36 @@ ?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 - { + OPTIONAL { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:volume ?volume . + } + OPTIONAL { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageStart ?startPage . + } + OPTIONAL { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageEnd ?endPage . + } + OPTIONAL { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource core:placeOfPublication ?locale . + } + OPTIONAL { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource vitro:mostSpecificType ?subclass . + } + OPTIONAL { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime + ?dateTimeValue core:dateTime ?dateTime . } @@ -41,99 +62,5 @@ } 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/> - 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 . - ?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 . - ?editorObj rdfs:label ?editor . - } - 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 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/webapp/src/main/webapp/config/listViewConfig-publisherOf.xml b/webapp/src/main/webapp/config/listViewConfig-publisherOf.xml index 9fc42cfd..d31ea7c7 100644 --- a/webapp/src/main/webapp/config/listViewConfig-publisherOf.xml +++ b/webapp/src/main/webapp/config/listViewConfig-publisherOf.xml @@ -27,28 +27,52 @@ ?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 { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource vitro:mostSpecificType ?subclass . + } + OPTIONAL { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:volume ?volume . + } + OPTIONAL { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageStart ?startPage . + } + OPTIONAL { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource bibo:pageEnd ?endPage . + } + OPTIONAL { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . + ?infoResource core:placeOfPublication ?locale . + } + OPTIONAL { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource bibo:reproducedIn ?appearsInObj . ?appearsInObj rdfs:label ?appearsIn . } - OPTIONAL - { + OPTIONAL { + ?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 . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource core:hasPublicationVenue ?publishedIn . ?publishedIn rdfs:label ?journal . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?infoResource . + ?infoResource a <http://purl.obolibrary.org/obo/IAO_0000030> . ?infoResource core:dateTimeValue ?dateTimeValue . ?dateTimeValue core:dateTime ?dateTime . } @@ -59,140 +83,5 @@ } 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/> - 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 . - ?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 . - ?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 . - ?editorObj rdfs:label ?editor . - } - 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 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/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml b/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml index 3ebd5de6..969bcb8f 100644 --- a/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml +++ b/webapp/src/main/webapp/config/listViewConfig-rangeUnion.xml @@ -26,24 +26,27 @@ ?subject ?property ?object . LET (?localName := afn:localname(?object)) - OPTIONAL { ?object rdfs:label ?label } + OPTIONAL { + ?subject ?property ?object . + ?object rdfs:label ?label . + } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?object . # 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 + #?classGroup a vitro:ClassGroup . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?object . ?object obo:ARG_2000028 ?vcard . ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title + ?titleObj vcard:title ?title . } @@ -56,54 +59,5 @@ } ORDER BY ?subclass ASC( ?label ) ASC( ?localName ) ?type - - 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 obo: <http://purl.obolibrary.org/obo/> - PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - - 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 . - ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title . - } - WHERE - { - { - ?subject ?property ?object . - } - 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 - { - ?subject ?property ?object . - ?object obo:ARG_2000028 ?vcard . - ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title . - } - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml b/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml index de6cb78b..9d3a7df8 100644 --- a/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml +++ b/webapp/src/main/webapp/config/listViewConfig-relatedRole.xml @@ -24,44 +24,88 @@ WHERE { ?subject ?property ?role . - ?role a ?objectType + ?role a ?objectType . - OPTIONAL { ?role rdfs:label ?roleLabel } + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role rdfs:label ?roleLabel . + } # We need ?subclass in the uncollated query to get the roleTypeLabel # for roles that have no label. - OPTIONAL { ?role vitro:mostSpecificType ?subclass . } - OPTIONAL { ?role vitro:mostSpecificType ?subclass . - ?subclass rdfs:label ?roleTypeLabel + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role vitro:mostSpecificType ?subclass . } - OPTIONAL { ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole } - OPTIONAL { ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . - ?indivInRole rdfs:label ?indivLabel + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role vitro:mostSpecificType ?subclass . + ?subclass rdfs:label ?roleTypeLabel . } - OPTIONAL { ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . - ?indivInRole a vcard:Kind . - ?indivInRole 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 ?indivLabel) . + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . + } + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . + ?indivInRole rdfs:label ?indivLabel . + } + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . + ?indivInRole a vcard:Kind . + ?indivInRole vcard:hasName ?vName . + ?vName vcard:familyName ?lastName . + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . + ?indivInRole a vcard:Kind . + ?indivInRole vcard:hasName ?vName . + ?vName vcard:givenName ?firstName . + } + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . + ?indivInRole a vcard:Kind . + ?indivInRole vcard:hasName ?vName . + ?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 ?indivLabel) . - OPTIONAL { ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . - ?indivInRole a vcard:Kind . - ?indivInRole vitro:mostSpecificType ?vSubclass . - ?vSubclass rdfs:subClassOf vcard:Kind - } + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . + ?indivInRole a vcard:Kind . + ?indivInRole vitro:mostSpecificType ?vSubclass . + ?vSubclass rdfs:subClassOf vcard:Kind . + } } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?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 { + ?subject ?property ?role . + ?role a ?objectType . + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . } FILTER ( bound(?indivInRole) ) @@ -69,154 +113,5 @@ } ORDER BY ?subclass ?indivLabel ?roleLabel ?roleTypeLabel ?indivName - - 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 ?objectType . - ?role rdfs:label ?roleLabel . - ?role vitro:mostSpecificType ?subclass . - ?subclass rdfs:label ?roleTypeLabel . - ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . - ?indivInRole rdfs:label ?indivLabel - } WHERE { - { - ?subject ?property ?role . - ?role a ?objectType - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role rdfs:label ?roleLabel - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role vitro:mostSpecificType ?subclass - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role vitro:mostSpecificType ?subclass . - ?subclass rdfs:label ?roleTypeLabel - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . - ?indivInRole rdfs:label ?indivLabel - } - } - - - - 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 { - ?subject ?property ?role . - ?role a ?objectType . - ?role rdfs:label ?roleLabel . - ?role vitro:mostSpecificType ?subclass . - ?subclass rdfs:label ?roleTypeLabel . - ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . - ?indivInRole a vcard:Kind . - ?indivInRole vcard:hasName ?vName . - ?vName vcard:familyName ?lastName . - ?vName vcard:givenName ?firstName . - ?vName core:middleName ?middleName . - ?indivInRole vitro:mostSpecificType ?vSubclass . - ?vSubclass rdfs:subClassOf vcard:Kind - } WHERE { - { - ?subject ?property ?role . - ?role a ?objectType - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role rdfs:label ?roleLabel - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role vitro:mostSpecificType ?subclass - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role vitro:mostSpecificType ?subclass . - ?subclass rdfs:label ?roleTypeLabel - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . - ?indivInRole a vcard:Kind . - ?indivInRole vcard:hasName ?vName . - ?vName vcard:familyName ?lastName . - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . - ?indivInRole a vcard:Kind . - ?indivInRole vcard:hasName ?vName . - ?vName vcard:familyName ?lastName . - ?vName vcard:givenName ?firstName . - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . - ?indivInRole a vcard:Kind . - ?indivInRole vcard:hasName ?vName . - ?vName vcard:familyName ?lastName . - ?vName vcard:givenName ?firstName . - ?vName core:middleName ?middleName . - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role <http://purl.obolibrary.org/obo/RO_0000052> ?indivInRole . - ?indivInRole a vcard:Kind . - ?indivInRole vitro:mostSpecificType ?vSubclass . - ?vSubclass rdfs:subClassOf vcard:Kind - } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a ?objectType . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?role . - ?role a ?objectType . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?role . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-researchActivities.xml b/webapp/src/main/webapp/config/listViewConfig-researchActivities.xml index a0723a71..7bfe4279 100644 --- a/webapp/src/main/webapp/config/listViewConfig-researchActivities.xml +++ b/webapp/src/main/webapp/config/listViewConfig-researchActivities.xml @@ -22,140 +22,54 @@ WHERE { ?subject ?property ?role . - ?role a core:ResearcherRole . - ?role vitro:mostSpecificType ?roleSubclass . + ?role vitro:mostSpecificType core:ResearcherRole . - OPTIONAL - { + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:ResearcherRole . ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . ?activity rdfs:label ?activityLabel . - + ?activity vitro:mostSpecificType ?subclass . - + } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:ResearcherRole . ?role core:relatedBy ?activity . ?activity rdfs:label ?activityLabel . - + ?activity vitro:mostSpecificType ?subclass . - + } - OPTIONAL { ?role rdfs:label ?roleLabel } - OPTIONAL { ?role core:hideFromDisplay ?hideThis } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:ResearcherRole . + ?role rdfs:label ?roleLabel . + } + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:ResearcherRole . + ?role core:hideFromDisplay ?hideThis . + } + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:ResearcherRole . ?role core:dateTimeInterval ?dateTimeInterval . ?dateTimeInterval core:start ?dateTimeStartValue . ?dateTimeStartValue core:dateTime ?dateTimeStart . } - OPTIONAL - { + OPTIONAL { + ?subject ?property ?role . + ?role vitro:mostSpecificType core:ResearcherRole . ?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 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 . - } - UNION - { - ?subject ?property ?role . - ?role a core:ResearcherRole . - ?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 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 . - } - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml b/webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml index 0ce19349..79a217e7 100644 --- a/webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml +++ b/webapp/src/main/webapp/config/listViewConfig-researchAreaOf.xml @@ -24,114 +24,46 @@ ?title ?dateTimeEnd WHERE { - ?subject ?property ?person . - OPTIONAL { ?person core:relatedBy ?position . - ?position a core:Position - } - OPTIONAL { ?person core:relatedBy ?position . - ?position a core:Position . - ?position rdfs:label ?posnLabel - } - OPTIONAL { ?person rdfs:label ?personName } - OPTIONAL { ?person obo:ARG_2000028 ?vcard . - ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title - } - OPTIONAL { ?person core:relatedBy ?position . - ?position a core:Position . - ?position core:relates ?org . - ?org a foaf:Organization . - ?org rdfs:label ?orgLabel - } - OPTIONAL { ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd . - FILTER ( ?dateTimeEnd < now() ) - } + ?subject ?property ?person . + OPTIONAL { + ?subject ?property ?person . + ?person core:relatedBy ?position . + ?position a core:Position . + } + OPTIONAL { + ?subject ?property ?person . + ?person core:relatedBy ?position . + ?position a core:Position . + ?position rdfs:label ?posnLabel . + } + OPTIONAL { + ?subject ?property ?person . + ?person rdfs:label ?personName . + } + OPTIONAL { + ?subject ?property ?person . + ?person obo:ARG_2000028 ?vcard . + ?vcard vcard:hasTitle ?titleObj . + ?titleObj vcard:title ?title . + } + OPTIONAL { + ?subject ?property ?person . + ?person core:relatedBy ?position . + ?position a core:Position . + ?position core:relates ?org . + ?org a foaf:Organization . + ?org rdfs:label ?orgLabel . + } + OPTIONAL { + ?subject ?property ?person . + ?position core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:end ?dateTimeEndValue . + ?dateTimeEndValue core:dateTime ?dateTimeEnd . + FILTER ( ?dateTimeEnd < now() ) + } } ORDER BY (fn:lower-case(?personName)) (bound(?dateTimeEnd)) desc(?dateTimeEnd) - - 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 ?person . - ?person core:relatedBy ?position . - ?position a core:Position . - ?position rdfs:label ?posnLabel . - ?position core:relates ?org . - ?org a foaf:Organization . - ?org rdfs:label ?orgName . - ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?endDate . - ?endDate core:dateTime ?endDateValue . - } WHERE { - { - ?subject ?property ?person - } UNION { - ?subject ?property ?person . - ?person core:relatedBy ?position . - ?position a core:Position . - } UNION { - ?subject ?property ?person . - ?person core:relatedBy ?position . - ?position a core:Position . - ?position rdfs:label ?posnLabel - } UNION { - ?subject ?property ?person . - ?person core:relatedBy ?position . - ?position a core:Position . - ?position core:relates ?org . - ?org a foaf:Organization . - } UNION { - ?subject ?property ?person . - ?person core:relatedBy ?position . - ?position a core:Position . - ?position core:relates ?org . - ?org a foaf:Organization . - ?org rdfs:label ?orgName - } UNION { - ?subject ?property ?person . - ?person core:relatedBy ?position . - ?position a core:Position . - ?position core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?endDate . - ?endDate core:dateTime ?endDateValue - } - } - - - - 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 obo: <http://purl.obolibrary.org/obo/> - PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - - CONSTRUCT { - ?subject ?property ?person . - ?person rdfs:label ?personName . - ?person obo:ARG_2000028 ?vcard . - ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title - } WHERE { - { - ?subject ?property ?person - } UNION { - ?subject ?property ?person . - ?person rdfs:label ?personName - } UNION { - ?subject ?property ?person . - ?person obo:ARG_2000028 ?vcard . - ?vcard vcard:hasTitle ?titleObj . - ?titleObj vcard:title ?title - } - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-roleContributesTo.xml b/webapp/src/main/webapp/config/listViewConfig-roleContributesTo.xml index 6ef077d1..7353486c 100644 --- a/webapp/src/main/webapp/config/listViewConfig-roleContributesTo.xml +++ b/webapp/src/main/webapp/config/listViewConfig-roleContributesTo.xml @@ -26,137 +26,47 @@ ?subject ?property ?role . ?role a ?objectType . - OPTIONAL { ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityLabel + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role core:roleContributesTo ?activity . + ?activity rdfs:label ?activityLabel . - - ?activity vitro:mostSpecificType ?subclass - + + ?activity vitro:mostSpecificType ?subclass . + } - OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity rdfs:label ?activityLabel + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . + ?activity rdfs:label ?activityLabel . - - ?activity vitro:mostSpecificType ?subclass - + + ?activity vitro:mostSpecificType ?subclass . + } - OPTIONAL { ?role rdfs:label ?roleLabel } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role rdfs:label ?roleLabel . } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?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 ?objectType . - ?role core:roleContributesTo ?activity . - ?activity vitro:mostSpecificType ?subclass . - } WHERE { - ?subject ?property ?role . - ?role a ?objectType . - ?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 ?objectType . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity vitro:mostSpecificType ?subclass . - } WHERE { - ?subject ?property ?role . - ?role a ?objectType . - ?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 { - ?subject ?property ?role . - ?role rdfs:label ?roleLabel . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityName . - } WHERE { - { - ?subject ?property ?role . - ?role a ?objectType . - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role rdfs:label ?roleLabel - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role core:relates ?activity . - ?activity rdfs:label ?activityName - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity rdfs:label ?activityName - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityName - } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a ?objectType . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?role . - ?role a ?objectType . - ?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 ?objectType . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?role . - ?role a ?objectType . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - diff --git a/webapp/src/main/webapp/config/listViewConfig-roleRealizedIn.xml b/webapp/src/main/webapp/config/listViewConfig-roleRealizedIn.xml index bddce137..8933676d 100644 --- a/webapp/src/main/webapp/config/listViewConfig-roleRealizedIn.xml +++ b/webapp/src/main/webapp/config/listViewConfig-roleRealizedIn.xml @@ -22,113 +22,48 @@ WHERE { ?subject ?property ?role . ?role a ?objectType . - - OPTIONAL { ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity rdfs:label ?activityLabel - - - ?activity vitro:mostSpecificType ?subclass - - } - OPTIONAL { ?role rdfs:label ?roleLabel } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart + + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role rdfs:label ?roleLabel . } - OPTIONAL { ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role core:roleContributesTo ?activity . + ?activity rdfs:label ?activityLabel . + + + ?activity vitro:mostSpecificType ?subclass . + + } + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . + ?activity rdfs:label ?activityLabel . + + + ?activity vitro:mostSpecificType ?subclass . + + } + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?role core:dateTimeInterval ?dateTimeInterval . + ?dateTimeInterval core:start ?dateTimeStartValue . + ?dateTimeStartValue core:dateTime ?dateTimeStart . + } + OPTIONAL { + ?subject ?property ?role . + ?role a ?objectType . + ?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 ?objectType . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity vitro:mostSpecificType ?subclass . - } WHERE { - ?subject ?property ?role . - ?role a ?objectType . - ?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 { - ?subject ?property ?role . - ?role rdfs:label ?roleLabel . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityName - } WHERE { - { - ?subject ?property ?role . - ?role a ?objectType . - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role rdfs:label ?roleLabel . - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role core:relates ?activity . - ?activity rdfs:label ?activityName - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role <http://purl.obolibrary.org/obo/BFO_0000054> ?activity . - ?activity rdfs:label ?activityName - } UNION { - ?subject ?property ?role . - ?role a ?objectType . - ?role core:roleContributesTo ?activity . - ?activity rdfs:label ?activityName - } - } - - - - PREFIX core: <http://vivoweb.org/ontology/core#> - CONSTRUCT { - ?subject ?property ?role . - ?role a ?objectType . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:start ?dateTimeStartValue . - ?dateTimeStartValue core:dateTime ?dateTimeStart - } WHERE { - ?subject ?property ?role . - ?role a ?objectType . - ?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 ?objectType . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } WHERE { - ?subject ?property ?role . - ?role a ?objectType . - ?role core:dateTimeInterval ?dateTimeInterval . - ?dateTimeInterval core:end ?dateTimeEndValue . - ?dateTimeEndValue core:dateTime ?dateTimeEnd - } - diff --git a/webapp/src/main/webapp/config/listViewConfig-scopusId.xml b/webapp/src/main/webapp/config/listViewConfig-scopusId.xml index 3498f5fc..a508574e 100644 --- a/webapp/src/main/webapp/config/listViewConfig-scopusId.xml +++ b/webapp/src/main/webapp/config/listViewConfig-scopusId.xml @@ -11,20 +11,11 @@ SELECT ?value WHERE { - ?subject ?property ?value + ?subject ?property ?value . FILTER isLiteral(?value) } ORDER BY ?value - - - CONSTRUCT { - ?subject ?property ?value - } WHERE { - ?subject ?property ?value - } - - diff --git a/webapp/src/main/webapp/config/listViewConfig-telephoneNumber.xml b/webapp/src/main/webapp/config/listViewConfig-telephoneNumber.xml index c0b0e56e..e4cd4a3f 100644 --- a/webapp/src/main/webapp/config/listViewConfig-telephoneNumber.xml +++ b/webapp/src/main/webapp/config/listViewConfig-telephoneNumber.xml @@ -12,24 +12,15 @@ WHERE { ?subject ?property ?vcard . ?vcard vcard:hasTelephone ?phone . - ?phone vcard:telephone ?number - MINUS {?phone a vcard:Fax} + ?phone vcard:telephone ?number . + MINUS { + ?subject ?property ?vcard . + ?vcard vcard:hasTelephone ?phone . + ?phone a vcard:Fax . + } } - - - PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - CONSTRUCT { - ?subject ?property ?vcard . - ?vcard vcard:hasTelephone ?phone . - ?phone ?phoneProperty ?phoneValue - } WHERE { - ?subject ?property ?vcard . - ?vcard vcard:hasTelephone ?phone . - ?phone ?phoneProperty ?phoneValue - } - - + edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.MaintainDuplicatesObjectPropertyDataPostProcessor diff --git a/webapp/src/main/webapp/config/listViewConfig-webpage.xml b/webapp/src/main/webapp/config/listViewConfig-webpage.xml index 6dac4bb3..31db7f01 100644 --- a/webapp/src/main/webapp/config/listViewConfig-webpage.xml +++ b/webapp/src/main/webapp/config/listViewConfig-webpage.xml @@ -16,12 +16,25 @@ (afn:localname(?link) AS ?linkName) (group_concat(distinct ?linkLabel;separator="/") as ?label) ?url - ?rank WHERE { + ?rank + WHERE { ?subject ?property ?vcard . - ?vcard vcard:hasURL ?link - OPTIONAL { ?link rdfs:label ?linkLabel } - OPTIONAL { ?link vcard:url ?url } - OPTIONAL { ?link core:rank ?rank } + ?vcard vcard:hasURL ?link . + OPTIONAL { + ?subject ?property ?vcard . + ?vcard vcard:hasURL ?link . + ?link rdfs:label ?linkLabel . + } + OPTIONAL { + ?subject ?property ?vcard . + ?vcard vcard:hasURL ?link . + ?link vcard:url ?url . + } + OPTIONAL { + ?subject ?property ?vcard . + ?vcard vcard:hasURL ?link . + ?link core:rank ?rank . + } FILTER ( bound(?link) ) @@ -29,36 +42,6 @@ ORDER BY ?rank ?linkLabel - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX vcard: <http://www.w3.org/2006/vcard/ns#> - CONSTRUCT { - ?subject ?property ?vcard . - ?vcard vcard:hasURL ?link . - ?link vcard:url ?url . - ?link core:rank ?rank . - ?link rdfs:label ?linkLabel - } WHERE { - { - ?subject ?property ?vcard . - ?vcard vcard:hasURL ?link - } UNION { - ?subject ?property ?vcard . - ?vcard vcard:hasURL ?link . - ?link vcard:url ?url - } UNION { - ?subject ?property ?vcard . - ?vcard vcard:hasURL ?link . - ?link core:rank ?rank - } UNION { - ?subject ?property ?vcard . - ?vcard vcard:hasURL ?link . - ?link rdfs:label ?linkLabel - } - } - - edu.cornell.mannlib.vitro.webapp.web.templatemodels.individual.MaintainDuplicatesObjectPropertyDataPostProcessor