hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 14:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

PHRAS-2805 #comment Port41 of Facet-case-sensibility

Browse Source
This commit is contained in:
Harrys Ravalomanana
2019-11-14 15:02:04 +04:00
parent e4516644c4
commit 5e4da5f28f
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Alchemy/Phrasea/Controller/Prod/QueryController.php
View File

@@ -382,7 +382,6 @@ class QueryController extends Controller
'labels' => $field->get_labels(), 'labels' => $field->get_labels(),
'type' => $field->get_type(), 'type' => $field->get_type(),
'field' => $field->get_name(), 'field' => $field->get_name(),
'query' => "field." . $field->get_name() . ":%s",
'trans_label' => $field->get_label($this->app['locale']), 'trans_label' => $field->get_label($this->app['locale']),
]; ];
$field->get_label($this->app['locale']); $field->get_label($this->app['locale']);

2
lib/Alchemy/Phrasea/SearchEngine/Elastic/ElasticsearchOptions.php
View File

@@ -323,7 +323,7 @@ class ElasticsearchOptions
"aggregated (2 values: fired = 0 or 1)" => -1, "aggregated (2 values: fired = 0 or 1)" => -1,
], ],
'output_formatter' => function($value) { 'output_formatter' => function($value) {
static $map = ['0'=>"No flash", '1'=>"Flash"]; static $map = ["false"=>"No flash", "true"=>"Flash", '0'=>"No flash", '1'=>"Flash"];
return array_key_exists($value, $map) ? $map[$value] : $value; return array_key_exists($value, $map) ? $map[$value] : $value;
}, },
], ],

5
lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/Escaper.php
View File

@@ -4,6 +4,11 @@ namespace Alchemy\Phrasea\SearchEngine\Elastic\Search;
class Escaper class Escaper
{ {
public function quoteWord($value)
{
return '"' . $this->escapeRaw($value) . '"';
}
public function escapeWord($value) public function escapeWord($value)
{ {
// Strip double quotes from values to prevent broken queries // Strip double quotes from values to prevent broken queries

2
lib/Alchemy/Phrasea/SearchEngine/Elastic/Search/FacetsResponse.php
View File

@@ -62,7 +62,7 @@ class FacetsResponse
'value' => $key, 'value' => $key,
'raw_value' => $key, 'raw_value' => $key,
'count' => $bucket['doc_count'], 'count' => $bucket['doc_count'],
'query' => sprintf('field.%s:%s', $this->escaper->escapeWord($name), $this->escaper->escapeWord($key)) 'query' => sprintf('field.%s=%s', $this->escaper->escapeWord($name), $this->escaper->quoteWord($key))
]; ];
} }

4
tests/Alchemy/Tests/Phrasea/SearchEngine/Structure/ValueCheckerTest.php
View File

@@ -14,14 +14,14 @@ use Alchemy\Phrasea\SearchEngine\Elastic\Structure\Typed;
class ValueCheckerTest extends \PHPUnit_Framework_TestCase class ValueCheckerTest extends \PHPUnit_Framework_TestCase
{ {
/** /**
* @dataProvider escapeRawProvider * @dataProvider valueCheckerProvider
*/ */
public function testValueCompatibility($subject, $value, $compatible) public function testValueCompatibility($subject, $value, $compatible)
{ {
$this->assertEquals($compatible, ValueChecker::isValueCompatible($subject, $value)); $this->assertEquals($compatible, ValueChecker::isValueCompatible($subject, $value));
} }
public function escapeRawProvider() public function valueCheckerProvider()
{ {
$values = [ $values = [
[FieldMapping::TYPE_FLOAT , 42 , true ], [FieldMapping::TYPE_FLOAT , 42 , true ],