Skip to content

Commit 8ca75ad

Browse files
namedgraphnamedgraph
committed
Promise error handling fixes
1 parent f119610 commit 8ca75ad

6 files changed

Lines changed: 45 additions & 25 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ exclude-result-prefixes="#all"
338338

339339
<xsl:function name="ldh:hide-block-progress-bar" as="map(*)" ixsl:updating="yes">
340340
<xsl:param name="context" as="map(*)"/>
341-
<xsl:param name="result" as="map(*)"/>
341+
<xsl:param name="ignored" as="item()?"/>
342342

343343
<xsl:variable name="container" select="$context('container')" as="element()"/>
344344

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -693,18 +693,19 @@ exclude-result-prefixes="#all"
693693
<xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
694694
</xsl:for-each>
695695

696-
<!-- error response - could not load query results -->
696+
<!-- error response - could not load query -->
697697
<xsl:for-each select="$container">
698698
<xsl:result-document href="?." method="ixsl:replace-content">
699699
<div class="alert alert-block">
700-
<strong>Error during query execution:</strong>
700+
<strong>Could not load query from <a href="{$query-uri}"><xsl:value-of select="$query-uri"/></a></strong>
701701
<pre>
702702
<xsl:value-of select="$response?message"/>
703703
</pre>
704704
</div>
705705
</xsl:result-document>
706706
</xsl:for-each>
707707

