Merge pull request #8943 from bozana/8940

#8940 fix clearIssueObjectsPubIds and saving URNs
pkp · Apr 28, 2023 · 2e69b0b · 2e69b0b
2 parents bd61fc9 + eac19f7
commit 2e69b0b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/classes/plugins/PKPPubIdPlugin.php b/classes/plugins/PKPPubIdPlugin.php
@@ -127,7 +127,7 @@ public function manage($args, $request)
      * Get the public identifier.
      *
      * @param object $pubObject
-     * 	Submission, Representation, SubmissionFile + OJS Issue
+     * 	Publication, Representation, SubmissionFile
      *
      * @return string
      */
@@ -321,7 +321,7 @@ public function verifyData($fieldName, $fieldValue, $pubObject, $contextId, &$er
             }
             $newPubId = $this->constructPubId($pubIdPrefix, $fieldValue, $contextId);
 
-            if (!$this->checkDuplicate($newPubId, $pubObject->getId(), get_class($pubObject), $contextId)) {
+            if (!$this->checkDuplicate($newPubId, get_class($pubObject), $pubObject->getId(), $contextId)) {
                 $errorMsg = $this->getNotUniqueErrorMsg();
                 return false;
             }
@@ -351,7 +351,6 @@ public function getDAOs()
     {
         return  [
             Repo::publication()->dao,
-            Repo::submission()->dao,
             Application::getRepresentationDAO(),
             Repo::submissionFile()->dao,
         ];
@@ -361,7 +360,7 @@ public function getDAOs()
      * Can a pub id be assigned to the object.
      *
      * @param object $pubObject
-     * 	Submission, Representation, SubmissionFile + OJS Issue
+     * 	Publication, Representation, SubmissionFile, OJS Issue, OMP Chapter
      *
      * @return bool
      * 	false, if the pub id contains an unresolved pattern i.e. '%' or
@@ -417,13 +416,15 @@ public function addToSchema($hookName, $params)
      * @see PKPPubIdPlugin::addToSchema()
      *
      * @param string $hookName
-     * @param array $params
+     * @param DAO $dao
+     * @param array $additionalFields
+     *
+     * @return bool
      */
-    public function getAdditionalFieldNames($hookName, $params)
+    public function getAdditionalFieldNames($hookName, $dao, &$additionalFields)
     {
-        $fields = & $params[1];
         foreach (array_merge($this->getFormFieldNames(), $this->getDAOFieldNames()) as $fieldName) {
-            $fields[] = $fieldName;
+            $additionalFields[] = $fieldName;
         }
         return false;
     }

diff --git a/classes/plugins/PKPPubIdPluginHelper.php b/classes/plugins/PKPPubIdPluginHelper.php
@@ -220,9 +220,6 @@ public function clearPubId($contextId, $pubIdPlugInClassName, $pubObject)
                     // delete the pubId from the DB
                     $dao = $pubObject->getDAO();
                     $pubObjectId = $pubObject->getId();
-                    if ($pubObject instanceof SubmissionFile) {
-                        $pubObjectId = $pubObject->getId();
-                    }
                     $dao->deletePubId($pubObjectId, $pubIdPlugin->getPubIdType());
                     // set the object setting/data 'pub-id::...' to null, in order
                     // not to be considered in the DB object update later in the form

diff --git a/classes/publication/DAO.php b/classes/publication/DAO.php
@@ -319,7 +319,7 @@ public function deletePubId($pubObjectId, $pubIdType)
     {
         DB::table($this->settingsTable)
             ->where('publication_id', (int) $pubObjectId)
-            ->where('setting_name', '=', $pubIdType)
+            ->where('setting_name', '=', 'pub-id::' . $pubIdType)
             ->delete();
     }
 

diff --git a/classes/submissionFile/SubmissionFile.php b/classes/submissionFile/SubmissionFile.php
@@ -405,6 +405,14 @@ public function getDoi(): ?string
             return $doiObject->getData('doi');
         }
     }
+
+    /**
+     * @copydoc \PKP\core\DataObject::getDAO()
+     */
+    public function getDAO(): DAO
+    {
+        return Repo::submissionFile()->dao;
+    }
 }
 
 if (!PKP_STRICT_MODE) {