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

Respect deleted records policy

This commit is contained in:
Sebastian Meyer 2024-01-04 15:33:28 +01:00
parent 7188f37c9f
commit 00d4dc80cc
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Console/CsvImportCommand.php
View File

@ -24,7 +24,6 @@ namespace OCC\OaiPmh2\Console;
use DateTime; use DateTime;
use OCC\OaiPmh2\Database; use OCC\OaiPmh2\Database;
use OCC\OaiPmh2\Database\Record;
use Symfony\Component\Console\Attribute\AsCommand; use Symfony\Component\Console\Attribute\AsCommand;
use Symfony\Component\Console\Command\Command; use Symfony\Component\Console\Command\Command;
use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputArgument;
@ -160,6 +159,7 @@ class CsvImportCommand extends Command
} }
} }
Database::getInstance()->flush(true); Database::getInstance()->flush(true);
Database::getInstance()->pruneOrphanSets();
$output->writeln([ $output->writeln([
'', '',

28
src/Database.php
View File

@ -129,21 +129,27 @@ class Database
$format = $this->entityManager->getReference(Format::class, $format); $format = $this->entityManager->getReference(Format::class, $format);
} }
$record = $this->entityManager->find(Record::class, ['identifier' => $identifier, 'format' => $format]); $record = $this->entityManager->find(Record::class, ['identifier' => $identifier, 'format' => $format]);
if (isset($record)) { if (!isset($data) && Configuration::getInstance()->deletedRecords === 'no') {
try { if (isset($record)) {
$record->setContent($data); $this->entityManager->remove($record);
$record->setLastChanged($lastChanged);
} catch (ValidationFailedException $exception) {
throw $exception;
} }
} else { } else {
try { if (isset($record)) {
$record = new Record($identifier, $format, $data, $lastChanged); try {
} catch (ValidationFailedException $exception) { $record->setContent($data);
throw $exception; $record->setLastChanged($lastChanged);
} catch (ValidationFailedException $exception) {
throw $exception;
}
} else {
try {
$record = new Record($identifier, $format, $data, $lastChanged);
} catch (ValidationFailedException $exception) {
throw $exception;
}
} }
$this->entityManager->persist($record);
} }
$this->entityManager->persist($record);
if (!$bulkMode) { if (!$bulkMode) {
$this->entityManager->flush(); $this->entityManager->flush();
} }