Merge pull request #324 from effective-webwork/issue_1957_2

#1957: Remove deprecated person publisher role configuration.
kitodo · Jan 15, 2025 · 60c7e7c · 60c7e7c
2 parents a722142 + 699ff62
commit 60c7e7c
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 49 deletions.
diff --git a/Classes/Configuration/ClientConfigurationManager.php b/Classes/Configuration/ClientConfigurationManager.php
@@ -385,11 +385,6 @@ public function getPersonAuthorRole()
         return $this->getSetting("personAuthorRole");
     }
 
-    public function getPersonPublisherRole()
-    {
-        return $this->getSetting("personPublisherRole");
-    }
-
     public function getFisIdXpath()
     {
         return $this->getSetting("fisIdXpath");

diff --git a/Classes/Domain/Model/Client.php b/Classes/Domain/Model/Client.php
@@ -528,13 +528,6 @@ class Client extends \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
      */
     protected $personAuthorRole = '';
 
-    /**
-     * Person publisher role
-     *
-     * @var string
-     */
-    protected $personPublisherRole = '';
-
     /**
      * $mypublicationsUpdateNotificationSubject
      *
@@ -2197,22 +2190,6 @@ public function setPersonAuthorRole(string $personAuthorRole)
         $this->personAuthorRole = $personAuthorRole;
     }
 
-    /**
-     * @return string
-     */
-    public function getPersonPublisherRole(): string
-    {
-        return $this->personPublisherRole;
-    }
-
-    /**
-     * @param string $personPublisherRole
-     */
-    public function setPersonPublisherRole(string $personPublisherRole)
-    {
-        $this->personPublisherRole = $personPublisherRole;
-    }
-
     /**
      * @return string
      */

diff --git a/Configuration/TCA/tx_dpf_domain_model_client.php b/Configuration/TCA/tx_dpf_domain_model_client.php
@@ -57,7 +57,7 @@
             original_source_title_xpath, creator_xpath, creation_date_xpath, repository_creation_date_xpath,
             repository_last_mod_date_xpath, deposit_license_xpath, all_notes_xpath, private_notes_xpath,
             person_xpath, person_family_xpath, person_given_xpath, person_role_xpath, person_fis_identifier_xpath, person_affiliation_xpath,
-            person_author_role, person_publisher_role,
+            person_author_role,
             fis_id_xpath, source_details_xpaths, collection_xpath,
             text_type_xpath, open_access_xpath,
             peer_review_xpath, peer_review_other_version_xpath, license_xpath, validation_xpath,
@@ -91,7 +91,7 @@
         original_source_title_xpath, creator_xpath, creation_date_xpath, repository_creation_date_xpath,
         repository_last_mod_date_xpath, deposit_license_xpath, all_notes_xpath, private_notes_xpath,
         person_xpath, person_family_xpath, person_given_xpath, person_role_xpath, person_fis_identifier_xpath, person_affiliation_xpath,
-        person_author_role, person_publisher_role,
+        person_author_role,
         fis_id_xpath, source_details_xpaths, collection_xpath,
         text_type_xpath, open_access_xpath,
         peer_review_xpath, peer_review_other_version_xpath, license_xpath, validation_xpath,
@@ -107,7 +107,7 @@
         original_source_title_xpath, creator_xpath, creation_date_xpath, repository_creation_date_xpath,
         repository_last_mod_date_xpath, deposit_license_xpath, all_notes_xpath, private_notes_xpath,
         person_xpath, person_family_xpath, person_given_xpath, person_role_xpath, person_fis_identifier_xpath, person_affiliation_xpath,
-        person_author_role, person_publisher_role,
+        person_author_role,
         fis_id_xpath, --pallette--;;pallette_collection_xpath,
         --div--;Search field XML,
             --pallette--;;pallette_source_details_xpath,
@@ -995,16 +995,6 @@
                 'eval' => 'trim',
             ),
         ),
-        'person_publisher_role' => array(
-            'exclude'   => 1,
-            'l10n_mode' => 'exclude',
-            'label'     => 'LLL:EXT:dpf/Resources/Private/Language/locallang_db.xlf:tx_dpf_domain_model_client.person_publisher_role',
-            'config'    => array(
-                'type' => 'input',
-                'size' => 30,
-                'eval' => 'trim',
-            ),
-        ),
         'fis_id_xpath' => array(
             'exclude'   => 1,
             'l10n_mode' => 'exclude',

diff --git a/Resources/Private/Language/de.locallang_db.xlf b/Resources/Private/Language/de.locallang_db.xlf
@@ -323,10 +323,6 @@
             <source>Person author role, value of the role, e.g. 'aut'</source>
             <target>Person-Autor-Rolle, Wert der Rolle, z.B. 'aut'</target>
         </trans-unit>
-        <trans-unit id="tx_dpf_domain_model_client.person_publisher_role" approved="yes">
-            <source>Person publisher role, value of the role, e.g. 'pub'</source>
-            <target>Person-Publisher-Rolle, Wert der Rolle, z.B. 'pub'</target>
-        </trans-unit>
         <trans-unit id="tx_dpf_domain_model_client.submitter_name" approved="yes">
             <source>Submitter name</source>
             <target>Name des Erstellers</target>

diff --git a/Resources/Private/Language/locallang_db.xlf b/Resources/Private/Language/locallang_db.xlf
@@ -245,9 +245,6 @@
         <trans-unit id="tx_dpf_domain_model_client.person_author_role" approved="yes">
             <source>Person author role, value of the role, e.g. 'aut'</source>
         </trans-unit>
-        <trans-unit id="tx_dpf_domain_model_client.person_publisher_role" approved="yes">
-            <source>Person publisher role, value of the role, e.g. 'pub'</source>
-        </trans-unit>
         <trans-unit id="tx_dpf_domain_model_client.submitter_name" approved="yes">
             <source>Submitter name</source>
         </trans-unit>

diff --git a/ext_tables.sql b/ext_tables.sql
@@ -471,7 +471,6 @@ CREATE TABLE tx_dpf_domain_model_client (
   person_fis_identifier_xpath tinytext NOT NULL,
   person_affiliation_xpath tinytext NOT NULL,
   person_author_role tinytext NOT NULL,
-  person_publisher_role tinytext NOT NULL,
   fis_id_xpath tinytext NOT NULL,
   source_details_xpaths text NOT NULL,
   collection_xpath tinytext NOT NULL,