Skip to content

Corrige vários bugs no prefixo oai-dc-scielo #752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rafaelpezzuto merged 15 commits into from
Aug 2, 2021
Merged

Corrige vários bugs no prefixo oai-dc-scielo #752

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
654e82c
remove espaço indevido em atributos de marcação
rafaelpezzuto Jul 25, 2021
55e7c72
altera termo name-content para named-content
rafaelpezzuto Jul 25, 2021
4fc91f2
adiciona escape de códigos html
rafaelpezzuto Jul 25, 2021
e8fd887
adiciona termo oai:scielo em identificador de registro
rafaelpezzuto Jul 25, 2021
49a74c0
Transforma atributo "num" de campo <reference> em campo <number_refer…
rafaelpezzuto Jul 25, 2021
2893359
Verifica se <number_reference> é número no XSLT
rafaelpezzuto Jul 25, 2021
73c2d70
Adiciona caminho para base gizmo
rafaelpezzuto Jul 26, 2021
dcd6c44
Adiciona parâmetro gizmo com valor GIZMO_OAI
rafaelpezzuto Jul 26, 2021
9cadcbe
Adiciona base gizmo com apenas uma conversão
rafaelpezzuto Jul 26, 2021
f641e9b
[oai-dc-scielo] Corrige retorno de dados de ISSUE para Press Release
rafaelpezzuto Jul 26, 2021
b1949e7
Imprime fechamento de ISSUE apenas quando houver ISSUE
rafaelpezzuto Jul 27, 2021
d49b415
Apresenta XML de erro apenas quando não houver PID de documento
rafaelpezzuto Jul 27, 2021
88d28e4
Adiciona conversão de caracter 0x019 na base gizmo
rafaelpezzuto Jul 27, 2021
c8080af
Substitui tag 4001^s por v6 tratada
rafaelpezzuto Jul 27, 2021
6a35e91
Melhora geração de estrutura parametrizada
rafaelpezzuto Jul 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions bases_modelo/gizmo/gizmo.id
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
!ID 0000001
!v001!<FONT FACE=Symbol>&#08;</FONT>
!v002!
!ID 0000002
!v001!
!v002!
Binary file added bases_modelo/gizmo/gizmo.mst
View file
Open in desktop
Binary file not shown.
Binary file added bases_modelo/gizmo/gizmo.xrf
View file
Open in desktop
Binary file not shown.
1 change: 1 addition & 0 deletions cgi-bin/ScieloXML/sci_cipar.xis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ PATH_DATA: tag 7014
'PROC_XML_SCOPUS_CITED_BY_COUNT.PFT=',v8034, 'pfts/proc_xml_scopus_cited_by_count.pft',/
'PROC_XML_CRS.PFT=',v8034, 'pfts/proc_xml_crs.pft',/
'GIZMO_XML_REF.*=', v8034, 'webservices/wxis/gizmo/gizmoXML.*',/
'GIZMO_OAI.*=', v7011, 'gizmo/gizmo.*',/
</pft>
</parm>

11 changes: 2 additions & 9 deletions cgi-bin/ScieloXML/sci_getrecord.xis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,8 @@

<call name="CreateErrorXML">
<pft>
if val(v5)<=0 or val(v6)<=0 or val(v7)<=0 then
'^l'v2,'^p'v1'^c',
if val(v5)<=0 then '0001'
else
if val(v6)<=0 then '0002'
else
if val(v7)<=0 then '0003' fi
fi
fi
if val(v7)<=0 then
'^l'v2,'^p'v1'^c','0001'
fi
</pft>
</call>
Expand Down
4 changes: 3 additions & 1 deletion cgi-bin/ScieloXML/sci_listrecords_scielo.xis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,9 @@
</pft>
</flow>

<field action="replace" tag="6"><pft>f(l(['NEWISSUE']'Y',mid(v1880,2,17)),1,0)</pft></field>
<field action="replace" tag="3331"><pft>ref(['ARTIGO']l(['ARTIGO']'HR='v1880),@PROC_SPLIT_MST.PFT,if p(v41) then 'P' else 'Y' fi)</pft></field>

<field action="replace" tag="6"><pft>f(l(['NEWISSUE']v3331,mid(v1880,2,17)),1,0)</pft></field>
<field action="replace" tag="11"><pft>if a(v11) then ref(['ARTIGO']val(v1003^m),@PROC_SPLIT_MST.PFT,v40) fi</pft></field>

<call name="CreateArticleXML">
Expand Down
11 changes: 7 additions & 4 deletions cgi-bin/ScieloXML/sci_record.xis
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@
<parm name="from"><pft>v4001^a</pft></parm>
<parm name="count">1</parm>
<parm name="buffersize">400000</parm>
<parm name="gizmo">GIZMO_OAI</parm>

<loop>
<display><pft>@PROC_SPLIT_MST.PFT</pft></display>
Expand Down Expand Up @@ -227,12 +228,12 @@
<call name="CreateTitleGroupXML"><pft>v5</pft></call>
<call name="CreateChangesInfoXML"><pft>v5</pft></call>

