From dd4f893d2bc017b99ad71404c5ce461e05469bff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20H=C3=A6gland?= Date: Thu, 23 May 2024 15:55:38 +0200 Subject: [PATCH] Fixed a bug in the fodt-set-keyword-status script A newline was accidentally gobbled up by the script --- parts/appendices/A.fodt | 13 ++++++++----- scripts/python/src/fodt/add_keyword_status.py | 9 +++++---- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/parts/appendices/A.fodt b/parts/appendices/A.fodt index b08e3880..4663be1c 100644 --- a/parts/appendices/A.fodt +++ b/parts/appendices/A.fodt @@ -6826,7 +6826,8 @@ Updated with AFR/TSA Rev-D comments and new keywords. - + + @@ -6838,8 +6839,9 @@ Updated with AFR/TSA Rev-D comments and new keywords. - - + + + @@ -6852,7 +6854,8 @@ Updated with AFR/TSA Rev-D comments and new keywords. - + + @@ -28788,4 +28791,4 @@ Updated with AFR/TSA Rev-D comments and new keywords. - \ No newline at end of file + diff --git a/scripts/python/src/fodt/add_keyword_status.py b/scripts/python/src/fodt/add_keyword_status.py index 4f8586fb..ab477056 100644 --- a/scripts/python/src/fodt/add_keyword_status.py +++ b/scripts/python/src/fodt/add_keyword_status.py @@ -83,15 +83,16 @@ def endElement(self, name: str): self.in_table_cell = False elif self.in_table_cell_style and name == "style:style": self.in_table_cell_style = False - if self.in_table_cell_p and name == "text:p" and self.start_tag_open and self.opm_flow: + if self.in_table_cell_p and name == "text:p" and self.start_tag_open: self.content.write(">") self.start_tag_open = False - content = "OPM Flow" self.keyword_handled = True self.current_keyword = None self.in_table_cell_p = False self.found_table_cell = False - self.content.write(XMLHelper.escape(content)) + if self.opm_flow: + content = "OPM Flow" + self.content.write(XMLHelper.escape(content)) if self.start_tag_open: self.content.write("/>") self.start_tag_open = False @@ -229,7 +230,7 @@ def set_keyword_status( try: color = KeywordStatus[color.upper()] except ValueError: - raise ValueError(f"Invalid status value: {status}.") + raise ValueError(f"Invalid color value: {color}.") logging.info(f"Updating parameters for keyword {keyword}: Color: {color}, flow-specific keyword: {opm_flow}.") UpdateKeywordStatus(maindir, keyword, color, opm_flow).update()