From 1a3f1937b3bf175650a7231213ec913e6eca48f4 Mon Sep 17 00:00:00 2001 From: Bozana Bokan Date: Mon, 6 Jan 2025 14:28:31 +0100 Subject: [PATCH 1/2] pkp/pkp-lib#10726 consider all existing submission metadata langauges --- plugins/importexport/doaj/filter/DOAJXmlFilter.php | 4 +--- plugins/metadata/dc11/filter/Dc11SchemaArticleAdapter.php | 7 ++----- .../rfc1807/OAIMetadataFormat_RFC1807.php | 8 ++------ 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/plugins/importexport/doaj/filter/DOAJXmlFilter.php b/plugins/importexport/doaj/filter/DOAJXmlFilter.php index 06624a950c3..163a4033178 100644 --- a/plugins/importexport/doaj/filter/DOAJXmlFilter.php +++ b/plugins/importexport/doaj/filter/DOAJXmlFilter.php @@ -190,12 +190,10 @@ public function &process(&$pubObjects) $node->setAttribute('format', 'html'); // Keywords - $supportedLocales = $context->getSupportedFormLocales(); $articleKeywords = Repo::controlledVocab()->getBySymbolic( ControlledVocab::CONTROLLED_VOCAB_SUBMISSION_KEYWORD, Application::ASSOC_TYPE_PUBLICATION, - $publication->getId(), - $supportedLocales + $publication->getId() ); if (array_key_exists($publication->getData('locale'), $articleKeywords)) { diff --git a/plugins/metadata/dc11/filter/Dc11SchemaArticleAdapter.php b/plugins/metadata/dc11/filter/Dc11SchemaArticleAdapter.php index 442c71076e1..1889b73070d 100644 --- a/plugins/metadata/dc11/filter/Dc11SchemaArticleAdapter.php +++ b/plugins/metadata/dc11/filter/Dc11SchemaArticleAdapter.php @@ -89,19 +89,16 @@ public function &extractMetadataFromDataObject(&$article) } // Subject - $supportedLocales = $journal->getSupportedFormLocales(); $subjects = array_merge_recursive( Repo::controlledVocab()->getBySymbolic( ControlledVocab::CONTROLLED_VOCAB_SUBMISSION_KEYWORD, Application::ASSOC_TYPE_PUBLICATION, - $publication->getId(), - $supportedLocales + $publication->getId() ), Repo::controlledVocab()->getBySymbolic( ControlledVocab::CONTROLLED_VOCAB_SUBMISSION_SUBJECT, Application::ASSOC_TYPE_PUBLICATION, - $publication->getId(), - $supportedLocales + $publication->getId() ) ); $this->_addLocalizedElements($dc11Description, 'dc:subject', $subjects); diff --git a/plugins/oaiMetadataFormats/rfc1807/OAIMetadataFormat_RFC1807.php b/plugins/oaiMetadataFormats/rfc1807/OAIMetadataFormat_RFC1807.php index e90b6092470..f99f794dc0a 100644 --- a/plugins/oaiMetadataFormats/rfc1807/OAIMetadataFormat_RFC1807.php +++ b/plugins/oaiMetadataFormats/rfc1807/OAIMetadataFormat_RFC1807.php @@ -75,20 +75,16 @@ public function toXml($record, $format = null) $creators[] = $authorName; } - $supportedLocales = $journal->getSupportedFormLocales(); - $subjects = array_merge_recursive( Repo::controlledVocab()->getBySymbolic( ControlledVocab::CONTROLLED_VOCAB_SUBMISSION_KEYWORD, Application::ASSOC_TYPE_PUBLICATION, - $publication->getId(), - $supportedLocales + $publication->getId() ), Repo::controlledVocab()->getBySymbolic( ControlledVocab::CONTROLLED_VOCAB_SUBMISSION_SUBJECT, Application::ASSOC_TYPE_PUBLICATION, - $article->getCurrentPublication()->getId(), - $supportedLocales + $article->getCurrentPublication()->getId() ) ); $subject = $subjects[$journal->getPrimaryLocale()] ?? ''; From b9572f2aeb51fd59e0008fc856fed32254b6dd01 Mon Sep 17 00:00:00 2001 From: Bozana Bokan Date: Thu, 9 Jan 2025 12:38:48 +0100 Subject: [PATCH 2/2] pkp/pkp-lib#10726 submodules updates ##bozana/10726## --- lib/pkp | 2 +- plugins/generic/citationStyleLanguage | 2 +- plugins/generic/jatsTemplate | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/pkp b/lib/pkp index d15e9984d6d..eec13bb4b9f 160000 --- a/lib/pkp +++ b/lib/pkp @@ -1 +1 @@ -Subproject commit d15e9984d6dad2f9264f37442f0b934a976dd383 +Subproject commit eec13bb4b9f694a42246fc343a34444bf52b5ddc diff --git a/plugins/generic/citationStyleLanguage b/plugins/generic/citationStyleLanguage index 3d86352091a..82c052c5a42 160000 --- a/plugins/generic/citationStyleLanguage +++ b/plugins/generic/citationStyleLanguage @@ -1 +1 @@ -Subproject commit 3d86352091a5c34ea7dc1057f238464cff08b96c +Subproject commit 82c052c5a428719346a0c0ef0bf07ee2e7317430 diff --git a/plugins/generic/jatsTemplate b/plugins/generic/jatsTemplate index d7cd264d112..6b67242f54e 160000 --- a/plugins/generic/jatsTemplate +++ b/plugins/generic/jatsTemplate @@ -1 +1 @@ -Subproject commit d7cd264d112ace31890d6040074ccf8bca999f49 +Subproject commit 6b67242f54eb9a5920623d59802946cdc568682e