first commit

This commit is contained in:
Sven Wappler
2021-04-17 21:20:54 +02:00
parent c93ec9492a
commit cadcc8edb4
406 changed files with 4917 additions and 5157 deletions

View File

@@ -43,13 +43,13 @@ use WapplerSystems\Meilisearch\Domain\Site\SiteHashService;
use WapplerSystems\Meilisearch\Domain\Site\SiteRepository;
use WapplerSystems\Meilisearch\FieldProcessor\PageUidToHierarchy;
use WapplerSystems\Meilisearch\System\Configuration\TypoScriptConfiguration;
use WapplerSystems\Meilisearch\System\Logging\SolrLogManager;
use WapplerSystems\Meilisearch\System\Logging\MeilisearchLogManager;
use WapplerSystems\Meilisearch\Util;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Frontend\ContentObject\ContentObjectRenderer;
/**
* The concrete QueryBuilder contains all TYPO3 specific initialization logic of solr queries, for TYPO3.
* The concrete QueryBuilder contains all TYPO3 specific initialization logic of meilisearch queries, for TYPO3.
*/
class QueryBuilder extends AbstractQueryBuilder {
@@ -67,7 +67,7 @@ class QueryBuilder extends AbstractQueryBuilder {
protected $typoScriptConfiguration = null;
/**
* @var SolrLogManager;
* @var MeilisearchLogManager;
*/
protected $logger = null;
@@ -79,13 +79,13 @@ class QueryBuilder extends AbstractQueryBuilder {
/**
* QueryBuilder constructor.
* @param TypoScriptConfiguration|null $configuration
* @param SolrLogManager|null $solrLogManager
* @param MeilisearchLogManager|null $meilisearchLogManager
* @param SiteHashService|null $siteHashService
*/
public function __construct(TypoScriptConfiguration $configuration = null, SolrLogManager $solrLogManager = null, SiteHashService $siteHashService = null)
public function __construct(TypoScriptConfiguration $configuration = null, MeilisearchLogManager $meilisearchLogManager = null, SiteHashService $siteHashService = null)
{
$this->typoScriptConfiguration = $configuration ?? Util::getSolrConfiguration();
$this->logger = $solrLogManager ?? GeneralUtility::makeInstance(SolrLogManager::class, /** @scrutinizer ignore-type */ __CLASS__);
$this->typoScriptConfiguration = $configuration ?? Util::getMeilisearchConfiguration();
$this->logger = $meilisearchLogManager ?? GeneralUtility::makeInstance(MeilisearchLogManager::class, /** @scrutinizer ignore-type */ __CLASS__);
$this->siteHashService = $siteHashService ?? GeneralUtility::makeInstance(SiteHashService::class);
}
@@ -121,7 +121,7 @@ class QueryBuilder extends AbstractQueryBuilder {
public function buildSearchQuery($rawQuery, $resultsPerPage = 10, array $additionalFiltersFromRequest = []) : SearchQuery
{
if ($this->typoScriptConfiguration->getLoggingQuerySearchWords()) {
$this->logger->log(SolrLogManager::INFO, 'Received search query', [$rawQuery]);
$this->logger->log(MeilisearchLogManager::INFO, 'Received search query', [$rawQuery]);
}
/* @var $query SearchQuery */
@@ -170,7 +170,7 @@ class QueryBuilder extends AbstractQueryBuilder {
/**
* Returns Query for Search which finds document for given page.
* Note: The Connection is per language as recommended in ext-solr docs.
* Note: The Connection is per language as recommended in ext-meilisearch docs.
*
* @return Query
*/
@@ -361,7 +361,7 @@ class QueryBuilder extends AbstractQueryBuilder {
}
/**
* Applies the configured initial query settings to set the alternative query for solr as required.
* Applies the configured initial query settings to set the alternative query for meilisearch as required.
*
* @return QueryBuilder
*/