Commit b6698661 authored by Bas de Nooijer's avatar Bas de Nooijer

- fixed the configuration mode for select queries

parent 44ef2299
......@@ -453,7 +453,11 @@ class Solarium_Query_Select extends Solarium_Query
*/
public function addFilterQueries(array $filterQueries)
{
foreach ($filterQueries AS $filterQuery) {
foreach ($filterQueries AS $key => $filterQuery) {
// in case of a config array: add key to config
if(is_array($filterQuery)) $filterQuery['key'] = $key;
$this->addFilterQuery($filterQuery);
}
......@@ -560,7 +564,11 @@ class Solarium_Query_Select extends Solarium_Query
*/
public function addFacets(array $facets)
{
foreach ($facets AS $facet) {
foreach ($facets AS $key => $facet) {
// in case of a config array: add key to config
if(is_array($facet)) $facet['key'] = $key;
$this->addFacet($facet);
}
......
......@@ -76,7 +76,11 @@ abstract class Solarium_Query_Select_Facet extends Solarium_Configurable
{
foreach ($this->_options AS $name => $value) {
switch ($name) {
case 'key':
$this->setKey($value);
break;
case 'exclude':
if(!is_array($value)) $value = array($value);
$this->setExcludes($value);
break;
}
......
......@@ -70,8 +70,12 @@ class Solarium_Query_Select_FilterQuery extends Solarium_Configurable
foreach ($this->_options AS $name => $value) {
switch ($name) {
case 'tag':
if(!is_array($value)) $value = array($value);
$this->addTags($value);
break;
case 'key':
$this->setKey($value);
break;
case 'query':
$this->setQuery($value);
break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment