Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support metadata thumbnails #16

Merged
merged 2 commits into from
Oct 23, 2024
Merged

Support metadata thumbnails #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8ef5ec
Support metadata thumbnails
josegar74 Oct 21, 2024
a3125fc
Support metadata thumbnails / Use matches as dublin-core schema. Add …
fxprunayre Oct 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 30 additions & 6 deletions src/main/plugin/dcat-ap/extract-relations.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,50 @@
-->

<xsl:stylesheet version="2.0"
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:dct="http://purl.org/dc/terms/"
xmlns:dcat="http://www.w3.org/ns/dcat#"
xmlns:adms="http://www.w3.org/ns/adms#"
xmlns:foaf="http://xmlns.com/foaf/0.1/"
xmlns:skos="http://www.w3.org/2004/02/skos/core#"
xmlns:gn-fn-rel="http://geonetwork-opensource.org/xsl/functions/relations"
exclude-result-prefixes="#all">

<xsl:import href="layout/utility-tpl-multilingual.xsl" />

<xsl:template mode="relation" match="metadata[rdf:RDF/dcat:Catalog]" priority="100">
<xsl:if test="count(*/descendant::*[name(.) = 'adms:sample']/*) > 0">
<xsl:if test="count(*/descendant::*[name(.) = 'foaf:page']/*) > 0">

<xsl:variable name="mainLanguage">
<xsl:call-template name="get-dcat-ap-language">
<xsl:with-param name="languageIri"
select=".//dcat:CatalogRecord/dct:language[1]/(@rdf:resource|skos:Concept/@rdf:about|dct:LinguisticSystem/@rdf:about)" />
</xsl:call-template>
</xsl:variable>

<thumbnails>
<xsl:for-each select="*/descendant::*[name(.) = 'adms:sample']">
<xsl:for-each select="*/descendant::*[name(.) = 'foaf:page' and foaf:Document[matches(@rdf:about, '.*(.gif|.png|.jpeg|.jpg)$', 'i')]]">
<item>
<id>
<xsl:value-of select="dcat:Distribution/dcat:downloadURL/@rdf:resource"/>
<xsl:value-of select="foaf:Document/@rdf:about"/>
</id>
<url>
<value lang="dut"><xsl:value-of select="dcat:Distribution/dcat:downloadURL/@rdf:resource"/></value>
<xsl:variable name="url" select="foaf:Document/@rdf:about" />

<value lang="{$mainLanguage}">
<xsl:value-of select="$url"/>
</value>
</url>
<title>
<value lang="dut"><xsl:value-of select="dct:title[1]"/></value>
<xsl:for-each select="dct:description">
<xsl:variable name="localeId"
select="@xml:lang"/>

<value lang="{$localeId}">
<xsl:value-of select="."/>
</value>
</xsl:for-each>
</title>
<type>thumbnail</type>
</item>
Expand Down
4 changes: 2 additions & 2 deletions src/main/plugin/dcat-ap/formatter/xsl-view/view.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,11 +193,11 @@
</span>
</h4>

<xsl:for-each select="//adms:sample[normalize-space(dcat:Distribution/dcat:downloadURL/@rdf:resource)!='']">
<xsl:for-each select="//foaf:page/foaf:Document[matches(@rdf:about, '.*(.gif|.png|.jpeg|.jpg)$', 'i')]">
<img data-gn-img-modal="md"
class="gn-img-thumbnail center-block"
alt="{$schemaStrings/overview}"
src="{normalize-space(dcat:Distribution/dcat:downloadURL/@rdf:resource)}"/>
src="{normalize-space(@rdf:about)}"/>
<div class="gn-img-thumbnail-caption"><xsl:value-of select="dct:title" /></div>
</xsl:for-each>
</section>
Expand Down
22 changes: 17 additions & 5 deletions src/main/plugin/dcat-ap/index-fields/index.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,21 @@
</resolutionScaleDenominator>
</xsl:for-each>

<!-- TODO check how to implement overviews in dcat-->
<xsl:copy-of select="gn-fn-index:add-field('hasOverview', 'false')"/>

<!-- Overviews -->
<xsl:variable name="overviews"
select="foaf:page/foaf:Document[matches(@rdf:about, '.*(.gif|.png|.jpeg|.jpg)$', 'i')]"/>
<xsl:copy-of select="gn-fn-index:add-field('hasOverview', if (count($overviews) > 0) then 'true' else 'false')"/>

<xsl:for-each select="$overviews">
<overview type="object">{
"url": "<xsl:value-of select="util:escapeForJson(normalize-space(@rdf:about))"/>"
<xsl:if test="normalize-space(dct:description) != ''">,
"nameObject": <xsl:value-of select="gn-fn-index:add-multilingual-field('name', dct:description, $allLanguages, true())"/>
</xsl:if>
}</overview>
</xsl:for-each>


<xsl:variable name="openKeywords" select="*[name() = ('dct:subject', 'mdcat:statuut') and
skos:Concept/@rdf:about = ('https://metadata.vlaanderen.be/id/GDI-Vlaanderen-Trefwoorden/VLOPENDATA', 'https://metadata.vlaanderen.be/id/GDI-Vlaanderen-Trefwoorden/VLOPENDATASERVICE')
Expand Down Expand Up @@ -608,7 +621,6 @@
<xsl:param name="fieldSuffix" select="''" as="xs:string"/>
<xsl:param name="role" select="''" as="xs:string"/>

