first commit
This commit is contained in:
@@ -30,27 +30,27 @@ namespace WapplerSystems\Meilisearch\Domain\Index\PageIndexer\Helper\UriBuilder;
|
||||
|
||||
use WapplerSystems\Meilisearch\IndexQueue\Item;
|
||||
use WapplerSystems\Meilisearch\IndexQueue\PageIndexerDataUrlModifier;
|
||||
use WapplerSystems\Meilisearch\System\Logging\SolrLogManager;
|
||||
use WapplerSystems\Meilisearch\System\Logging\MeilisearchLogManager;
|
||||
use WapplerSystems\Meilisearch\System\Url\UrlHelper;
|
||||
use TYPO3\CMS\Core\Utility\GeneralUtility;
|
||||
|
||||
/**
|
||||
* Implementations of this class are able to build an indexing url for solr page indexing.
|
||||
* Implementations of this class are able to build an indexing url for meilisearch page indexing.
|
||||
*/
|
||||
abstract class AbstractUriStrategy
|
||||
{
|
||||
/**
|
||||
* @var SolrLogManager|null|object
|
||||
* @var MeilisearchLogManager|null|object
|
||||
*/
|
||||
protected $logger;
|
||||
|
||||
/**
|
||||
* AbstractUriStrategy constructor.
|
||||
* @param SolrLogManager|null $logger
|
||||
* @param MeilisearchLogManager|null $logger
|
||||
*/
|
||||
public function __construct(SolrLogManager $logger = null)
|
||||
public function __construct(MeilisearchLogManager $logger = null)
|
||||
{
|
||||
$this->logger = $logger ?? GeneralUtility::makeInstance(SolrLogManager::class, /** @scrutinizer ignore-type */ __CLASS__);
|
||||
$this->logger = $logger ?? GeneralUtility::makeInstance(MeilisearchLogManager::class, /** @scrutinizer ignore-type */ __CLASS__);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -100,7 +100,7 @@ abstract class AbstractUriStrategy
|
||||
|
||||
if (!GeneralUtility::isValidUrl($dataUrl)) {
|
||||
$this->logger->log(
|
||||
SolrLogManager::ERROR,
|
||||
MeilisearchLogManager::ERROR,
|
||||
'Could not create a valid URL to get frontend data while trying to index a page.',
|
||||
[
|
||||
'item' => (array)$item,
|
||||
@@ -140,13 +140,13 @@ abstract class AbstractUriStrategy
|
||||
*/
|
||||
protected function applyDataUrlModifier(Item $item, int $language, $dataUrl, UrlHelper $urlHelper):string
|
||||
{
|
||||
if (empty($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['IndexQueuePageIndexer']['dataUrlModifier'])) {
|
||||
if (empty($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['meilisearch']['IndexQueuePageIndexer']['dataUrlModifier'])) {
|
||||
return $dataUrl;
|
||||
}
|
||||
|
||||
$dataUrlModifier = GeneralUtility::makeInstance($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['IndexQueuePageIndexer']['dataUrlModifier']);
|
||||
$dataUrlModifier = GeneralUtility::makeInstance($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['meilisearch']['IndexQueuePageIndexer']['dataUrlModifier']);
|
||||
if (!$dataUrlModifier instanceof PageIndexerDataUrlModifier) {
|
||||
throw new \RuntimeException($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['solr']['IndexQueuePageIndexer']['dataUrlModifier'] . ' is not an implementation of WapplerSystems\Meilisearch\IndexQueue\PageIndexerDataUrlModifier', 1290523345);
|
||||
throw new \RuntimeException($GLOBALS['TYPO3_CONF_VARS']['EXTCONF']['meilisearch']['IndexQueuePageIndexer']['dataUrlModifier'] . ' is not an implementation of WapplerSystems\Meilisearch\IndexQueue\PageIndexerDataUrlModifier', 1290523345);
|
||||
}
|
||||
|
||||
return $dataUrlModifier->modifyDataUrl($dataUrl,
|
||||
|
@@ -29,7 +29,7 @@ namespace WapplerSystems\Meilisearch\Domain\Index\PageIndexer\Helper\UriBuilder;
|
||||
***************************************************************/
|
||||
|
||||
use WapplerSystems\Meilisearch\IndexQueue\Item;
|
||||
use WapplerSystems\Meilisearch\System\Logging\SolrLogManager;
|
||||
use WapplerSystems\Meilisearch\System\Logging\MeilisearchLogManager;
|
||||
use TYPO3\CMS\Core\Exception\SiteNotFoundException;
|
||||
use TYPO3\CMS\Core\Routing\InvalidRouteArgumentsException;
|
||||
use TYPO3\CMS\Core\Site\SiteFinder;
|
||||
@@ -49,10 +49,10 @@ class TYPO3SiteStrategy extends AbstractUriStrategy
|
||||
|
||||
/**
|
||||
* TYPO3SiteStrategy constructor.
|
||||
* @param SolrLogManager|null $logger
|
||||
* @param MeilisearchLogManager|null $logger
|
||||
* @param SiteFinder|null $siteFinder
|
||||
*/
|
||||
public function __construct(SolrLogManager $logger = null, SiteFinder $siteFinder = null)
|
||||
public function __construct(MeilisearchLogManager $logger = null, SiteFinder $siteFinder = null)
|
||||
{
|
||||
parent::__construct($logger);
|
||||
$this->siteFinder = $siteFinder ?? GeneralUtility::makeInstance(SiteFinder::class);
|
||||
|
@@ -40,7 +40,7 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
|
||||
* This can be:
|
||||
* * A TYPO3 site managed with site management
|
||||
* * A TYPO3 site without site management where the url is build by EXT:meilisearch with L and id param and information from the domain
|
||||
* record or solr specific configuration.
|
||||
* record or meilisearch specific configuration.
|
||||
*/
|
||||
class UriStrategyFactory
|
||||
{
|
||||
|
Reference in New Issue
Block a user