diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-meta-related-article.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-meta-related-article.xsl index 463e8cc8e..d2773829f 100644 --- a/packtools/catalogs/htmlgenerator/v2.0/article-meta-related-article.xsl +++ b/packtools/catalogs/htmlgenerator/v2.0/article-meta-related-article.xsl @@ -45,6 +45,7 @@ do site. --> + This addendum adds information to the following document This erratum corrects This retraction retracts This document comments diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-text-graphic.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-text-graphic.xsl index baf0c561c..9dd5c2aba 100644 --- a/packtools/catalogs/htmlgenerator/v2.0/article-text-graphic.xsl +++ b/packtools/catalogs/htmlgenerator/v2.0/article-text-graphic.xsl @@ -129,29 +129,35 @@ - - + - + - + - + - + - + + + + + + + + - + diff --git a/packtools/catalogs/htmlgenerator/v2.0/article-text-xref.xsl b/packtools/catalogs/htmlgenerator/v2.0/article-text-xref.xsl index 510748d39..e8726a439 100644 --- a/packtools/catalogs/htmlgenerator/v2.0/article-text-xref.xsl +++ b/packtools/catalogs/htmlgenerator/v2.0/article-text-xref.xsl @@ -140,15 +140,11 @@ - + - - - - - + diff --git a/packtools/catalogs/htmlgenerator/v2.0/config-labels.xml b/packtools/catalogs/htmlgenerator/v2.0/config-labels.xml index 96107acb7..3d6790e0e 100644 --- a/packtools/catalogs/htmlgenerator/v2.0/config-labels.xml +++ b/packtools/catalogs/htmlgenerator/v2.0/config-labels.xml @@ -493,4 +493,11 @@ Este documento tem um adendo Este documento tiene una addenda + + This addendum adds information to the following document + This addendum adds information to the following document + Este adendo adiciona informação ao documento + Esta addenda agrega información al documento + + \ No newline at end of file diff --git a/packtools/catalogs/htmlgenerator/v2.0/html-modals-contribs.xsl b/packtools/catalogs/htmlgenerator/v2.0/html-modals-contribs.xsl index 08aa362d3..7f7e17be7 100644 --- a/packtools/catalogs/htmlgenerator/v2.0/html-modals-contribs.xsl +++ b/packtools/catalogs/htmlgenerator/v2.0/html-modals-contribs.xsl @@ -101,9 +101,71 @@
+
- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + , , + +
  • diff --git a/packtools/file_utils_mimetype.py b/packtools/file_utils_mimetype.py index 428a1785c..a67cf9e1c 100644 --- a/packtools/file_utils_mimetype.py +++ b/packtools/file_utils_mimetype.py @@ -1,5 +1,5 @@ import os -import magic +import mimetypes def is_valid_file(file_path, check_mimetype=False): @@ -14,5 +14,4 @@ def is_valid_file(file_path, check_mimetype=False): def get_mimetype(file_path): - with open(file_path, 'rb') as fin: - return magic.from_buffer(fin.read(2048), mime=True) + return mimetypes.guess_type(file_path, strict=True) diff --git a/packtools/sps/models/article_ids.py b/packtools/sps/models/article_ids.py index 5a83bed3f..1c47cd945 100644 --- a/packtools/sps/models/article_ids.py +++ b/packtools/sps/models/article_ids.py @@ -64,16 +64,28 @@ def v2(self, value): node = self._get_node( './/article-id[@specific-use="scielo-v2"]' ) + if node is not None and node.text: + raise AttributeError( + "can't set attribute ArticleIds.v2. It is already set: %s" % + node.text + ) + if not value: + raise ValueError( + "can't set attribute ArticleIds.v2. " + "Given value %s is not valid" % value) if node is None: node = etree.Element("article-id") node.set("pub-id-type", "publisher-id") node.set("specific-use", "scielo-v2") self.am.insert(1, node) - if node is not None: - node.text = value + node.text = value @v3.setter def v3(self, value): + if not value: + raise ValueError( + "can't set attribute ArticleIds.v3. " + "Given value %s is not valid" % value) node = self._get_node( './/article-id[@specific-use="scielo-v3"]' ) @@ -87,6 +99,10 @@ def v3(self, value): @aop_pid.setter def aop_pid(self, value): + if not value: + raise ValueError( + "can't set attribute ArticleIds.aop_pid. " + "Given value %s is not valid" % value) node = self._get_node( './/article-id[@specific-use="previous-pid" and ' '@pub-id-type="publisher-id"]' @@ -110,4 +126,3 @@ def _get_node_text(self, xpath): return self._get_node(xpath).text except AttributeError: return None - diff --git a/packtools/sps/models/funding_group.py b/packtools/sps/models/funding_group.py index 2975f9f6f..8488b3710 100644 --- a/packtools/sps/models/funding_group.py +++ b/packtools/sps/models/funding_group.py @@ -1,7 +1,5 @@ import logging -from packtools.sps.utils import xml_utils - logger = logging.getLogger(__name__) @@ -23,8 +21,8 @@ class FundingGroup: Arrangement containing a dictionary that correlates funding-source and award-id or values of one of the attributes. """ - def __init__(self, xml): - self._xmltree = xml_utils.get_xml_tree(xml) + def __init__(self, xmltree): + self._xmltree = xmltree @property def award_groups(self): diff --git a/tests/fixtures/htmlgenerator/affiliations/0006-8705-brag-81-e2022.en.html b/tests/fixtures/htmlgenerator/affiliations/0006-8705-brag-81-e2022.en.html index f87f9543f..243113ee3 100644 --- a/tests/fixtures/htmlgenerator/affiliations/0006-8705-brag-81-e2022.en.html +++ b/tests/fixtures/htmlgenerator/affiliations/0006-8705-brag-81-e2022.en.html @@ -4,8 +4,8 @@ - - + + @@ -324,42 +324,50 @@

    History

  • - - + diff --git a/tests/fixtures/htmlgenerator/alternatives/imagens_fora_de_fig.es.html b/tests/fixtures/htmlgenerator/alternatives/imagens_fora_de_fig.es.html index a75671725..bee1defb7 100644 --- a/tests/fixtures/htmlgenerator/alternatives/imagens_fora_de_fig.es.html +++ b/tests/fixtures/htmlgenerator/alternatives/imagens_fora_de_fig.es.html @@ -4,8 +4,8 @@ - - + + @@ -148,18 +148,22 @@

    Fechas de Publicación

    - + diff --git a/tests/fixtures/htmlgenerator/app_group_supplementary_material/0104-5970-hcsm-27-01-0275.pt.html b/tests/fixtures/htmlgenerator/app_group_supplementary_material/0104-5970-hcsm-27-01-0275.pt.html index 43a01ab96..c5bb86042 100644 --- a/tests/fixtures/htmlgenerator/app_group_supplementary_material/0104-5970-hcsm-27-01-0275.pt.html +++ b/tests/fixtures/htmlgenerator/app_group_supplementary_material/0104-5970-hcsm-27-01-0275.pt.html @@ -4,8 +4,8 @@ - - + + @@ -163,12 +163,14 @@

    Histórico