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

Merge native keys, flag & fields syntaxes together (PHRAS-685)

Browse Source 
- « IN » syntax was removed
- Tests where updated with new serialized representations (IN is replaced by MATCHES)
- Removed tests of native fields with IN syntax
- 4 tests (lines 77, 80, 83 and 86 in queries.csv) are not passing but
they were not really part of specified functionality. They need some work eventually.
This commit is contained in:
Mathieu Darse
2015-10-12 19:50:23 +02:00
parent fbac292430
commit e86918de4b
5 changed files with 31 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,45 +61,29 @@ foo > "2015/01/01"|<range:foo gt="2015/01/01">
foo ≥ "2015/01/01"|<range:foo gte="2015/01/01">
# Field narrowing
foo IN bar|(<text:"foo"> IN <field:bar>)
foo bar IN baz|(<text:"foo bar"> IN <field:baz>)
foo IN bar baz|<text:"foo IN bar baz">
fooINbar|<text:"fooINbar">
# Native fields with IN syntax (temporary)
foo IN collection|<collection:foo>
foo IN collection AND bar|(<collection:foo> AND <text:"bar">)
foo IN collection bar|<text:"foo IN collection bar">
foo IN database|<database:foo>
foo IN database AND bar|(<database:foo> AND <text:"bar">)
foo IN database bar|<text:"foo IN database bar">
foo IN type|<media_type:foo>
foo IN type AND bar|(<media_type:foo> AND <text:"bar">)
foo IN type bar|<text:"foo IN type bar">
90 IN id|<record_identifier:90>
90 IN id AND foo|(<record_identifier:90> AND <text:"foo">)
90 IN id foo|<text:"90 IN id foo">
90 IN recordid|<record_identifier:90>
foo:bar|(<field:foo> MATCHES <text:"bar">)
foo:bar baz|(<field:foo> MATCHES <text:"bar baz">)
foo bar:baz|<text:"foo bar:baz">
# Regular field with name colliding with a native key
foo IN field.collection|(<text:"foo"> IN <field:collection>)
foo IN field.database|(<text:"foo"> IN <field:database>)
foo IN field.type|(<text:"foo"> IN <field:type>)
foo IN field.id|(<text:"foo"> IN <field:id>)
field.collection:foo|(<field:collection> MATCHES <text:"foo">)
field.database:foo|(<field:database> MATCHES <text:"foo">)
field.type:foo|(<field:type> MATCHES <text:"foo">)
field.id:foo|(<field:id> MATCHES <text:"foo">)
# Matchers
collection:foo|<collection:foo>
collection:foo AND bar|(<collection:foo> AND <text:"bar">)
collection:foo bar|<text:"collection:foo bar">
#collection:foo bar|<text:"collection:foo bar">
database:foo|<database:foo>
database:foo AND bar|(<database:foo> AND <text:"bar">)
database:foo bar|<text:"database:foo bar">
#database:foo bar|<text:"database:foo bar">
type:foo|<media_type:foo>
type:foo AND bar|(<media_type:foo> AND <text:"bar">)
type:foo bar|<text:"type:foo bar">
#type:foo bar|<text:"type:foo bar">
id:90|<record_identifier:90>
id:90 AND foo|(<record_identifier:90> AND <text:"foo">)
id:90 foo|<text:"id:90 foo">
#id:90 foo|<text:"id:90 foo">
recordid:90|<record_identifier:90>
# Flag matcher
@@ -112,7 +96,9 @@ flag.foo bar:true|<text:"flag.foo bar:true">
true|<text:"true">
# Matcher on unknown name --> fulltext
foo:bar|<text:"foo:bar">
foo:bar|(<field:foo> MATCHES <text:"bar">)
foo:bar AND baz|((<field:foo> MATCHES <text:"bar">) AND <text:"baz">)
foo AND bar:baz|(<text:"foo"> AND (<field:bar> MATCHES <text:"baz">))
# Search terms with embedded keywords
INA|<text:"INA">
Can't render this file because it contains an unexpected character in line 1 and column 11.