From 8446cb2786215c5527555f03d8bf6be08ed4b01d Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 14 Jul 2023 13:11:12 +0100 Subject: [PATCH] Tidying --- utils.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/utils.py b/utils.py index ad8e1f1bf..240e622d7 100644 --- a/utils.py +++ b/utils.py @@ -244,20 +244,25 @@ def get_content_from_post(post_json_object: {}, system_language: str, if this_post_json[map_dict].get(system_language): sys_lang = this_post_json[map_dict][system_language] if isinstance(sys_lang, str): - content = this_post_json[map_dict][system_language] + content = sys_lang content = remove_markup_tag(content, 'pre') + content = content.replace('&', '&') return standardize_text(content) else: # is there a contentMap/summaryMap entry for one of # the understood languages? for lang in languages_understood: if this_post_json[map_dict].get(lang): - content = this_post_json[map_dict][lang] - content = remove_markup_tag(content, 'pre') - return standardize_text(content) + map_lang = this_post_json[map_dict][lang] + if isinstance(map_lang, str): + content = map_lang + content = remove_markup_tag(content, 'pre') + content = content.replace('&', '&') + return standardize_text(content) else: if isinstance(this_post_json[content_type], str): content = this_post_json[content_type] + content = content.replace('&', '&') content = remove_markup_tag(content, 'pre') return standardize_text(content)