Merge branch 'master' into init-logger-middleware

kitodo · Sep 20, 2024 · 05fe77d · 05fe77d
2 parents 28ac9b6 + 3e31b86
commit 05fe77d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/...search/lib/solr-ocrhighlighting-0.9.0.jar → ...search/lib/solr-ocrhighlighting-0.9.1.jar b/...search/lib/solr-ocrhighlighting-0.9.0.jar → ...search/lib/solr-ocrhighlighting-0.9.1.jar
diff --git a/Classes/Common/Solr/SolrSearch.php b/Classes/Common/Solr/SolrSearch.php
@@ -809,7 +809,7 @@ private function getSort() : array
             'score' => 'desc',
             'year_sorting' => 'asc',
             'title_sorting' => 'asc',
-            'volume' => 'asc'
+            'volume_sorting' => 'asc'
         ];
     }
 

diff --git a/Classes/Controller/AbstractController.php b/Classes/Controller/AbstractController.php
@@ -19,6 +19,7 @@
 use Psr\Log\LoggerAwareTrait;
 use TYPO3\CMS\Core\Configuration\ExtensionConfiguration;
 use TYPO3\CMS\Core\Localization\LanguageService;
+use TYPO3\CMS\Core\Log\LogManager;
 use TYPO3\CMS\Core\Pagination\PaginationInterface;
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Core\Utility\MathUtility;
@@ -111,6 +112,8 @@ protected function initialize(): void
         // Get extension configuration.
         $this->extConf = GeneralUtility::makeInstance(ExtensionConfiguration::class)->get('dlf');
 
+        $this->logger = GeneralUtility::makeInstance(LogManager::class)->getLogger(__CLASS__);
+
         $this->viewData = [
             'pageUid' => $this->pageUid,
             'uniqueId' => uniqid(),

diff --git a/composer.lock b/composer.lock