VALUES injection fix

Fixed CLI script name ambiguity

Author: namedgraph

bin/imports/import-csv.sh

@@ -164,7 +164,8 @@ import_doc=$(create-item.sh \
 )
 
 # Add the CONSTRUCT query to the item using fragment identifier
-add-construct.sh \
+# TO-DO: fix ambigous add-construct.sh script names
+"$(dirname "$0")/../add-construct.sh" \
   -b "$base" \
   -f "$cert_pem_file" \
   -p "$cert_password" \

bin/imports/import-rdf.sh

@@ -168,7 +168,8 @@ if [ -n "$query_file" ] ; then
     query_id=$(uuidgen | tr '[:upper:]' '[:lower:]')
 
     # Add the CONSTRUCT query to the item using fragment identifier
-    add-construct.sh \
+    # TO-DO: fix ambigous add-construct.sh script names
+    "$(dirname "$0")/../add-construct.sh" \
       -b "$base" \
       -f "$cert_pem_file" \
       -p "$cert_password" \

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

@@ -934,8 +934,6 @@ ORDER BY DESC(?created)
         <!-- TODO: we need to check if instances are in named graphs - for now use SelectInstancesInGraphs -->
         <xsl:variable name="query-uri" select="xs:anyURI('&ldh;SelectInstancesInGraphs')" as="xs:anyURI"/>
         <xsl:variable name="select-string" select="key('resources', $query-uri, document(ac:document-uri('&ldh;')))/sp:text" as="xs:string"/>
-        <!-- Add VALUES clause to bind $type to the class URI -->
-        <xsl:variable name="select-string" select="$select-string || ' VALUES $type { &lt;' || $class-uri || '&gt; }'" as="xs:string"/>
 
         <xsl:variable name="select-json" as="item()">
             <xsl:variable name="select-builder" select="ixsl:call(ixsl:get(ixsl:get(ixsl:window(), 'SPARQLBuilder'), 'SelectBuilder'), 'fromString', [ $select-string ])"/>
@@ -944,8 +942,8 @@ ORDER BY DESC(?created)
         <xsl:variable name="select-json-string" select="ixsl:call(ixsl:get(ixsl:window(), 'JSON'), 'stringify', [ $select-json ])" as="xs:string"/>
         <xsl:variable name="select-xml" as="document-node()">
             <xsl:document>
-                <xsl:apply-templates select="json-to-xml($select-json-string)" mode="ldh:replace-variables">
-                    <xsl:with-param name="var-names" select="('s')" tunnel="yes"/>
+                <xsl:apply-templates select="json-to-xml($select-json-string)" mode="ldh:append-values">
+                    <xsl:with-param name="values-map" select="map { '$type': $class-uri }" tunnel="yes"/>
                 </xsl:apply-templates>
             </xsl:document>
         </xsl:variable>

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

@@ -812,5 +812,35 @@ extension-element-prefixes="ixsl"
                 </json:map>
             </xsl:copy>
     </xsl:template>
-    
+
+    <!-- Append VALUES block to WHERE clause -->
+
+    <xsl:template match="@* | node()" mode="ldh:append-values">
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()" mode="#current"/>
+        </xsl:copy>
+    </xsl:template>
+
+    <xsl:template match="json:array[@key = 'where']" mode="ldh:append-values" priority="1">
+        <xsl:param name="values-map" as="map(xs:string, xs:anyAtomicType)" tunnel="yes"/>
+
+        <xsl:copy>
+            <xsl:apply-templates select="@* | node()" mode="#current"/>
+
+            <!-- Append VALUES block -->
+            <json:map>
+                <json:string key="type">values</json:string>
+                <json:array key="values">
+                    <json:map>
+                        <xsl:for-each select="map:keys($values-map)">
+                            <json:string key="{.}">
+                                <xsl:value-of select="map:get($values-map, .)"/>
+                            </json:string>
+                        </xsl:for-each>
+                    </json:map>
+                </json:array>
+            </json:map>
+        </xsl:copy>
+    </xsl:template>
+
 </xsl:stylesheet>