From 654e82cc3020d50fcc5c416e1ce4c16d1083dc5c Mon Sep 17 00:00:00 2001 From: Rafael JPD Date: Sun, 25 Jul 2021 14:38:02 -0300 Subject: [PATCH 01/15] =?UTF-8?q?remove=20espa=C3=A7o=20indevido=20em=20at?= =?UTF-8?q?ributos=20de=20marca=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/oai/oai_scielo_common.xsl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/oai/oai_scielo_common.xsl b/htdocs/oai/oai_scielo_common.xsl index b6b1524c6..5a5538044 100644 --- a/htdocs/oai/oai_scielo_common.xsl +++ b/htdocs/oai/oai_scielo_common.xsl @@ -20,7 +20,7 @@ - + From 55e7c726f6e4da841eb32a01f1d68cdb12588ac5 Mon Sep 17 00:00:00 2001 From: Rafael JPD Date: Sun, 25 Jul 2021 14:38:22 -0300 Subject: [PATCH 02/15] altera termo name-content para named-content --- htdocs/oai/oai_scielo_common.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/oai/oai_scielo_common.xsl b/htdocs/oai/oai_scielo_common.xsl index 5a5538044..9ac1a2d41 100644 --- a/htdocs/oai/oai_scielo_common.xsl +++ b/htdocs/oai/oai_scielo_common.xsl @@ -76,9 +76,9 @@ - + - + From 4fc91f2f802f5acd0ac5ee50e708fa885c474532 Mon Sep 17 00:00:00 2001 From: Rafael JPD Date: Sun, 25 Jul 2021 14:39:06 -0300 Subject: [PATCH 03/15] =?UTF-8?q?adiciona=20escape=20de=20c=C3=B3digos=20h?= =?UTF-8?q?tml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/oai/oai_scielo_common.xsl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/oai/oai_scielo_common.xsl b/htdocs/oai/oai_scielo_common.xsl index 9ac1a2d41..4702355ca 100644 --- a/htdocs/oai/oai_scielo_common.xsl +++ b/htdocs/oai/oai_scielo_common.xsl @@ -95,7 +95,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -180,7 +180,7 @@ - + From e8fd887a70444eab7cfc091064427db241242ccd Mon Sep 17 00:00:00 2001 From: Rafael JPD Date: Sun, 25 Jul 2021 14:39:38 -0300 Subject: [PATCH 04/15] adiciona termo oai:scielo em identificador de registro --- htdocs/oai/oai_scielo_common.xsl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/htdocs/oai/oai_scielo_common.xsl b/htdocs/oai/oai_scielo_common.xsl index 4702355ca..1c50c7bc5 100644 --- a/htdocs/oai/oai_scielo_common.xsl +++ b/htdocs/oai/oai_scielo_common.xsl @@ -570,9 +570,7 @@
- - - + oai:scielo: From 49a74c083568e5b7aad9728c24ed456ca8c1e613 Mon Sep 17 00:00:00 2001 From: Rafael JPD Date: Sun, 25 Jul 2021 17:47:13 -0300 Subject: [PATCH 05/15] Transforma atributo "num" de campo em campo MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Há situações em que este campo está povoado com marcações e isso acarreta falha na renderização do XML --- cgi-bin/ScieloXML/sci_record.xis | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cgi-bin/ScieloXML/sci_record.xis b/cgi-bin/ScieloXML/sci_record.xis index 759cf879c..018ffbd68 100644 --- a/cgi-bin/ScieloXML/sci_record.xis +++ b/cgi-bin/ScieloXML/sci_record.xis @@ -306,7 +306,9 @@ v32701 - '' + '' + ,||, + if p(v12) then '' fi if p(v10) then From 2893359077118f45b34f23c418c328a3c6ad17d7 Mon Sep 17 00:00:00 2001 From: Rafael JPD Date: Sun, 25 Jul 2021 17:47:53 -0300 Subject: [PATCH 06/15] =?UTF-8?q?Verifica=20se=20=20?= =?UTF-8?q?=C3=A9=20n=C3=BAmero=20no=20XSLT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/oai/oai_scielo_common.xsl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/htdocs/oai/oai_scielo_common.xsl b/htdocs/oai/oai_scielo_common.xsl index 1c50c7bc5..19de56a04 100644 --- a/htdocs/oai/oai_scielo_common.xsl +++ b/htdocs/oai/oai_scielo_common.xsl @@ -204,8 +204,8 @@ - - + + From 73c2d7035bf60c1b37ab004cd6812dd7f8f55990 Mon Sep 17 00:00:00 2001 From: Rafael JPD Date: Mon, 26 Jul 2021 14:51:55 -0300 Subject: [PATCH 07/15] Adiciona caminho para base gizmo --- cgi-bin/ScieloXML/sci_cipar.xis | 1 + 1 file changed, 1 insertion(+) diff --git a/cgi-bin/ScieloXML/sci_cipar.xis b/cgi-bin/ScieloXML/sci_cipar.xis index 5f3230e46..1715ef9d7 100644 --- a/cgi-bin/ScieloXML/sci_cipar.xis +++ b/cgi-bin/ScieloXML/sci_cipar.xis @@ -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.*',/ From dcd6c44fe17dfbba51b11540a695eab32e447bcc Mon Sep 17 00:00:00 2001 From: Rafael JPD Date: Mon, 26 Jul 2021 14:52:11 -0300 Subject: [PATCH 08/15] =?UTF-8?q?Adiciona=20par=C3=A2metro=20gizmo=20com?= =?UTF-8?q?=20valor=20GIZMO=5FOAI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cgi-bin/ScieloXML/sci_record.xis | 1 + 1 file changed, 1 insertion(+) diff --git a/cgi-bin/ScieloXML/sci_record.xis b/cgi-bin/ScieloXML/sci_record.xis index 018ffbd68..ec07c5d26 100644 --- a/cgi-bin/ScieloXML/sci_record.xis +++ b/cgi-bin/ScieloXML/sci_record.xis @@ -156,6 +156,7 @@ v4001^a 1 400000 + GIZMO_OAI @PROC_SPLIT_MST.PFT From 9cadcbe9ec6d9226271770d3699d94a245d05f8d Mon Sep 17 00:00:00 2001 From: Rafael JPD Date: Mon, 26 Jul 2021 14:55:08 -0300 Subject: [PATCH 09/15] =?UTF-8?q?Adiciona=20base=20gizmo=20com=20apenas=20?= =?UTF-8?q?uma=20convers=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bases_modelo/gizmo/gizmo.id | 3 +++ bases_modelo/gizmo/gizmo.mst | Bin 0 -> 512 bytes bases_modelo/gizmo/gizmo.xrf | Bin 0 -> 512 bytes 3 files changed, 3 insertions(+) create mode 100644 bases_modelo/gizmo/gizmo.id create mode 100644 bases_modelo/gizmo/gizmo.mst create mode 100644 bases_modelo/gizmo/gizmo.xrf diff --git a/bases_modelo/gizmo/gizmo.id b/bases_modelo/gizmo/gizmo.id new file mode 100644 index 000000000..0362dcbb0 --- /dev/null +++ b/bases_modelo/gizmo/gizmo.id @@ -0,0 +1,3 @@ +!ID 0000001 +!v001! +!v002! diff --git a/bases_modelo/gizmo/gizmo.mst b/bases_modelo/gizmo/gizmo.mst new file mode 100644 index 0000000000000000000000000000000000000000..27973854c13119139f7638bb7452068452d77bfe GIT binary patch literal 512 zcmZQzU|?VZVn!ftWME(eQX~P8J_ooC1-MyqK$aZPR2w&czYqmCM`u^t;L6;j{2V(q WWdjRq8-0+toq_^f>nLMDLI41#wF%7t literal 0 HcmV?d00001 diff --git a/bases_modelo/gizmo/gizmo.xrf b/bases_modelo/gizmo/gizmo.xrf new file mode 100644 index 0000000000000000000000000000000000000000..6ef07b717aef24d24e4a11490a12fc6ea5d8c3c7 GIT binary patch literal 512 ScmezW|NnnOhEXt5LjV9(x&$r& literal 0 HcmV?d00001 From f641e9b0dbb9456b46a5f68a853255862694436e Mon Sep 17 00:00:00 2001 From: Rafael JPD Date: Mon, 26 Jul 2021 17:36:13 -0300 Subject: [PATCH 10/15] [oai-dc-scielo] Corrige retorno de dados de ISSUE para Press Release --- cgi-bin/ScieloXML/sci_listrecords_scielo.xis | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cgi-bin/ScieloXML/sci_listrecords_scielo.xis b/cgi-bin/ScieloXML/sci_listrecords_scielo.xis index 27dcd8f86..622f7be17 100644 --- a/cgi-bin/ScieloXML/sci_listrecords_scielo.xis +++ b/cgi-bin/ScieloXML/sci_listrecords_scielo.xis @@ -175,7 +175,9 @@ - f(l(['NEWISSUE']'Y',mid(v1880,2,17)),1,0) + ref(['ARTIGO']l(['ARTIGO']'HR='v1880),@PROC_SPLIT_MST.PFT,if p(v41) then 'P' else 'Y' fi) + + f(l(['NEWISSUE']v3331,mid(v1880,2,17)),1,0) if a(v11) then ref(['ARTIGO']val(v1003^m),@PROC_SPLIT_MST.PFT,v40) fi From b1949e735d938b50d1068c5e6f609455eef90450 Mon Sep 17 00:00:00 2001 From: Rafael JPD Date: Tue, 27 Jul 2021 15:34:27 -0300 Subject: [PATCH 11/15] Imprime fechamento de ISSUE apenas quando houver ISSUE --- cgi-bin/ScieloXML/sci_record.xis | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cgi-bin/ScieloXML/sci_record.xis b/cgi-bin/ScieloXML/sci_record.xis index ec07c5d26..c6045847f 100644 --- a/cgi-bin/ScieloXML/sci_record.xis +++ b/cgi-bin/ScieloXML/sci_record.xis @@ -233,7 +233,7 @@ - '' + if val(v6)>0 then '' fi From d49b4155b012f4eaf15f0a6a5e010a8054878a78 Mon Sep 17 00:00:00 2001 From: Rafael JPD Date: Tue, 27 Jul 2021 15:34:52 -0300 Subject: [PATCH 12/15] =?UTF-8?q?Apresenta=20XML=20de=20erro=20apenas=20qu?= =?UTF-8?q?ando=20n=C3=A3o=20houver=20PID=20de=20documento?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cgi-bin/ScieloXML/sci_getrecord.xis | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/cgi-bin/ScieloXML/sci_getrecord.xis b/cgi-bin/ScieloXML/sci_getrecord.xis index 01dadda88..82153e645 100644 --- a/cgi-bin/ScieloXML/sci_getrecord.xis +++ b/cgi-bin/ScieloXML/sci_getrecord.xis @@ -32,15 +32,8 @@ - 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 From 88d28e409973380b745d63854b20459aff790682 Mon Sep 17 00:00:00 2001 From: Rafael JPD Date: Tue, 27 Jul 2021 15:38:00 -0300 Subject: [PATCH 13/15] =?UTF-8?q?Adiciona=20convers=C3=A3o=20de=20caracter?= =?UTF-8?q?=200x019=20na=20base=20gizmo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bases_modelo/gizmo/gizmo.id | 3 +++ bases_modelo/gizmo/gizmo.mst | Bin 512 -> 512 bytes bases_modelo/gizmo/gizmo.xrf | Bin 512 -> 512 bytes 3 files changed, 3 insertions(+) diff --git a/bases_modelo/gizmo/gizmo.id b/bases_modelo/gizmo/gizmo.id index 0362dcbb0..102a1eeb4 100644 --- a/bases_modelo/gizmo/gizmo.id +++ b/bases_modelo/gizmo/gizmo.id @@ -1,3 +1,6 @@ !ID 0000001 !v001! !v002! +!ID 0000002 +!v001! +!v002! diff --git a/bases_modelo/gizmo/gizmo.mst b/bases_modelo/gizmo/gizmo.mst index 27973854c13119139f7638bb7452068452d77bfe..86b7757d3de788e847e5e862a59dd8dc3bf4930d 100644 GIT binary patch delta 77 ycmZo*X Date: Tue, 27 Jul 2021 19:49:45 -0300 Subject: [PATCH 14/15] Substitui tag 4001^s por v6 tratada --- cgi-bin/ScieloXML/sci_record.xis | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cgi-bin/ScieloXML/sci_record.xis b/cgi-bin/ScieloXML/sci_record.xis index c6045847f..8129a5c72 100644 --- a/cgi-bin/ScieloXML/sci_record.xis +++ b/cgi-bin/ScieloXML/sci_record.xis @@ -228,8 +228,8 @@ v5 v5 - v4001^s - '^r'v4001^s'^l'v4001^l'^i'v4001^i + v6 + '^r'v6'^l'v4001^l'^i'v4001^i From 6a35e911927afcc3fe3abc3094de6976b4c6ed7c Mon Sep 17 00:00:00 2001 From: Rafael JPD Date: Wed, 28 Jul 2021 11:40:20 -0300 Subject: [PATCH 15/15] =?UTF-8?q?Melhora=20gera=C3=A7=C3=A3o=20de=20estrut?= =?UTF-8?q?ura=20parametrizada?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/oai/oai_scielo_common.xsl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/htdocs/oai/oai_scielo_common.xsl b/htdocs/oai/oai_scielo_common.xsl index 19de56a04..8f114f6ce 100644 --- a/htdocs/oai/oai_scielo_common.xsl +++ b/htdocs/oai/oai_scielo_common.xsl @@ -20,7 +20,12 @@ - + + + + + +