diff --git a/Classes/Common/Doc.php b/Classes/Common/Doc.php index 4768a6c12..03d501384 100644 --- a/Classes/Common/Doc.php +++ b/Classes/Common/Doc.php @@ -15,7 +15,7 @@ use TYPO3\CMS\Core\Cache\CacheManager; use TYPO3\CMS\Core\Configuration\ExtensionConfiguration; use TYPO3\CMS\Core\Database\ConnectionPool; -use TYPO3\CMS\Core\Log\LogManager; +use TYPO3\CMS\Core\Log\Logger; use TYPO3\CMS\Core\Utility\GeneralUtility; use Ubl\Iiif\Presentation\Common\Model\Resources\IiifResourceInterface; use Ubl\Iiif\Tools\IiifHelper; @@ -51,7 +51,7 @@ abstract class Doc /** * This holds the logger * - * @var LogManager + * @var Logger * @access protected */ protected $logger; @@ -558,6 +558,7 @@ protected function getFullTextFromXml($id) // ... and extension configuration. $extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get(self::$extKey); $fileGrpsFulltext = GeneralUtility::trimExplode(',', $extConf['fileGrpFulltext']); + $textFormat = ""; if (!empty($this->physicalStructureInfo[$id])) { while ($fileGrpFulltext = array_shift($fileGrpsFulltext)) { if (!empty($this->physicalStructureInfo[$id]['files'][$fileGrpFulltext])) { diff --git a/Classes/Common/MetsDocument.php b/Classes/Common/MetsDocument.php index d2b705134..cc6c7a30e 100644 --- a/Classes/Common/MetsDocument.php +++ b/Classes/Common/MetsDocument.php @@ -15,10 +15,10 @@ use TYPO3\CMS\Core\Configuration\ExtensionConfiguration; use TYPO3\CMS\Core\Database\ConnectionPool; use TYPO3\CMS\Core\Database\Query\Restriction\HiddenRestriction; +use TYPO3\CMS\Core\Log\LogManager; use TYPO3\CMS\Core\Utility\GeneralUtility; use Ubl\Iiif\Tools\IiifHelper; use Ubl\Iiif\Services\AbstractImageService; -use TYPO3\CMS\Core\Log\LogManager; /** * MetsDocument class for the 'dlf' extension. @@ -75,7 +75,7 @@ final class MetsDocument extends Doc * This maps the ID of each amdSec to the IDs of its children (techMD etc.). * When an ADMID references an amdSec instead of techMD etc., this is used to iterate the child elements. * - * @var string[] + * @var array * @access protected */ protected $amdSecChildIds = []; @@ -645,8 +645,10 @@ class_exists($class) * a logical structure node or to a file. * * @access protected + * * @param string $id: The "@ID" attribute of the file node - * @return void + * + * @return array */ protected function getMetadataIds($id) {