From 7544d4a983e206a5fab210eff5d466b9b2ddc0a8 Mon Sep 17 00:00:00 2001 From: Thiago Date: Thu, 12 Sep 2024 17:43:03 -0400 Subject: [PATCH 1/4] Fixes participant is not a user --- filter/export/ExtendedArticleNativeXmlFilter.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/filter/export/ExtendedArticleNativeXmlFilter.inc.php b/filter/export/ExtendedArticleNativeXmlFilter.inc.php index 87152b9..e2283bb 100644 --- a/filter/export/ExtendedArticleNativeXmlFilter.inc.php +++ b/filter/export/ExtendedArticleNativeXmlFilter.inc.php @@ -147,6 +147,9 @@ private function createQueryParticipantsNode($doc, $deployment, $participantIds) foreach ($participantIds as $participantId) { $participant = $userDAO->getById($participantId); + if (!$participant) { + continue; + } $participantNode = $doc->createElementNS( $deployment->getNamespace(), 'participant', From 6686826badfda92c9acdd2668f05cabeb764aed1 Mon Sep 17 00:00:00 2001 From: Thiago Date: Thu, 12 Sep 2024 17:43:56 -0400 Subject: [PATCH 2/4] Fixes usage instructions --- locale/en_US/locale.po | 4 ++-- locale/pt_BR/locale.po | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/en_US/locale.po b/locale/en_US/locale.po index 11c8212..76fd7d2 100644 --- a/locale/en_US/locale.po +++ b/locale/en_US/locale.po @@ -8,8 +8,8 @@ msgid "plugins.importexport.fullJournal.cliUsage" msgstr "" "Usage: {$scriptName} {$pluginName} [command] ...\n" "Commands:\n" -"import [xmlFileName] [user_name]\n" -"export [xmlFileName] [journal_path]\n" +"import [targzFileName] [user_name]\n" +"export [targzFileName] [journal_path]\n" msgid "plugins.importexport.fullJournalTransfer.attention" msgstr "Attention" diff --git a/locale/pt_BR/locale.po b/locale/pt_BR/locale.po index bac33ce..47ca6db 100644 --- a/locale/pt_BR/locale.po +++ b/locale/pt_BR/locale.po @@ -8,8 +8,8 @@ msgid "plugins.importexport.fullJournal.cliUsage" msgstr "" "Uso: {$scriptName} {$pluginName} [comando] ...\n" "Comandos:\n" -"import [xmlFileName] [user_name]\n" -"export [xmlFileName] [journal_path]\n" +"import [targzFileName] [user_name]\n" +"export [targzFileName] [journal_path]\n" msgid "plugins.importexport.fullJournalTransfer.attention" msgstr "Atenção" From 985b7dc37eb7d1ca9b4cfc699b87416816867816 Mon Sep 17 00:00:00 2001 From: Thiago Date: Thu, 12 Sep 2024 17:44:40 -0400 Subject: [PATCH 3/4] Fixes errors handle --- FullJournalImportExportPlugin.inc.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/FullJournalImportExportPlugin.inc.php b/FullJournalImportExportPlugin.inc.php index f356b7a..33fbd0f 100644 --- a/FullJournalImportExportPlugin.inc.php +++ b/FullJournalImportExportPlugin.inc.php @@ -227,18 +227,21 @@ public function exportJournal($journal, $archivePath, $opts) libxml_use_internal_errors(true); $journalXml = $filter->execute($journal); + $xml = $journalXml ? $journalXml->saveXml() : null; $errors = array_filter(libxml_get_errors(), function ($error) { return $error->level == LIBXML_ERR_ERROR || $error->level == LIBXML_ERR_FATAL; }); if (!empty($errors)) { - $this->displayXMLValidationErrors($errors, $xml); + try { + $this->displayXMLValidationErrors($errors, $xml); + } catch (Exception $e) { + echo $e->getMessage() . "\n"; + } return false; } - $xml = $journalXml->saveXml(); - if (empty($xml)) { return false; } From 6f4e496f1f0bced70d1e84ba26f61ac9f0f21886 Mon Sep 17 00:00:00 2001 From: Thiago Date: Thu, 12 Sep 2024 17:45:49 -0400 Subject: [PATCH 4/4] Update version.xml --- version.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.xml b/version.xml index 0185c11..a5b2242 100644 --- a/version.xml +++ b/version.xml @@ -10,7 +10,7 @@ fullJournalTransfer plugins.importexport - 2.0.14.0 - 2024-06-21 + 2.0.15.0 + 2024-09-12 FullJournalImportExportPlugin