Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BUGFIX] Fixes in Doc class #979

Merged
merged 3 commits into from
Jun 27, 2023
Merged

[BUGFIX] Fixes in Doc class #979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
568f1a4
Fix logger variable definition
beatrycze-volk Jun 27, 2023
d70cb39
Add missing initalization for textFormat
beatrycze-volk Jun 27, 2023
b867789
Fix types for metadata sections
beatrycze-volk Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions Classes/Common/Doc.php
View file
Open in desktop
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
View file
Open in desktop
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