Skip to content

Commit e571977

Browse files
committed
IXSL fixes
1 parent 46cd050 commit e571977

File tree

8 files changed

+131
-84
lines changed

8 files changed

+131
-84
lines changed

src/main/java/com/atomgraph/linkeddatahub/Application.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
*/
1717
package com.atomgraph.linkeddatahub;
1818

19-
import com.atomgraph.linkeddatahub.server.mapper.ResourceExistsExceptionMapper;
2019
import com.atomgraph.linkeddatahub.server.mapper.HttpHostConnectExceptionMapper;
2120
import com.atomgraph.linkeddatahub.server.mapper.InternalURLExceptionMapper;
2221
import com.atomgraph.linkeddatahub.server.mapper.MessagingExceptionMapper;
@@ -1104,7 +1103,6 @@ protected void registerExceptionMappers()
11041103
register(WebIDDelegationExceptionMapper.class);
11051104
register(WebIDLoadingExceptionMapper.class);
11061105
register(TokenExpiredExceptionMapper.class);
1107-
register(ResourceExistsExceptionMapper.class);
11081106
register(QueryParseExceptionMapper.class);
11091107
register(AuthenticationExceptionMapper.class);
11101108
register(ForbiddenExceptionMapper.class);

src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -699,8 +699,10 @@ exclude-result-prefixes="#all"
699699
<xsl:variable name="container-results-id" select="$container-id || '-container-results'" as="xs:string"/>
700700
<xsl:variable name="base-uri" select="ldh:base-uri(.)" as="xs:anyURI"/>
701701

702-
<!-- store sorted results as the current view results -->
703-
<ixsl:set-property name="results" select="$results" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block/@about || '`')"/>
702+
<xsl:if test="$block/@about">
703+
<!-- store sorted results as the current view results -->
704+
<ixsl:set-property name="results" select="$results" object="ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block/@about || '`')"/>
705+
</xsl:if>
704706

705707
<xsl:variable name="initial-load" select="empty(.//div[@id = $container-results-id])" as="xs:boolean"/>
706708
<xsl:message>$initial-load: <xsl:value-of select="$initial-load"/></xsl:message>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ exclude-result-prefixes="#all"
9393
</xsl:function>
9494

9595
<xsl:function name="sd:endpoint" as="xs:anyURI">
96-
<xsl:sequence select="xs:anyURI(ixsl:get(ixsl:window(), 'LinkedDataHub.endpoint'))"/>
96+
<xsl:sequence select="resolve-uri('sparql', ldt:base())"/>
9797
</xsl:function>
9898

9999
<xsl:function name="ldh:query-type" as="xs:string?">

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

Lines changed: 120 additions & 75 deletions
Large diffs are not rendered by default.

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/query-transforms.xsl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,10 @@ extension-element-prefixes="ixsl"
107107
<json:array key="where">
108108
<xsl:sequence select="."/>
109109
</json:array>
110+
<!-- Preserve VALUES clause if present -->
111+
<xsl:if test="json:array[@key = 'values']">
112+
<xsl:sequence select="json:array[@key = 'values']"/>
113+
</xsl:if>
110114
</json:map>
111115
</xsl:template>
112116

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -353,9 +353,6 @@
353353
<rdf:Description rdf:nodeID="document-tree">
354354
<rdfs:label xml:lang="en-US">Document tree</rdfs:label>
355355
</rdf:Description>
356-
<rdf:Description rdf:nodeID="classes">
357-
<rdfs:label xml:lang="en-US">Classes</rdfs:label>
358-
</rdf:Description>
359356
<rdf:Description rdf:nodeID="reconcile-title">
360357
<rdfs:label xml:lang="en-US">Reconcile this resource against resources in the selected service</rdfs:label>
361358
</rdf:Description>

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ WHERE
286286
<ixsl:set-property name="contents" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
287287
<ixsl:set-property name="typeahead" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/> <!-- used by typeahead.xsl -->
288288
<ixsl:set-property name="graph" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/> <!-- used by graph.xsl -->
289-
<ixsl:set-property name="endpoint" select="$sd:endpoint" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
289+
<!-- <ixsl:set-property name="endpoint" select="$sd:endpoint" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>-->
290290
<ixsl:set-property name="yasqe" select="ldh:new-object()" object="ixsl:get(ixsl:window(), 'LinkedDataHub')"/>
291291

292292
<!-- handle OAuth ID token from URL fragment -->

0 commit comments

Comments
 (0)