Skip to content

Scc 5296/8#696

Open
danamansana wants to merge 19 commits intomainfrom
scc-5296/8
Open

Scc 5296/8#696
danamansana wants to merge 19 commits intomainfrom
scc-5296/8

Conversation

@danamansana
Copy link
Copy Markdown
Contributor

@danamansana danamansana commented Apr 2, 2026 •
edited
Loading

This PR addresses issues in SCC-5296 and SCC-5298, and makes extensive use of AI assistance.

Some modifications to the grammar:

  • allow whitespace around parentheses
  • allow (and ignore) surrounding whitespace in query terms
  • allow single-word queries to not use quotes
  • make controlled vocab terms (e.g. scope terms like title or author, operators like AND or NOT, relation terms like any or all) case insensitive

Fix bug where displayParsed was returning text backwards

Fix bug where top-level query for cql queries was should instead of must, which allowed spurious matches whenever filters were applied

Add a CqlQuery class so we can use the same AST for buildEsQuery and displayParsed and not parse twice

Require date format to pass validation

Include items with cql results

Fix/Update/Add tests

danamansana added 19 commits April 1, 2026 12:57
@danamansana
Fix tests for cql grammar
d4e66c7
@danamansana
&ai Update grammar and tests
8adffea 
- Grammar now allows for unquoted single word queries
- Special characters are allowed only in quoted queries
- Update tests to reflect this
@danamansana
&ai Add case insensitivity in grammar operators
8bcab30
@danamansana
Add support for case-insensitive scope/connective/relation
6cac1c1
@danamansana
Add support for upper and lowercase in cql reserved terms
29351f8
@danamansana
Add CqlQuery class
670561c
@danamansana
Add more whitespace to whitespace test
4723233
@danamansana
Add unquoted_words as top-level phrases
dae24b4
@danamansana
Add test for single word query without quotes
da35b34
@danamansana
Add date validation
79ae5eb
@danamansana
&ai add test for date validation
dc4b62d
@danamansana
&ai Add tests for displayParsed and fix some bugs
230731a
@danamansana
&ai add some more tests for displayParsed
5c6542e
@danamansana
&ai fix linting
3b49d33
@danamansana
Remove cql check for addInnerHits
304c191
@danamansana
Remove python version
e335227
@danamansana
&ai Fix top-level should to must
ecb35d0
@danamansana
Remove extraneous comment
48392a0
@danamansana
Add trimming of whitespace within query terms
19b2e66
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@nonword nonword nonword approved these changes

@yossariano yossariano Awaiting requested review from yossariano

@charmingduchess charmingduchess Awaiting requested review from charmingduchess

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@danamansana @nonword