Work-Related/search_core
Work-Related/search_core
1
0
mirror of https://github.com/Codappix/search_core.git synced 2024-11-26 01:16:12 +01:00
Code Releases Activity

[TASK] bugfixes and error removal

Browse source
This commit is contained in:
Konstantin Sölch 2018-10-18 15:21:25 +02:00
parent f936d1f7c5
commit 0a9cdd5dce
3 changed files with 83 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Classes/Configuration/ConfigurationContainer.php
View file

@ -20,8 +20,10 @@ namespace Codappix\SearchCore\Configuration;
* 02110-1301, USA.
*/
use TYPO3\CMS\Core\Utility\Exception\MissingArrayPathException;
use TYPO3\CMS\Extbase\Configuration\ConfigurationManagerInterface;
use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Extbase\Utility\DebuggerUtility;
/**
* Container of all configurations for extension.
@ -60,7 +62,7 @@ class ConfigurationContainer implements ConfigurationContainerInterface
*/
public function get(string $path)
{
$value = ArrayUtility::getValueByPath($this->settings, $path);
$value = ArrayUtility::getValueByPath($this->settings, $path, '.');
if ($value === null) {
throw new InvalidArgumentException(
@ -78,6 +80,10 @@ class ConfigurationContainer implements ConfigurationContainerInterface
*/
public function getIfExists(string $path)
{
return ArrayUtility::getValueByPath($this->settings, $path);
try {
return ArrayUtility::getValueByPath($this->settings, $path, '.');
} catch (MissingArrayPathException $exception) {
return null;
}
}
}

60
Classes/Domain/Index/AbstractIndexer.php
View file

@ -1,4 +1,5 @@
<?php
namespace Codappix\SearchCore\Domain\Index;
/*
@ -23,6 +24,8 @@ namespace Codappix\SearchCore\Domain\Index;
use Codappix\SearchCore\Configuration\ConfigurationContainerInterface;
use Codappix\SearchCore\Configuration\InvalidArgumentException;
use Codappix\SearchCore\Connection\ConnectionInterface;
use TYPO3\CMS\Core\Exception;
use TYPO3\CMS\Core\Utility\Exception\MissingArrayPathException;
use TYPO3\CMS\Core\Utility\GeneralUtility;
abstract class AbstractIndexer implements IndexerInterface
@ -96,7 +99,7 @@ abstract class AbstractIndexer implements IndexerInterface
{
$this->logger->info('Start indexing single record.', [$identifier]);
try {
$record = $this->getRecord((int) $identifier);
$record = $this->getRecord((int)$identifier);
$this->prepareRecord($record);
$this->connection->addDocument($this->getDocumentName(), $record);
@ -114,7 +117,7 @@ abstract class AbstractIndexer implements IndexerInterface
$this->logger->info('Finish deletion.');
}
protected function getRecordGenerator() : \Generator
protected function getRecordGenerator(): \Generator
{
$offset = 0;
$limit = $this->getLimit();
@ -125,28 +128,51 @@ abstract class AbstractIndexer implements IndexerInterface
}
}
/**
* @param array $record
*
* @throws \Exception
*/
protected function prepareRecord(array &$record)
{
try {
foreach ($this->configuration->get('indexing.' . $this->identifier . '.dataProcessing') as $configuration) {
$record = $this->dataProcessorService->executeDataProcessor($configuration, $record, $this->identifier);
$indexingConfiguration = $this->configuration->get('indexing.' . $this->identifier . '.dataProcessing');
if (!empty($indexingConfiguration) && is_array($indexingConfiguration)) {
foreach ($indexingConfiguration as $configuration) {
$record = $this->dataProcessorService->executeDataProcessor($configuration, $record,
$this->identifier);
}
}
} catch (\Exception $e) {
if ($e instanceof InvalidArgumentException) {
// Nothing to do
} elseif ($e instanceof MissingArrayPathException) {
// Nothing to do
} else {
throw $e;
}
} catch (InvalidArgumentException $e) {
// Nothing to do.
}
$this->handleAbstract($record);
}
/**
* @param array $record
*
* @throws \Exception
*/
protected function handleAbstract(array &$record)
{
$record['search_abstract'] = '';
try {
$fieldsToUse = GeneralUtility::trimExplode(
',',
$this->configuration->get('indexing.' . $this->identifier . '.abstractFields')
);
$indexConfiguration = $this->configuration->get('indexing.' . $this->identifier . '.abstractFields');
$fieldsToUse = GeneralUtility::trimExplode(',', $indexConfiguration);
if ($fieldsToUse === []) {
return;
}
@ -156,15 +182,21 @@ abstract class AbstractIndexer implements IndexerInterface
break;
}
}
} catch (InvalidArgumentException $e) {
} catch (\Exception $e) {
if ($e instanceof InvalidArgumentException) {
return;
} elseif ($e instanceof MissingArrayPathException) {
return;
} else {
throw $e;
}
}
}
/**
* Returns the limit to use to fetch records.
*/
protected function getLimit() : int
protected function getLimit(): int
{
// TODO: Make configurable.
return 50;
@ -178,7 +210,7 @@ abstract class AbstractIndexer implements IndexerInterface
/**
* @throws NoRecordFoundException If record could not be found.
*/
abstract protected function getRecord(int $identifier) : array;
abstract protected function getRecord(int $identifier): array;
abstract protected function getDocumentName() : string;
abstract protected function getDocumentName(): string;
}

5
ext_localconf.php
View file

@ -42,12 +42,13 @@ call_user_func(
\Codappix\SearchCore\Compatibility\ImplementationRegistrationService::registerImplementations();
// API does make use of object manager, therefore use GLOBALS
$extensionConfiguration = \TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Core\Configuration\ExtensionConfiguration::class)->get($extensionKey);
if ($extensionConfiguration === false
|| !isset($extensionConfiguration['disable.']['elasticsearch'])
|| $extensionConfiguration['disable.']['elasticsearch'] !== '1'
|| !isset($extensionConfiguration['disable']['elasticsearch'])
|| $extensionConfiguration['disable']['elasticsearch'] !== '1'
) {
\TYPO3\CMS\Core\Utility\GeneralUtility::makeInstance(\TYPO3\CMS\Extbase\Object\Container\Container::class)
->registerImplementation(