Skip to content
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

Dev 3 4 0 #184

Merged
merged 2 commits into from
Apr 30, 2024
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
12 changes: 12 additions & 0 deletions classes/Db/PluginSchema.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@

namespace APP\plugins\generic\citationManager\classes\Db;

use APP\core\Services;
use APP\plugins\generic\citationManager\CitationManagerPlugin;
use APP\plugins\generic\citationManager\classes\DataModels\MetadataAuthor;
use APP\plugins\generic\citationManager\classes\DataModels\MetadataJournal;
use APP\plugins\generic\citationManager\classes\DataModels\MetadataPublication;
use APP\plugins\generic\citationManager\classes\Helpers\ClassHelper;
use PKP\services\PKPSchemaService;

class PluginSchema
{
Expand Down Expand Up @@ -95,4 +97,14 @@ public function addToSchemaAuthor(string $hookName, array $args): bool

return false;
}

/**
* Reload the context so that changes to the context schema can take place.
*
* @return void
*/
public static function reloadJournalSchema(): void
{
Services::get('schema')->get(PKPSchemaService::SCHEMA_CONTEXT, true);
}
}
9 changes: 4 additions & 5 deletions classes/External/Wikidata/Inbound.php
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,11 @@ public function execute(): bool
/* @var CitationModel $citation */
$citation = ClassHelper::getClassWithValuesAssigned(new CitationModel(), $citations[$i]);

if (!empty($citation->wikidataId)) continue;
if (!empty($citation->wikidataId) || empty($citation->doi)) continue;

if(!empty($citation->doi)){
$citation = $this->processCitation($citation);
$citation->wikidataId = Wikidata::removePrefix($citation->wikidataId);
}
$citation = $this->processCitation($citation);

$citation->wikidataId = Wikidata::removePrefix($citation->wikidataId);

$citations[$i] = $citation;
}
Expand Down
3 changes: 3 additions & 0 deletions classes/Handlers/DepositHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use APP\plugins\generic\citationManager\classes\DataModels\MetadataJournal;
use APP\plugins\generic\citationManager\classes\DataModels\MetadataPublication;
use APP\plugins\generic\citationManager\classes\Db\PluginDAO;
use APP\plugins\generic\citationManager\classes\Db\PluginSchema;
use APP\plugins\generic\citationManager\classes\External\ExecuteAbstract;
use APP\plugins\generic\citationManager\classes\Helpers\ClassHelper;
use APP\plugins\generic\citationManager\classes\Helpers\LogHelper;
Expand Down Expand Up @@ -44,6 +45,8 @@ public function __construct()
/** @var CitationManagerPlugin $plugin */
$plugin = PluginRegistry::getPlugin('generic', strtolower(CITATION_MANAGER_PLUGIN_NAME));
$this->plugin = $plugin;

PluginSchema::reloadJournalSchema();
}

/**
Expand Down
3 changes: 3 additions & 0 deletions classes/Handlers/ProcessHandler.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use APP\plugins\generic\citationManager\classes\DataModels\MetadataJournal;
use APP\plugins\generic\citationManager\classes\DataModels\MetadataPublication;
use APP\plugins\generic\citationManager\classes\Db\PluginDAO;
use APP\plugins\generic\citationManager\classes\Db\PluginSchema;
use APP\plugins\generic\citationManager\classes\External\ExecuteAbstract;
use APP\plugins\generic\citationManager\classes\Helpers\ClassHelper;
use APP\plugins\generic\citationManager\classes\Helpers\LogHelper;
Expand Down Expand Up @@ -52,6 +53,8 @@ public function __construct()
/** @var CitationManagerPlugin $plugin */
$plugin = PluginRegistry::getPlugin('generic', strtolower(CITATION_MANAGER_PLUGIN_NAME));
$this->plugin = $plugin;

PluginSchema::reloadJournalSchema();
}

/**
Expand Down
Loading