first commit
This commit is contained in:
@@ -26,7 +26,7 @@ namespace WapplerSystems\Meilisearch\Controller\Backend\Search;
|
||||
|
||||
use WapplerSystems\Meilisearch\ConnectionManager;
|
||||
use WapplerSystems\Meilisearch\IndexQueue\Queue;
|
||||
use WapplerSystems\Meilisearch\System\Solr\SolrConnection;
|
||||
use WapplerSystems\Meilisearch\System\Meilisearch\MeilisearchConnection;
|
||||
use WapplerSystems\Meilisearch\Util;
|
||||
use TYPO3\CMS\Backend\Routing\UriBuilder as BackendUriBuilder;
|
||||
use TYPO3\CMS\Core\Messaging\FlashMessage;
|
||||
@@ -50,14 +50,14 @@ class IndexAdministrationModuleController extends AbstractModuleController
|
||||
/**
|
||||
* @var ConnectionManager
|
||||
*/
|
||||
protected $solrConnectionManager = null;
|
||||
protected $meilisearchConnectionManager = null;
|
||||
|
||||
/**
|
||||
* @param ConnectionManager $solrConnectionManager
|
||||
* @param ConnectionManager $meilisearchConnectionManager
|
||||
*/
|
||||
public function setSolrConnectionManager(ConnectionManager $solrConnectionManager)
|
||||
public function setMeilisearchConnectionManager(ConnectionManager $meilisearchConnectionManager)
|
||||
{
|
||||
$this->solrConnectionManager = $solrConnectionManager;
|
||||
$this->meilisearchConnectionManager = $meilisearchConnectionManager;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -67,7 +67,7 @@ class IndexAdministrationModuleController extends AbstractModuleController
|
||||
{
|
||||
parent::initializeAction();
|
||||
$this->indexQueue = GeneralUtility::makeInstance(Queue::class);
|
||||
$this->solrConnectionManager = GeneralUtility::makeInstance(ConnectionManager::class);
|
||||
$this->meilisearchConnectionManager = GeneralUtility::makeInstance(ConnectionManager::class);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -77,7 +77,7 @@ class IndexAdministrationModuleController extends AbstractModuleController
|
||||
*/
|
||||
public function indexAction()
|
||||
{
|
||||
if ($this->selectedSite === null || empty($this->solrConnectionManager->getConnectionsBySite($this->selectedSite))) {
|
||||
if ($this->selectedSite === null || empty($this->meilisearchConnectionManager->getConnectionsBySite($this->selectedSite))) {
|
||||
$this->view->assign('can_not_proceed', true);
|
||||
}
|
||||
}
|
||||
@@ -93,18 +93,18 @@ class IndexAdministrationModuleController extends AbstractModuleController
|
||||
|
||||
try {
|
||||
$affectedCores = [];
|
||||
$solrServers = $this->solrConnectionManager->getConnectionsBySite($this->selectedSite);
|
||||
foreach ($solrServers as $solrServer) {
|
||||
$writeService = $solrServer->getWriteService();
|
||||
/* @var $solrServer SolrConnection */
|
||||
$meilisearchServers = $this->meilisearchConnectionManager->getConnectionsBySite($this->selectedSite);
|
||||
foreach ($meilisearchServers as $meilisearchServer) {
|
||||
$writeService = $meilisearchServer->getWriteService();
|
||||
/* @var $meilisearchServer MeilisearchConnection */
|
||||
$writeService->deleteByQuery('siteHash:' . $siteHash);
|
||||
$writeService->commit(false, false, false);
|
||||
$affectedCores[] = $writeService->getPrimaryEndpoint()->getCore();
|
||||
}
|
||||
$message = LocalizationUtility::translate('solr.backend.index_administration.index_emptied_all', 'Solr', [$this->selectedSite->getLabel(), implode(', ', $affectedCores)]);
|
||||
$message = LocalizationUtility::translate('meilisearch.backend.index_administration.index_emptied_all', 'Meilisearch', [$this->selectedSite->getLabel(), implode(', ', $affectedCores)]);
|
||||
$this->addFlashMessage($message);
|
||||
} catch (\Exception $e) {
|
||||
$this->addFlashMessage(LocalizationUtility::translate('solr.backend.index_administration.error.on_empty_index', 'Solr', [$e->__toString()]), '', FlashMessage::ERROR);
|
||||
$this->addFlashMessage(LocalizationUtility::translate('meilisearch.backend.index_administration.error.on_empty_index', 'Meilisearch', [$e->__toString()]), '', FlashMessage::ERROR);
|
||||
}
|
||||
|
||||
$this->redirect('index');
|
||||
@@ -119,14 +119,14 @@ class IndexAdministrationModuleController extends AbstractModuleController
|
||||
{
|
||||
$this->indexQueue->deleteItemsBySite($this->selectedSite);
|
||||
$this->addFlashMessage(
|
||||
LocalizationUtility::translate('solr.backend.index_administration.success.queue_emptied', 'Solr',
|
||||
LocalizationUtility::translate('meilisearch.backend.index_administration.success.queue_emptied', 'Meilisearch',
|
||||
[$this->selectedSite->getLabel()])
|
||||
);
|
||||
$this->redirectToReferrerModule();
|
||||
}
|
||||
|
||||
/**
|
||||
* Reloads the site's Solr cores.
|
||||
* Reloads the site's Meilisearch cores.
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
@@ -134,11 +134,11 @@ class IndexAdministrationModuleController extends AbstractModuleController
|
||||
{
|
||||
$coresReloaded = true;
|
||||
$reloadedCores = [];
|
||||
$solrServers = $this->solrConnectionManager->getConnectionsBySite($this->selectedSite);
|
||||
$meilisearchServers = $this->meilisearchConnectionManager->getConnectionsBySite($this->selectedSite);
|
||||
|
||||
foreach ($solrServers as $solrServer) {
|
||||
/* @var $solrServer SolrConnection */
|
||||
$coreAdmin = $solrServer->getAdminService();
|
||||
foreach ($meilisearchServers as $meilisearchServer) {
|
||||
/* @var $meilisearchServer MeilisearchConnection */
|
||||
$coreAdmin = $meilisearchServer->getAdminService();
|
||||
$coreReloaded = $coreAdmin->reloadCore()->getHttpStatus() === 200;
|
||||
|
||||
$coreName = $coreAdmin->getPrimaryEndpoint()->getCore();
|
||||
@@ -188,7 +188,7 @@ class IndexAdministrationModuleController extends AbstractModuleController
|
||||
$backendUriBuilder = GeneralUtility::makeInstance(BackendUriBuilder::class);
|
||||
|
||||
$parameters = ['id' => $this->selectedPageUID];
|
||||
$referringUri = $backendUriBuilder->buildUriFromRoute('searchbackend_SolrIndexqueue', $parameters);
|
||||
$referringUri = $backendUriBuilder->buildUriFromRoute('searchbackend_MeilisearchIndexqueue', $parameters);
|
||||
|
||||
$this->redirectToUri($referringUri);
|
||||
}
|
||||
|
Reference in New Issue
Block a user