Replaced ldh:new with ixsl:new

Author: namedgraph

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

@@ -115,7 +115,7 @@ exclude-result-prefixes="#all"
             </xsl:message>
         </xsl:if>
 
-        <xsl:variable name="chart" select="ldh:new($chart-class, [ id($canvas-id, ixsl:page()) ])"/>
+        <xsl:variable name="chart" select="ixsl:new($chart-class, [ id($canvas-id, ixsl:page()) ])"/>
         <xsl:variable name="options" as="map(xs:string, item())">
             <xsl:map>
                 <xsl:if test="exists($width)">

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

@@ -592,7 +592,7 @@ exclude-result-prefixes="#all"
                 <!-- query NS ontology to retrieve the ontology URI from the $type class' rdfs:isDefinedBy value. Fallback to the assumed $type's namespace URI -->
                 <xsl:variable name="request-uri" select="ac:build-uri(resolve-uri('ns', ldt:base()), map{ 'query': 'DESCRIBE &lt;' || $type || '&gt;', 'accept': 'application/rdf+xml' })" as="xs:anyURI"/>
                 <xsl:variable name="ontology-uri" select="(key('resources', $type, document(ac:document-uri($request-uri)))/rdfs:isDefinedBy/@rdf:resource, $namespace)[1]" as="xs:anyURI"/>
-                <xsl:variable name="form-data" select="ldh:new('URLSearchParams', [ ldh:new('FormData', []) ])"/>
+                <xsl:variable name="form-data" select="ixsl:new('URLSearchParams', [ ixsl:new('FormData', []) ])"/>
                 <xsl:sequence select="ixsl:call($form-data, 'append', [ 'uri', $ontology-uri ])[current-date() lt xs:date('2000-01-01')]"/>
 
                 <!-- clear this ontology first, then proceed to clear the namespace ontology -->
@@ -679,7 +679,7 @@ exclude-result-prefixes="#all"
 
     <xsl:template name="ldh:ClearNamespace">
         <xsl:param name="ontology-uri" select="resolve-uri('ns#', ldt:base())" as="xs:anyURI"/>
-        <xsl:variable name="form-data" select="ldh:new('URLSearchParams', [ ldh:new('FormData', []) ])"/>
+        <xsl:variable name="form-data" select="ixsl:new('URLSearchParams', [ ixsl:new('FormData', []) ])"/>
         <xsl:sequence select="ixsl:call($form-data, 'append', [ 'uri', $ontology-uri ])[current-date() lt xs:date('2000-01-01')]"/>
 
         <xsl:variable name="admin-base-uri" select="xs:anyURI(replace(ldt:base(), '^(https?://)', '$1admin.'))" as="xs:anyURI"/>

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

@@ -618,7 +618,7 @@ WHERE
         <xsl:choose>
             <!-- we need to handle multipart requests specially because of Saxon-JS 2 limitations: https://saxonica.plan.io/issues/4732 -->
             <xsl:when test="$enctype = 'multipart/form-data'">
-                <xsl:variable name="form-data" select="ldh:new('FormData', [ $form ])"/> <!-- only for file uploads! XMLLiterals will not be canonicalized -->
+                <xsl:variable name="form-data" select="ixsl:new('FormData', [ $form ])"/> <!-- only for file uploads! XMLLiterals will not be canonicalized -->
                 <xsl:variable name="headers" select="ldh:new-object()"/>
                 <ixsl:set-property name="Accept" select="$accept" object="$headers"/>
                 <ixsl:set-property name="If-Match" select="$etag" object="$headers"/>

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

@@ -105,12 +105,15 @@ exclude-result-prefixes="#all"
         <xsl:sequence select="ixsl:eval(string($js-statement/@statement))"/>
     </xsl:function>
 
+    <!-- Deprecated: use ixsl:new() instead (available in SaxonJS 3.0+) -->
+    <!--
     <xsl:function name="ldh:new" as="item()">
         <xsl:param name="target" as="xs:string"/>
         <xsl:param name="arguments" as="array(*)"/>
 
         <xsl:sequence select="ixsl:call(ixsl:window(), 'Reflect.construct', [ ixsl:get(ixsl:window(), $target), $arguments ] )"/>
     </xsl:function>
+    -->
 
     <!-- format URLs in DataTable as HTML links. !!! Saxon-JS cannot intercept Google Charts events, therefore set a full proxied URL !!! -->
     <xsl:template match="@rdf:about[starts-with(., 'http://')] | @rdf:about[starts-with(., 'https://')] | @rdf:resource[starts-with(., 'http://')] | @rdf:resource[starts-with(., 'https://')] | srx:uri[starts-with(., 'http://')] | srx:uri[starts-with(., 'https://')]" mode="ac:DataTable">
@@ -175,7 +178,7 @@ exclude-result-prefixes="#all"
         <xsl:param name="string" as="xs:string"/>
         <xsl:param name="mime-type" as="xs:string"/>
 
-        <xsl:sequence select="ixsl:call(ldh:new('DOMParser', []), 'parseFromString', [ $string, $mime-type ])"/>
+        <xsl:sequence select="ixsl:call(ixsl:new('DOMParser', []), 'parseFromString', [ $string, $mime-type ])"/>
     </xsl:function>
 
     <!-- parses RDF/POST inputs into a sequence of SPARQL.js triple maps (they need to be wrapped into <array key="triples">) -->

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

@@ -133,7 +133,7 @@ exclude-result-prefixes="#all"
             <!-- add the mouse offset within the element which was stored in onmousedown -->
             <xsl:variable name="dom-x" select="ixsl:get(ixsl:event(), 'clientX') + $offset-x"/>
             <xsl:variable name="dom-y" select="ixsl:get(ixsl:event(), 'clientY') + $offset-y"/>
-            <xsl:variable name="point" select="ldh:new('DOMPoint', [ $dom-x, $dom-y ])"/>
+            <xsl:variable name="point" select="ixsl:new('DOMPoint', [ $dom-x, $dom-y ])"/>
             <xsl:variable name="ctm" select="ixsl:call(., 'getScreenCTM', [])"/>
             <xsl:variable name="svg-point" select="ixsl:call($point, 'matrixTransform', [ ixsl:call($ctm, 'inverse', []) ])"/>
             <xsl:variable name="svg-x" select="ixsl:get($svg-point, 'x')"/>

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

@@ -41,8 +41,8 @@ exclude-result-prefixes="#all"
         <xsl:param name="zoom" as="xs:integer?"/>
 
         <xsl:variable name="tile-options" select="ldh:new-object()"/>
-        <ixsl:set-property name="source" select="ldh:new('ol.source.OSM', [])" object="$tile-options"/>
-        <xsl:variable name="tile" select="ldh:new('ol.layer.Tile', [ $tile-options ])"/>
+        <ixsl:set-property name="source" select="ixsl:new('ol.source.OSM', [])" object="$tile-options"/>
+        <xsl:variable name="tile" select="ixsl:new('ol.layer.Tile', [ $tile-options ])"/>
         <xsl:variable name="layers" select="[ $tile ]" as="array(*)"/>
 
         <xsl:variable name="view-options" select="ldh:new-object()"/>
@@ -53,14 +53,14 @@ exclude-result-prefixes="#all"
         <xsl:if test="exists($zoom)">
             <ixsl:set-property name="zoom" select="$zoom" object="$view-options"/>
         </xsl:if>
-        <xsl:variable name="view" select="ldh:new('ol.View', [ $view-options ])"/>
+        <xsl:variable name="view" select="ixsl:new('ol.View', [ $view-options ])"/>
 
         <xsl:variable name="map-options" select="ldh:new-object()"/>
         <ixsl:set-property name="target" select="$canvas-id" object="$map-options"/>
         <ixsl:set-property name="layers" select="$layers" object="$map-options"/>
         <ixsl:set-property name="view" select="$view" object="$map-options"/>
 
-        <xsl:variable name="map" select="ldh:new('ol.Map', [ $map-options ])"/>
+        <xsl:variable name="map" select="ixsl:new('ol.Map', [ $map-options ])"/>
         <xsl:if test="exists($lat) and exists($lng)">
             <xsl:variable name="lon-lat" select="[ $lng, $lat ]" as="array(*)"/>
             <xsl:variable name="center" select="ixsl:call(ixsl:get(ixsl:window(), 'ol.proj'), 'fromLonLat', [ $lon-lat ])"/>
@@ -215,12 +215,12 @@ exclude-result-prefixes="#all"
                 <!--<ixsl:set-property name="scale" select="0.2" object="$icon-options"/>-->
                 <!-- icon has to have an initial src, otherwise the ol.style.Icon constructor will throw an assertion error -->
                 <ixsl:set-property name="src" select="." object="$icon-options"/>
-                <xsl:variable name="icon" select="ldh:new('ol.style.Icon', [ $icon-options ])"/>
+                <xsl:variable name="icon" select="ixsl:new('ol.style.Icon', [ $icon-options ])"/>
                 <xsl:sequence select="ixsl:call($icon, 'setAnchor', [ [0.5, 30] ])[current-date() lt xs:date('2000-01-01')]"/>
 
                 <xsl:variable name="icon-style-options" select="ldh:new-object()"/>
                 <ixsl:set-property name="image" select="$icon" object="$icon-style-options"/>