<call name="CreateIssueInfoXML"><pft>v4001^s</pft></call>
<call name="CreateIssueStripXML"><pft>'^r'v4001^s'^l'v4001^l'^i'v4001^i</pft></call>
<call name="CreateIssueInfoXML"><pft>v6</pft></call>
<call name="CreateIssueStripXML"><pft>'^r'v6'^l'v4001^l'^i'v4001^i</pft></call>

<display>
<pft>
'</ISSUE>'
if val(v6)>0 then '</ISSUE>' fi
</pft>
</display>

Expand Down Expand Up @@ -306,7 +307,9 @@
<call name="PROC_SPLIT_MST"><pft>v32701</pft></call>
<display>
<pft>
'<REFERENCE NUM="',v118,'">'
'<REFERENCE>'
,|<NUMBER_REFERENCE><![CDATA[|v118^*|]]></NUMBER_REFERENCE>|,

if p(v12) then '<TITLE_REFERENCE LANG="',v12^l,'"><![CDATA[',v12^*,']]></TITLE_REFERENCE>' fi

if p(v10) then
Expand Down
25 changes: 14 additions & 11 deletions htdocs/oai/oai_scielo_common.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,12 @@
<xsl:param name="param_value"/>

<xsl:if test="$value != ''">
<xsl:value-of select=" concat( '&lt;', $name, ' ', $param_name, '= &quot;', $param_value, '&quot; &gt;', $value, '&lt;/', $name, '&gt;' )" disable-output-escaping="yes"/>
<xsl:element name="{$name}">
<xsl:attribute name="{$param_name}">
<xsl:value-of select="$param_value"/>
</xsl:attribute>
<xsl:value-of select="$value" disable-output-escaping="yes" />
Copy link
Copy Markdown
Member

@robertatakenaka robertatakenaka Jul 28, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Talvez não seja desejável ser yes, pois &gt; poderia ser convertido a >, certo? Pode confirmar?

Copy link
Copy Markdown
Contributor Author

@rafaelpezzuto rafaelpezzuto Jul 28, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@robertatakenaka,

Eu preciso que converta. Veja um exemplo com o parâmetro disable-output-escaping

valorado com no
image

valorado com yes
image

Nós queremos que seja convertido, portanto, deve estar valorado com yes.

</xsl:element>
</xsl:if>
</xsl:template>

Expand Down Expand Up @@ -76,9 +81,9 @@
<name><xsl:value-of select="NAME"/></name>
<surname><xsl:value-of select="SURNAME"/></surname>
<xsl:if test="ORCID">
<name-content content-type="orcid">
<named-content content-type="orcid">
<xsl:value-of select="ORCID"/>
</name-content>
</named-content>
</xsl:if>
<xsl:if test="AFF">
<xref ref-type="aff">
Expand All @@ -95,7 +100,7 @@
<xsl:attribute name="fullname">
<xsl:value-of select="."/>
</xsl:attribute>
<xsl:value-of select="concat( '&lt;![CDATA[', @HREF ,']]&gt;' )"/>
<xsl:value-of select="concat( '&lt;![CDATA[ ', @HREF ,' ]]&gt;' )" disable-output-escaping="yes"/>
</named-content>
</xsl:template>

Expand All @@ -112,7 +117,7 @@

<xsl:template match="ORGNAME" mode="reference">
<collab-group collab-group-type="author">
<xsl:value-of select="concat( '&lt;![CDATA[ ', ., ' ]]&gt;' )"/>
<xsl:value-of select="concat( '&lt;![CDATA[ ', ., ' ]]&gt;' )" disable-output-escaping="yes"/>
</collab-group>
</xsl:template>

Expand Down Expand Up @@ -180,7 +185,7 @@
<xsl:attribute name="xml:lang">
<xsl:value-of select="@LANG"/>
</xsl:attribute>
<xsl:value-of disable-output-escaping="yes" select="concat( '&lt;![CDATA[', . , ']]&gt;' )"/>
<xsl:value-of select="concat( '&lt;![CDATA[', . , ']]&gt;' )" disable-output-escaping="yes"/>
</abstract>
</xsl:template>

Expand All @@ -204,8 +209,8 @@

<xsl:template match="ARTICLE/REFERENCES/REFERENCE">
<ref>
<xsl:if test="@NUM != ''">
<xsl:attribute name="id"><xsl:value-of select="@NUM"/></xsl:attribute>
<xsl:if test="string(number(NUMBER_REFERENCE))!='NaN'">
<xsl:attribute name="id"><xsl:value-of select="NUMBER_REFERENCE"/></xsl:attribute>
</xsl:if>

<element-citation>
Expand Down Expand Up @@ -570,9 +575,7 @@
<xsl:template match="ARTICLE" name="format_article">
<record>
<header>
<dc:identifier pub-id-type="publisher-id">
<xsl:value-of select="@PID"/>
</dc:identifier>
<dc:identifier pub-id-type="publisher-id">oai:scielo:<xsl:value-of select="@PID"/></dc:identifier>

<dc:isPartOf>
<xsl:value-of select="ISSN"/>
Expand Down