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

Merge pull request #1351 from mdarse/facets-strict-match-context-regression

Browse Source 
Fix strict facets regressions and add tests
This commit is contained in:
Benoît Burnichon
2015-04-16 09:39:26 +02:00
parent f2082f5c51 8d767788fe
commit fdf296cacf
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,7 +226,7 @@ class QueryVisitor implements Visit
continue; continue;
} }
if ($node instanceof AST\Context) { if ($node instanceof AST\Context) {
if ($root instanceof ContextAbleInterface) { if ($root instanceof AST\ContextAbleInterface) {
$root = $root->withContext($node); $root = $root->withContext($node);
} else { } else {
throw new \Exception('Unexpected context after non-contextualizable node'); throw new \Exception('Unexpected context after non-contextualizable node');

9
tests/Alchemy/Tests/Phrasea/SearchEngine/resources/queries.csv
View File

@@ -9,6 +9,15 @@ foo bar (baz qux)|<text:"foo bar" context:"baz qux">
[foo (bar)]|<term:"foo" context:"bar"> [foo (bar)]|<term:"foo" context:"bar">
[foo bar (baz qux)]|<term:"foo bar" context:"baz qux"> [foo bar (baz qux)]|<term:"foo bar" context:"baz qux">
# Raw string
r"foo"|<raw:"foo">
r"foo bar"|<raw:"foo bar">
r"\"foo\""|<raw:""foo"">
r"\o/"|<raw:"\o/">
r"\\o/"|<raw:"\o/">
r"foo \n bar"|<raw:"foo \n bar">
r"foo\\nbar"|<raw:"foo\nbar">
# Parenthesis grouping # Parenthesis grouping
(foo)|<text:"foo"> (foo)|<text:"foo">
(foo bar)|<text:"foo bar"> (foo bar)|<text:"foo bar">
Can't render this file because it contains an unexpected character in line 1 and column 11.