[FEATURE] Two-level metadata: Model and appearance #910

chrizzor · 2023-02-10T14:52:23Z

Extended version of pull request #835

sebastian-meyer · 2023-02-14T13:35:59Z

Please rebase this to master and resolve the corresponding conflicts.

sebastian-meyer · 2023-02-14T13:43:33Z

I've deployed this branch on https://test.dfg-viewer.de for testing. Examples can be found here.

…tructure accordingly

The Metadata object can now hold entry nodes with a new array containing all subentries. These are fetched from the subentries table.

* Updated the domain model and repositories to comply with the new DB structure. * Cleaned up all references to the old table name 'tx_dlf_metadata_subentries'. * Make 'tx_dlf_metadatasubentries' table accessible for some functions in Hooks/Helper class. * Extbase class mappings have to be hold as TypoScript _and_ PHP config as long as TYPO3 9 support is not dropped. In addition, create empty repository class to comply with Extbase conventions.

Required for TYPO3 9.5 support.

Also provided IsArrayViewHelper and respect sub-arrays when building $metaCObjData.

Add a TypoScript Wrap field for subentries in database and TCA.

When XPath functions like concat() are used, evaluate() returns a string instead of a DOMNodeList.

…subentry

sebastian-meyer · 2023-04-17T10:04:47Z

I've updated https://test.dfg-viewer.de to the current 1e87169, but this leads to errors: example

Unfortunately there are no messages in the admin log pointing to the cause.

chrizzor · 2023-04-17T13:24:56Z

I have enabled the detailed error output on the system. It seems that there are problems with the assets. Clearing the cache doesn't help.

sebastian-meyer · 2023-04-17T13:46:39Z

OK, the problem was the recent renaming of Resources/Public/Javascript to Resources/Public/JavaScript, because the typoscript configuration of https://github.com/slub/dfg-viewer still addresses the old path. I added a symbolic link for the old directory name and the errors were gone.
Furthermore, I had to disable usage of the internal page proxy because of #908

sebastian-meyer · 2023-05-23T13:18:32Z

Classes/Common/Indexer.php

