Merge pull request #184 from GaziYucel/dev-3_4_0

Dev 3 4 0
GaziYucel · Apr 30, 2024 · 67362d8 · 67362d8
2 parents 820da92 + bd0b74a
commit 67362d8
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/classes/Db/PluginSchema.php b/classes/Db/PluginSchema.php
@@ -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
 {
@@ -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);
+    }
 }
diff --git a/classes/External/Wikidata/Inbound.php b/classes/External/Wikidata/Inbound.php
@@ -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;
         }

diff --git a/classes/Handlers/DepositHandler.php b/classes/Handlers/DepositHandler.php
@@ -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;
@@ -44,6 +45,8 @@ public function __construct()
         /** @var CitationManagerPlugin $plugin */
         $plugin = PluginRegistry::getPlugin('generic', strtolower(CITATION_MANAGER_PLUGIN_NAME));
         $this->plugin = $plugin;
+
+        PluginSchema::reloadJournalSchema();
     }
 
     /**

diff --git a/classes/Handlers/ProcessHandler.php b/classes/Handlers/ProcessHandler.php
@@ -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;
@@ -52,6 +53,8 @@ public function __construct()
         /** @var CitationManagerPlugin $plugin */
         $plugin = PluginRegistry::getPlugin('generic', strtolower(CITATION_MANAGER_PLUGIN_NAME));
         $this->plugin = $plugin;
+
+        PluginSchema::reloadJournalSchema();
     }
 
     /**