Merge pull request #65 from robertatakenaka/fix_create_element_which_…

…has_tags Corrige a criação de elementos que tenham sub elementos
scieloorg · Sep 23, 2024 · fdc20d9 · fdc20d9
2 parents 5d12645 + 8e82a58
commit fdc20d9
Showing 1 changed file with 5 additions and 15 deletions.
diff --git a/scielo_classic_website/spsxml/sps_xml_pipes.py b/scielo_classic_website/spsxml/sps_xml_pipes.py
@@ -23,6 +23,7 @@
     XMLArticleMetaTitleGroupPipe,
     XMLArticleMetaTranslatedTitleGroupPipe,
     XMLNormalizeSpacePipe,
+    create_node_with_fixed_html_text,
 )
 from scielo_classic_website.spsxml.sps_xml_attributes import (
     get_article_type,
@@ -379,25 +380,16 @@ def transform(self, data):
             # ARTICLE TITLE
             if raw.translated_titles:
                 titlegroup = ET.Element("title-group")
-                articletitle = ET.Element("article-title")
-                articletitle.set("{http://www.w3.org/XML/1998/namespace}lang", language)
                 title = raw.get_article_title(language)
-                if "&" in title:
-                    articletitle.text = ET.CDATA(title)
-                else:
-                    articletitle.text = title
+                articletitle = create_node_with_fixed_html_text("article-title", title)
+                articletitle.set("{http://www.w3.org/XML/1998/namespace}lang", language)
                 titlegroup.append(articletitle)
                 frontstub.append(titlegroup)
 
             # ABSTRACT
             if raw.translated_abstracts:
-                p = ET.Element("p")
                 text = raw.get_abstract(language)
-                if "&" in text:
-                    p.text = ET.CDATA(text)
-                else:
-                    p.text = text
-                abstract = ET.Element("abstract")
+                abstract = create_node_with_fixed_html_text("p", text)
                 abstract.set("{http://www.w3.org/XML/1998/namespace}lang", language)
                 abstract.append(p)
                 frontstub.append(abstract)
@@ -408,9 +400,7 @@ def transform(self, data):
                 kwd_group = ET.Element("kwd-group")
                 kwd_group.set("{http://www.w3.org/XML/1998/namespace}lang", language)
                 for item in keywords_group:
-                    kwd = ET.Element("kwd")
-                    kwd.text = ET.CDATA(item) if "&" in item else item
-                    kwd_group.append(kwd)
+                    kwd_group.append(create_node_with_fixed_html_text("kwd", item))
                 frontstub.append(kwd_group)
             subarticle.append(frontstub)
         return data