Ap5 ap6 ap1 internal format

public/typo3conf/LocalConfiguration.php

@@ -21,6 +21,7 @@
     ],
     'EXT' => [
         'extConf' => [
+            'dpf' => 'a:11:{s:9:"swordHost";s:9:"localhost";s:9:"swordUser";s:4:"user";s:13:"swordPassword";s:8:"password";s:24:"swordCollectionNamespace";s:6:"qucosa";s:10:"fedoraHost";s:9:"localhost";s:10:"fedoraUser";s:4:"user";s:14:"fedoraPassword";s:8:"password";s:17:"elasticSearchHost";s:9:"localhost";s:17:"elasticSearchPort";s:4:"9200";s:15:"uploadDirectory";s:14:"uploads/tx_dpf";s:12:"uploadDomain";s:0:"";}',
             'rsaauth' => 'a:1:{s:18:"temporaryDirectory";s:0:"";}',
             'rte_ckeditor' => 'a:1:{s:15:"ckeditorVersion";s:6:"latest";}',
             'saltedpasswords' => 'a:2:{s:3:"BE.";a:4:{s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\Pbkdf2Salt";s:11:"forceSalted";i:0;s:15:"onlyAuthService";i:0;s:12:"updatePasswd";i:1;}s:3:"FE.";a:5:{s:7:"enabled";i:1;s:21:"saltedPWHashingMethod";s:41:"TYPO3\\CMS\\Saltedpasswords\\Salt\\Pbkdf2Salt";s:11:"forceSalted";i:0;s:15:"onlyAuthService";i:0;s:12:"updatePasswd";i:1;}}',

src/Classes/Configuration/ClientConfigurationManager.php

@@ -22,7 +22,7 @@
 class ClientConfigurationManager
 {
 
-	/**
+    /**
      * objectManager
      *
      * @var \TYPO3\CMS\Extbase\Object\ObjectManagerInterface
@@ -51,7 +51,7 @@ class ClientConfigurationManager
      *
      * @var \EWW\Dpf\Domain\Model\Client
      */
-    protected $client = NULL;
+    protected $client = null;
 
     /**
      * extensionConfiguration
@@ -65,34 +65,31 @@ public function __construct()
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(ObjectManager::class);
         $clientRepository = $objectManager->get(ClientRepository::class);
 
-		if (TYPO3_MODE === 'BE')
-		{
-            $selectedPageId = (int) \TYPO3\CMS\Core\Utility\GeneralUtility::_GP('id');
-            if ($selectedPageId)
-            {
+        if (TYPO3_MODE === 'BE') {
+            $selectedPageId = (int)\TYPO3\CMS\Core\Utility\GeneralUtility::_GP('id');
+            if ($selectedPageId) {
                 $this->client = $clientRepository->findAll()->current();
 
                 $configurationManager = $objectManager->get(BackendConfigurationManager::class);
-                $settings = $configurationManager->getConfiguration(NULL,NULL);
+                $settings = $configurationManager->getConfiguration(null, null);
                 $this->settings = $settings; //['settings'];
             }
 
-		}
-		else
-		{
+        } else {
             $this->client = $clientRepository->findAll()->current();
 
             $configurationManager = $objectManager->get(ConfigurationManager::class);
-    		$this->settings = $configurationManager->getConfiguration(
-            	\TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS
-        	);
+            $this->settings = $configurationManager->getConfiguration(
+                \TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface::CONFIGURATION_TYPE_SETTINGS
+            );
 
         }
 
         $this->extensionConfiguration = unserialize($GLOBALS['TYPO3_CONF_VARS']['EXT']['extConf']['dpf']);
     }
 
-    public function setConfigurationPid($pid) {
+    public function setConfigurationPid($pid)
+    {
         $objectManager = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(ObjectManager::class);
         $clientRepository = $objectManager->get(ClientRepository::class);
 
@@ -105,11 +102,11 @@ public function setConfigurationPid($pid) {
      *
      * @var array
      */
-    public function getSetting($settingName, $extConfig = NULL)
+    public function getSetting($settingName, $extConfig = null)
     {
-        $setting = NULL;
+        $setting = null;
         if ($this->client) {
-            $setting = trim($this->client->{"get".ucfirst($settingName)}());
+            $setting = trim($this->client->{"get" . ucfirst($settingName)}());
         }
 
         // use global extConfig if client settings is empty
@@ -128,62 +125,242 @@ public function getOwnerId()
 
     public function getSwordHost()
     {
-    	return $this->getSetting("swordHost","swordHost");
+        return $this->getSetting("swordHost", "swordHost");
     }
 
-	public function getSwordUser()
+    public function getSwordUser()
     {
-    	return $this->getSetting("swordUser","swordUser");
+        return $this->getSetting("swordUser", "swordUser");
     }
 
-	public function getSwordPassword()
+    public function getSwordPassword()
     {
-    	return $this->getSetting("swordPassword","swordPassword");
+        return $this->getSetting("swordPassword", "swordPassword");
     }
 
-	public function getSwordCollectionNamespace()
+    public function getSwordCollectionNamespace()
     {
-    	return $this->getSetting("swordCollectionNamespace","swordCollectionNamespace");
+        return $this->getSetting("swordCollectionNamespace", "swordCollectionNamespace");
     }
 
-	public function getFedoraHost()
+    public function getFedoraHost()
     {
-    	return $this->getSetting("fedoraHost","fedoraHost");
+        return $this->getSetting("fedoraHost", "fedoraHost");
     }
 
-	public function getFedoraUser()
+    public function getFedoraUser()
     {
-    	return $this->getSetting("fedoraUser","fedoraUser");
+        return $this->getSetting("fedoraUser", "fedoraUser");
     }
 
-	public function getFedoraPassword()
+    public function getFedoraPassword()
     {
-    	return $this->getSetting("fedoraPassword","fedoraPassword");
+        return $this->getSetting("fedoraPassword", "fedoraPassword");
     }
 
-	public function getElasticSearchHost()
+    public function getElasticSearchHost()
     {
-    	return $this->getSetting("elasticSearchHost","elasticSearchHost");
+        return $this->getSetting("elasticSearchHost", "elasticSearchHost");
     }
 
-	public function getElasticSearchPort()
+    public function getElasticSearchPort()
     {
-    	return $this->getSetting("elasticSearchPort","elasticSearchPort");
+        return $this->getSetting("elasticSearchPort", "elasticSearchPort");
     }
 
-	public function getUploadDirectory()
+    public function getUploadDirectory()
     {
-    	return $this->getSetting("uploadDirectory","uploadDirectory");
+        return $this->getSetting("uploadDirectory", "uploadDirectory");
     }
 
-	public function getUploadDomain()
+    public function getUploadDomain()
     {
-    	return $this->getSetting("uploadDomain","uploadDomain");
+        return $this->getSetting("uploadDomain", "uploadDomain");
     }
 
     public function getSuggestionFlashMessage()
     {
         return $this->getSetting("suggestionFlashmessage", "suggestionFlashmessage");
     }
 
+    public function getFileXpath()
+    {
+        return $this->getSetting("fileXpath", "fileXpath");
+    }
+
+    public function getStateXpath()
+    {
+        return $this->getSetting("stateXpath", "stateXpath");
+    }
+
+    public function getTypeXpath()
+    {
+        return $this->getSetting("typeXpath", "typeXpath");
+    }
+
+    public function getTypeXpathInput()
+    {
+        return $this->getSetting("typeXpathInput", "typeXpathInput");
+    }
+
+    public function getUrnXpath()
+    {
+        return $this->getSetting("urnXpath", "urnXpath");
+    }
+
+    public function getQucosaUrnXpath()
+    {
+        return $this->getSetting("qucosaUrnXpath", "qucosaUrnXpath");
+    }
+
+    public function getDateXpath()
+    {
+        return $this->getSetting("dateXpath", "dateXpath");
+    }
+
+    public function getPublishingYearXpath()
+    {
+        return $this->getSetting("publishingYearXpath", "publishingYearXpath");
+    }
+
+    public function getNamespaces()
+    {
+        return $this->getSetting("namespaces", "namespaces");
+    }
+
+    public function getTitleXpath()
+    {
+        return $this->getSetting("titleXpath", "titleXpath");
+    }
+
+    public function getOriginalSourceTitleXpath()
+    {
+        return $this->getSetting("originalSourceTitleXpath", "originalSourceTitleXpath");
+    }
+
+    public function getProcessNumberXpath()
+    {
+        return $this->getSetting("processnumberXpath", "processnumberXpath");
+    }
+
+    public function getSubmitterNameXpath()
+    {
+        return $this->getSetting("submitterNameXpath", "submitterNameXpath");
+    }
+
+    public function getSubmitterEmailXpath()
+    {
+        return $this->getSetting("submitterEmailXpath", "submitterEmailXpath");
+    }
+
+    public function getSubmitterNoticeXpath()
+    {
+        return $this->getSetting("submitterNoticeXpath", "submitterNoticeXpath");
+    }
+
+    public function getCreatorXpath()
+    {
+        return $this->getSetting("creatorXpath", "creatorXpath");
+    }
+
+    public function getCreationDateXpath()
+    {
+        return $this->getSetting("creationDateXpath", "creationDateXpath");
+    }
+
+    public function getRepositoryCreationDateXpath()
+    {
+        return $this->getSetting("repositoryCreationDateXpath", "repositoryCreationDateXpath");
+    }
+
+    public function getRepositoryLastModDateXpath()
+    {
+        return $this->getSetting("repositoryLastModDateXpath", "repositoryLastModDateXpath");
+    }
+
+    public function getDepositLicenseXpath()
+    {
+        return $this->getSetting("depositLicenseXpath", "depositLicenseXpath");
+    }
+
+    public function getAllNotesXpath()
+    {
+        return $this->getSetting("allNotesXpath", "allNotesXpath");
+    }
+
+    public function getPrivateNotesXpath()
+    {
+        return $this->getSetting("privateNotesXpath", "privateNotesXpath");
+    }
+
+    public function getInputTransformation()
+    {
+        return $this->client->getInputTransformation()->current();
+    }
+
+    public function getOutputTransformation()
+    {
+        return $this->client->getOutputTransformation()->current();
+    }
+
+    public function getPersonXpath()
+    {
+        return $this->getSetting("personXpath", "personXpath");
+    }
+
+    public function getPersonFamilyXpath()
+    {
+        return $this->getSetting("personFamilyXpath", "personFamilyXpath");
+    }
+
+    public function getPersonGivenXpath()
+    {
+        return $this->getSetting("personGivenXpath", "personGivenXpath");
+    }
+
+    public function getPersonRoleXpath()
+    {
+        return $this->getSetting("personRoleXpath", "personRoleXpath");
+    }
+
+    public function getPersonFisIdentifierXpath()
+    {
+        return $this->getSetting("personFisIdentifierXpath", "personFisIdentifierXpath");
+    }
+
+    public function getPersonAffiliationXpath()
+    {
+        return $this->getSetting("personAffiliationXpath", "personAffiliationXpath");
+    }
+
+    public function getPersonAffiliationIdentifierXpath()
+    {
+        return $this->getSetting("personAffiliationIdentifierXpath", "personAffiliationIdentifierXpath");
+    }
+
+    public function getPersonAuthorRole()
+    {
+        return $this->getSetting("personAuthorRole", "personAuthorRole");
+    }
+
+    public function getPersonPublisherRole()
+    {
+        return $this->getSetting("personPublisherRole", "personPublisherRole");
+    }
+
+    public function getValidationXpath()
+    {
+        return $this->getSetting("validationXpath", "validationXpath");
+    }
+
+    public function fisIdXpath()
+    {
+        return $this->getSetting("fisIdXpath", "fisIdXpath");
+    }
+
+    public function getSourceDetailsXpaths()
+    {
+        return $this->getSetting("sourceDetailsXpaths", "sourceDetailsXpaths");
+    }
+
 }

src/Classes/Controller/AbstractController.php

@@ -16,6 +16,8 @@
 
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Extbase\SignalSlot\Dispatcher;
+use TYPO3\CMS\Core\Log\LogManager;
+
 
 abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
 {
@@ -59,6 +61,19 @@ abstract class AbstractController extends \TYPO3\CMS\Extbase\Mvc\Controller\Acti
      */
     protected $session = null;
 
+    /**
+     * logger
+     *
+     * @var \TYPO3\CMS\Core\Log\Logger
+     */
+    protected $logger = null;
+
+
+    public function __construct()
+    {
+        /** @var $logger \TYPO3\CMS\Core\Log\Logger */
+        $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
+    }
 
     protected function initializeView(\TYPO3\CMS\Extbase\Mvc\View\ViewInterface $view)
     {