Merge pull request #636 from albig/prepare-3.2.2

Prepare Bugfix Release 3.2.2
kitodo · Jul 1, 2021 · 65b53f3 · 65b53f3
2 parents 354af41 + e1b4b3c
commit 65b53f3
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Classes/Plugin/OaiPmh.php b/Classes/Plugin/OaiPmh.php
@@ -1013,9 +1013,11 @@ protected function generateOutputForDocumentList(DocumentList $documentListSet)
  $output->appendChild($header);
  }
  } else {
- // Add sets.
+ // Add sets but only if oai_name field is not empty.
  foreach (explode(' ', $resArray['collections']) as $spec) {
- $header->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'setSpec', htmlspecialchars($spec, ENT_NOQUOTES, 'UTF-8')));
+ if ($spec) {
+ $header->appendChild($this->oai->createElementNS('http://www.openarchives.org/OAI/2.0/', 'setSpec', htmlspecialchars($spec, ENT_NOQUOTES, 'UTF-8')));
+ }
  }
  if ($verb === 'ListRecords') {
  // Add record node.

diff --git a/Documentation/Settings.cfg b/Documentation/Settings.cfg
@@ -1,6 +1,6 @@
 [general]
 project = Kitodo.Presentation
-release = 3.2.1
+release = 3.2.2
 copyright = since 2017 by Kitodo Release Management Team
 
 [html_theme_options]

diff --git a/class.ext_update.php b/class.ext_update.php
@@ -296,9 +296,9 @@ protected function updateFormatClasses(): void
  {
  $oldRecords = $this->oldFormatClasses();
  $newValues = [
- 'ALTO' => 'Kitodo\\\\Dlf\\\\Format\\\\Alto', // Those are effectively single backslashes
- 'MODS' => 'Kitodo\\\\Dlf\\\\Format\\\\Mods',
- 'TEIHDR' => 'Kitodo\\\\Dlf\\\\Format\\\\TeiHeader'
+ 'ALTO' => 'Kitodo\\Dlf\\Format\\Alto', // Those are effectively single backslashes
+ 'MODS' => 'Kitodo\\Dlf\\Format\\Mods',
+ 'TEIHDR' => 'Kitodo\\Dlf\\Format\\TeiHeader'
  ];
  $queryBuilder = GeneralUtility::makeInstance(ConnectionPool::class)->getQueryBuilderForTable('tx_dlf_formats');
 

diff --git a/ext_emconf.php b/ext_emconf.php
@@ -13,7 +13,7 @@
 $EM_CONF[$_EXTKEY] = [
  'title' => 'Kitodo.Presentation',
  'description' => 'Base plugins, modules, services and API of the Digital Library Framework. It is part of the community-based Kitodo Digitization Suite.',
- 'version' => '3.2.1',
+ 'version' => '3.2.2',
  'category' => 'misc',
  'constraints' => [
  'depends' => [