opencultureconsulting
/
oai-pmh2
mirror of https://github.com/opencultureconsulting/oai-pmh2.git
2
0
Fork 0
Code Issues

Allow hierarchical sets

This commit is contained in:
Sebastian Meyer 2024-01-12 08:09:26 +01:00
parent 6c700c6f24
commit cf3695a888
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Database.php
View File

@ -32,6 +32,7 @@ use Doctrine\ORM\Configuration as DoctrineConfiguration;
use Doctrine\ORM\EntityManager; use Doctrine\ORM\EntityManager;
use Doctrine\ORM\Mapping\Driver\AttributeDriver; use Doctrine\ORM\Mapping\Driver\AttributeDriver;
use Doctrine\ORM\Proxy\ProxyFactory; use Doctrine\ORM\Proxy\ProxyFactory;
use Doctrine\ORM\Query\Expr\Join;
use Doctrine\ORM\Tools\Pagination\Paginator; use Doctrine\ORM\Tools\Pagination\Paginator;
use OCC\Basics\Traits\Singleton; use OCC\Basics\Traits\Singleton;
use OCC\OaiPmh2\Entity\Format; use OCC\OaiPmh2\Entity\Format;
@ -313,8 +314,17 @@ class Database
$until = $until->format('Y-m-d\TH:i:s\Z'); $until = $until->format('Y-m-d\TH:i:s\Z');
} }
if (isset($set)) { if (isset($set)) {
$dql->andWhere($dql->expr()->in('record.sets', ':set')); $dql->innerJoin(
$dql->setParameter('set', $set); Set::class,
'sets',
Join::WITH,
$dql->expr()->orX(
$dql->expr()->eq('sets.spec', ':setSpec'),
$dql->expr()->like('sets.spec', ':setLike')
)
);
$dql->setParameter('setSpec', $set->getSpec());
$dql->setParameter('setLike', $set->getSpec() . ':%');
$set = $set->getSpec(); $set = $set->getSpec();
} }
$query = $dql->getQuery(); $query = $dql->getQuery();