diff --git a/productMods/config/listViewConfig-advisorIn.xml b/productMods/config/listViewConfig-advisorIn.xml index 3e1f10f7..662acc78 100644 --- a/productMods/config/listViewConfig-advisorIn.xml +++ b/productMods/config/listViewConfig-advisorIn.xml @@ -125,21 +125,6 @@ } - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - CONSTRUCT { - ?subject ?property ?advisory . - ?advisory vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:AdvisingRelationship - } WHERE { - ?subject ?property ?advisory . - ?advisory vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:AdvisingRelationship - } - - PREFIX core: <http://vivoweb.org/ontology/core#> CONSTRUCT { diff --git a/productMods/config/listViewConfig-authorInAuthorship.xml b/productMods/config/listViewConfig-authorInAuthorship.xml index 31d4c7d5..15b952c9 100644 --- a/productMods/config/listViewConfig-authorInAuthorship.xml +++ b/productMods/config/listViewConfig-authorInAuthorship.xml @@ -26,39 +26,37 @@ ?editor ?hideThis WHERE { - ?subject ?property ?authorship - OPTIONAL { ?authorship core:linkedInformationResource ?infoResource . - ?infoResource rdfs:label ?infoResourceName + ?subject ?property ?authorship . + ?authorship core:linkedInformationResource ?infoResource . + ?infoResource rdfs:label ?infoResourceName - OPTIONAL { ?infoResource bibo:volume ?volume } - OPTIONAL { ?infoResource bibo:pageStart ?startPage } - OPTIONAL { ?infoResource bibo:pageEnd ?endPage } - OPTIONAL { ?infoResource core:placeOfPublication ?locale } - OPTIONAL { ?infoResource bibo:reproducedIn ?appearsInObj . - ?appearsInObj rdfs:label ?appearsIn - } - OPTIONAL { ?infoResource core:publisher ?publisherObj . - ?publisherObj rdfs:label ?publisher - } - OPTIONAL { ?infoResource core:editor ?editorObj . - ?editorObj rdfs:label ?editor - } - OPTIONAL { ?infoResource core:partOf ?partOfObj . - ?partOfObj rdfs:label ?partOf - } + OPTIONAL { ?infoResource bibo:volume ?volume } + OPTIONAL { ?infoResource bibo:pageStart ?startPage } + OPTIONAL { ?infoResource bibo:pageEnd ?endPage } + OPTIONAL { ?infoResource core:placeOfPublication ?locale } + OPTIONAL { ?infoResource bibo:reproducedIn ?appearsInObj . + ?appearsInObj rdfs:label ?appearsIn + } + OPTIONAL { ?infoResource core:publisher ?publisherObj . + ?publisherObj rdfs:label ?publisher + } + OPTIONAL { ?infoResource core:editor ?editorObj . + ?editorObj rdfs:label ?editor + } + OPTIONAL { ?infoResource core:partOf ?partOfObj . + ?partOfObj rdfs:label ?partOf + } + OPTIONAL { ?infoResource vitro:mostSpecificType ?subclass . + ?subclass rdfs:subClassOf core:InformationResource + } + OPTIONAL { ?infoResource core:hasPublicationVenue ?publishedIn . + ?publishedIn rdfs:label ?journal + } + OPTIONAL { ?infoResource core:dateTimeValue ?dateTimeValue . + ?dateTimeValue core:dateTime ?dateTime + } + OPTIONAL { ?authorship core:hideFromDisplay ?hideThis } - OPTIONAL { ?infoResource vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:InformationResource - } - OPTIONAL { ?infoResource core:hasPublicationVenue ?publishedIn . - ?publishedIn rdfs:label ?journal - } - OPTIONAL { ?infoResource core:dateTimeValue ?dateTimeValue . - ?dateTimeValue core:dateTime ?dateTime - } - OPTIONAL { ?authorship core:hideFromDisplay ?hideThis } - } - # NOT EXISTS { ?authorship core:hideFromDisplay ?hideThis } FILTER ( bound(?infoResource) ) @@ -169,22 +167,6 @@ } - - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - CONSTRUCT { - ?subject ?property ?authorship . - ?infoResource vitro:mostSpecificType ?subclass . - ?authorship core:linkedInformationResource ?infoResource - } WHERE { - ?subject ?property ?authorship . - ?authorship core:linkedInformationResource ?infoResource . - ?infoResource vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf core:InformationResource - } - - PREFIX core: <http://vivoweb.org/ontology/core#> PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> diff --git a/productMods/config/listViewConfig-educationalTraining.xml b/productMods/config/listViewConfig-educationalTraining.xml index 76f0b612..986356f3 100644 --- a/productMods/config/listViewConfig-educationalTraining.xml +++ b/productMods/config/listViewConfig-educationalTraining.xml @@ -122,22 +122,6 @@ } - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> - PREFIX core: <http://vivoweb.org/ontology/core#> - PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#> - CONSTRUCT { - ?subject ?property ?edTraining . - ?org vitro:mostSpecificType ?subclass . - ?edTraining core:trainingAtOrganization ?org - } WHERE { - ?subject ?property ?edTraining . - ?org vitro:mostSpecificType ?subclass . - ?edTraining core:trainingAtOrganization ?org - } - - - PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#> PREFIX core: <http://vivoweb.org/ontology/core#> diff --git a/productMods/config/listViewConfig-mailingAddress.xml b/productMods/config/listViewConfig-mailingAddress.xml index 13c51600..75049f33 100644 --- a/productMods/config/listViewConfig-mailingAddress.xml +++ b/productMods/config/listViewConfig-mailingAddress.xml @@ -66,21 +66,6 @@ } } - - - 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 { - ?subject ?property ?address . - ?address vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf vivo:Address - } WHERE { - ?subject ?property ?address . - ?address vitro:mostSpecificType ?subclass . - ?subclass rdfs:subClassOf vivo:Address - } - diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl index fa5ef8a2..687851de 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage-quickview.ftl @@ -16,8 +16,7 @@ <#assign count = property.statements?size!> <#assign identifier> - <#if statement.url?has_content> - ${statement.url?replace(":","")?replace("/","")?replace(".","-")?replace("&","")?replace("%","")?replace("?","")?replace("=","")}<#t> + <#if statement.url?has_content>${statement.url?replace("[^\\p{L}\\p{N}]","","r")}<#t> <#else> "noUrl"<#t>