GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 06:22:22 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Fix searching for non-blank adjacent wildcard fields (#4009)

Browse source 
* modify collect_ranges to take param on whether to join ranges

* update tests

* update existing call

* fix searching for non-empty wildcard fields
This commit is contained in:
llama 2025-05-19 11:15:23 +08:00 committed by GitHub
parent ed13a351b9
commit d667abffd1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
rslib/src/search/sqlwriter.rs
View file

@ -583,8 +583,10 @@ impl SqlWriter<'_> {
} }
fn write_single_field(&mut self, field_name: &str, val: &str) -> Result<()> { fn write_single_field(&mut self, field_name: &str, val: &str) -> Result<()> {
let field_indicies_by_notetype = let field_indicies_by_notetype = self.num_fields_and_fields_indices_by_notetype(
self.num_fields_and_fields_indices_by_notetype(field_name)?; field_name,
matches!(val, "*" | "_*" | "*_"),
)?;
if field_indicies_by_notetype.is_empty() { if field_indicies_by_notetype.is_empty() {
write!(self.sql, "false").unwrap(); write!(self.sql, "false").unwrap();
return Ok(()); return Ok(());
@ -630,6 +632,7 @@ impl SqlWriter<'_> {
fn num_fields_and_fields_indices_by_notetype( fn num_fields_and_fields_indices_by_notetype(
&mut self, &mut self,
field_name: &str, field_name: &str,
test_for_nonempty: bool,
) -> Result<Vec<FieldQualifiedSearchContext>> { ) -> Result<Vec<FieldQualifiedSearchContext>> {
let matches_glob = glob_matcher(field_name); let matches_glob = glob_matcher(field_name);
@ -640,7 +643,7 @@ impl SqlWriter<'_> {
.iter() .iter()
.filter(|&field| matches_glob(&field.name)) .filter(|&field| matches_glob(&field.name))
.map(|field| field.ord.unwrap_or_default()) .map(|field| field.ord.unwrap_or_default())
.collect_ranges(); .collect_ranges(!test_for_nonempty);
if !matched_fields.is_empty() { if !matched_fields.is_empty() {
field_map.push(FieldQualifiedSearchContext { field_map.push(FieldQualifiedSearchContext {
ntid: nt.id, ntid: nt.id,
@ -697,7 +700,7 @@ impl SqlWriter<'_> {
} }
(!field.config.exclude_from_search).then_some(ord) (!field.config.exclude_from_search).then_some(ord)
}) })
.collect_ranges(); .collect_ranges(true);
if !matched_fields.is_empty() { if !matched_fields.is_empty() {
field_map.push(UnqualifiedSearchContext { field_map.push(UnqualifiedSearchContext {
ntid: nt.id, ntid: nt.id,
@ -899,7 +902,7 @@ impl RequiredTable {
/// contiguous numbers. /// contiguous numbers.
trait CollectRanges { trait CollectRanges {
type Item; type Item;
fn collect_ranges(self) -> Vec<Range<Self::Item>>; fn collect_ranges(self, join: bool) -> Vec<Range<Self::Item>>;
} }
impl< impl<
@ -909,7 +912,7 @@ impl<
{ {
type Item = Idx; type Item = Idx;
fn collect_ranges(self) -> Vec<Range<Self::Item>> { fn collect_ranges(self, join: bool) -> Vec<Range<Self::Item>> {
let mut result = Vec::new(); let mut result = Vec::new();
let mut iter = self.into_iter(); let mut iter = self.into_iter();
let next = iter.next(); let next = iter.next();
@ -920,7 +923,7 @@ impl<
let mut end = next.unwrap(); let mut end = next.unwrap();
for i in iter { for i in iter {
if i == end + 1.into() { if join && i == end + 1.into() {
end = end + 1.into(); end = end + 1.into();
} else { } else {
result.push(start..end + 1.into()); result.push(start..end + 1.into());
@ -1334,7 +1337,8 @@ c.odue != 0 then c.odue else c.due end) != {days}) or (c.queue in (1,4) and
#[allow(clippy::single_range_in_vec_init)] #[allow(clippy::single_range_in_vec_init)]
#[test] #[test]
fn ranges() { fn ranges() {
assert_eq!([1, 2, 3].collect_ranges(), [1..4]); assert_eq!([1, 2, 3].collect_ranges(true), [1..4]);
assert_eq!([1, 3, 4].collect_ranges(), [1..2, 3..5]); assert_eq!([1, 3, 4].collect_ranges(true), [1..2, 3..5]);
assert_eq!([1, 2, 5, 6].collect_ranges(false), [1..2, 2..3, 5..6, 6..7]);
} }
} }