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

Merge pull request #1497 from mdarse/fix-691-cross-field-query

Browse Source 
PHRAS-691
This commit is contained in:
Benoît Burnichon
2015-09-08 10:52:07 +02:00
parent bfdbf0fa96 2afd15dd38
commit a41df40d49
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Alchemy/Phrasea/SearchEngine/Elastic/AST/TextNode.php
View File

@@ -53,6 +53,7 @@ class TextNode extends AbstractTermNode implements ContextAbleInterface
'multi_match' => [ 'multi_match' => [
'fields' => $index_fields, 'fields' => $index_fields,
'query' => $this->text, 'query' => $this->text,
'type' => 'cross_fields',
'operator' => 'and', 'operator' => 'and',
'lenient' => true, 'lenient' => true,
] ]

6
tests/Alchemy/Tests/Phrasea/SearchEngine/AST/TextNodeTest.php
View File

@@ -55,6 +55,7 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase
"multi_match": { "multi_match": {
"fields": ["foo.fr", "foo.en"], "fields": ["foo.fr", "foo.en"],
"query": "bar", "query": "bar",
"type": "cross_fields",
"operator": "and", "operator": "and",
"lenient": true "lenient": true
} }
@@ -94,6 +95,7 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase
"multi_match": { "multi_match": {
"fields": ["foo.fr", "foo.en"], "fields": ["foo.fr", "foo.en"],
"query": "baz", "query": "baz",
"type": "cross_fields",
"operator": "and", "operator": "and",
"lenient": true "lenient": true
} }
@@ -108,6 +110,7 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase
"multi_match": { "multi_match": {
"fields": ["private_caption.bar.fr", "private_caption.bar.en"], "fields": ["private_caption.bar.fr", "private_caption.bar.en"],
"query": "baz", "query": "baz",
"type": "cross_fields",
"operator": "and", "operator": "and",
"lenient": true "lenient": true
} }
@@ -140,6 +143,7 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase
"multi_match": { "multi_match": {
"fields": ["foo.fr", "foo.en"], "fields": ["foo.fr", "foo.en"],
"query": "bar", "query": "bar",
"type": "cross_fields",
"operator": "and", "operator": "and",
"lenient": true "lenient": true
} }
@@ -189,6 +193,7 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase
"multi_match": { "multi_match": {
"fields": ["foo.fr", "foo.en"], "fields": ["foo.fr", "foo.en"],
"query": "baz", "query": "baz",
"type": "cross_fields",
"operator": "and", "operator": "and",
"lenient": true "lenient": true
} }
@@ -212,6 +217,7 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase
"multi_match": { "multi_match": {
"fields": ["private_caption.bar.fr", "private_caption.bar.en"], "fields": ["private_caption.bar.fr", "private_caption.bar.en"],
"query": "baz", "query": "baz",
"type": "cross_fields",
"operator": "and", "operator": "and",
"lenient": true "lenient": true
} }