Skip to content

Commit 3a1c6a5

Browse files
namedgraphnamedgraph
committed
Reverted ldh:RenderViewResults changes
1 parent 25ce954 commit 3a1c6a5

File tree

1 file changed

+49
-52
lines changed
  • src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block

1 file changed

+49
-52
lines changed

‎src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl‎

Lines changed: 49 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -775,21 +775,39 @@ exclude-result-prefixes="#all"
775775
<ixsl:set-style name="width" select="'88%'" object="."/>
776776
</xsl:for-each>
777777

778-
<xsl:variable name="object-uris" select="distinct-values($results/rdf:RDF/rdf:Description/*/@rdf:resource[not(key('resources', .))])" as="xs:string*"/>
779-
<xsl:variable name="query-string" select="$object-metadata-query || ' VALUES $this { ' || string-join(for $uri in $object-uris return '&lt;' || $uri || '&gt;', ' ') || ' }'" as="xs:string"/>
780-
<xsl:variable name="request" select="map{ 'method': 'POST', 'href': $endpoint, 'media-type': 'application/sparql-query', 'body': $query-string, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
781-
<xsl:sequence select="
782-
map{
783-
'request': $request,
784-
'block': $block,
785-
'container': .//div[contains-token(@class, 'container-results')],
786-
'container-id': $container-id,
787-
'endpoint': $endpoint,
788-
'results': $results,
789-
'active-mode': $active-mode,
790-
'select-xml': $select-xml,
791-
'base-uri': $base-uri
792-
}"/>
778+
<!-- only load object metadata when querying the local endpoint -->
779+
<xsl:choose>
780+
<xsl:when test="$endpoint = sd:endpoint()">
781+
<xsl:variable name="object-uris" select="distinct-values($results/rdf:RDF/rdf:Description/*/@rdf:resource[not(key('resources', .))])" as="xs:string*"/>
782+
<xsl:variable name="query-string" select="$object-metadata-query || ' VALUES $this { ' || string-join(for $uri in $object-uris return '&lt;' || $uri || '&gt;', ' ') || ' }'" as="xs:string"/>
783+
<xsl:variable name="request" select="map{ 'method': 'POST', 'href': $endpoint, 'media-type': 'application/sparql-query', 'body': $query-string, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
784+
<xsl:sequence select="
785+
map{
786+
'request': $request,
787+
'block': $block,
788+
'container': .//div[contains-token(@class, 'container-results')],
789+
'container-id': $container-id,
790+
'endpoint': $endpoint,
791+
'results': $results,
792+
'active-mode': $active-mode,
793+
'select-xml': $select-xml,
794+
'base-uri': $base-uri
795+
}"/>
796+
</xsl:when>
797+
<xsl:otherwise>
798+
<xsl:call-template name="ldh:RenderViewMode">
799+
<xsl:with-param name="block" select="$block"/>
800+
<xsl:with-param name="container" select=".//div[contains-token(@class, 'container-results')]"/>
801+
<xsl:with-param name="container-id" select="$container-id"/>
802+
<xsl:with-param name="endpoint" select="$endpoint"/>
803+
<xsl:with-param name="results" select="$results"/>
804+
<xsl:with-param name="object-metadata" select="()"/>
805+
<xsl:with-param name="active-mode" select="$active-mode"/>
806+
<xsl:with-param name="select-xml" select="$select-xml"/>
807+
<xsl:with-param name="base-uri" select="$base-uri"/>
808+
</xsl:call-template>
809+
</xsl:otherwise>
810+
</xsl:choose>
793811
</xsl:template>
794812

795813
<!-- facets -->
@@ -1728,43 +1746,22 @@ exclude-result-prefixes="#all"
17281746
</xsl:document>
17291747
</xsl:variable>
17301748

1731-
<!-- only load object metadata when querying the local endpoint -->
1732-
<xsl:choose>
1733-
<xsl:when test="$endpoint = sd:endpoint()">
1734-
<!-- returns $context map -->
1735-
<xsl:for-each select="$container/div[contains-token(@class, 'main')]">
1736-
<xsl:call-template name="ldh:RenderViewResults">
1737-
<xsl:with-param name="block" select="$block"/>
1738-
<xsl:with-param name="container" select="$container"/>
1739-
<xsl:with-param name="results" select="$sorted-results"/>
1740-
<xsl:with-param name="select-xml" select="$select-xml"/>
1741-
<xsl:with-param name="bgp-triples-map" select="$bgp-triples-map"/>
1742-
<xsl:with-param name="container-id" select="$container-id"/>
1743-
<xsl:with-param name="endpoint" select="$endpoint"/>
1744-
<xsl:with-param name="focus-var-name" select="$focus-var-name"/>
1745-
<xsl:with-param name="desc" select="$desc"/>
1746-
<xsl:with-param name="order-by-predicate" select="$order-by-predicate"/>
1747-
<xsl:with-param name="result-count-container-id" select="$result-count-container-id"/>
1748-
<xsl:with-param name="active-mode" select="$active-mode"/>
1749-
</xsl:call-template>
1750-
</xsl:for-each>
1751-
</xsl:when>
1752-
<xsl:otherwise>
1753-
<xsl:call-template name="ldh:RenderViewMode">
1754-
<xsl:with-param name="block" select="$block"/>
1755-
<xsl:with-param name="container" select=".//div[contains-token(@class, 'container-results')]"/>
1756-
<xsl:with-param name="container-id" select="$container-id"/>
1757-
<xsl:with-param name="endpoint" select="$endpoint"/>
1758-
<xsl:with-param name="results" select="."/>
1759-
<xsl:with-param name="object-metadata" select="()"/>
1760-
<xsl:with-param name="active-mode" select="$active-mode"/>
1761-
<xsl:with-param name="select-xml" select="$select-xml"/>
1762-
<xsl:with-param name="base-uri" select="ldh:base-uri(.)"/>
1763-
</xsl:call-template>
1764-
1765-
<xsl:sequence select="$context"/>
1766-
</xsl:otherwise>
1767-
</xsl:choose>
1749+
<xsl:for-each select="$container/div[contains-token(@class, 'main')]">
1750+
<xsl:call-template name="ldh:RenderViewResults">
1751+
<xsl:with-param name="block" select="$block"/>
1752+
<xsl:with-param name="container" select="$container"/>
1753+
<xsl:with-param name="results" select="$sorted-results"/>
1754+
<xsl:with-param name="select-xml" select="$select-xml"/>
1755+
<xsl:with-param name="bgp-triples-map" select="$bgp-triples-map"/>
1756+
<xsl:with-param name="container-id" select="$container-id"/>
1757+
<xsl:with-param name="endpoint" select="$endpoint"/>
1758+
<xsl:with-param name="focus-var-name" select="$focus-var-name"/>
1759+
<xsl:with-param name="desc" select="$desc"/>
1760+
<xsl:with-param name="order-by-predicate" select="$order-by-predicate"/>
1761+
<xsl:with-param name="result-count-container-id" select="$result-count-container-id"/>
1762+
<xsl:with-param name="active-mode" select="$active-mode"/>
1763+
</xsl:call-template>
1764+
</xsl:for-each>
17681765

17691766
<!-- use the initial (not the current transformed) SELECT query and focus var name for facet rendering -->
17701767
<xsl:for-each select="$container/div[contains-token(@class, 'left-nav')]">

0 commit comments

Comments
 (0)