Skip to content

pkp/pkp-lib#11238 prepare DB for structured citations #1947

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.

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

Merged
merged 2 commits into from
Apr 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions dbscripts/xml/upgrade.xml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,7 @@
<migration class="PKP\migration\upgrade\v3_5_0\I4787_InstallReviewerSuggestion"/>
<!-- Intentional re-run of 3.4.0 migration; see https://github.com/pkp/pkp-lib/issues/10264#issuecomment-2702413991 -->
<migration class="PKP\migration\upgrade\v3_4_0\I7624_StrftimeDeprecation"/>
<migration class="PKP\migration\upgrade\v3_5_0\I11238_PrepareDBForStructuredCitations"/>
<note file="docs/release-notes/README-3.5.0" />
</upgrade>

Expand Down
15 changes: 5 additions & 10 deletions pages/catalog/CatalogBookHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
use APP\security\authorization\OmpPublishedSubmissionAccessPolicy;
use APP\submission\Submission;
use APP\template\TemplateManager;
use PKP\citation\CitationDAO;
use PKP\core\Core;
use PKP\core\PKPApplication;
use PKP\core\PKPRequest;
Expand Down Expand Up @@ -227,15 +226,11 @@ public function book($args, $request)
]);

// Citations
if ($this->publication->getData('citationsRaw')) {
/** @var CitationDAO $citationDao */
$citationDao = DAORegistry::getDAO('CitationDAO');
$parsedCitations = $citationDao->getByPublicationId($this->publication->getId());
$templateMgr->assign([
'citations' => $parsedCitations->toArray(),
'parsedCitations' => $parsedCitations, // compatible with older themes
]);
}
$parsedCitations = $this->publication->getData('citations');
$templateMgr->assign([
'citations' => $parsedCitations,
'parsedCitations' => $parsedCitations, // compatible with older themes
]);

// Retrieve editors for an edited volume
$editors = [];
Expand Down
16 changes: 4 additions & 12 deletions plugins/generic/googleScholar/GoogleScholarPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@

use APP\core\Application;
use APP\template\TemplateManager;
use PKP\citation\CitationDAO;
use PKP\db\DAORegistry;
use PKP\i18n\LocaleConversion;
use PKP\plugins\GenericPlugin;
use PKP\plugins\Hook;
Expand Down Expand Up @@ -177,16 +175,10 @@ public function monographView($hookName, $args)
}

// Citations
$outputReferences = [];
$citationDao = DAORegistry::getDAO('CitationDAO'); /** @var CitationDAO $citationDao */
$parsedCitations = $citationDao->getByPublicationId($publication->getId());
while ($citation = $parsedCitations->next()) {
$outputReferences[] = $citation->getRawCitation();
}
Hook::call('GoogleScholarPlugin::references', [&$outputReferences, $submission->getId()]);

foreach ($outputReferences as $i => $outputReference) {
$templateMgr->addHeader('googleScholarReference' . $i++, '<meta name="citation_reference" content="' . htmlspecialchars($outputReference) . '"/>');
$citations = $publication->getData('citations') ?? [];
Hook::call('GoogleScholarPlugin::references', [&$citations, $submission->getId()]);
foreach ($citations as $i => $citation) {
$templateMgr->addHeader('googleScholarReference' . $i++, '<meta name="citation_reference" content="' . htmlspecialchars($citation->getRawCitation()) . '"/>');
}

return false;
Expand Down