Skip to content

Commit 1090b6d

Browse files
namedgraphnamedgraph
committed
IXSL refactoring
1 parent 4faa000 commit 1090b6d

File tree

8 files changed

+215
-248
lines changed

8 files changed

+215
-248
lines changed

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

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -117,20 +117,6 @@ exclude-result-prefixes="#all"
117117

118118
<!-- render row -->
119119

120-
<!-- match resources that are not LDH system resources -->
121-
<!-- <xsl:template match="*[@typeof[not(. = ('&ldh;Object', '&ldh;View', '&ldh;GraphChart', '&ldh;ResultSetChart'))]]" mode="ldh:RenderRow" priority="1">
122-
<xsl:apply-templates mode="#current"/>
123-
124-
<xsl:message>HELLO? @about: <xsl:value-of select="@about"/></xsl:message>
125-
126-
hide the progress bar
127-
<xsl:for-each select="ancestor::div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')]">
128-
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
129-
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
130-
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
131-
</xsl:for-each>
132-
</xsl:template>-->
133-
134120
<xsl:template match="*" mode="ldh:RenderRow">
135121
<xsl:apply-templates mode="#current"/>
136122
</xsl:template>

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

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,12 @@ exclude-result-prefixes="#all"
621621
</xsl:for-each>
622622
</xsl:when>
623623
<xsl:otherwise>
624-
<ixsl:set-style name="display" select="'none'" object="$block//div[contains-token(@class, 'bar')]"/>
624+
<!-- hide the progress bar - either of this block (if it contains a progress bar) or of the parent block -->
625+
<xsl:for-each select="($block//div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')], $block/ancestor::div[contains-token(@class, 'block')]//div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')])[1]">
626+
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
627+
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
628+
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
629+
</xsl:for-each>
625630

626631
<!-- error response - could not load query results -->
627632
<xsl:for-each select="$container">
@@ -690,10 +695,6 @@ exclude-result-prefixes="#all"
690695
<xsl:with-param name="series" select="$series"/>
691696
</xsl:call-template>
692697

693-
<!-- <xsl:for-each select="$container//div[@class = 'progress-bar']">
694-
<ixsl:set-style name="display" select="'none'" object="."/>
695-
</xsl:for-each>-->
696-
697698
<!-- hide the progress bar - either of this block (if it contains a progress bar) or of the parent block -->
698699
<xsl:for-each select="($block//div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')], $block/ancestor::div[contains-token(@class, 'block')]//div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')])[1]">
699700
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
@@ -703,8 +704,11 @@ exclude-result-prefixes="#all"
703704
</xsl:for-each>
704705
</xsl:when>
705706
<xsl:otherwise>
706-
<xsl:for-each select="$container//div[@class = 'progress-bar']">
707-
<ixsl:set-style name="display" select="'none'" object="."/>
707+
<!-- hide the progress bar - either of this block (if it contains a progress bar) or of the parent block -->
708+
<xsl:for-each select="($block//div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')], $block/ancestor::div[contains-token(@class, 'block')]//div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')])[1]">
709+
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
710+
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
711+
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
708712
</xsl:for-each>
709713

710714
<!-- error response - could not load query results -->

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

Lines changed: 19 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,19 @@ exclude-result-prefixes="#all"
3535
>
3636

3737
<!-- TEMPLATES -->
38+
39+
<!-- <xsl:template match="div[@typeof = '&ldh;Object']/div/div[@about]" mode="ldh:RenderRow" priority="1">
40+
<xsl:apply-templates mode="#current"/>
41+
42+
<xsl:message>HELLO? @about: <xsl:value-of select="@about"/></xsl:message>
43+
44+
hide the progress bar
45+
<xsl:for-each select="ancestor::div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')]">
46+
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
47+
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
48+
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
49+
</xsl:for-each>
50+
</xsl:template>-->
3851

3952
<!-- hide type control -->
4053
<xsl:template match="*[rdf:type/@rdf:resource = '&ldh;Object']" mode="bs2:TypeControl" priority="1">
@@ -52,7 +65,7 @@ exclude-result-prefixes="#all"
5265