<xsl:variable name="organisationName" select="vcard:Organization/vcard:organization-name"/>
<xsl:variable name="website" select="vcard:Organization/vcard:hasURL/@rdf:resource"/>
<xsl:variable name="email" select="vcard:Organization/vcard:hasEmail/@rdf:resource"/>
<xsl:variable name="phone" select="vcard:Organization/vcard:hasTelephone"/>
Expand All @@ -618,7 +630,7 @@
<xsl:when test="vcard:Organization/vcard:hasAddress/vcard:Address">
<xsl:for-each select="vcard:Organization/vcard:hasAddress/vcard:Address">
<xsl:value-of
select="concat(vcard:street-address, ', ', vcard:locality, ', ', vcard:postal-code, ', ', vcard:country-name)"/>
select="concat(vcard:street-address[1], ', ', vcard:locality[1], ', ', vcard:postal-code[1], ', ', vcard:country-name[1])"/>
</xsl:for-each>
</xsl:when>
<xsl:otherwise>
Expand All @@ -642,7 +654,7 @@
"website":"<xsl:value-of select="$website"/>",
"individual":"<xsl:value-of select="util:escapeForJson($individualName)"/>",
"phone":"<xsl:value-of select="util:escapeForJson($phone[1])"/>",
"address":"<xsl:value-of select="util:escapeForJson($address)"/>"
"address":"<xsl:value-of select="util:escapeForJson($address[1])"/>"
}
</xsl:element>
</xsl:template>
Expand Down
9 changes: 9 additions & 0 deletions src/main/plugin/dcat-ap/layout/config-editor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,9 @@
displayTooltipsMode="onhover"
hideTimeInCalendar="true">
<sidePanel>
<directive data-gn-overview-manager=""
data-file-types=".png,.gif,.jpeg,.jpg"/>

<directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
<directive data-gn-validation-report=""/>
</sidePanel>
Expand Down Expand Up @@ -746,6 +749,9 @@
displayTooltipsMode="onhover"
hideTimeInCalendar="true">
<sidePanel>
<directive data-gn-overview-manager=""
data-file-types=".png,.gif,.jpeg,.jpg"/>

<directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
<directive data-gn-validation-report=""/>
</sidePanel>
Expand Down Expand Up @@ -889,6 +895,9 @@

<view name="fromroot">
<sidePanel>
<directive data-gn-overview-manager=""
data-file-types=".png,.gif,.jpeg,.jpg"/>

<directive data-gn-associated-resources-panel="gnCurrentEdit.metadata" />
<directive data-gn-validation-report=""/>
</sidePanel>
Expand Down
21 changes: 14 additions & 7 deletions src/main/plugin/dcat-ap/process/thumbnail-add.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,23 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:dct="http://purl.org/dc/terms/"
xmlns:dcat="http://www.w3.org/ns/dcat#"
xmlns:adms="http://www.w3.org/ns/adms#"
xmlns:foaf="http://xmlns.com/foaf/0.1/"
xmlns:skos="http://www.w3.org/2004/02/skos/core#"
xmlns:geonet="http://www.fao.org/geonetwork"
exclude-result-prefixes="#all"
version="2.0">

<xsl:import href="../layout/utility-tpl-multilingual.xsl" />
<!-- Thumbnail base url (mandatory) -->
<xsl:param name="thumbnail_url"/>
<xsl:param name="thumbnail_desc" select="''"/>

<xsl:variable name="metadata" select="//rdf:RDF" />

<xsl:variable name="mainLanguage">
<xsl:call-template name="get-dcat-ap-language" />
</xsl:variable>

<xsl:template match="/root">
<xsl:apply-templates select="rdf:RDF"/>
</xsl:template>
Expand All @@ -55,14 +63,13 @@

<xsl:template name="fill">
<xsl:if test="$thumbnail_url != ''">
<adms:sample>
<dcat:Distribution>
<dcat:downloadURL rdf:resource="{$thumbnail_url}"/>
<foaf:page>
<foaf:Document rdf:about="{$thumbnail_url}">
<xsl:if test="$thumbnail_desc!=''">
<dct:title xml:lang="nl"><xsl:value-of select="$thumbnail_desc"/></dct:title>
<dct:description xml:lang="{$mainLanguage}"><xsl:value-of select="$thumbnail_desc"/></dct:description>
</xsl:if>
</dcat:Distribution>
</adms:sample>
</foaf:Document>
</foaf:page>
</xsl:if>
</xsl:template>

Expand Down
7 changes: 6 additions & 1 deletion src/main/plugin/dcat-ap/process/thumbnail-remove.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:dcat="http://www.w3.org/ns/dcat#"
xmlns:adms="http://www.w3.org/ns/adms#"
xmlns:foaf="http://xmlns.com/foaf/0.1/"
xmlns:geonet="http://www.fao.org/geonetwork" exclude-result-prefixes="#all"
version="2.0">

Expand All @@ -39,7 +40,11 @@
<!-- Remove the thumbnail define in thumbnail_url parameter -->
<xsl:template
priority="2"
match="adms:sample[normalize-space(dcat:Distribution/dcat:downloadURL/@rdf:resource) = normalize-space($thumbnail_url)]"/>
match="foaf:page[normalize-space(foaf:Document/@rdf:about) = normalize-space($thumbnail_url)]"/>

<!--<xsl:template
priority="2"
match="adms:sample[normalize-space(dcat:Distribution/dcat:downloadURL/@rdf:resource) = normalize-space($thumbnail_url)]"/>-->

<!-- Do a copy of every nodes and attributes -->
<xsl:template match="@*|node()">
Expand Down