@@ -367,6 +367,7 @@ protected static function processLogical(Document $document, array $logicalUnit)
 }
 $autocomplete = [];
 foreach ($metadata as $index_name => $data) {
+ // TODO: Include also subentries if available.


Are these TODOs still relevant? The two-level metadata feature should be implemented completely. So either these TODOs are done (and should be removed) or should be done.

sebastian-meyer · 2023-05-23T13:18:37Z

Classes/Common/Indexer.php

@@ -464,6 +465,7 @@ protected static function processPhysical(Document $document, $page, array $phys
 $solrDoc->setField('fulltext', $fullText);
 if (is_array($doc->metadataArray[$doc->toplevelId])) {
 // Add faceting information to physical sub-elements if applicable.
+ // TODO: Include also subentries if available.


Are these TODOs still relevant? The two-level metadata feature should be implemented completely. So either these TODOs are done (and should be removed) or should be done.

sebastian-meyer · 2023-05-23T13:19:05Z

Classes/Common/Indexer.php

+ //if ($index_name == 'author') {
+ //$data = self::removeAppendsFromAuthor($data);
+ //}


Please remove inactive code.

sebastian-meyer · 2023-05-23T13:19:23Z

Classes/Common/MetsDocument.php

@@ -559,6 +560,7 @@ class_exists($class)
 $queryBuilder->expr()->eq('tx_dlf_metadata.pid', intval($cPid)),
 $queryBuilder->expr()->eq('tx_dlf_metadata.l18n_parent', 0),
 $queryBuilder->expr()->eq('tx_dlf_metadataformat_joins.pid', intval($cPid)),
+ //$queryBuilder->expr()->eq('tx_dlf_metadataformat_joins.subentries', 0),


Please remove inactive code.

sebastian-meyer · 2023-05-23T13:19:40Z

Classes/Common/MetsDocument.php

+ // $queryBuilder->expr()->eq('tx_dlf_metadata.l18n_parent', 0),
+ // $queryBuilder->expr()->eq('tx_dlf_metadataformat_joins.pid', intval($cPid)),


Please remove inactive code.

sebastian-meyer · 2023-05-23T13:20:25Z

Classes/Common/MetsDocument.php

@@ -624,24 +675,23 @@ class_exists($class)
 ) {
 if (
 $resArray['format'] > 0
- && !empty($resArray['xpath_sorting'])
+ && !empty($resArray['xpath_sorting']) // TODO: will fail, for subentries


This is bad and should be fixed. ;o)

sebastian-meyer · 2023-05-23T13:22:04Z

Classes/Controller/ListViewController.php

+ // TODO: Sebastian fragen
+ // TODO: Include also subentries if available.


Are these TODOs still relevant? The two-level metadata feature should be implemented completely. So either these TODOs are done (and should be removed) or should be done.

sebastian-meyer · 2023-05-23T13:22:23Z

Classes/Controller/MetadataController.php

+ ? implode($this->settings['separator'], $value)
+ : $value;
+
+ // TODO: This might not be necessary for subentries or needs to be typecasted correctly.


Are these TODOs still relevant? The two-level metadata feature should be implemented completely. So either these TODOs are done (and should be removed) or should be done.

sebastian-meyer · 2023-05-23T13:23:23Z

Classes/Domain/Repository/MetadataSubentryRepository.php

+class MetadataSubentryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository
+{
+
+}


Please add linebreak at end of file.

sebastian-meyer · 2023-05-23T13:23:32Z

Classes/Hooks/DataHandler.php

@@ -80,6 +80,7 @@ public function processDatamap_postProcessFieldArray($status, $table, $id, &$fie
 }
 break;
 // Field post-processing for table "tx_dlf_metadata".
+ // TODO: Include also subentries if available.


Are these TODOs still relevant? The two-level metadata feature should be implemented completely. So either these TODOs are done (and should be removed) or should be done.

# Conflicts: # Classes/Common/Indexer.php # Classes/Common/MetsDocument.php # Classes/Domain/Model/MetadataFormat.php # Configuration/TCA/tx_dlf_metadataformat.php # Resources/Private/Partials/Metadata/Entries.html # ext_typoscript_setup.txt

sebastian-meyer self-requested a review February 10, 2023 15:56

sebastian-meyer assigned chrizzor Feb 10, 2023

sebastian-meyer added the ⚙ feature A new feature or enhancement. label Feb 10, 2023

sebastian-meyer added this to the Kitodo.Presentation 5.0.0 milestone Feb 10, 2023

sebastian-meyer linked an issue Feb 10, 2023 that may be closed by this pull request

Metadata grouping/subfields #400

Open

6 tasks

sebastian-meyer mentioned this pull request Feb 10, 2023

[FEATURE] Two-level metadata: Model and appearance #835

Closed

fraschz and others added 13 commits February 21, 2023 12:53

[FEATURE] Create new table tx_dlf_metadata_subentries and change DB s…

8739af1

…tructure accordingly

[FEATURE] Update document model with subentries.

b84bf8f

The Metadata object can now hold entry nodes with a new array containing all subentries. These are fetched from the subentries table.

[BUGFIX] Rename table for subentries, removed inappropriate '_'

506589c

[GITIGNORE] Added .bak-files created by Notepad++

c952c16

[BUGFIX] Add required class mappings in TypoScript config

fca0b69

Required for TYPO3 9.5 support.

[FEATURE] Add output for metadata subentries.

402e5da

Also provided IsArrayViewHelper and respect sub-arrays when building $metaCObjData.

[FEATURE] Make the appearance of subentries configurable.

826b6be

Add a TypoScript Wrap field for subentries in database and TCA.

[TODO] TODOs for future changes in Indexer and Controller.

a98f693

[CODACY] Cleanup open issues.

6185995

Add sorting for tx_dlf_subentries

0b78d14

Consider the return of a string of evaluate()

8e91be8

When XPath functions like concat() are used, evaluate() returns a string instead of a DOMNodeList.

Rendering all subentry metadata if available

d93ecd3

chrizzor force-pushed the two-level-metadata branch from 7bf05a6 to d93ecd3 Compare February 21, 2023 12:51

sebastian-meyer and others added 2 commits March 15, 2023 21:08

Merge branch 'master' into two-level-metadata

a0ef467

Check if the nodevalue is empty and prevent adding an empty array as …

1e87169

…subentry

chrizzor added 3 commits May 16, 2023 14:05

Merge branch 'master' into two-level-metadata

de795d8

Remove unused variable

d8394fd

Fix overwritten code from merge with master

9b425be

Remove var_dump

e2258f1

sebastian-meyer requested changes May 23, 2023

View reviewed changes

Merge branch 'master' into two-level-metadata

fc4ceb7

sebastian-meyer changed the base branch from master to project-slub August 8, 2023 05:28

Merge branch 'project-slub' into two-level-metadata

c1200ca

sebastian-meyer changed the base branch from project-slub to 4.x August 8, 2023 05:30

sebastian-meyer changed the base branch from 4.x to master August 8, 2023 05:30

sebastian-meyer modified the milestones: Kitodo.Presentation 5.0.0, Kitodo.Presentation 5.1.0 Nov 7, 2023

chrizzor added 9 commits June 11, 2024 22:17

Fix conflict

e528658

Add changed language files

e4fe841

Add subentries for new metadata processing

f93bee6

Fix codacy and remove todos comments

4c6b57a

Codacy fix

709711b

Codacy fix

c8200eb

Fix function nesting level

2311c83

Fix assignment of the merge result

246d785

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[FEATURE] Two-level metadata: Model and appearance #910

[FEATURE] Two-level metadata: Model and appearance #910

chrizzor commented Feb 10, 2023

sebastian-meyer commented Feb 14, 2023

sebastian-meyer commented Feb 14, 2023

sebastian-meyer commented Apr 17, 2023

chrizzor commented Apr 17, 2023

sebastian-meyer commented Apr 17, 2023

sebastian-meyer May 23, 2023

sebastian-meyer May 23, 2023

sebastian-meyer May 23, 2023

sebastian-meyer May 23, 2023

sebastian-meyer May 23, 2023

sebastian-meyer May 23, 2023

sebastian-meyer May 23, 2023

sebastian-meyer May 23, 2023

sebastian-meyer May 23, 2023

sebastian-meyer May 23, 2023

		// $queryBuilder->expr()->eq('tx_dlf_metadata.l18n_parent', 0),
		// $queryBuilder->expr()->eq('tx_dlf_metadataformat_joins.pid', intval($cPid)),

		// TODO: Sebastian fragen
		// TODO: Include also subentries if available.

[FEATURE] Two-level metadata: Model and appearance #910

Are you sure you want to change the base?

[FEATURE] Two-level metadata: Model and appearance #910

Conversation

chrizzor commented Feb 10, 2023

sebastian-meyer commented Feb 14, 2023

sebastian-meyer commented Feb 14, 2023

sebastian-meyer commented Apr 17, 2023

chrizzor commented Apr 17, 2023

sebastian-meyer commented Apr 17, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment