ldh:href function fixes

Author: namedgraph

src/main/resources/com/atomgraph/linkeddatahub/lapp.ttl

@@ -87,10 +87,6 @@
             rdfs:label "Missing base URI" ;
             sp:arg1 ldt:base
         ] ;
-        #[ a ldh:MissingPropertyValue ;
-        #    rdfs:label "Missing SPARQL service" ;
-        #    sp:arg1 ldt:service
-        #] ;
     rdfs:label "Application" ;
     rdfs:comment "An application represents a data space identified by its base URI, in which application resource URIs are relative to the base URI. The only application interface (API) is read-write RESTful Linked data, backed by an RDF dataset accessible as a SPARQL 1.1 service. Application structure is defined in an ontology, which can import other ontologies." ;
     rdfs:isDefinedBy : .
@@ -102,8 +98,7 @@
       PREFIX rdfs:    <http://www.w3.org/2000/01/rdf-schema#>
 
       CONSTRUCT {
-          $this ldt:base [ a rdfs:Resource ] ;
-            ldt:service [ a ldh:Service ] .
+          $this ldt:base [ a rdfs:Resource ] .
       }
       WHERE {
     }""" ;

src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/imports/default.xsl

@@ -118,12 +118,12 @@ exclude-result-prefixes="#all"
             <!-- proxy external URI/graph -->
             <xsl:when test="$uri and $graph">
                 <xsl:variable name="fragment" select="if ($fragment) then $fragment else encode-for-uri($uri)" as="xs:string?"/>
-                <xsl:sequence select="xs:anyURI(ac:build-uri($absolute-path, map:merge((map{ 'uri': string($uri), 'graph': string($graph) }, $query-params))) || (if ($fragment) then ('#' || $fragment) else ()))"/>
+                <xsl:sequence select="xs:anyURI(ac:build-uri($base, map:merge((map{ 'uri': string($uri), 'graph': string($graph) }, $query-params))) || (if ($fragment) then ('#' || $fragment) else ()))"/>
             </xsl:when>
             <!-- proxy external URI -->
             <xsl:when test="$uri">
                 <xsl:variable name="fragment" select="if ($fragment) then $fragment else encode-for-uri($uri)" as="xs:string?"/>
-                <xsl:sequence select="xs:anyURI(ac:build-uri($absolute-path, map:merge((map{ 'uri': string($uri) }, $query-params))) || (if ($fragment) then ('#' || $fragment) else ()))"/>
+                <xsl:sequence select="xs:anyURI(ac:build-uri($base, map:merge((map{ 'uri': string($uri) }, $query-params))) || (if ($fragment) then ('#' || $fragment) else ()))"/>
             </xsl:when>
             <!-- no URI supplied -->
             <xsl:otherwise>