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 #1478 from mdarse/fix-concept-query-builder

Browse Source 
Fix concept query builder & private field wrapping
This commit is contained in:
Benoît Burnichon
2015-08-26 18:07:58 +02:00
parent 065084818b c596914ab9
commit b1bdd73662
6 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/Alchemy/Tests/Phrasea/SearchEngine/AST/QuotedTextNodeTest.php
View File

@@ -79,19 +79,20 @@ class QuotedTextNodeTest extends \PHPUnit_Framework_TestCase
"lenient": true
}
}, {
"bool": {
"must": [{
"filtered": {
"filter": {
"terms": {
"base_id": [1, 2, 3]
}
}, {
},
"query": {
"multi_match": {
"type": "phrase",
"fields": ["private_caption.bar.fr", "private_caption.bar.en"],
"query": "baz",
"lenient": true
}
}]
}
}
}]
}

30
tests/Alchemy/Tests/Phrasea/SearchEngine/AST/TermNodeTest.php
View File

@@ -121,23 +121,27 @@ class TermNodeTest extends \PHPUnit_Framework_TestCase
"query": "/qux"
}
}, {
"bool": {
"must": [{
"filtered": {
"filter": {
"terms": {
"base_id": [1, 2, 3]
}
}],
"should": [{
"multi_match": {
"fields": ["concept_path.bar"],
"query": "/baz"
},
"query": {
"bool": {
"should": [{
"multi_match": {
"fields": ["concept_path.bar"],
"query": "/baz"
}
}, {
"multi_match": {
"fields": ["concept_path.bar"],
"query": "/qux"
}
}]
}
}, {
"multi_match": {
"fields": ["concept_path.bar"],
"query": "/qux"
}
}]
}
}
}]
}

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

@@ -98,19 +98,20 @@ class TextNodeTest extends \PHPUnit_Framework_TestCase
"lenient": true
}
}, {
"bool": {
"must": [{
"filtered": {
"filter": {
"terms": {
"base_id": [1, 2, 3]
}
}, {
},
"query": {
"multi_match": {
"fields": ["private_caption.bar.fr", "private_caption.bar.en"],
"query": "baz",
"operator": "and",
"lenient": true
}
}]
}
}
}]
}