Add quoted search functionality on browse sources page #1737
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…into issue-1632
dchiller
reviewed
Jan 24, 2025
| r'"(.*?)"', general_str | ||
| ) # Extract terms in quotes | ||
| unquoted_terms = re.findall( | ||
| r"\b[\w,-.]+\b", re.sub(r'"(.*?)"', "", general_str) |
There was a problem hiding this comment.
You could also do this with one regex with look-aheads/look-behinds:
(?<!\")\b[\w,-.]+\b(?!\")
There was a problem hiding this comment.
Probably clearer what's happening here with the way you have it now...
| # Add quoted terms to the Q object with exact matching (iexact) | ||
| for term in quoted_terms: | ||
| holding_institution_q |= Q( | ||
| holding_institution__name__unaccent__iexact=term |
There was a problem hiding this comment.
I don't think iexact is correct here...
If someone searches for "North Vancouver", don't I want any results where "North Vancouver" shows up somewhere in one of these fields, not just results where a field is exactly "North Vancouver"?
I think contains is probably still the method, it's just we're not searching single words, but sometimes groups of words depending on the quotes.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixed some bugs in the search functionality on the Browse Sources page by adding support for quoted phrase matching, allowing exact matches for phrases (e.g., "North Vancouver").
Enabled unaccented search terms to match fields with or without accents, applying both partial (icontains) and exact (iexact) matching logic across key fields like institution name, city, shelfmark, and more.
Updated the query logic to handle quoted and unquoted terms separately using regex for better granularity and consistency.
Added tests for these changes.
Resolves #1632. We should proceed with #435 as part of a more robust fix for these types of issues.