Corrige validação para SupplementaryMaterial e testes #947
Conversation
| data=self.data, | ||
| ) | ||
|
|
||
| def validate_prohibited_inline(self): |
There was a problem hiding this comment.
@Rossi-Luciano este método pode ser de uma classe que seja instanciada com xml_tree
There was a problem hiding this comment.
OK, @robertatakenaka
| advice=None, | ||
| data=supp, | ||
| error_level="OK", | ||
| def __init__(self, data, xml_tree, params, node=None): |
There was a problem hiding this comment.
@Rossi-Luciano excluir xml_tree. Tenha uma classe para validar o elemento individualmente e outra para validar no nível do XML
There was a problem hiding this comment.
OK, @robertatakenaka
| data=None, | ||
| error_level=error_level, | ||
|
|
||
| def validate_position(self): |
There was a problem hiding this comment.
@Rossi-Luciano método de uma classe que é instanciada com xml_tree
There was a problem hiding this comment.
OK, @robertatakenaka
…leSupplementaryMaterialValidation'
| advice=None, | ||
| data=supp, | ||
| error_level="OK", | ||
| def __init__(self, data, params, node=None): |
There was a problem hiding this comment.
@Rossi-Luciano Em data não há dados de média ou de graphic? Deveria para evitar que você tenha que passar o node.
There was a problem hiding this comment.
OK, @robertatakenaka
| for media in self.node.xpath(".//media"): | ||
| if media.data: | ||
| yield from MediaValidation(media.data, self.params).validate() | ||
|
|
There was a problem hiding this comment.
@Rossi-Luciano não daria para fazer algo como:
if data.get("alguma chave que indica que é media"):
yield from MediaValidation(data, self.params).validate()There was a problem hiding this comment.
OK, @robertatakenaka
| """ | ||
| Ensures that <supplementary-material> does not occur inside <app-group> and <app>. | ||
| """ | ||
| valid = self.data.get("parent_suppl_mat") not in ["app-group", "app"] |
There was a problem hiding this comment.
@Rossi-Luciano colocar em params o item é "parent_suppl_mat_expected": ["app-group", "app"]
There was a problem hiding this comment.
OK, @robertatakenaka
| """ | ||
| Verifies if the supplementary materials section is in the last position of <body> or inside <back>. | ||
| """ | ||
| article_body = self.xml_tree.find("body") |
There was a problem hiding this comment.
@Rossi-Luciano acho que primeiro tem que saber se há pelo menos 1 material suplementar antes de seguir a validação
There was a problem hiding this comment.
OK, @robertatakenaka
…aterial_validation
…lementary-material>
| @@ -82,11 +86,11 @@ def items_by_id(self): | |||
| considera esse elemento, apesar de ele poder existir. | |||
| """ | |||
| supp_dict = {} | |||
| for node in self.xml_tree.xpath(". | sub-article"): | |||
| for node in self.xml_tree.xpath("./front | ./body | ./back | .//sub-article"): | |||
There was a problem hiding this comment.
@Rossi-Luciano: troque self.xml_tree.xpath("./front | ./body | ./back | .//sub-article"): por self.xml_tree.xpath(". | .//sub-article"):
| node_id = node.get("id") if node.get("id") else "main_article" | ||
| supp_dict.setdefault(node_id, []) | ||
| full_text = Fulltext(node) | ||
| for supp_node in full_text.node.xpath(".//supplementary-material"): | ||
| for supp_node in full_text.node.xpath(".//supplementary-material") or []: |
There was a problem hiding this comment.
troque full_text.node.xpath(".//supplementary-material") por full_text.node.xpath("./front//supplementary-material | ./body//supplementary-material | ./back//supplementary-material")
| @@ -124,6 +124,10 @@ def validate_position(self): | |||
| """ | |||
| Verifies if the supplementary materials section is in the last position of <body> or inside <back>. | |||
| """ | |||
| sections = self.xml_tree.findall(".//sec") | |||
There was a problem hiding this comment.
troque sections = self.xml_tree.findall(".//sec")... por
sections = self.xml_tree.xpath('.//sec[@sec-type="supplementary-material"]')
if not sections:
return
| node_id = node.get("id") if node.get("id") else "main_article" | ||
| supp_dict.setdefault(node_id, []) | ||
| full_text = Fulltext(node) | ||
| for supp_node in full_text.node.xpath(".//supplementary-material"): | ||
| for supp_node in full_text.node.xpath("./front//supplementary-material | ./body//supplementary-material | ./back//supplementary-material") or []: |
There was a problem hiding this comment.
@Rossi-Luciano adicionar front-stub
There was a problem hiding this comment.
OK, @robertatakenaka
O que esse PR faz?
Corrige validação para
SupplementaryMateriale testes.Onde a revisão poderia começar?
NA
Como este poderia ser testado manualmente?
NA
Algum cenário de contexto que queira dar?
NA
Screenshots
NA
Quais são tickets relevantes?
Substitui o PR #915
Referências
NA