From b48dfa18947e96567b691f3044507a266ef605e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Mon, 26 Jan 2026 18:32:16 +0100 Subject: [PATCH 01/20] Class tree feature --- platform/datasets/admin.trig | 40 --- .../linkeddatahub/resource/Generate.java | 33 ++- .../com/atomgraph/linkeddatahub/ldh.ttl | 22 ++ .../xsl/bootstrap/2.3.2/client/modal.xsl | 10 +- .../xsl/bootstrap/2.3.2/client/navigation.xsl | 253 +++++++++++++++++- .../xsl/bootstrap/2.3.2/layout.xsl | 13 - .../xsl/bootstrap/2.3.2/translations.rdf | 3 + .../atomgraph/linkeddatahub/xsl/client.xsl | 8 + 8 files changed, 315 insertions(+), 67 deletions(-) diff --git a/platform/datasets/admin.trig b/platform/datasets/admin.trig index 4756fa90b..67aa36f21 100644 --- a/platform/datasets/admin.trig +++ b/platform/datasets/admin.trig @@ -94,46 +94,6 @@ WHERE } - -{ - - a dh:Item ; - sioc:has_container ; - dct:title "Select instances" ; - foaf:primaryTopic . - - a sp:Select ; - dct:title "Select instances" ; - dct:description "Selects instances of type from the default graph" ; - sp:text """SELECT DISTINCT ?s -WHERE - { ?s a $type ; - ?p ?o - }""" . - -} - - -{ - - a dh:Item ; - sioc:has_container ; - dct:title "Select instances in graphs" ; - foaf:primaryTopic . - - a sp:Select ; - dct:title "Select instances in graphs" ; - dct:description "Selects instances of type from named graphs" ; - sp:text """SELECT DISTINCT ?s -WHERE - { GRAPH ?g - { ?s a $type ; - ?p ?o - } - }""" . - -} - { diff --git a/src/main/java/com/atomgraph/linkeddatahub/resource/Generate.java b/src/main/java/com/atomgraph/linkeddatahub/resource/Generate.java index 716289439..cecd10dd6 100644 --- a/src/main/java/com/atomgraph/linkeddatahub/resource/Generate.java +++ b/src/main/java/com/atomgraph/linkeddatahub/resource/Generate.java @@ -18,8 +18,6 @@ import com.atomgraph.core.MediaTypes; import com.atomgraph.linkeddatahub.apps.model.Application; -import com.atomgraph.linkeddatahub.client.GraphStoreClient; -import com.atomgraph.linkeddatahub.imports.QueryLoader; import com.atomgraph.linkeddatahub.server.model.impl.DirectGraphStoreImpl; import com.atomgraph.linkeddatahub.server.security.AgentContext; import com.atomgraph.linkeddatahub.server.util.Skolemizer; @@ -44,8 +42,10 @@ import jakarta.ws.rs.core.Response.Status; import jakarta.ws.rs.core.UriBuilder; import jakarta.ws.rs.core.UriInfo; +import org.apache.jena.ontology.Ontology; import org.apache.jena.query.ParameterizedSparqlString; import org.apache.jena.query.Query; +import org.apache.jena.query.QueryFactory; import org.apache.jena.query.Syntax; import org.apache.jena.rdf.model.Model; import org.apache.jena.rdf.model.ModelFactory; @@ -69,10 +69,11 @@ public class Generate private final UriInfo uriInfo; private final MediaTypes mediaTypes; private final Application application; + private final Ontology ontology; private final Optional agentContext; private final com.atomgraph.linkeddatahub.Application system; private final ResourceContext resourceContext; - + /** * Constructs endpoint for container generation. * @@ -80,18 +81,21 @@ public class Generate * @param uriInfo current URI info * @param mediaTypes supported media types * @param application matched application + * @param ontology ontology of the current application * @param system system application * @param agentContext authenticated agent's context * @param resourceContext resource context for creating resources */ @Inject public Generate(@Context Request request, @Context UriInfo uriInfo, MediaTypes mediaTypes, - com.atomgraph.linkeddatahub.apps.model.Application application, Optional agentContext, + com.atomgraph.linkeddatahub.apps.model.Application application, Optional ontology, Optional agentContext, com.atomgraph.linkeddatahub.Application system, @Context ResourceContext resourceContext) { + if (ontology.isEmpty()) throw new InternalServerErrorException("Ontology is not specified"); this.uriInfo = uriInfo; this.mediaTypes = mediaTypes; this.application = application; + this.ontology = ontology.get(); this.agentContext = agentContext; this.system = system; this.resourceContext = resourceContext; @@ -129,10 +133,13 @@ public Response post(Model model) Resource queryRes = part.getPropertyResourceValue(SPIN.query); if (queryRes == null) throw new BadRequestException("Container query string (spin:query) not provided"); - GraphStoreClient gsc = GraphStoreClient.create(getSystem().getClient(), getSystem().getMediaTypes()). - delegation(getUriInfo().getBaseUri(), getAgentContext().orElse(null)); - QueryLoader queryLoader = new QueryLoader(URI.create(queryRes.getURI()), getApplication().getBase().getURI(), Syntax.syntaxARQ, gsc); - Query query = queryLoader.get(); + // Lookup query in ontology + Resource queryResource = getOntology().getOntModel().getResource(queryRes.getURI()); + if (queryResource == null || !queryResource.hasProperty(SP.text)) + throw new BadRequestException("Query resource not found in ontology: " + queryRes.getURI()); + + String queryString = queryResource.getProperty(SP.text).getString(); + Query query = QueryFactory.create(queryString, Syntax.syntaxARQ); if (!query.isSelectType()) throw new BadRequestException("Container query is not of SELECT type"); ParameterizedSparqlString pss = new ParameterizedSparqlString(query.toString()); @@ -253,6 +260,16 @@ public Application getApplication() return application; } + /** + * Returns the ontology. + * + * @return the ontology + */ + public Ontology getOntology() + { + return ontology; + } + /** * Returns the current URI info. * diff --git a/src/main/resources/com/atomgraph/linkeddatahub/ldh.ttl b/src/main/resources/com/atomgraph/linkeddatahub/ldh.ttl index 589ae75b9..caa46a07f 100644 --- a/src/main/resources/com/atomgraph/linkeddatahub/ldh.ttl +++ b/src/main/resources/com/atomgraph/linkeddatahub/ldh.ttl @@ -493,6 +493,28 @@ ORDER BY ?title """ ; rdfs:isDefinedBy : . +:SelectInstances a sp:Select ; + rdfs:label "Select instances" ; + dct:description "Selects instances of type from the default graph" ; + sp:text """SELECT DISTINCT ?s +WHERE + { ?s a $type ; + ?p ?o + }""" ; + rdfs:isDefinedBy : . + +:SelectInstancesInGraphs a sp:Select ; + rdfs:label "Select instances in graphs" ; + dct:description "Selects instances of type from named graphs" ; + sp:text """SELECT DISTINCT ?s +WHERE + { GRAPH ?g + { ?s a $type ; + ?p ?o + } + }""" ; + rdfs:isDefinedBy : . + :ChildrenView a :View ; rdfs:label "Children view" ; spin:query :SelectChildren ; diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl index 97a4e39c8..091c3a4af 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/modal.xsl @@ -59,7 +59,7 @@ ORDER BY DESC(COUNT(?s)) LIMIT 10 ]]> - + @@ -1369,16 +1369,16 @@ LIMIT 10 - + - + - + - + - + @@ -509,6 +510,62 @@ LIMIT 10 ldh:class-tree-response + + + + + + + + + + + + + + + + + + + + + No class types found + + + + + + + + Error loading class types from sparql endpoint + + + + + + + + + + + + + + + + + ldh:class-tree-describe-response + @@ -518,7 +575,8 @@ LIMIT 10 - + + @@ -528,8 +586,9 @@ LIMIT 10 - Error loading class tree + Error loading class descriptions from ns endpoint + @@ -539,10 +598,19 @@ LIMIT 10 + + + +
    • From e571977340d4cb6d07e988047f377cfab8aaf66d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Sun, 8 Feb 2026 23:23:50 +0100 Subject: [PATCH 03/20] IXSL fixes --- .../atomgraph/linkeddatahub/Application.java | 2 - .../atomgraph/linkeddatahub/css/bootstrap.css | 1 + .../xsl/bootstrap/2.3.2/client/block/view.xsl | 6 +- .../xsl/bootstrap/2.3.2/client/functions.xsl | 2 +- .../xsl/bootstrap/2.3.2/client/navigation.xsl | 195 +++++++++++------- .../2.3.2/client/query-transforms.xsl | 4 + .../xsl/bootstrap/2.3.2/translations.rdf | 3 - .../atomgraph/linkeddatahub/xsl/client.xsl | 2 +- 8 files changed, 131 insertions(+), 84 deletions(-) diff --git a/src/main/java/com/atomgraph/linkeddatahub/Application.java b/src/main/java/com/atomgraph/linkeddatahub/Application.java index 0a5851110..ac7c6dba8 100644 --- a/src/main/java/com/atomgraph/linkeddatahub/Application.java +++ b/src/main/java/com/atomgraph/linkeddatahub/Application.java @@ -16,7 +16,6 @@ */ package com.atomgraph.linkeddatahub; -import com.atomgraph.linkeddatahub.server.mapper.ResourceExistsExceptionMapper; import com.atomgraph.linkeddatahub.server.mapper.HttpHostConnectExceptionMapper; import com.atomgraph.linkeddatahub.server.mapper.InternalURLExceptionMapper; import com.atomgraph.linkeddatahub.server.mapper.MessagingExceptionMapper; @@ -1104,7 +1103,6 @@ protected void registerExceptionMappers() register(WebIDDelegationExceptionMapper.class); register(WebIDLoadingExceptionMapper.class); register(TokenExpiredExceptionMapper.class); - register(ResourceExistsExceptionMapper.class); register(QueryParseExceptionMapper.class); register(AuthenticationExceptionMapper.class); register(ForbiddenExceptionMapper.class); diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css index 66155e480..5a9b23e5f 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css @@ -37,6 +37,7 @@ button.btn.create-action { height: 30px; } a.external::after { content: "⤴"; padding-left: 0.2em; } a.btn.create-action { height: 20px; } .create-resource .btn.create-action { margin-top: 1em; } +.btn-class { background: inherit; } .btn-group.open .btn.dropdown-toggle.create-action { background-image: url('../icons/ic_note_add_black_24px.svg'); } li button.btn-edit-constructors, li button.btn-add-data, li button.btn-add-ontology, li button.btn-generate-containers { text-align: left; width: 100%; background-color: inherit; } .btn-container { background-image: url('../icons/folder.svg'); } diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl index 3ebcc4766..56a81a38e 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl @@ -699,8 +699,10 @@ exclude-result-prefixes="#all" - - + + + + $initial-load: diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl index 5731d47c9..73705d3b1 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl @@ -93,7 +93,7 @@ exclude-result-prefixes="#all"     - + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl index f90940d19..a84c49a31 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl @@ -569,20 +569,34 @@ LIMIT 10 - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -596,73 +610,64 @@ LIMIT 10 - + - - - +
  • - -
    • - - - - - - - - - - - - - -
      - -
    -     -     - - - - - - -     - - - - - - - -     -     - - - - - - - + + + + + + + + + + - + + + + + + + + + + + - + @@ -672,8 +677,8 @@ LIMIT 10 - - + + @@ -698,11 +703,15 @@ LIMIT 10 + - + + + + + ldh:class-instances-response @@ -724,14 +737,33 @@ LIMIT 10 - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -741,6 +773,7 @@ LIMIT 10 Error loading instances for class: + @@ -757,4 +790,16 @@ LIMIT 10 + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/query-transforms.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/query-transforms.xsl index 4d0172236..c78f5bb72 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/query-transforms.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/query-transforms.xsl @@ -107,6 +107,10 @@ extension-element-prefixes="ixsl" + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf index 1070e80f7..a7dfaff31 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf @@ -353,9 +353,6 @@ Document tree - - Classes - Reconcile this resource against resources in the selected service diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl index 03763b2ac..1d7548d37 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl @@ -286,7 +286,7 @@ WHERE - + From 195f0038b4044aa4122dd0c89b6b9cb6d7c15623 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Mon, 9 Feb 2026 12:22:45 +0100 Subject: [PATCH 04/20] Navigation fixes --- .../xsl/bootstrap/2.3.2/client/navigation.xsl | 340 +++++++++++++++--- .../2.3.2/client/query-transforms.xsl | 4 - .../atomgraph/linkeddatahub/xsl/client.xsl | 20 +- 3 files changed, 292 insertions(+), 72 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl index a84c49a31..7aa3dc55b 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl @@ -73,43 +73,8 @@ LIMIT 10 -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • +

    - -
    +

    @@ -101,6 +121,26 @@ LIMIT 10
    + + +
    +

    + +

    + +
      +
    • + +
      • +
    • + +
      • +
    +
    @@ -755,7 +795,7 @@ LIMIT 10 - + @@ -814,7 +854,7 @@ LIMIT 10 - + @@ -833,14 +873,18 @@ LIMIT 10
    -
    +
    - +
    @@ -850,20 +894,28 @@ LIMIT 10 + + + + + - + + - + - + + + @@ -886,6 +938,12 @@ LIMIT 10 + + + + + + @@ -896,16 +954,16 @@ LIMIT 10 - - + + ldh:class-instances-response @@ -932,31 +991,14 @@ LIMIT 10 - - - - - - - - - - + - - + @@ -968,6 +1010,7 @@ LIMIT 10 + @@ -986,21 +1029,18 @@ LIMIT 10 - - - - - - - + + + - - + + + - - + + @@ -1013,9 +1053,7 @@ LIMIT 10 - + @@ -1026,6 +1064,7 @@ LIMIT 10 + @@ -1036,21 +1075,18 @@ LIMIT 10 on-failure="ldh:promise-failure#1"/> - - - - - - - + + + - - + + + - - + + @@ -1063,9 +1099,7 @@ LIMIT 10 - + @@ -1076,6 +1110,7 @@ LIMIT 10 + @@ -1086,21 +1121,18 @@ LIMIT 10 on-failure="ldh:promise-failure#1"/> - - + + Modal container-order handler triggered - - - - - + + - - - - + + + + @@ -1115,9 +1147,7 @@ LIMIT 10 - + @@ -1128,6 +1158,7 @@ LIMIT 10 + @@ -1139,20 +1170,16 @@ LIMIT 10 - - Modal order-by button handler triggered - - - - - + + + - - - - + + + + @@ -1165,9 +1192,7 @@ LIMIT 10 - + @@ -1178,6 +1203,7 @@ LIMIT 10 + @@ -1191,20 +1217,17 @@ LIMIT 10 - - - Modal view mode handler triggered - - - - - + + + + View mode handler triggered for + - - - - + + + + @@ -1226,6 +1249,7 @@ LIMIT 10 + @@ -1236,40 +1260,339 @@ LIMIT 10 on-failure="ldh:promise-failure#1"/> - - - - - - - - + + + - + + + - - -
  • - - - -
    • + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ldh:geo-resources-response + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Error loading geo resources + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ldh:latest-resources-response + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Error loading latest resources + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf index a7dfaff31..df130e8df 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf @@ -104,6 +104,10 @@ Geo Geo + + Other + Otro + Files Archivos diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl index 56c85c3ff..3f0ec1505 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/client.xsl @@ -591,9 +591,19 @@ WHERE + + + + + + + + + - - + + + From 4d0cb94f34359f01e48c5ca7b78648295dc4d148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Thu, 12 Feb 2026 00:03:11 +0100 Subject: [PATCH 12/20] View template refactoring --- .../atomgraph/linkeddatahub/css/bootstrap.css | 7 +- .../xsl/bootstrap/2.3.2/client/block.xsl | 31 +- .../bootstrap/2.3.2/client/block/object.xsl | 5 + .../xsl/bootstrap/2.3.2/client/block/view.xsl | 350 +++++++++--------- .../xsl/bootstrap/2.3.2/client/functions.xsl | 2 + .../xsl/bootstrap/2.3.2/client/navigation.xsl | 87 ++--- 6 files changed, 255 insertions(+), 227 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css index 322228af6..8009fd3ee 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css @@ -50,8 +50,6 @@ li button.btn-edit-constructors, li button.btn-add-data, li button.btn-add-ontol .btn-import { background-image: url('../icons/ic_transform_black_24px.svg'); } .btn-chart { background-image: url('../icons/ic_show_chart_black_24px.svg'); } .btn-view { background-image: url('../icons/ic_view_list_black_24px.svg'); } -.btn-latest { background-image: url('../icons/ic_new_releases_black_24px.svg'); } -.btn-geo { background-image: url('../icons/ic_location_on_black_24px.svg'); } .btn-logo { background-position: left; background-repeat: no-repeat; padding-left: 32px; } .dropdown-menu .btn-logo { background-position: 12px center; padding-left: 40px; } .btn.btn-toggle-content { font-size: 0; color: transparent; background-image: url('../icons/baseline-expand_less-24px.svg'); background-position: center center; background-repeat: no-repeat; width: 48px; } @@ -92,9 +90,12 @@ li button.btn-edit-constructors, li button.btn-add-data, li button.btn-add-ontol #left-sidebar .nav { max-height: 20em; overflow: auto; } } #left-sidebar .nav-list > li > a { margin-left: 0; margin-right: 0; } -#left-sidebar .nav-list > li > a.btn-container, #left-sidebar .nav-list > li > a.btn-app, #left-sidebar .nav-list > li > a.btn-chart, #left-sidebar .nav-list > li > a.btn-file, #left-sidebar .nav-list > li > a.btn-geo, #left-sidebar .nav-list > li > a.btn-import, #left-sidebar .nav-list > li > a.btn-latest, #left-sidebar .nav-list > li > a.btn-query, #left-sidebar .nav-list > li > a.btn-service { padding-left: 24px; } +#left-sidebar .nav-list > li > a.btn-container #left-sidebar li { max-height: 20em; overflow: auto; } #left-sidebar li > a { display: inline-block; } +#left-sidebar .btn-latest { background-image: url('../icons/ic_new_releases_black_24px.svg'); background-color: inherit; } +#left-sidebar .btn-geo { background-image: url('../icons/ic_location_on_black_24px.svg'); background-color: inherit; } + .btn.btn-expand-tree { height: 24px; width: 24px; background-image: url('../icons/expand_more_black_24dp.svg'); } .btn.btn-expand-tree:hover, .btn.btn-expand-tree:focus { background-position: 0 0; } .btn.btn-expanded-tree { height: 24px; width: 24px; background-image: url('../icons/chevron_right_black_24dp.svg'); } diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl index 1060d7ba2..cb41f0b97 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl @@ -454,7 +454,36 @@ exclude-result-prefixes="#all" - + + + + + + ldh:update-progress % + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/object.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/object.xsl index 5113857fa..56b0d1d5d 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/object.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/object.xsl @@ -304,6 +304,11 @@ exclude-result-prefixes="#all" + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl index c32dd7134..b480569ee 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl @@ -74,16 +74,6 @@ exclude-result-prefixes="#all" - - ldh:RenderRow - cache: - - - - - - - @@ -130,24 +120,31 @@ exclude-result-prefixes="#all" ixsl:http-request($context('request')) => ixsl:then(ldh:rethread-response($context, ?)) => ixsl:then(ldh:handle-response#1) => - ixsl:then(ldh:view-query-response#1) + ixsl:then(ldh:view-query-response#1) => + ixsl:then(ldh:update-progress(?, 33)) "/> - + ldh:view-results-thunk @@ -157,6 +154,8 @@ exclude-result-prefixes="#all" + ldh:load-object-metadata + @@ -200,12 +199,14 @@ exclude-result-prefixes="#all" - + + ldh:set-object-metadata + @@ -219,7 +220,7 @@ exclude-result-prefixes="#all" - + @@ -497,7 +498,6 @@ exclude-result-prefixes="#all" - @@ -508,10 +508,6 @@ exclude-result-prefixes="#all" - - - - @@ -534,7 +530,6 @@ exclude-result-prefixes="#all" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - @@ -708,7 +742,6 @@ exclude-result-prefixes="#all" - @@ -822,13 +855,8 @@ exclude-result-prefixes="#all"     - - - @@ -1140,7 +1168,7 @@ exclude-result-prefixes="#all" - + @@ -1151,9 +1179,7 @@ exclude-result-prefixes="#all" - - - + @@ -1169,9 +1195,8 @@ exclude-result-prefixes="#all"     - + - @@ -1181,6 +1206,7 @@ exclude-result-prefixes="#all" + - - + - - - - - - - - - - + + + + + - - - - - + + + + - - - - + + + + - @@ -1233,7 +1251,8 @@ exclude-result-prefixes="#all" - + + - - + - - - - - - - - - - + + + + + - - - - - + + + + - + - - + + - @@ -1285,48 +1296,44 @@ exclude-result-prefixes="#all" - + + - + - + - - - - - - - - - + + + + + - - - - - + + + + + - + - + - @@ -1336,47 +1343,44 @@ exclude-result-prefixes="#all" - + + - + - + - - - - - - - + + + + + - - - - - + + + + - - - + + + - @@ -1386,20 +1390,21 @@ exclude-result-prefixes="#all" - + + - + - + - + @@ -1408,8 +1413,7 @@ exclude-result-prefixes="#all" - - + @@ -1432,9 +1436,19 @@ exclude-result-prefixes="#all" - - - + + + + + + + + + + + + + @@ -1496,7 +1510,7 @@ exclude-result-prefixes="#all" - + @@ -1508,11 +1522,9 @@ exclude-result-prefixes="#all" - - - - - + + + @@ -1527,9 +1539,8 @@ exclude-result-prefixes="#all" - + - @@ -1539,7 +1550,8 @@ exclude-result-prefixes="#all" - + + - + @@ -1558,11 +1570,9 @@ exclude-result-prefixes="#all" - - - - - + + + @@ -1577,9 +1587,8 @@ exclude-result-prefixes="#all" - + - @@ -1589,7 +1598,8 @@ exclude-result-prefixes="#all" - + + - ldh:view-query-response $cache: + ldh:view-query-response @@ -1650,11 +1660,8 @@ exclude-result-prefixes="#all" - - - - - + + @@ -1673,23 +1680,21 @@ exclude-result-prefixes="#all" - - - - - - - - - - - - - - - - + + + + + + + + + + + + + +     @@ -1748,10 +1753,7 @@ exclude-result-prefixes="#all" - - - - + ldh:render-view @@ -1817,11 +1819,13 @@ exclude-result-prefixes="#all" - + + + - + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl index 73705d3b1..1b0e1f2e4 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl @@ -495,6 +495,8 @@ exclude-result-prefixes="#all" + ldh:handle-response + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl index a0905e808..46198af02 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl @@ -1032,32 +1032,27 @@ ORDER BY DESC(?created) - - - - + + - - - - - + + + + - - + - @@ -1067,6 +1062,7 @@ ORDER BY DESC(?created) + - - - - + + - - - - - + + + + - - + - @@ -1113,6 +1104,7 @@ ORDER BY DESC(?created) + Modal container-order handler triggered - - - + - - + + - - - - - + + + + + - - + - @@ -1161,6 +1149,7 @@ ORDER BY DESC(?created) + - - - + + + - - - - - + + + + - - + - @@ -1206,6 +1192,7 @@ ORDER BY DESC(?created) + - + - @@ -1252,6 +1238,7 @@ ORDER BY DESC(?created) + - - - - - - - - - - + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl index b480569ee..a7600a5bd 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl @@ -1168,60 +1168,84 @@ exclude-result-prefixes="#all" - - + + BLOCK DELEGATION: view-mode handler triggered + - - - - + BLOCK DELEGATION: block URI = - - - - - - - - + BLOCK DELEGATION: cache found: - - - - - - - - + + + + - - - - - - - - - - - - - + - + + BLOCK DELEGATION: pager previous triggered + + + BLOCK DELEGATION: block URI = + + BLOCK DELEGATION: cache found: + + + + - + - - - + + BLOCK DELEGATION: pager next triggered + + BLOCK DELEGATION: block URI = + BLOCK DELEGATION: cache found: + + + + + + + + + + BLOCK DELEGATION: container-order triggered + + + BLOCK DELEGATION: block URI = + + BLOCK DELEGATION: cache found: + + + + + + + + + + + BLOCK DELEGATION: btn-order-by triggered + + + BLOCK DELEGATION: block URI = + + BLOCK DELEGATION: cache found: + + + + + + + + + + @@ -1251,7 +1275,7 @@ exclude-result-prefixes="#all" - + - - + - - - - + + @@ -1296,7 +1317,7 @@ exclude-result-prefixes="#all" - + - - + - - - + + - @@ -1343,7 +1361,7 @@ exclude-result-prefixes="#all" - + - - - + - - - + + - @@ -1390,7 +1404,7 @@ exclude-result-prefixes="#all" - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl index 46198af02..f3a1de50b 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl @@ -873,9 +873,13 @@ ORDER BY DESC(?created)
    -
    -
    - +
    +
    +
    +
    + +
    +
    @@ -944,296 +948,13 @@ ORDER BY DESC(?created) - - - - - - - - - - - - - - - - - - - - - - - - - - - ldh:class-instances-response - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Error loading instances for class: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Modal container-order handler triggered - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - View mode handler triggered for - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1274,9 +995,13 @@ ORDER BY DESC(?created)
    -
    -
    - +
    +
    +
    +
    + +
    +
    @@ -1338,89 +1063,26 @@ ORDER BY DESC(?created) - - - + + + + + + + + + + - - - - - - - - + + - - - - - - - - - - - - ldh:geo-resources-response - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Error loading geo resources - - - - - - - - - @@ -1436,9 +1098,13 @@ ORDER BY DESC(?created)
    -
    -
    - +
    +
    +
    +
    + +
    +
    @@ -1500,86 +1166,24 @@ ORDER BY DESC(?created) - - - + + + + + + + + + + - - - - - - - - + + - - - - - - - - - - - - ldh:latest-resources-response - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Error loading latest resources - - - - - - - - - \ No newline at end of file diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl index 551d4417f..429c0c94b 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl @@ -507,7 +507,7 @@ extension-element-prefixes="ixsl"
    -
    +
    From 7ef5d1bdcc15007a7c684ed7ae496abb4e8eb23e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Thu, 12 Feb 2026 22:53:59 +0100 Subject: [PATCH 14/20] Virew progress bar fixes --- .../xsl/bootstrap/2.3.2/client/block.xsl | 83 ++++++++++++++++++- .../xsl/bootstrap/2.3.2/client/block/view.xsl | 75 ++++++++++++----- .../xsl/bootstrap/2.3.2/client/navigation.xsl | 42 +++++++++- 3 files changed, 171 insertions(+), 29 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl index 65d08fe3d..f6471a00b 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl @@ -458,11 +458,11 @@ exclude-result-prefixes="#all" - + - ldh:update-progress % + ldh:update-progress % at @@ -477,6 +477,11 @@ exclude-result-prefixes="#all" + + + + + @@ -484,7 +489,79 @@ exclude-result-prefixes="#all" - + + + + + + + + + + + + + + + + + + + + + + + + + [0ms] Progress INIT: total-steps= step-size=% + + + + + + + + + + + + + + + + + [ms] Progress STEP /: % + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl index a7600a5bd..a891d5681 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl @@ -74,6 +74,10 @@ exclude-result-prefixes="#all" + + + + @@ -89,7 +93,10 @@ exclude-result-prefixes="#all" 'query-uri': $query-uri, 'cache': ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block/@about || '`') }"/> - + + + + ixsl:then(ldh:rethread-response($context, ?)) => ixsl:then(ldh:handle-response#1) => - ixsl:then(ldh:view-query-response#1) => - ixsl:then(ldh:update-progress(?, 33)) + ixsl:then(ldh:view-query-response#1) "/> @@ -130,21 +136,18 @@ exclude-result-prefixes="#all" ldh:view-results-thunk + + + @@ -164,8 +167,12 @@ exclude-result-prefixes="#all" - + + + + + @@ -187,7 +194,7 @@ exclude-result-prefixes="#all" - + ldh:set-object-metadata + + + @@ -343,6 +353,7 @@ exclude-result-prefixes="#all" + @@ -377,8 +388,13 @@ exclude-result-prefixes="#all" map { 'request': $request, 'container': ., - 'count-var-name': $count-var-name + 'count-var-name': $count-var-name, + 'cache': $cache }"/> + + + + + @@ -845,8 +862,10 @@ exclude-result-prefixes="#all" 'container': id($order-by-container-id, ixsl:page()), 'id': $id, 'predicate': $predicate, - 'order-by-predicate': $order-by-predicate + 'order-by-predicate': $order-by-predicate, + 'cache': $cache }"/> + + + + @@ -1779,7 +1801,7 @@ exclude-result-prefixes="#all" - + + @@ -1879,6 +1902,9 @@ exclude-result-prefixes="#all" + + + @@ -1892,7 +1918,7 @@ exclude-result-prefixes="#all" ldh:facet-filter-response - + @@ -1908,7 +1934,7 @@ exclude-result-prefixes="#all" - + @@ -1920,7 +1946,7 @@ exclude-result-prefixes="#all" ldh:parallax-response - + @@ -1976,7 +2002,7 @@ exclude-result-prefixes="#all" ldh:parallax-property-response - + @@ -2036,7 +2062,7 @@ exclude-result-prefixes="#all" ldh:facet-value-response - + @@ -2182,6 +2208,9 @@ exclude-result-prefixes="#all" ldh:result-count-response + + + @@ -2205,7 +2234,7 @@ exclude-result-prefixes="#all" - + @@ -2220,7 +2249,7 @@ exclude-result-prefixes="#all" ldh:order-by-response - + @@ -2234,7 +2263,7 @@ exclude-result-prefixes="#all" - + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl index f3a1de50b..78bbf38a2 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl @@ -874,7 +874,15 @@ ORDER BY DESC(?created)
    -
    +
    +
    +
    +
    +
    +
    +
    +
    +
    @@ -948,6 +956,9 @@ ORDER BY DESC(?created) + + + @@ -996,7 +1007,15 @@ ORDER BY DESC(?created)
    -
    +
    +
    +
    +
    +
    +
    +
    +
    +
    @@ -1063,6 +1082,9 @@ ORDER BY DESC(?created) + + + @@ -1099,7 +1121,15 @@ ORDER BY DESC(?created)
    -
    +
    +
    +
    +
    +
    +
    +
    +
    +
    @@ -1132,6 +1162,9 @@ ORDER BY DESC(?created) + + + @@ -1166,6 +1199,9 @@ ORDER BY DESC(?created) + + + From cba4ebd743afae136aa2eaceec02bbe079fa072e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Thu, 12 Feb 2026 23:05:04 +0100 Subject: [PATCH 15/20] Removed unused function --- .../xsl/bootstrap/2.3.2/client/block.xsl | 38 ------------------- 1 file changed, 38 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl index f6471a00b..8633467e5 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl @@ -458,44 +458,6 @@ exclude-result-prefixes="#all" - - - - - ldh:update-progress % at - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From ac8a8f7610894490ad19f982d923fd994124758d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Fri, 13 Feb 2026 13:01:51 +0100 Subject: [PATCH 16/20] File/import test fixes --- .../create-query.sh => add-construct.sh} | 58 +++++++------ bin/{imports/create-file.sh => add-file.sh} | 67 ++------------- ...create-csv-import.sh => add-csv-import.sh} | 50 +++++------- ...create-rdf-import.sh => add-rdf-import.sh} | 50 +++++------- bin/imports/import-csv.sh | 65 +++++++++------ bin/imports/import-rdf.sh | 81 +++++++++++-------- .../ontology-import-upload-no-deadlock.sh | 26 +++--- http-tests/imports/GET-file-304.sh | 1 + http-tests/imports/GET-file-range.sh | 32 +++++--- http-tests/imports/GET-file-sha1sum.sh | 39 ++++++--- .../imports/PUT-file-format-explicit.sh | 31 ++++--- http-tests/imports/PUT-file-format.sh | 30 ++++--- http-tests/imports/create-file.sh | 34 ++++---- 13 files changed, 284 insertions(+), 280 deletions(-) rename bin/{imports/create-query.sh => add-construct.sh} (72%) rename bin/{imports/create-file.sh => add-file.sh} (61%) rename bin/imports/{create-csv-import.sh => add-csv-import.sh} (73%) rename bin/imports/{create-rdf-import.sh => add-rdf-import.sh} (73%) diff --git a/bin/imports/create-query.sh b/bin/add-construct.sh similarity index 72% rename from bin/imports/create-query.sh rename to bin/add-construct.sh index f9d793498..5549b25ab 100755 --- a/bin/imports/create-query.sh +++ b/bin/add-construct.sh @@ -5,7 +5,7 @@ print_usage() { printf "Creates a SPARQL CONSTRUCT query.\n" printf "\n" - printf "Usage: %s options\n" "$0" + printf "Usage: %s options TARGET_URI\n" "$0" printf "\n" printf "Options:\n" printf " -f, --cert-pem-file CERT_FILE .pem file with the WebID certificate of the agent\n" @@ -13,20 +13,16 @@ print_usage() printf " -b, --base BASE_URI Base URI of the application\n" printf " --proxy PROXY_URL The host this request will be proxied through (optional)\n" printf "\n" - printf " --title TITLE Title of the chart\n" - printf " --description DESCRIPTION Description of the chart (optional)\n" - printf " --slug STRING String that will be used as URI path segment (optional)\n" + printf " --title TITLE Title of the query\n" + printf " --description DESCRIPTION Description of the query (optional)\n" + printf " --uri URI URI of the query (optional)\n" printf "\n" printf " --query-file ABS_PATH Absolute path to the text file with the SPARQL query string\n" + printf " --service SERVICE_URI URI of the SPARQL service specific to this query (optional)\n" } hash turtle 2>/dev/null || { echo >&2 "turtle not on \$PATH. Aborting."; exit 1; } -urlencode() { - python -c 'import urllib.parse, sys; print(urllib.parse.quote(sys.argv[1], sys.argv[2]))' \ - "$1" "$urlencode_safe" -} - args=() while [[ $# -gt 0 ]] do @@ -63,8 +59,8 @@ do shift # past argument shift # past value ;; - --slug) - slug="$2" + --uri) + uri="$2" shift # past argument shift # past value ;; @@ -73,6 +69,11 @@ do shift # past argument shift # past value ;; + --service) + service="$2" + shift # past argument + shift # past value + ;; *) # unknown arguments args+=("$1") # save it in an array for later shift # past argument @@ -81,6 +82,8 @@ do done set -- "${args[@]}" # restore args +target="$1" + if [ -z "$cert_pem_file" ] ; then print_usage exit 1 @@ -102,43 +105,38 @@ if [ -z "$query_file" ] ; then exit 1 fi -if [ -z "$slug" ] ; then - slug=$(uuidgen | tr '[:upper:]' '[:lower:]') # lowercase -fi -encoded_slug=$(urlencode "$slug") - -container="${base}queries/" query=$(<"$query_file") # read query string from file -target="${container}${encoded_slug}/" - args+=("-f") args+=("$cert_pem_file") args+=("-p") args+=("$cert_password") args+=("-t") args+=("text/turtle") # content type -args+=("$target") if [ -n "$proxy" ]; then args+=("--proxy") args+=("$proxy") fi +if [ -n "$uri" ] ; then + subject="<${uri}>" +else + subject="_:subject" +fi + turtle+="@prefix ldh: .\n" -turtle+="@prefix dh: .\n" turtle+="@prefix dct: .\n" -turtle+="@prefix foaf: .\n" turtle+="@prefix sp: .\n" -turtle+="_:query a sp:Construct .\n" -turtle+="_:query dct:title \"${title}\" .\n" -turtle+="_:query sp:text \"\"\"${query}\"\"\" .\n" -turtle+="<${target}> a dh:Item .\n" -turtle+="<${target}> foaf:primaryTopic _:query .\n" -turtle+="<${target}> dct:title \"${title}\" .\n" +turtle+="${subject} a sp:Construct .\n" +turtle+="${subject} dct:title \"${title}\" .\n" +turtle+="${subject} sp:text \"\"\"${query}\"\"\" .\n" +if [ -n "$service" ] ; then + turtle+="${subject} ldh:service <${service}> .\n" +fi if [ -n "$description" ] ; then - turtle+="_:query dct:description \"${description}\" .\n" + turtle+="${subject} dct:description \"${description}\" .\n" fi # submit Turtle doc to the server -echo -e "$turtle" | turtle --base="$target" | put.sh "${args[@]}" \ No newline at end of file +echo -e "$turtle" | turtle --base="$target" | post.sh "${args[@]}" \ No newline at end of file diff --git a/bin/imports/create-file.sh b/bin/add-file.sh similarity index 61% rename from bin/imports/create-file.sh rename to bin/add-file.sh index 36413d34c..ecc6104b1 100755 --- a/bin/imports/create-file.sh +++ b/bin/add-file.sh @@ -5,7 +5,7 @@ print_usage() { printf "Uploads a file.\n" printf "\n" - printf "Usage: %s options\n" "$0" + printf "Usage: %s options TARGET_URI\n" "$0" printf "\n" printf "Options:\n" printf " -f, --cert-pem-file CERT_FILE .pem file with the WebID certificate of the agent\n" @@ -14,22 +14,14 @@ print_usage() printf " --proxy PROXY_URL The host this request will be proxied through (optional)\n" printf "\n" printf " --title TITLE Title of the file\n" - printf " --container CONTAINER_URI URI of the parent container (optional)\n" printf " --description DESCRIPTION Description of the file (optional)\n" - printf " --slug STRING String that will be used as URI path segment (optional)\n" printf "\n" printf " --file ABS_PATH Absolute path to the file\n" printf " --file-content-type MEDIA_TYPE Media type of the file (optional)\n" - #printf " --file-slug STRING String that will be used as the file's URI path segment (optional)\n" } hash curl 2>/dev/null || { echo >&2 "curl not on \$PATH. Aborting."; exit 1; } -urlencode() { - python -c 'import urllib.parse, sys; print(urllib.parse.quote(sys.argv[1], sys.argv[2]))' \ - "$1" "$urlencode_safe" -} - args=() while [[ $# -gt 0 ]] do @@ -66,16 +58,6 @@ do shift # past argument shift # past value ;; - --slug) - slug="$2" - shift # past argument - shift # past value - ;; - --container) - container="$2" - shift # past argument - shift # past value - ;; --file) file="$2" shift # past argument @@ -86,11 +68,6 @@ do shift # past argument shift # past value ;; - --file-slug) - file_slug="$2" - shift # past argument - shift # past value - ;; *) # unknown arguments args+=("$1") # save it in an array for later shift # past argument @@ -99,6 +76,8 @@ do done set -- "${args[@]}" # restore args +target="$1" + if [ -z "$cert_pem_file" ] ; then print_usage exit 1 @@ -124,23 +103,6 @@ if [ -z "$file_content_type" ] ; then file_content_type=$(file -b --mime-type "$file") fi -if [ -z "$slug" ] ; then - slug=$(uuidgen | tr '[:upper:]' '[:lower:]') # lowercase -fi -encoded_slug=$(urlencode "$slug") - -# need to create explicit file URI since that is what this script returns (not the graph URI) - -#if [ -z "$file_slug" ] ; then -# file_slug=$(uuidgen | tr '[:upper:]' '[:lower:]') # lowercase -#fi - -if [ -z "$container" ] ; then - container="${base}files/" -fi - -target="${container}${encoded_slug}/" - # https://stackoverflow.com/questions/19116016/what-is-the-right-way-to-post-multipart-form-data-using-curl rdf_post+="-F \"rdf=\"\n" @@ -151,18 +113,8 @@ rdf_post+="-F \"pu=http://purl.org/dc/terms/title\"\n" rdf_post+="-F \"ol=${title}\"\n" rdf_post+="-F \"pu=http://www.w3.org/1999/02/22-rdf-syntax-ns#type\"\n" rdf_post+="-F \"ou=http://www.semanticdesktop.org/ontologies/2007/03/22/nfo#FileDataObject\"\n" -rdf_post+="-F \"su=${target}\"\n" -rdf_post+="-F \"pu=http://purl.org/dc/terms/title\"\n" -rdf_post+="-F \"ol=${title}\"\n" -rdf_post+="-F \"pu=http://www.w3.org/1999/02/22-rdf-syntax-ns#type\"\n" -rdf_post+="-F \"ou=https://www.w3.org/ns/ldt/document-hierarchy#Item\"\n" -rdf_post+="-F \"pu=http://xmlns.com/foaf/0.1/primaryTopic\"\n" -rdf_post+="-F \"ob=file\"\n" -rdf_post+="-F \"pu=http://rdfs.org/sioc/ns#has_container\"\n" -rdf_post+="-F \"ou=${container}\"\n" if [ -n "$description" ] ; then - rdf_post+="-F \"sb=file\"\n" rdf_post+="-F \"pu=http://purl.org/dc/terms/description\"\n" rdf_post+="-F \"ol=${description}\"\n" fi @@ -176,14 +128,5 @@ if [ -n "$proxy" ]; then target="${target/$target_host/$proxy_host}" fi -# POST RDF/POST multipart form and capture the effective URL -effective_url=$(echo -e "$rdf_post" | curl -w '%{url_effective}' -f -v -s -k -X PUT -H "Accept: text/turtle" -E "$cert_pem_file":"$cert_password" -o /dev/null --config - "$target") - -# If using proxy, rewrite the effective URL back to original hostname -if [ -n "$proxy" ]; then - # Replace proxy host with original host in the effective URL - rewritten_url="${effective_url/$proxy_host/$target_host}" - echo "$rewritten_url" -else - echo "$effective_url" -fi +# POST RDF/POST multipart form +echo -e "$rdf_post" | curl -f -v -s -k -X POST -H "Accept: text/turtle" -E "$cert_pem_file":"$cert_password" -o /dev/null --config - "$target" diff --git a/bin/imports/create-csv-import.sh b/bin/imports/add-csv-import.sh similarity index 73% rename from bin/imports/create-csv-import.sh rename to bin/imports/add-csv-import.sh index f7edac6cd..5b01392b1 100755 --- a/bin/imports/create-csv-import.sh +++ b/bin/imports/add-csv-import.sh @@ -5,7 +5,7 @@ print_usage() { printf "Transforms CSV data into RDF using a SPARQL query and imports it.\n" printf "\n" - printf "Usage: %s options\n" "$0" + printf "Usage: %s options TARGET_URI\n" "$0" printf "\n" printf "Options:\n" printf " -f, --cert-pem-file CERT_FILE .pem file with the WebID certificate of the agent\n" @@ -13,9 +13,9 @@ print_usage() printf " -b, --base BASE_URI Base URI of the application\n" printf " --proxy PROXY_URL The host this request will be proxied through (optional)\n" printf "\n" - printf " --title TITLE Title of the container\n" - printf " --description DESCRIPTION Description of the container (optional)\n" - printf " --slug STRING String that will be used as URI path segment (optional)\n" + printf " --title TITLE Title of the import\n" + printf " --description DESCRIPTION Description of the import (optional)\n" + printf " --uri URI URI of the import resource (optional)\n" printf "\n" printf " --query QUERY_URI URI of the CONSTRUCT mapping query\n" printf " --file FILE_URI URI of the CSV file\n" @@ -24,11 +24,6 @@ print_usage() hash turtle 2>/dev/null || { echo >&2 "turtle not on \$PATH. Aborting."; exit 1; } -urlencode() { - python -c 'import urllib.parse, sys; print(urllib.parse.quote(sys.argv[1], sys.argv[2]))' \ - "$1" "$urlencode_safe" -} - args=() while [[ $# -gt 0 ]] do @@ -65,8 +60,8 @@ do shift # past argument shift # past value ;; - --slug) - slug="$2" + --uri) + uri="$2" shift # past argument shift # past value ;; @@ -93,6 +88,8 @@ do done set -- "${args[@]}" # restore args +target="$1" + if [ -z "$cert_pem_file" ] ; then print_usage exit 1 @@ -122,14 +119,11 @@ if [ -z "$delimiter" ] ; then exit 1 fi -if [ -z "$slug" ] ; then - slug=$(uuidgen | tr '[:upper:]' '[:lower:]') # lowercase +if [ -n "$uri" ] ; then + subject="<${uri}>" +else + subject="_:import" fi -encoded_slug=$(urlencode "$slug") - -container="${base}imports/" - -target="${container}${encoded_slug}/" args+=("-f") args+=("$cert_pem_file") @@ -137,29 +131,23 @@ args+=("-p") args+=("$cert_password") args+=("-t") args+=("text/turtle") # content type -args+=("$target") if [ -n "$proxy" ]; then args+=("--proxy") args+=("$proxy") fi turtle+="@prefix ldh: .\n" -turtle+="@prefix dh: .\n" turtle+="@prefix dct: .\n" -turtle+="@prefix foaf: .\n" turtle+="@prefix spin: .\n" -turtle+="_:import a ldh:CSVImport .\n" -turtle+="_:import dct:title \"${title}\" .\n" -turtle+="_:import spin:query <${query}> .\n" -turtle+="_:import ldh:file <${file}> .\n" -turtle+="_:import ldh:delimiter \"${delimiter}\" .\n" -turtle+="<${target}> a dh:Item .\n" -turtle+="<${target}> foaf:primaryTopic _:import .\n" -turtle+="<${target}> dct:title \"${title}\" .\n" +turtle+="${subject} a ldh:CSVImport .\n" +turtle+="${subject} dct:title \"${title}\" .\n" +turtle+="${subject} spin:query <${query}> .\n" +turtle+="${subject} ldh:file <${file}> .\n" +turtle+="${subject} ldh:delimiter \"${delimiter}\" .\n" if [ -n "$description" ] ; then - turtle+="_:import dct:description \"${description}\" .\n" + turtle+="${subject} dct:description \"${description}\" .\n" fi # submit Turtle doc to the server -echo -e "$turtle" | turtle --base="$target" | put.sh "${args[@]}" \ No newline at end of file +echo -e "$turtle" | turtle --base="$target" | post.sh "${args[@]}" \ No newline at end of file diff --git a/bin/imports/create-rdf-import.sh b/bin/imports/add-rdf-import.sh similarity index 73% rename from bin/imports/create-rdf-import.sh rename to bin/imports/add-rdf-import.sh index 8d76b5e48..c47e68011 100755 --- a/bin/imports/create-rdf-import.sh +++ b/bin/imports/add-rdf-import.sh @@ -5,7 +5,7 @@ print_usage() { printf "Imports RDF data.\n" printf "\n" - printf "Usage: %s options\n" "$0" + printf "Usage: %s options TARGET_URI\n" "$0" printf "\n" printf "Options:\n" printf " -f, --cert-pem-file CERT_FILE .pem file with the WebID certificate of the agent\n" @@ -13,9 +13,9 @@ print_usage() printf " -b, --base BASE_URI Base URI of the application\n" printf " --proxy PROXY_URL The host this request will be proxied through (optional)\n" printf "\n" - printf " --title TITLE Title of the container\n" - printf " --description DESCRIPTION Description of the container (optional)\n" - printf " --slug STRING String that will be used as URI path segment (optional)\n" + printf " --title TITLE Title of the import\n" + printf " --description DESCRIPTION Description of the import (optional)\n" + printf " --uri URI URI of the import resource (optional)\n" printf "\n" printf " --query QUERY_URI URI of the CONSTRUCT mapping query (optional)\n" printf " --graph GRAPH_URI URI of the graph (optional)\n" @@ -24,11 +24,6 @@ print_usage() hash turtle 2>/dev/null || { echo >&2 "turtle not on \$PATH. Aborting."; exit 1; } -urlencode() { - python -c 'import urllib.parse, sys; print(urllib.parse.quote(sys.argv[1], sys.argv[2]))' \ - "$1" "$urlencode_safe" -} - args=() while [[ $# -gt 0 ]] do @@ -65,8 +60,8 @@ do shift # past argument shift # past value ;; - --slug) - slug="$2" + --uri) + uri="$2" shift # past argument shift # past value ;; @@ -93,6 +88,8 @@ do done set -- "${args[@]}" # restore args +target="$1" + if [ -z "$cert_pem_file" ] ; then print_usage exit 1 @@ -114,14 +111,11 @@ if [ -z "$file" ] ; then exit 1 fi -if [ -z "$slug" ] ; then - slug=$(uuidgen | tr '[:upper:]' '[:lower:]') # lowercase +if [ -n "$uri" ] ; then + subject="<${uri}>" +else + subject="_:import" fi -encoded_slug=$(urlencode "$slug") - -container="${base}imports/" - -target="${container}${encoded_slug}/" args+=("-f") args+=("$cert_pem_file") @@ -129,34 +123,28 @@ args+=("-p") args+=("$cert_password") args+=("-t") args+=("text/turtle") # content type -args+=("$target") if [ -n "$proxy" ]; then args+=("--proxy") args+=("$proxy") fi turtle+="@prefix ldh: .\n" -turtle+="@prefix dh: .\n" turtle+="@prefix dct: .\n" -turtle+="@prefix foaf: .\n" -turtle+="_:import a ldh:RDFImport .\n" -turtle+="_:import dct:title \"${title}\" .\n" -turtle+="_:import ldh:file <${file}> .\n" -turtle+="<${target}> a dh:Item .\n" -turtle+="<${target}> foaf:primaryTopic _:import .\n" -turtle+="<${target}> dct:title \"${title}\" .\n" +turtle+="${subject} a ldh:RDFImport .\n" +turtle+="${subject} dct:title \"${title}\" .\n" +turtle+="${subject} ldh:file <${file}> .\n" if [ -n "$graph" ] ; then turtle+="@prefix sd: .\n" - turtle+="_:import sd:name <${graph}> .\n" + turtle+="${subject} sd:name <${graph}> .\n" fi if [ -n "$query" ] ; then turtle+="@prefix spin: .\n" - turtle+="_:import spin:query <${query}> .\n" + turtle+="${subject} spin:query <${query}> .\n" fi if [ -n "$description" ] ; then - turtle+="_:import dct:description \"${description}\" .\n" + turtle+="${subject} dct:description \"${description}\" .\n" fi # submit Turtle doc to the server -echo -e "$turtle" | turtle --base="$target" | put.sh "${args[@]}" \ No newline at end of file +echo -e "$turtle" | turtle --base="$target" | post.sh "${args[@]}" \ No newline at end of file diff --git a/bin/imports/import-csv.sh b/bin/imports/import-csv.sh index d7c55dd38..68aac1710 100755 --- a/bin/imports/import-csv.sh +++ b/bin/imports/import-csv.sh @@ -139,55 +139,72 @@ if [ -z "$proxy" ] ; then proxy="$base" fi -query_doc=$(create-query.sh \ +# Generate query ID for fragment identifier +query_id=$(uuidgen | tr '[:upper:]' '[:lower:]') + +# Create the imports/ container first (ignore error if it already exists) +create-container.sh \ -b "$base" \ -f "$cert_pem_file" \ -p "$cert_password" \ --proxy "$proxy" \ - --title "$title" \ - --slug "$query_doc_slug" \ - --query-file "$query_file" -) + --title "Imports" \ + --parent "$base" \ + --slug "imports" 2>/dev/null || true -query_ntriples=$(get.sh \ +# Create the import item document +import_doc=$(create-item.sh \ + -b "$base" \ -f "$cert_pem_file" \ -p "$cert_password" \ --proxy "$proxy" \ - --accept 'application/n-triples' \ - "$query_doc" + --title "$title" \ + --container "${base}imports/" \ + --slug "$query_doc_slug" ) -query=$(echo "$query_ntriples" | sed -rn "s/<${query_doc//\//\\/}> <(.*)> \./\1/p" | head -1) - -file_doc=$(create-file.sh \ +# Add the CONSTRUCT query to the item using fragment identifier +add-construct.sh \ -b "$base" \ -f "$cert_pem_file" \ -p "$cert_password" \ --proxy "$proxy" \ --title "$title" \ - --slug "$file_doc_slug" \ - --file-slug "$file_slug" \ - --file "$file" \ - --file-content-type "text/csv" -) + --uri "#${query_id}" \ + --query-file "$query_file" \ + "$import_doc" + +# The query URI is the document with fragment +query="${import_doc}#${query_id}" -file_ntriples=$(get.sh \ +# Add the file to the import item +add-file.sh \ + -b "$base" \ -f "$cert_pem_file" \ -p "$cert_password" \ --proxy "$proxy" \ - --accept 'application/n-triples' \ - "$file_doc") + --title "$title" \ + --file "$file" \ + --file-content-type "text/csv" \ + "$import_doc" + +# Calculate file URI from SHA1 hash +sha1sum=$(shasum -a 1 "$file" | awk '{print $1}') +file_uri="${base}uploads/${sha1sum}" -file=$(echo "$file_ntriples" | sed -rn "s/<${file_doc//\//\\/}> <(.*)> \./\1/p" | head -1) +# Generate import ID for fragment identifier +import_id=$(uuidgen | tr '[:upper:]' '[:lower:]') -create-csv-import.sh \ +# Add the import metadata to the import item using fragment identifier +add-csv-import.sh \ -b "$base" \ -f "$cert_pem_file" \ -p "$cert_password" \ --proxy "$proxy" \ --title "$title" \ - --slug "$import_slug" \ + --uri "#${import_id}" \ --query "$query" \ - --file "$file" \ - --delimiter "$delimiter" + --file "$file_uri" \ + --delimiter "$delimiter" \ + "$import_doc" \ No newline at end of file diff --git a/bin/imports/import-rdf.sh b/bin/imports/import-rdf.sh index 086d4d303..d6d562a12 100755 --- a/bin/imports/import-rdf.sh +++ b/bin/imports/import-rdf.sh @@ -142,68 +142,85 @@ if [ -z "$proxy" ] ; then proxy="$base" fi +# Create the imports/ container first +create-container.sh \ + -b "$base" \ + -f "$cert_pem_file" \ + -p "$cert_password" \ + --proxy "$proxy" \ + --title "Imports" \ + --parent "$base" \ + --slug "imports" + +# Create the import item document +import_doc=$(create-item.sh \ + -b "$base" \ + -f "$cert_pem_file" \ + -p "$cert_password" \ + --proxy "$proxy" \ + --title "$title" \ + --container "${base}imports/" \ + --slug "$query_doc_slug" +) + if [ -n "$query_file" ] ; then - query_doc=$(create-query.sh \ + # Generate query ID for fragment identifier + query_id=$(uuidgen | tr '[:upper:]' '[:lower:]') + + # Add the CONSTRUCT query to the item using fragment identifier + add-construct.sh \ -b "$base" \ -f "$cert_pem_file" \ -p "$cert_password" \ --proxy "$proxy" \ --title "$title" \ - --slug "$query_doc_slug" \ - --query-file "$query_file" - ) - - query_ntriples=$(get.sh \ - -f "$cert_pem_file" \ - -p "$cert_password" \ - --proxy "$proxy" \ - --accept 'application/n-triples' \ - "$query_doc" - ) + --uri "#${query_id}" \ + --query-file "$query_file" \ + "$import_doc" - query=$(echo "$query_ntriples" | sed -rn "s/<${query_doc//\//\\/}> <(.*)> \./\1/p" | head -1) + # The query URI is the document with fragment + query="${import_doc}#${query_id}" fi -file_doc=$(create-file.sh \ +# Add the file to the import item +add-file.sh \ -b "$base" \ -f "$cert_pem_file" \ -p "$cert_password" \ --proxy "$proxy" \ --title "$title" \ - --slug "$file_doc_slug" \ - --file-slug "$file_slug" \ --file "$file" \ - --file-content-type "$file_content_type" -) + --file-content-type "$file_content_type" \ + "$import_doc" -file_ntriples=$(get.sh \ - -f "$cert_pem_file" \ - -p "$cert_password" \ - --proxy "$proxy" \ - --accept 'application/n-triples' \ - "$file_doc" -) +# Calculate file URI from SHA1 hash +sha1sum=$(shasum -a 1 "$file" | awk '{print $1}') +file_uri="${base}uploads/${sha1sum}" -file=$(echo "$file_ntriples" | sed -rn "s/<${file_doc//\//\\/}> <(.*)> \./\1/p" | head -1) +# Generate import ID for fragment identifier +import_id=$(uuidgen | tr '[:upper:]' '[:lower:]') +# Add the import metadata to the import item using fragment identifier if [ -n "$query" ] ; then - create-rdf-import.sh \ + add-rdf-import.sh \ -b "$base" \ -f "$cert_pem_file" \ -p "$cert_password" \ --proxy "$proxy" \ --title "$title" \ - --slug "$import_slug" \ + --uri "#${import_id}" \ --query "$query" \ - --file "$file" + --file "$file_uri" \ + "$import_doc" else - create-rdf-import.sh \ + add-rdf-import.sh \ -b "$base" \ -f "$cert_pem_file" \ -p "$cert_password" \ --proxy "$proxy" \ --title "$title" \ - --slug "$import_slug" \ + --uri "#${import_id}" \ --graph "$graph" \ - --file "$file" + --file "$file_uri" \ + "$import_doc" fi \ No newline at end of file diff --git a/http-tests/admin/model/ontology-import-upload-no-deadlock.sh b/http-tests/admin/model/ontology-import-upload-no-deadlock.sh index 939da9687..7079f86d5 100755 --- a/http-tests/admin/model/ontology-import-upload-no-deadlock.sh +++ b/http-tests/admin/model/ontology-import-upload-no-deadlock.sh @@ -28,24 +28,32 @@ add-agent-to-group.sh \ # Step 1: Upload an RDF file file_content_type="text/turtle" +slug=$(uuidgen | tr '[:upper:]' '[:lower:]') -file_doc=$(create-file.sh \ +# Create an item document to hold the file +file_doc=$(create-item.sh \ -f "$AGENT_CERT_FILE" \ -p "$AGENT_CERT_PWD" \ -b "$END_USER_BASE_URL" \ --title "Test ontology for upload import" \ - --file "$pwd/test-ontology-import.ttl" \ - --file-content-type "${file_content_type}") - -# Step 2: Extract the uploaded file URI (content-addressed) + --container "$END_USER_BASE_URL" \ + --slug "$slug") -file_doc_ntriples=$(get.sh \ +# Add the file to the document +add-file.sh \ -f "$AGENT_CERT_FILE" \ -p "$AGENT_CERT_PWD" \ - --accept 'application/n-triples' \ - "$file_doc") + -b "$END_USER_BASE_URL" \ + --title "Test ontology for upload import" \ + --file "$pwd/test-ontology-import.ttl" \ + --file-content-type "${file_content_type}" \ + "$file_doc" + +# Step 2: Extract the uploaded file URI (content-addressed) -upload_uri=$(echo "$file_doc_ntriples" | sed -rn "s/<${file_doc//\//\\/}> <(.*)> \./\1/p") +# Calculate file URI from SHA1 hash +sha1sum=$(shasum -a 1 "$pwd/test-ontology-import.ttl" | awk '{print $1}') +upload_uri="${END_USER_BASE_URL}uploads/${sha1sum}" # Verify the uploaded file is accessible before we add it as an import curl -k -f -s \ diff --git a/http-tests/imports/GET-file-304.sh b/http-tests/imports/GET-file-304.sh index 8b4f3728c..1f38581f7 100755 --- a/http-tests/imports/GET-file-304.sh +++ b/http-tests/imports/GET-file-304.sh @@ -7,6 +7,7 @@ purge_cache "$END_USER_VARNISH_SERVICE" purge_cache "$ADMIN_VARNISH_SERVICE" purge_cache "$FRONTEND_VARNISH_SERVICE" +# Run the create-file test and capture the file URI it outputs file=$(./create-file.sh) etag=$( diff --git a/http-tests/imports/GET-file-range.sh b/http-tests/imports/GET-file-range.sh index 649215916..e7eceb0a8 100755 --- a/http-tests/imports/GET-file-range.sh +++ b/http-tests/imports/GET-file-range.sh @@ -22,22 +22,30 @@ add-agent-to-group.sh \ filename="/tmp/random-file" time dd if=/dev/urandom of="$filename" bs=1 count=1024 file_content_type="application/octet-stream" +slug=$(uuidgen | tr '[:upper:]' '[:lower:]') -file_doc=$(create-file.sh \ --f "$AGENT_CERT_FILE" \ --p "$AGENT_CERT_PWD" \ --b "$END_USER_BASE_URL" \ ---title "Random file" \ ---file "$filename" \ ---file-content-type "${file_content_type}") - -file_doc_ntriples=$(get.sh \ +# Create an item document to hold the file +file_doc=$(create-item.sh \ -f "$AGENT_CERT_FILE" \ -p "$AGENT_CERT_PWD" \ - --accept 'application/n-triples' \ - "$file_doc") + -b "$END_USER_BASE_URL" \ + --title "Random file" \ + --container "$END_USER_BASE_URL" \ + --slug "$slug") -file=$(echo "$file_doc_ntriples" | sed -rn "s/<${file_doc//\//\\/}> <(.*)> \./\1/p") +# Add the file to the document +add-file.sh \ + -f "$AGENT_CERT_FILE" \ + -p "$AGENT_CERT_PWD" \ + -b "$END_USER_BASE_URL" \ + --title "Random file" \ + --file "$filename" \ + --file-content-type "${file_content_type}" \ + "$file_doc" + +# Calculate file URI from SHA1 hash +sha1sum=$(shasum -a 1 "$filename" | awk '{print $1}') +file="${END_USER_BASE_URL}uploads/${sha1sum}" from=100 length=42 diff --git a/http-tests/imports/GET-file-sha1sum.sh b/http-tests/imports/GET-file-sha1sum.sh index 3384ffc4a..08a0bd3fb 100755 --- a/http-tests/imports/GET-file-sha1sum.sh +++ b/http-tests/imports/GET-file-sha1sum.sh @@ -23,21 +23,36 @@ filename="/tmp/random-file" time dd if=/dev/urandom of="$filename" bs=1 count=1024 file_content_type="application/octet-stream" -file_doc=$(create-file.sh \ --f "$AGENT_CERT_FILE" \ --p "$AGENT_CERT_PWD" \ --b "$END_USER_BASE_URL" \ ---title "Random file" \ ---file "$filename" \ ---file-content-type "${file_content_type}") - -file_doc_ntriples=$(get.sh \ +# Create a container for files first +create-container.sh \ -f "$AGENT_CERT_FILE" \ -p "$AGENT_CERT_PWD" \ - --accept 'application/n-triples' \ - "$file_doc") + -b "$END_USER_BASE_URL" \ + --title "Files" \ + --parent "$END_USER_BASE_URL" \ + --slug "files" -file=$(echo "$file_doc_ntriples" | sed -rn "s/<${file_doc//\//\\/}> <(.*)> \./\1/p") +# Create an item document to hold the file +file_doc=$(create-item.sh \ + -f "$AGENT_CERT_FILE" \ + -p "$AGENT_CERT_PWD" \ + -b "$END_USER_BASE_URL" \ + --title "Random file" \ + --container "${END_USER_BASE_URL}files/") + +# Add the file to the document +add-file.sh \ + -f "$AGENT_CERT_FILE" \ + -p "$AGENT_CERT_PWD" \ + -b "$END_USER_BASE_URL" \ + --title "Random file" \ + --file "$filename" \ + --file-content-type "${file_content_type}" \ + "$file_doc" + +# Calculate file URI from SHA1 hash +sha1sum=$(shasum -a 1 "$filename" | awk '{print $1}') +file="${END_USER_BASE_URL}uploads/${sha1sum}" server_sha1sum=$(echo "$file" | cut -d "/" -f 5) # cut the last URL path segment diff --git a/http-tests/imports/PUT-file-format-explicit.sh b/http-tests/imports/PUT-file-format-explicit.sh index 3c9dffd8b..3d5b3d38c 100755 --- a/http-tests/imports/PUT-file-format-explicit.sh +++ b/http-tests/imports/PUT-file-format-explicit.sh @@ -24,20 +24,30 @@ echo "test,data,sample" > "$test_file" echo "1,2,3" >> "$test_file" echo "4,5,6" >> "$test_file" -# generate slug for the file document - slug=$(uuidgen | tr '[:upper:]' '[:lower:]') -# upload file with explicit media type: text/plain +# Create an item document to hold the file +file_doc=$(create-item.sh \ + -f "$AGENT_CERT_FILE" \ + -p "$AGENT_CERT_PWD" \ + -b "$END_USER_BASE_URL" \ + --title "Test File for Media Type Update" \ + --container "$END_USER_BASE_URL" \ + --slug "$slug") -file_doc=$(create-file.sh \ +# upload file with explicit media type: text/plain +add-file.sh \ -f "$AGENT_CERT_FILE" \ -p "$AGENT_CERT_PWD" \ -b "$END_USER_BASE_URL" \ --title "Test File for Media Type Update" \ - --slug "$slug" \ --file "$test_file" \ - --file-content-type "text/plain") + --file-content-type "text/plain" \ + "$file_doc" + +# Calculate file URI from SHA1 hash +sha1sum=$(shasum -a 1 "$test_file" | awk '{print $1}') +file_uri="${END_USER_BASE_URL}uploads/${sha1sum}" # get the file resource URI and initial dct:format @@ -47,8 +57,6 @@ file_doc_ntriples=$(get.sh \ --accept 'application/n-triples' \ "$file_doc") -file_uri=$(echo "$file_doc_ntriples" | sed -rn "s/<${file_doc//\//\\/}> <(.*)> \./\1/p") - # get initial SHA1 hash initial_sha1=$(echo "$file_doc_ntriples" | sed -rn "s/<${file_uri//\//\\/}> \"(.*)\" \./\1/p") @@ -61,18 +69,17 @@ if [[ ! "$initial_format" =~ text/plain ]]; then exit 1 fi -# re-upload the same file with same slug but different explicit media type: text/csv +# re-upload the same file but different explicit media type: text/csv # this simulates editing the file document through the UI and uploading a new file -create-file.sh \ +add-file.sh \ -f "$AGENT_CERT_FILE" \ -p "$AGENT_CERT_PWD" \ -b "$END_USER_BASE_URL" \ --title "Test File for Media Type Update" \ - --slug "$slug" \ --file "$test_file" \ --file-content-type "text/csv" \ - > /dev/null + "$file_doc" # get updated document diff --git a/http-tests/imports/PUT-file-format.sh b/http-tests/imports/PUT-file-format.sh index 4a30ad9d6..fa503fbac 100755 --- a/http-tests/imports/PUT-file-format.sh +++ b/http-tests/imports/PUT-file-format.sh @@ -24,19 +24,29 @@ echo "test,data,sample" > "$test_file" echo "1,2,3" >> "$test_file" echo "4,5,6" >> "$test_file" -# generate slug for the file document - slug=$(uuidgen | tr '[:upper:]' '[:lower:]') -# upload file WITHOUT explicit media type (rely on browser detection via `file -b --mime-type`) +# Create an item document to hold the file +file_doc=$(create-item.sh \ + -f "$AGENT_CERT_FILE" \ + -p "$AGENT_CERT_PWD" \ + -b "$END_USER_BASE_URL" \ + --title "Test File for Browser Media Type" \ + --container "$END_USER_BASE_URL" \ + --slug "$slug") -file_doc=$(create-file.sh \ +# upload file WITHOUT explicit media type (rely on browser detection via `file -b --mime-type`) +add-file.sh \ -f "$AGENT_CERT_FILE" \ -p "$AGENT_CERT_PWD" \ -b "$END_USER_BASE_URL" \ --title "Test File for Browser Media Type" \ - --slug "$slug" \ - --file "$test_file") + --file "$test_file" \ + "$file_doc" + +# Calculate file URI from SHA1 hash +sha1sum=$(shasum -a 1 "$test_file" | awk '{print $1}') +file_uri="${END_USER_BASE_URL}uploads/${sha1sum}" # get the file resource URI and initial dct:format @@ -46,25 +56,23 @@ file_doc_ntriples=$(get.sh \ --accept 'application/n-triples' \ "$file_doc") -file_uri=$(echo "$file_doc_ntriples" | sed -rn "s/<${file_doc//\//\\/}> <(.*)> \./\1/p") - # get initial SHA1 hash initial_sha1=$(echo "$file_doc_ntriples" | sed -rn "s/<${file_uri//\//\\/}> \"(.*)\" \./\1/p") # get initial dct:format (should be browser-detected) initial_format=$(echo "$file_doc_ntriples" | sed -rn "s/<${file_uri//\//\\/}> <(.*)> \./\1/p") -# re-upload the same file with same slug but WITH explicit media type: text/csv +# re-upload the same file but WITH explicit media type: text/csv # this simulates editing and uploading with a corrected format after browser auto-detection was wrong -create-file.sh \ +add-file.sh \ -f "$AGENT_CERT_FILE" \ -p "$AGENT_CERT_PWD" \ -b "$END_USER_BASE_URL" \ --title "Test File for Browser Media Type" \ - --slug "$slug" \ --file "$test_file" \ --file-content-type "text/csv" \ + "$file_doc" \ > /dev/null # get updated document diff --git a/http-tests/imports/create-file.sh b/http-tests/imports/create-file.sh index d7e5c462c..a054bb1af 100755 --- a/http-tests/imports/create-file.sh +++ b/http-tests/imports/create-file.sh @@ -20,24 +20,30 @@ add-agent-to-group.sh \ # create file file_content_type="text/csv" +slug=$(uuidgen | tr '[:upper:]' '[:lower:]') -file_doc=$(create-file.sh \ --f "$AGENT_CERT_FILE" \ --p "$AGENT_CERT_PWD" \ --b "$END_USER_BASE_URL" \ ---title "Test CSV" \ ---file "$pwd/test.csv" \ ---file-content-type "${file_content_type}") - -file_doc_ntriples=$(get.sh \ +# Create an item document to hold the file +file_doc=$(create-item.sh \ -f "$AGENT_CERT_FILE" \ -p "$AGENT_CERT_PWD" \ - --accept 'application/n-triples' \ - "$file_doc") - -# echo "FILE NTRIPLES: $file_doc_ntriples" + -b "$END_USER_BASE_URL" \ + --title "Test CSV" \ + --container "$END_USER_BASE_URL" \ + --slug "$slug") -file=$(echo "$file_doc_ntriples" | sed -rn "s/<${file_doc//\//\\/}> <(.*)> \./\1/p") +# Add the file to the document +add-file.sh \ + -f "$AGENT_CERT_FILE" \ + -p "$AGENT_CERT_PWD" \ + -b "$END_USER_BASE_URL" \ + --title "Test CSV" \ + --file "$pwd/test.csv" \ + --file-content-type "${file_content_type}" \ + "$file_doc" + +# Calculate file URI from SHA1 hash +sha1sum=$(shasum -a 1 "$pwd/test.csv" | awk '{print $1}') +file="${END_USER_BASE_URL}uploads/${sha1sum}" echo "$file" # file URL used in other tests From fbdca50943bdb556bfb6b8a0c10223a82d0931fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Fri, 13 Feb 2026 13:02:48 +0100 Subject: [PATCH 17/20] Chart rendering aligned with view Using `ldh:update-progress-counter()` to update the progress bar --- .../bootstrap/2.3.2/client/block/chart.xsl | 54 +++++++++---------- .../bootstrap/2.3.2/client/block/query.xsl | 17 +++--- .../xsl/bootstrap/2.3.2/client/block/view.xsl | 2 - 3 files changed, 36 insertions(+), 37 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl index 5541a334b..53307ebbc 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl @@ -286,11 +286,16 @@ exclude-result-prefixes="#all" - - - - - + + + + + + + + + + - - - - + + - - - - - - - @@ -816,8 +813,7 @@ exclude-result-prefixes="#all"
    - - + - @@ -867,11 +862,10 @@ exclude-result-prefixes="#all" - - - + + - + @@ -880,7 +874,10 @@ exclude-result-prefixes="#all" - + + + + @@ -896,8 +893,7 @@ exclude-result-prefixes="#all"
    - - + + + + + + + @@ -325,7 +331,7 @@ exclude-result-prefixes="#all" - + @@ -536,7 +542,7 @@ exclude-result-prefixes="#all" - + @@ -581,11 +587,10 @@ exclude-result-prefixes="#all" - - - + + - + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl index a891d5681..e5d3cd2db 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl @@ -194,7 +194,6 @@ exclude-result-prefixes="#all" - - - - @@ -944,8 +942,8 @@ ORDER BY DESC(?created) - - + + diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/query-transforms.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/query-transforms.xsl index 4d0172236..e0fd8f361 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/query-transforms.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/query-transforms.xsl @@ -812,5 +812,35 @@ extension-element-prefixes="ixsl" - + + + + + + + + + + + + + + + + + + values + + + + + + + + + + + + + \ No newline at end of file From dfae966f6625b5797c56b519ec25ca66e7a11cb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Fri, 13 Feb 2026 13:53:41 +0100 Subject: [PATCH 19/20] CSS fix --- .../webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css index 8009fd3ee..fcfc0fb23 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/css/bootstrap.css @@ -89,6 +89,7 @@ li button.btn-edit-constructors, li button.btn-add-data, li button.btn-add-ontol #left-sidebar { display: block; width: auto; position: unset; top: unset; height: auto; } #left-sidebar .nav { max-height: 20em; overflow: auto; } } +#left-sidebar .nav-list > li > a.btn-container { padding-left: 24px; } #left-sidebar .nav-list > li > a { margin-left: 0; margin-right: 0; } #left-sidebar .nav-list > li > a.btn-container #left-sidebar li { max-height: 20em; overflow: auto; } From 32cf73c463d088233bf540f2cba4519224cd8a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martynas=20Jusevi=C4=8Dius?= Date: Fri, 13 Feb 2026 14:00:45 +0100 Subject: [PATCH 20/20] Debug output cleanup --- .../xsl/bootstrap/2.3.2/client/block.xsl | 4 ---- .../xsl/bootstrap/2.3.2/client/navigation.xsl | 22 ------------------- 2 files changed, 26 deletions(-) diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl index 8633467e5..745d5aab7 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl @@ -478,8 +478,6 @@ exclude-result-prefixes="#all" - [0ms] Progress INIT: total-steps= step-size=% - @@ -495,8 +493,6 @@ exclude-result-prefixes="#all" - [ms] Progress STEP /: % - diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl index ddf3350a1..d1d0197d5 100644 --- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl +++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/navigation.xsl @@ -150,10 +150,6 @@ ORDER BY DESC(?created) - - ldh:DocTreeActivateHref $href: , stripped: - - @@ -192,14 +188,11 @@ ORDER BY DESC(?created) - ldh:DocTreeExpandPathAndActivate - starting descent for target: - - ldh:DocTreeExpandPathAndActivate - found root: @@ -471,12 +464,9 @@ ORDER BY DESC(?created) - ldh:doctree-descend - current: , target: - - ldh:doctree-descend - reached target, activating @@ -492,8 +482,6 @@ ORDER BY DESC(?created) - ldh:doctree-descend - expanding: - @@ -552,18 +540,14 @@ ORDER BY DESC(?created) - ldh:doctree-descend - already expanded, finding next child - - ldh:doctree-descend - descending to: - ldh:doctree-descend - no matching child found, activating target @@ -576,7 +560,6 @@ ORDER BY DESC(?created) - ldh:doctree-descend - waiting for children to load @@ -584,7 +567,6 @@ ORDER BY DESC(?created) - ldh:doctree-descend - target not under this branch @@ -597,18 +579,14 @@ ORDER BY DESC(?created) - ldh:doctree-descend-after-load - children loaded for: - - ldh:doctree-descend-after-load - descending to: - ldh:doctree-descend-after-load - no matching child, activating target