deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #151 from geecu/fix_search_command

Browse source 
fix search command when no index option is passed
This commit is contained in:
Richard Miller 2012-08-10 02:26:14 -07:00
parent 14fcc5faa1 3cdfcf1cea
commit 20a58c502c
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Command/SearchCommand.php
View file

@ -40,7 +40,8 @@ class SearchCommand extends ContainerAwareCommand
*/ */
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
$index = $this->getContainer()->get('foq_elastica.index_manager')->getIndex($input->getOption('index')); $indexName = $input->getOption('index');
$index = $this->getContainer()->get('foq_elastica.index_manager')->getIndex($indexName ? $indexName : null);
$type = $index->getType($input->getArgument('type')); $type = $index->getType($input->getArgument('type'));
$query = Elastica_Query::create($input->getArgument('query')); $query = Elastica_Query::create($input->getArgument('query'));
$query->setLimit($input->getOption('limit')); $query->setLimit($input->getOption('limit'));

4
IndexManager.php
View file

@ -13,10 +13,10 @@ class IndexManager
* @param array $indexesByName * @param array $indexesByName
* @param string $defaultIndexName * @param string $defaultIndexName
*/ */
public function __construct(array $indexesByName, $defaultIndexName) public function __construct(array $indexesByName, $defaultIndex)
{ {
$this->indexesByName = $indexesByName; $this->indexesByName = $indexesByName;
$this->defaultIndexName = $defaultIndexName; $this->defaultIndexName = $defaultIndex->getName();
} }
/** /**