Skip to content

pkp/pkp-lib#10133 Port Genre and GenreDAO to Use Eloquent Model #69

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

Open
Hafsa-Naeem wants to merge 2 commits into
base: main
Choose a base branch
from
Open

pkp/pkp-lib#10133 Port Genre and GenreDAO to Use Eloquent Model #69

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6046554
pkp/pkp-lib#10133 Port Genre and GenreDAO to Use Eloquent Model
Hafsa-Naeem Jun 2, 2025
335359e
pkp/pkp-lib#10133 Adjust genre lookup
Hafsa-Naeem Jan 8, 2026
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
13 changes: 5 additions & 8 deletions filter/ArticleCrossrefXmlFilter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@
use PKP\db\DAORegistry;
use PKP\filter\FilterGroup;
use PKP\i18n\LocaleConversion;
use PKP\submission\GenreDAO;
use PKP\submission\genre\Genre;
;
Copy link
Copy Markdown
Member

@kaitlinnewson kaitlinnewson Mar 26, 2026

Choose a reason for hiding this comment

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

Suggested change
;


class ArticleCrossrefXmlFilter extends IssueCrossrefXmlFilter
{
Expand Down Expand Up @@ -263,18 +264,14 @@ public function createJournalArticleNode(DOMDocument $doc, Publication $publicat
$pdfGalleyInArticleLocale = null;
// Also collect supplementary files with DOIs for the component list
$componentGalleys = [];
$genreDao = DAORegistry::getDAO('GenreDAO'); /** @var GenreDAO $genreDao */
foreach ($galleys as $galley) {
// Only include supplementary files that have a DOI
if (!$galley->getData('urlRemote')) {
$galleyFile = $galley->getFile();
if ($galleyFile) {
$genre = $genreDao->getById($galleyFile->getGenreId());
if ($genre->getSupplementary()) {
if ($galley->getDoi()) {
// construct the array key with galley best ID and locale needed for the component node
$componentGalleys[] = $galley;
}
$genre = Genre::findById((int) $galleyFile->getGenreId());
if ($genre !== null && $genre->supplementary && $galley->getDoi()) {
$componentGalleys[] = $galley;
} else {
$submissionGalleys[] = $galley;
if ($galley->isPdfGalley()) {
Expand Down