Refatoração do processamento XML PMC para melhorar o tratamento de elementos <aff> e ampliar a cobertura de testes

packtools/sps/formats/pmc.py

@@ -43,14 +43,29 @@ def xml_pmc_aff(xml_tree):
     """
     affs = xml_tree.findall(".//aff")
     for aff in affs:
-        aff_institution = aff.find("./institution[@content-type='original']").text
+        original_institution = aff.find("./institution[@content-type='original']")
+        if original_institution is not None:
+            aff_institution = original_institution.text
+        else:
+            aff_with_address = []
+            aff_with_address.append(aff.find("./institution[@content-type='orgname']").text)
+
+            addr_line = aff.find("./addr-line")
+            if addr_line is not None:
+                named_contents = addr_line.findall(".//named-content")
+                aff_with_address.extend([named_content.text for named_content in named_contents])
+
+            country = aff.find("./country")
+            if country is not None:
+                aff_with_address.append(country.text)
+            aff_institution = ", ".join(aff_with_address)
+
 
         for institution in aff.findall(".//institution"):
             aff.remove(institution)
 
-        aff.remove(aff.find("./addr-line"))
-
-        aff.remove(aff.find("./country"))
+        for element in [aff.find("./addr-line"), aff.find("./country")]:
+            aff.remove(element)
 
         node_label = aff.find("./label")
 
@@ -154,3 +169,4 @@ def xml_pmc_ref(xml_tree):
     refs = xml_tree.findall(".//ref")
     for ref in refs:
         ref.remove(ref.find("./mixed-citation"))
+

tests/sps/formats/test_pmc.py

@@ -492,6 +492,77 @@ def test_xml_pmc_ref(self):
 
         self.assertEqual(obtained, expected)
 
+    def test_xml_pmc_without_original(self):
+        self.maxDiff = None
+        expected = (
+            '<article xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:xlink="http://www.w3.org/1999/xlink" article-type="research-article" dtd-version="1.1" specific-use="sps-1.9" xml:lang="en">'
+            '<front>'
+            '<article-meta>'
+            '<article-id specific-use="scielo-v3" pub-id-type="publisher-id">ZwzqmpTpbhTmtwR9GfDzP7c</article-id>'
+            '<article-id specific-use="scielo-v2" pub-id-type="publisher-id">S0080-62342022000100445</article-id>'
+            '<article-id pub-id-type="doi">10.1590/1980-220X-REEUSP-2021-0569en</article-id>'
+            '<article-id pub-id-type="other">00445</article-id>'
+            '<contrib-group>'
+            '<contrib contrib-type="author">'
+            '<contrib-id contrib-id-type="orcid">0000-0003-0843-6485</contrib-id>'
+            '<name>'
+            '<surname>Boni</surname>'
+            '<given-names>Fernanda Guarilha</given-names>'
+            '</name>'
+            '<xref ref-type="aff" rid="aff1">'
+            '<sup>1</sup>'
+            '</xref>'
+            '</contrib>'
+            '</contrib-group>'
+            '<aff id="aff1">'
+            'Universidade Federal do Rio Grande do Sul, Porto Alegre, RS, Brazil'
+            '</aff>'
+            '</article-meta>'
+            '</front>'
+            '</article>'
+
+        )
+        xml_tree = ET.fromstring(
+            '<article xmlns:mml="http://www.w3.org/1998/Math/MathML" xmlns:xlink="http://www.w3.org/1999/xlink" article-type="research-article" dtd-version="1.1" specific-use="sps-1.9" xml:lang="en">'
+            '<front>'
+            '<article-meta>'
+            '<article-id specific-use="scielo-v3" pub-id-type="publisher-id">ZwzqmpTpbhTmtwR9GfDzP7c</article-id>'
+            '<article-id specific-use="scielo-v2" pub-id-type="publisher-id">S0080-62342022000100445</article-id>'
+            '<article-id pub-id-type="doi">10.1590/1980-220X-REEUSP-2021-0569en</article-id>'
+            '<article-id pub-id-type="other">00445</article-id>'
+            '<contrib-group>'
+            '<contrib contrib-type="author">'
+            '<contrib-id contrib-id-type="orcid">0000-0003-0843-6485</contrib-id>'
+            '<name>'
+            '<surname>Boni</surname>'
+            '<given-names>Fernanda Guarilha</given-names>'
+            '</name>'
+            '<xref ref-type="aff" rid="aff1">'
+            '<sup>1</sup>'
+            '</xref>'
+            '</contrib>'
+            '</contrib-group>'
+            '<aff id="aff1">'
+            '<institution content-type="orgname">Universidade Federal do Rio Grande do Sul</institution>'
+            '<institution content-type="orgdiv1">Escola de Enfermagem</institution>'
+            '<institution content-type="orgdiv2">Programa de Pós-Graduação em Enfermagem</institution>'
+            '<addr-line>'
+            '<named-content content-type="city">Porto Alegre</named-content>'
+            '<named-content content-type="state">RS</named-content>'
+            '</addr-line>'
+            '<country country="BR">Brazil</country>'
+            '</aff>'
+            '</article-meta>'
+            '</front>'
+            '</article>'
+        )        
+
+        xml_pmc_aff(xml_tree)
+
+        obtained = ET.tostring(xml_tree, encoding="utf-8").decode("utf-8")
+
+        self.assertEqual(obtained, expected)
+
 
 if __name__ == '__main__':
     unittest.main()