Merge branch 'fixQueryParticipants' into 'main'

Fix query participants See merge request softwares-pkp/plugins_ojs/fullJournalTransfer!60
lepidus · Sep 12, 2024 · 4b1b87a · 4b1b87a
2 parents da4e66e + 6f4e496
commit 4b1b87a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git 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;
         }

diff --git 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',

diff --git 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
@@ -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"

diff --git a/version.xml b/version.xml
@@ -10,7 +10,7 @@
 <version>
 	<application>fullJournalTransfer</application>
 	<type>plugins.importexport</type>
-	<release>2.0.14.0</release>
-	<date>2024-06-21</date>
+	<release>2.0.15.0</release>
+	<date>2024-09-12</date>
     <class>FullJournalImportExportPlugin</class>
 </version>