5366
<!-- object block (RDF resource) -->
5467

55-
<xsl:template match="*[@typeof = '&ldh;Object'][descendant::*[@property = '&rdf;value'][@resource]]" mode="ldh:RenderRow" priority="1">
68+
<xsl:template match="*[@typeof = '&ldh;Object'][descendant::*[@property = '&rdf;value'][@resource]]" mode="ldh:RenderRow" priority="2"> <!-- prioritize above block.xsl -->
5669
<xsl:param name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()"/>
5770
<xsl:param name="about" select="$block/@about" as="xs:anyURI"/>
5871
<xsl:param name="block-uri" select="$about" as="xs:anyURI"/>
@@ -110,11 +123,11 @@ exclude-result-prefixes="#all"
110123
<xsl:variable name="resource" select="key('resources', $resource-uri)" as="element()?"/>
111124
<xsl:choose>
112125
<!-- only attempt to load object metadata for local resources -->
113-
<xsl:when test="$resource and starts-with($resource-uri, $ldt:base)">
114-
<xsl:message>ldh:block-object-value-response local $resource-uri: <xsl:value-of select="$resource-uri"/></xsl:message>
115-
<xsl:variable name="object-uris" select="distinct-values($resource/*/@rdf:resource[not(key('resources', ., root($resource)))])" as="xs:string*"/>
126+
<xsl:when test="$resource">
127+
<xsl:message>ldh:block-object-value-response $resource-uri: <xsl:value-of select="$resource-uri"/></xsl:message>
128+
<xsl:variable name="object-uris" select="distinct-values($resource/*/@rdf:resource[starts-with(., $ldt:base)][not(key('resources', ., root($resource)))])" as="xs:string*"/>
116129
<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"/>
117-
<xsl:variable name="request" select="map{ 'method': 'POST', 'href': sd:endpoint(), 'media-type': 'application/sparql-query', 'body': $query-string, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
130+
<xsl:variable name="request" select="map{ 'method': 'POST', 'href': sd:endpoint(), 'media-type': 'application/sparql-query', 'body': $query-string, 'headers': map{ 'Accept': 'application/rdf+xml' } }" as="map(*)"/>
118131
<xsl:variable name="context" as="map(*)" select="
119132
map{
120133
'request': $request,
@@ -131,36 +144,6 @@ exclude-result-prefixes="#all"
131144
ixsl:then(ldh:block-object-metadata-response#1)"
132145
on-failure="ldh:promise-failure#1"/>
133146
</xsl:when>
134-
<xsl:when test="$resource">
135-
<xsl:message>ldh:block-object-value-response external $resource-uri: <xsl:value-of select="$resource-uri"/></xsl:message>
136-
<xsl:variable name="row" as="node()*">
137-
<xsl:apply-templates select="$resource" mode="bs2:Row">
138-
<xsl:with-param name="graph" select="$graph" tunnel="yes"/>
139-
<xsl:with-param name="mode" select="$mode"/>
140-
<xsl:with-param name="show-edit-button" select="$show-edit-button" tunnel="yes"/>
141-
<xsl:with-param name="show-row-block-controls" select="false()"/> <!-- blocks nested within ldh:Object do not show their own progress bars -->
142-
<xsl:with-param name="draggable" select="false()"/> <!-- blocks nested within ldh:Object are not draggable -->
143-
</xsl:apply-templates>
144-
</xsl:variable>
145-
146-
<xsl:for-each select="$container">
147-
<xsl:result-document href="?." method="ixsl:replace-content">
148-
<!-- wrap the row -->
149-
<div class="span12">
150-
<xsl:copy-of select="$row"/>
151-
</div>
152-
</xsl:result-document>
153-
154-
<xsl:apply-templates mode="ldh:RenderRow"/> <!-- recurse down the block hierarchy -->
155-
156-
<!-- hide the progress bar -->
157-
<xsl:for-each select="ancestor::div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')]">
158-
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
159-
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
160-
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
161-
</xsl:for-each>
162-
</xsl:for-each>
163-
</xsl:when>
164147
<xsl:otherwise>
165148
<xsl:for-each select="$container">
166149
<xsl:result-document href="?." method="ixsl:replace-content">
@@ -247,12 +230,7 @@ exclude-result-prefixes="#all"
247230

248231
<xsl:apply-templates mode="ldh:RenderRow"/> <!-- recurse down the block hierarchy -->
249232

250-
<!-- hide the progress bar -->
251-
<xsl:for-each select="ancestor::div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')]">
252-
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
253-
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
254-
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
255-
</xsl:for-each>
233+
<!-- cannot hide the progress bar here as the blocks might continue loading -->
256234
</xsl:for-each>
257235
</xsl:when>
258236
<xsl:otherwise>

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

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ exclude-result-prefixes="#all"
105105

106106
<!-- render query block -->
107107

108-
<xsl:template match="*[@typeof = ('&sp;Ask', '&sp;Select', '&sp;Describe', '&sp;Construct')][descendant::*[@property = '&sp;text'][pre/text()]]" mode="ldh:RenderRow" priority="1">
108+
<xsl:template match="*[@typeof = ('&sp;Ask', '&sp;Select', '&sp;Describe', '&sp;Construct')][descendant::*[@property = '&sp;text'][pre/text()]]" mode="ldh:RenderRow" priority="2 "> <!-- prioritize above block.xsl -->
109109
<xsl:param name="block" select="ancestor-or-self::div[contains-token(@class, 'block')][1]" as="element()"/>
110110
<xsl:param name="about" select="$block/@about" as="xs:anyURI"/>
111111
<xsl:param name="block-uri" select="$about" as="xs:anyURI"/>
@@ -154,20 +154,6 @@ exclude-result-prefixes="#all"
154154
<xsl:apply-templates select="key('resources', $service-uri, document($request-uri))" mode="ldh:Typeahead">
155155
<xsl:with-param name="forClass" select="$forClass"/>
156156
</xsl:apply-templates>
157-
158-
<!--
159-
<xsl:variable name="request-uri" select="ldh:href($ldt:base, ac:absolute-path(ldh:base-uri(.)), map{}, $query-uri)" as="xs:anyURI"/>
160-
<xsl:variable name="request" as="item()*">
161-
<ixsl:schedule-action http-request="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }">
162-
<xsl:call-template name="onQueryServiceLoad">
163-
<xsl:with-param name="container" select="$container"/>
164-
<xsl:with-param name="forClass" select="$forClass"/>
165-
<xsl:with-param name="service-uri" select="$service-uri"/>
166-
</xsl:call-template>
167-
</ixsl:schedule-action>
168-
</xsl:variable>
169-
<xsl:sequence select="$request[current-date() lt xs:date('2000-01-01')]"/>
170-
-->
171157
</xsl:when>
172158
<xsl:otherwise>
173159
<xsl:call-template name="bs2:Lookup">
@@ -574,17 +560,9 @@ exclude-result-prefixes="#all"
574560
<xsl:with-param name="category" select="$category"/>
575561
<xsl:with-param name="series" select="$series"/>
576562
</xsl:call-template>
577-
578-
<xsl:for-each select="$container//div[@class = 'progress-bar']">
579-
<ixsl:set-style name="display" select="'none'" object="."/>
580-
</xsl:for-each>
581563
</xsl:for-each>
582564
</xsl:when>
583565
<xsl:otherwise>
584-
<xsl:for-each select="$container//div[@class = 'progress-bar']">
585-
<ixsl:set-style name="display" select="'none'" object="."/>
586-
</xsl:for-each>
587-
588566
<!-- error response - could not load query results -->
589567
<xsl:for-each select="$results-container">
590568
<xsl:result-document href="?." method="ixsl:replace-content">

0 commit comments

Comments
 (0)