Respect deleted records policy

opencultureconsulting · Jan 4, 2024 · 00d4dc8 · 00d4dc8
1 parent 7188f37
commit 00d4dc8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/src/Console/CsvImportCommand.php b/src/Console/CsvImportCommand.php
@@ -24,7 +24,6 @@
 
 use DateTime;
 use OCC\OaiPmh2\Database;
-use OCC\OaiPmh2\Database\Record;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
@@ -160,6 +159,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             }
         }
         Database::getInstance()->flush(true);
+        Database::getInstance()->pruneOrphanSets();
 
         $output->writeln([
             '',

diff --git a/src/Database.php b/src/Database.php
@@ -129,21 +129,27 @@ public function addOrUpdateRecord(
             $format = $this->entityManager->getReference(Format::class, $format);
         }
         $record = $this->entityManager->find(Record::class, ['identifier' => $identifier, 'format' => $format]);
-        if (isset($record)) {
-            try {
-                $record->setContent($data);
-                $record->setLastChanged($lastChanged);
-            } catch (ValidationFailedException $exception) {
-                throw $exception;
+        if (!isset($data) && Configuration::getInstance()->deletedRecords === 'no') {
+            if (isset($record)) {
+                $this->entityManager->remove($record);
             }
         } else {
-            try {
-                $record = new Record($identifier, $format, $data, $lastChanged);
-            } catch (ValidationFailedException $exception) {
-                throw $exception;
+            if (isset($record)) {
+                try {
+                    $record->setContent($data);
+                    $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) {
             $this->entityManager->flush();
         }