From df97fbf2d52d5ea5a2af76ad9a66479a45ebc76f Mon Sep 17 00:00:00 2001
From: daxid <david.rouquet@tetras-libre.fr>
Date: Tue, 14 Jan 2025 10:29:15 +0100
Subject: [PATCH] fix comments and anchors
---
tetras_extraction/script/src/transform.py | 5 ++++-
tetras_extraction/script/templates/activite.rq | 3 ++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/tetras_extraction/script/src/transform.py b/tetras_extraction/script/src/transform.py
index bb0d8df..460a099 100644
--- a/tetras_extraction/script/src/transform.py
+++ b/tetras_extraction/script/src/transform.py
@@ -87,7 +87,10 @@ def postEditMD(str):
regexANCHOR = re.compile(r"@ANCHORSTART@(.)@(.*?)@ANCHOREND")
str = regexANCHOR.sub(r"<span commentaireInfoId='\1'>\2</span>", str)
- # For the comments themselves it is done in activite.rq
+ # For the comments themselves
+ if '@COMMENTIDSTART' in str :
+ str = str.replace('@COMMENTIDSTART@','<div class="commentaireInfo" id="').replace('@COMMENTIDEND','">') + '</div>'
+
###################################################
diff --git a/tetras_extraction/script/templates/activite.rq b/tetras_extraction/script/templates/activite.rq
index c138254..f84a948 100644
--- a/tetras_extraction/script/templates/activite.rq
+++ b/tetras_extraction/script/templates/activite.rq
@@ -17,7 +17,8 @@ template mt:activite(?act) {
'<div class="commentaireInfoGroup" hidden="True">' st:nl()
group {
- concat(replace(replace(?info_comment,'@COMMENTIDSTART@','<div class="commentaireInfo" id="'),'@COMMENTIDEND','">'),'</div>')
+ '<div class="commentaireInfo">' st:nl()
+ ?info_comment
'</div>' st:nl()
}
'</div>' st:nl()
--
GitLab