Skip to content

Commit

Permalink
[BUGFIX] Fixes in Doc class (#979)
Browse files Browse the repository at this point in the history
  • Loading branch information
beatrycze-volk authored and sebastian-meyer committed Sep 15, 2023
1 parent b7f2404 commit e39d8e9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
5 changes: 3 additions & 2 deletions Classes/Common/Doc.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -51,7 +51,7 @@ abstract class Doc
/**
* This holds the logger
*
* @var LogManager
* @var Logger
* @access protected
*/
protected $logger;
Expand Down Expand Up @@ -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])) {
Expand Down
8 changes: 5 additions & 3 deletions Classes/Common/MetsDocument.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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 = [];
Expand Down Expand Up @@ -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)
{
Expand Down

0 comments on commit e39d8e9

Please sign in to comment.