708+
<xsl:sequence select="ldh:hide-block-progress-bar($context, ())[current-date() lt xs:date('2000-01-01')]"/>
708709
<xsl:sequence select="
709710
error(
710711
QName('&ldh;', 'ldh:HTTPError'),
@@ -784,6 +785,7 @@ exclude-result-prefixes="#all"
784785
</xsl:result-document>
785786
</xsl:for-each>
786787

788+
<xsl:sequence select="ldh:hide-block-progress-bar($context, ())[current-date() lt xs:date('2000-01-01')]"/>
787789
<xsl:sequence select="
788790
error(
789791
QName('&ldh;', 'ldh:HTTPError'),

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ exclude-result-prefixes="#all"
182182
</xsl:result-document>
183183
</xsl:for-each>
184184

185+
<xsl:sequence select="ldh:hide-block-progress-bar($context, ())[current-date() lt xs:date('2000-01-01')]"/>
185186
<xsl:sequence select="
186187
error(
187188
QName('&ldh;', 'ldh:HTTPError'),
@@ -209,16 +210,17 @@ exclude-result-prefixes="#all"
209210
<strong>Could not load resource: <a href="{$resource-uri}"><xsl:value-of select="$resource-uri"/></a></strong>
210211
</div>
211212
</xsl:result-document>
212-
213-
<xsl:sequence select="
214-
error(
215-
QName('&ldh;', 'ldh:HTTPError'),
216-
concat('HTTP ', ?status, ' returned: ', ?message),
217-
$response
218-
)
219-
"/>
220213
</xsl:for-each>
221214

215+
<xsl:sequence select="ldh:hide-block-progress-bar($context, ())[current-date() lt xs:date('2000-01-01')]"/>
216+
<xsl:sequence select="
217+
error(
218+
QName('&ldh;', 'ldh:HTTPError'),
219+
concat('HTTP ', ?status, ' returned: ', ?message),
220+
$response
221+
)
222+
"/>
223+
222224
<xsl:sequence select="$context"/>
223225
</xsl:otherwise>
224226
</xsl:choose>

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ exclude-result-prefixes="#all"
7070
<ixsl:set-property name="{$textarea-id}" select="ixsl:eval(string($js-statement/@statement))" object="ixsl:get(ixsl:window(), 'LinkedDataHub.yasqe')"/>
7171
</xsl:template>
7272

73-
<xsl:template name="onQueryServiceLoad">
73+
<!-- <xsl:template name="onQueryServiceLoad">
7474
<xsl:context-item as="map(*)" use="required"/>
7575
<xsl:param name="container" as="element()"/>
7676
<xsl:param name="forClass" as="xs:anyURI"/>
@@ -88,7 +88,7 @@ exclude-result-prefixes="#all"
8888
</xsl:when>
8989
<xsl:otherwise>
9090
<xsl:variable name="response" select="." as="map(*)"/>
91-
<!-- error response - could not load service -->
91+
error response - could not load service
9292
<xsl:for-each select="$container">
9393
<xsl:result-document href="?." method="ixsl:replace-content">
9494
<div class="alert alert-block">
@@ -109,7 +109,7 @@ exclude-result-prefixes="#all"
109109
"/>
110110
</xsl:otherwise>
111111
</xsl:choose>
112-
</xsl:template>
112+
</xsl:template>-->
113113

114114
<!-- render query block -->
115115

@@ -331,6 +331,7 @@ exclude-result-prefixes="#all"
331331
</xsl:for-each>
332332
</xsl:if>
333333

334+
<!-- TO-DO: refactor as promise -->
334335
<xsl:variable name="request" as="item()*">
335336
<ixsl:schedule-action http-request="$request">
336337
<xsl:call-template name="onSPARQLResultsLoad">
@@ -620,6 +621,8 @@ exclude-result-prefixes="#all"
620621
</xsl:result-document>
621622
</xsl:for-each>
622623

624+
<!-- TO-DO: $context -->
625+
<xsl:sequence select="ldh:hide-block-progress-bar(map{}, ())[current-date() lt xs:date('2000-01-01')]"/>
623626
<xsl:sequence select="
624627
error(
625628
QName('&ldh;', 'ldh:HTTPError'),

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

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,7 @@ exclude-result-prefixes="#all"
153153
<xsl:choose>
154154
<xsl:when test="$endpoint = sd:endpoint()">
155155
<xsl:variable name="object-uris" select="distinct-values($results/rdf:RDF/rdf:Description/*/@rdf:resource[not(key('resources', .))])" as="xs:string*"/>
156-
<xsl:message>ldh:load-object-metadata $results/rdf:RDF/rdf:Description/*/@rdf:resource: <xsl:value-of select="$results/rdf:RDF/rdf:Description/*/@rdf:resource"/></xsl:message>
157-
<xsl:message>ldh:load-object-metadata $object-uris: <xsl:value-of select="$object-uris"/></xsl:message>
158156
<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"/>
159-
<xsl:message>ldh:load-object-metadata $query-string: <xsl:value-of select="$query-string"/></xsl:message>
160157
<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(*)"/>
161158
<xsl:sequence select="map:merge(($context, map{ 'request': $request , 'response': () , 'results': $results }), map{ 'duplicates': 'use-last' })"/>
162159
</xsl:when>
@@ -169,11 +166,17 @@ exclude-result-prefixes="#all"
169166
<xsl:for-each select="$container">
170167
<xsl:result-document href="?." method="ixsl:replace-content">
171168
<div class="alert alert-block">
172-
<strong>Could not load container results</strong>
169+
<strong>Could not load query results from <a href="{$endpoint}"><xsl:value-of select="$endpoint"/></a></strong>
170+
<pre>
171+
<xsl:value-of select="$response?message"/>
172+
</pre>
173173
</div>
174174
</xsl:result-document>
175175
</xsl:for-each>
176176

177+
<ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
178+
179+
<xsl:sequence select="ldh:hide-block-progress-bar($context, ())[current-date() lt xs:date('2000-01-01')]"/>
177180
<xsl:sequence select="
178181
error(
179182
QName('&ldh;', 'ldh:HTTPError'),
@@ -204,6 +207,7 @@ exclude-result-prefixes="#all"
204207
<xsl:with-param name="message" select="?message"/>
205208
</xsl:call-template>
206209

210+
<xsl:sequence select="ldh:hide-block-progress-bar($context, ())[current-date() lt xs:date('2000-01-01')]"/>
207211
<xsl:sequence select="
208212
error(
209213
QName('&ldh;', 'ldh:HTTPError'),
@@ -663,7 +667,7 @@ exclude-result-prefixes="#all"
663667
</xsl:for-each>
664668
</xsl:template>
665669

666-
<!-- container results -->
670+
<!-- view mode choice -->
667671

668672
<xsl:template name="ldh:ViewModeChoice">
669673
<xsl:param name="container-id" as="xs:string"/>
@@ -744,12 +748,12 @@ exclude-result-prefixes="#all"
744748
<xsl:variable name="container-results-id" select="$container-id || '-container-results'" as="xs:string"/>
745749
<xsl:variable name="base-uri" select="ldh:base-uri(.)" as="xs:anyURI"/>
746750

747-
<!-- store sorted results as the current container results -->
751+
<!-- store sorted results as the current view results -->
748752
<ixsl:set-property name="results" select="$results" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block/@about || '`')"/>
749753

750754
<xsl:variable name="initial-load" select="empty(.//div[@id = $container-results-id])" as="xs:boolean"/>
751755
<xsl:message>$initial-load: <xsl:value-of select="$initial-load"/></xsl:message>
752-
<!-- first time rendering the container results -->
756+
<!-- first time rendering the view results -->
753757
<xsl:if test="$initial-load">
754758
<xsl:result-document href="?." method="ixsl:replace-content">
755759
<div class="pull-right">
@@ -1694,6 +1698,9 @@ exclude-result-prefixes="#all"
16941698
<xsl:result-document href="?." method="ixsl:replace-content">
16951699
<div class="alert alert-block">
16961700
<strong>Could not load service resource: <a href="{$service-uri}"><xsl:value-of select="$service-uri"/></a></strong>
1701+
<pre>
1702+
<xsl:value-of select="$response?message"/>
1703+
</pre>
16971704
</div>
16981705
</xsl:result-document>
16991706
</xsl:for-each>
@@ -1706,10 +1713,14 @@ exclude-result-prefixes="#all"
17061713
<xsl:result-document href="?." method="ixsl:replace-content">
17071714
<div class="alert alert-block">
17081715
<strong>Could not load query resource: <a href="{$query-uri}"><xsl:value-of select="$query-uri"/></a></strong>
1716+
<pre>
1717+
<xsl:value-of select="$response?message"/>
1718+
</pre>
17091719
</div>
17101720
</xsl:result-document>
17111721
</xsl:for-each>
17121722

1723+
<xsl:sequence select="ldh:hide-block-progress-bar($context, ())[current-date() lt xs:date('2000-01-01')]"/>
17131724
<xsl:sequence select="
17141725
error(
17151726
QName('&ldh;', 'ldh:HTTPError'),

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -967,11 +967,13 @@ WHERE
967967

968968
<!-- cannot be in $block context because it contains old DOM (pre-ixsl:replace-content) -->
969969
<xsl:variable name="factory" as="function(item()?) as item()*?">
970-
<xsl:apply-templates select="id($block/@id, ixsl:page())" mode="ldh:RenderRow"/>!!!!
970+
<xsl:apply-templates select="id($block/@id, ixsl:page())" mode="ldh:RenderRow"/>
971971
</xsl:variable>
972-
973-
<!-- invoke the factory -->
974-
<xsl:sequence select="$factory(())"/>
972+
<xsl:message>exists($factory): <xsl:value-of select="exists($factory)"/></xsl:message>
973+
<xsl:if test="exists($factory)">
974+
<!-- invoke the factory -->
975+
<xsl:sequence select="$factory(())"/>
976+
</xsl:if>
975977

976978
<ixsl:set-style name="cursor" select="'default'" object="ixsl:page()//body"/>
977979
</xsl:for-each>

0 commit comments

Comments
 (0)