-                <xsl:sequence select="ldh:new('ol.style.Style', [ $icon-style-options ])"/>
+                <xsl:sequence select="ixsl:new('ol.style.Style', [ $icon-style-options ])"/>
             </xsl:for-each>
         </xsl:param>
         <xsl:if test="count($icon-styles) = 0">
@@ -234,7 +234,7 @@ exclude-result-prefixes="#all"
         <xsl:variable name="geo-json" select="ixsl:call(ixsl:get(ixsl:window(), 'JSON'), 'parse', [ $geo-json-string ])"/>
         <xsl:variable name="geo-json-options" select="ldh:new-object()"/>
         <ixsl:set-property name="featureProjection" select="'EPSG:3857'" object="$geo-json-options"/>
-        <xsl:variable name="geo-json-features" select="array{ ixsl:call(ldh:new('ol.format.GeoJSON', []), 'readFeatures', [ $geo-json, $geo-json-options ]) }"/>
+        <xsl:variable name="geo-json-features" select="array{ ixsl:call(ixsl:new('ol.format.GeoJSON', []), 'readFeatures', [ $geo-json, $geo-json-options ]) }"/>
 
         <!-- read WKT features from gs:asWKT properties -->
         <xsl:variable name="wkt-options" select="ldh:new-object()"/>
@@ -249,7 +249,7 @@ exclude-result-prefixes="#all"
                     <xsl:sequence select="$features"/>
                 </xsl:on-completion>
 
-                <xsl:variable name="feature" select="ixsl:call(ldh:new('ol.format.WKT', []), 'readFeature', [ string(gs:asWKT[@rdf:datatype = '&gs;wktLiteral']/text()), $wkt-options ])"/>
+                <xsl:variable name="feature" select="ixsl:call(ixsl:new('ol.format.WKT', []), 'readFeature', [ string(gs:asWKT[@rdf:datatype = '&gs;wktLiteral']/text()), $wkt-options ])"/>
                 <xsl:sequence select="ixsl:call($feature, 'setId', [ string((@rdf:about, @rdf:nodeID)[1]) ])[current-date() lt xs:date('2000-01-01')]"/>
                 <xsl:sequence select="ixsl:call($feature, 'set', [ 'name', ac:label(.) ])[current-date() lt xs:date('2000-01-01')]"/>
                 <xsl:sequence select="ixsl:call($feature, 'set', [ 'types', array{ rdf:type/@rdf:resource/string() } ])[current-date() lt xs:date('2000-01-01')]"/>
@@ -264,11 +264,11 @@ exclude-result-prefixes="#all"
         <ixsl:set-property name="font" select="'12px sans-serif'" object="$text-options"/>
         <ixsl:set-property name="offsetY" select="10" object="$text-options"/>
         <ixsl:set-property name="overflow" select="true()" object="$text-options"/>
-        <xsl:variable name="text" select="ldh:new('ol.style.Text', [ $text-options ])"/>
+        <xsl:variable name="text" select="ixsl:new('ol.style.Text', [ $text-options ])"/>
 
         <xsl:variable name="label-style-options" select="ldh:new-object()"/>
         <ixsl:set-property name="text" select="$text" object="$label-style-options"/>
-        <xsl:variable name="label-style" select="ldh:new('ol.style.Style', [ $label-style-options ])"/>
+        <xsl:variable name="label-style" select="ixsl:new('ol.style.Style', [ $label-style-options ])"/>
 
         <xsl:variable name="js-statement" as="xs:string">
             <![CDATA[
@@ -297,12 +297,12 @@ exclude-result-prefixes="#all"
             ]]>
         </xsl:variable>
         <xsl:variable name="js-function" select="ixsl:eval(normalize-space($js-statement))"/> <!-- need normalize-space() due to Saxon-JS 2.4 bug: https://saxonica.plan.io/issues/5667 -->
-        <xsl:variable name="js-function" select="ixsl:call($js-function, 'bind', [ (), $label-style, $icon-styles, ldh:new('Map', []) ])"/>
+        <xsl:variable name="js-function" select="ixsl:call($js-function, 'bind', [ (), $label-style, $icon-styles, ixsl:new('Map', []) ])"/>
 
         <xsl:variable name="source-options" select="ldh:new-object()"/>
         <!--<ixsl:set-property name="features" select="$geo-json-features" object="$source-options"/>-->
