pcvolkmer/osc-variant
1
0
Fork 0
mirror of https://github.com/pcvolkmer/osc-variant.git synced 2025-04-19 19:56:50 +00:00
Code Issues

Issue #8: Use field ReferencedDataForm instead of Name

Browse Source
This commit is contained in:
Paul-Christian Volkmer 2023-09-30 15:37:09 +02:00
parent 416204b30a
commit 6be11a8951
2 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/model/data_form.rs
View File

@ -272,7 +272,13 @@ impl Requires for DataForm {
self.entries self.entries
.entry .entry
.iter() .iter()
.map(|item| item.type_ == "formReference" && item.name == name) .map(|item| {
item.type_ == "formReference"
&& match item.referenced_data_form.as_ref() {
Some(refname) => refname == name,
_ => false,
}
})
.filter(|&it| it) .filter(|&it| it)
.last() .last()
.unwrap_or_default() .unwrap_or_default()
@ -281,7 +287,13 @@ impl Requires for DataForm {
self.entries self.entries
.entry .entry
.iter() .iter()
.map(|item| item.type_ == "subform" && item.name == name) .map(|item| {
item.type_ == "subform"
&& match item.referenced_data_form.as_ref() {
Some(refname) => refname == name,
_ => false,
}
})
.filter(|&it| it) .filter(|&it| it)
.last() .last()
.unwrap_or_default() .unwrap_or_default()

16
src/model/unterformular.rs
View File

@ -276,7 +276,13 @@ impl Requires for Unterformular {
self.entries self.entries
.entry .entry
.iter() .iter()
.map(|item| item.type_ == "formReference" && item.name == name) .map(|item| {
item.type_ == "formReference"
&& match item.referenced_data_form.as_ref() {
Some(refname) => refname == name,
_ => false,
}
})
.filter(|&it| it) .filter(|&it| it)
.last() .last()
.unwrap_or_default() .unwrap_or_default()
@ -285,7 +291,13 @@ impl Requires for Unterformular {
self.entries self.entries
.entry .entry
.iter() .iter()
.map(|item| item.type_ == "subform" && item.name == name) .map(|item| {
item.type_ == "subform"
&& match item.referenced_data_form.as_ref() {
Some(refname) => refname == name,
_ => false,
}
})
.filter(|&it| it) .filter(|&it| it)
.last() .last()
.unwrap_or_default() .unwrap_or_default()