From 6fcfd5c2be9d07456c3ab5d8b8a132f766545b88 Mon Sep 17 00:00:00 2001 From: SimonTaurus Date: Sat, 16 Nov 2024 06:29:26 +0000 Subject: [PATCH] fix: resolve SMW and datatable result format issues Refs: https://github.com/SemanticMediaWiki/SemanticResultFormats/issues/827, https://github.com/SemanticMediaWiki/SemanticResultFormats/issues/860, https://github.com/SemanticMediaWiki/SemanticMediaWiki/issues/5714 --- mediawiki/build/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mediawiki/build/Dockerfile b/mediawiki/build/Dockerfile index 116b09b..2c407ae 100644 --- a/mediawiki/build/Dockerfile +++ b/mediawiki/build/Dockerfile @@ -217,9 +217,9 @@ RUN set -x; \ && COMPOSER=composer.local.json composer require --no-update mediawiki/semantic-scribunto:~2.2 \ ## SRF && cd $MW_HOME/extensions \ - #&& git clone --depth 1 -b use-vizjs-renderer https://github.com/simontaurus/SemanticResultFormats.git SemanticResultFormats \ - && git clone https://github.com/SemanticMediaWiki/SemanticResultFormats.git SemanticResultFormats \ - && cd SemanticResultFormats && git checkout -b dev f9ba69b35f43f2859e0bfd3dca14282bcb3fd5d3 && cd .. \ + && git clone --depth 1 -b dev https://github.com/OpenSemanticLab/SemanticResultFormats.git SemanticResultFormats \ + #&& git clone https://github.com/SemanticMediaWiki/SemanticResultFormats.git SemanticResultFormats \ + #&& cd SemanticResultFormats && git checkout -b dev f9ba69b35f43f2859e0bfd3dca14282bcb3fd5d3 && cd .. \ #&& git clone --depth 1 https://github.com/SemanticMediaWiki/Mermaid.git Mermaid \ #&& git clone --depth 1 https://github.com/SemanticMediaWiki/SemanticExtraSpecialProperties.git \ #&& git clone --depth 1 -b dev-$MW_VERSION https://github.com/simontaurus/SemanticFormsSelect.git \ @@ -239,7 +239,9 @@ RUN set -x; \ && cd $MW_HOME \ && composer update --no-dev --prefer-source --optimize-autoloader \ # fix: videos in gallery format not shown - && sed -i -e "s/find( 'a.image' )/find( 'a.image' ).add( 'video>a' )/g" $MW_HOME/extensions/SemanticResultFormats/formats/gallery/resources/ext.srf.gallery.redirect.js + && sed -i -e "s/find( 'a.image' )/find( 'a.image' ).add( 'video>a' )/g" $MW_HOME/extensions/SemanticResultFormats/formats/gallery/resources/ext.srf.gallery.redirect.js \ + # fix: create temp table only if not existing yet, see https://github.com/SemanticMediaWiki/SemanticMediaWiki/issues/5714 + && sed -i -e 's/"CREATE TEMPORARY TABLE "/"CREATE TEMPORARY TABLE IF NOT EXISTS "/g' $MW_HOME/extensions/SemanticMediaWiki/src/SQLStore/TableBuilder/TemporaryTableBuilder.php #### Scribunto / Lua #### RUN set -x; \