-        <xsl:variable name="geo-json-source" select="ldh:new('ol.source.Vector', [ $source-options ])"/>
-        <xsl:variable name="wkt-source" select="ldh:new('ol.source.Vector', [ $source-options ])"/>
+        <xsl:variable name="geo-json-source" select="ixsl:new('ol.source.Vector', [ $source-options ])"/>
+        <xsl:variable name="wkt-source" select="ixsl:new('ol.source.Vector', [ $source-options ])"/>
         <!--<ixsl:set-property name="loader" select="$loader-function" object="$source-options"/>-->
         <xsl:sequence select="ixsl:call($geo-json-source, 'addFeatures', [ $geo-json-features ])[current-date() lt xs:date('2000-01-01')]"/>
         <xsl:sequence select="ixsl:call($wkt-source, 'addFeatures', [ $wkt-features ])[current-date() lt xs:date('2000-01-01')]"/>
@@ -311,13 +311,13 @@ exclude-result-prefixes="#all"
         <ixsl:set-property name="declutter" select="true()" object="$geo-json-layer-options"/>
         <ixsl:set-property name="source" select="$geo-json-source" object="$geo-json-layer-options"/>
         <ixsl:set-property name="style" select="$js-function" object="$geo-json-layer-options"/>
-        <xsl:variable name="geo-json-layer" select="ldh:new('ol.layer.Vector', [ $geo-json-layer-options ])"/>
+        <xsl:variable name="geo-json-layer" select="ixsl:new('ol.layer.Vector', [ $geo-json-layer-options ])"/>
 
         <xsl:variable name="wkt-layer-options" select="ldh:new-object()"/>
         <!--<ixsl:set-property name="declutter" select="true()" object="$wkt-layer-options"/>-->
         <ixsl:set-property name="source" select="$wkt-source" object="$wkt-layer-options"/>
         <ixsl:set-property name="style" select="$js-function" object="$wkt-layer-options"/>
-        <xsl:variable name="wkt-layer" select="ldh:new('ol.layer.Vector', [ $wkt-layer-options ])"/>
+        <xsl:variable name="wkt-layer" select="ixsl:new('ol.layer.Vector', [ $wkt-layer-options ])"/>
 
         <xsl:sequence select="ixsl:call($map, 'addLayer', [ $geo-json-layer ])[current-date() lt xs:date('2000-01-01')]"/>
         <xsl:sequence select="ixsl:call($map, 'addLayer', [ $wkt-layer ])[current-date() lt xs:date('2000-01-01')]"/>
@@ -426,7 +426,7 @@ exclude-result-prefixes="#all"
                     <ixsl:set-property name="positioning" select="'bottom-center'" object="$overlay-options"/>
                     <!--<ixsl:set-property name="className" select="'ol-overlay-container ol-selectable'" object="$overlay-options"/>-->
                     <!--<ixsl:set-property name="autoPanAnimation" select="" object="$overlay-options"/>-->
-                    <xsl:variable name="overlay" select="ldh:new('ol.Overlay', [ $overlay-options ])"/>
+                    <xsl:variable name="overlay" select="ixsl:new('ol.Overlay', [ $overlay-options ])"/>
                     <xsl:sequence select="ixsl:call($overlay, 'setPosition', [ $coord ])[current-date() lt xs:date('2000-01-01')]"/>
 
                     <xsl:for-each select="$container">

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

@@ -770,7 +770,7 @@ LIMIT   10
                 <xsl:variable name="method" select="ixsl:get(., 'method')" as="xs:string"/>
                 <xsl:variable name="action" select="ixsl:get(., 'action')" as="xs:anyURI"/>
                 <xsl:variable name="enctype" select="ixsl:get(., 'enctype')" as="xs:string"/>
-                <xsl:variable name="form-data" select="ldh:new('URLSearchParams', [ ldh:new('FormData', [ $form ]) ])"/>
+                <xsl:variable name="form-data" select="ixsl:new('URLSearchParams', [ ixsl:new('FormData', [ $form ]) ])"/>
                 <xsl:variable name="request-uri" select="ldh:href($action, map{})" as="xs:anyURI"/>
 
                 <xsl:variable name="request" as="item()*">
@@ -859,7 +859,7 @@ LIMIT   10
         <xsl:variable name="method" select="ixsl:get(., 'method')" as="xs:string"/>
         <xsl:variable name="action" select="ixsl:get(., 'action')" as="xs:anyURI"/>
         <xsl:variable name="enctype" select="ixsl:get(., 'enctype')" as="xs:string"/>
-        <xsl:variable name="form-data" select="ldh:new('URLSearchParams', [ ldh:new('FormData', [ $form ]) ])"/>
+        <xsl:variable name="form-data" select="ixsl:new('URLSearchParams', [ ixsl:new('FormData', [ $form ]) ])"/>
         <xsl:variable name="request-uri" select="ldh:href($action, map{})" as="xs:anyURI"/>
 
         <xsl:variable name="request" as="item()*">