Kieran/snort
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix search

Browse Source
This commit is contained in:
Kieran
2023-09-22 21:24:44 +01:00
parent d3c0b866f2
commit c12703791a
2 changed files with 4 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
packages/system-wasm/src/filter.rs
View File

@ -34,7 +34,7 @@ pub struct ReqFilter {
#[serde(rename = "#g", skip_serializing_if = "Option::is_none")] #[serde(rename = "#g", skip_serializing_if = "Option::is_none")]
pub g_tag: Option<HashSet<String>>, pub g_tag: Option<HashSet<String>>,
#[serde(rename = "search", skip_serializing_if = "Option::is_none")] #[serde(rename = "search", skip_serializing_if = "Option::is_none")]
pub search: Option<HashSet<String>>, pub search: Option<String>,
#[serde(rename = "since", skip_serializing_if = "Option::is_none")] #[serde(rename = "since", skip_serializing_if = "Option::is_none")]
pub since: Option<i32>, pub since: Option<i32>,
#[serde(rename = "until", skip_serializing_if = "Option::is_none")] #[serde(rename = "until", skip_serializing_if = "Option::is_none")]
@ -122,7 +122,6 @@ impl Distance for FlatReqFilter {
ret += prop_dist(&self.d_tag, &b.d_tag); ret += prop_dist(&self.d_tag, &b.d_tag);
ret += prop_dist(&self.r_tag, &b.r_tag); ret += prop_dist(&self.r_tag, &b.r_tag);
ret += prop_dist(&self.t_tag, &b.t_tag); ret += prop_dist(&self.t_tag, &b.t_tag);
ret += prop_dist(&self.search, &b.search);
ret ret
} }
@ -171,7 +170,7 @@ impl From<Vec<&FlatReqFilter>> for ReqFilter {
array_prop_append(&x.r_tag, &mut acc.r_tag); array_prop_append(&x.r_tag, &mut acc.r_tag);
array_prop_append(&x.a_tag, &mut acc.a_tag); array_prop_append(&x.a_tag, &mut acc.a_tag);
array_prop_append(&x.g_tag, &mut acc.g_tag); array_prop_append(&x.g_tag, &mut acc.g_tag);
array_prop_append(&x.search, &mut acc.search); acc.search = x.search.to_owned();
acc.since = x.since; acc.since = x.since;
acc.until = x.until; acc.until = x.until;
acc.limit = x.limit; acc.limit = x.limit;
@ -210,7 +209,7 @@ impl From<Vec<&ReqFilter>> for ReqFilter {
array_prop_append_vec(&x.r_tag, &mut acc.r_tag); array_prop_append_vec(&x.r_tag, &mut acc.r_tag);
array_prop_append_vec(&x.a_tag, &mut acc.a_tag); array_prop_append_vec(&x.a_tag, &mut acc.a_tag);
array_prop_append_vec(&x.g_tag, &mut acc.g_tag); array_prop_append_vec(&x.g_tag, &mut acc.g_tag);
array_prop_append_vec(&x.search, &mut acc.search); acc.search = x.search.to_owned();
acc.since = x.since; acc.since = x.since;
acc.until = x.until; acc.until = x.until;
acc.limit = x.limit; acc.limit = x.limit;
@ -295,13 +294,6 @@ impl Into<Vec<FlatReqFilter>> for &ReqFilter {
.collect(); .collect();
inputs.push(t_ids); inputs.push(t_ids);
} }
if let Some(search) = &self.search {
let t_ids = search
.iter()
.map(|z| StringOrNumberEntry::String(("search", z)))
.collect();
inputs.push(t_ids);
}
for p in inputs.iter().multi_cartesian_product() { for p in inputs.iter().multi_cartesian_product() {
ret.push(FlatReqFilter { ret.push(FlatReqFilter {
@ -385,14 +377,7 @@ impl Into<Vec<FlatReqFilter>> for &ReqFilter {
} }
None None
}), }),
search: p.iter().find_map(|q| { search: self.search.to_owned(),
if let StringOrNumberEntry::String((k, v)) = q {
if (*k).eq("search") {
return Some((*v).to_string());
}
}
None
}),
since: self.since, since: self.since,
until: self.until, until: self.until,
limit: self.limit, limit: self.limit,
@ -415,7 +400,6 @@ impl Distance for ReqFilter {
ret += prop_dist_vec(&self.r_tag, &b.r_tag); ret += prop_dist_vec(&self.r_tag, &b.r_tag);
ret += prop_dist_vec(&self.t_tag, &b.t_tag); ret += prop_dist_vec(&self.t_tag, &b.t_tag);
ret += prop_dist_vec(&self.a_tag, &b.a_tag); ret += prop_dist_vec(&self.a_tag, &b.a_tag);
ret += prop_dist_vec(&self.search, &b.search);
ret ret
} }

0
packages/system-wasm/src/utils.rs
View File