diff --git a/tetras_extraction/script/src/transform.py b/tetras_extraction/script/src/transform.py index bb0d8df9d7c37f733d682f9434e1790692fefdae..460a09905e2a7b2582cea3393ea4664f1eddc497 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 c1382546b76baa42fc6357be791797da473f222c..f84a9484a0a1bf5dd772ac204d5d47c54779a684 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()