Chris/ORB
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix handling of optional ingredient fields

Browse Source
This commit is contained in:
Chris 2017-01-02 14:29:34 +00:00
parent 28427f9b67
commit b990d0b191
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
modules/ORB/System/Recipe.pm
View File

@ -560,20 +560,31 @@ sub _add_ingredients {
my $ingid = $self -> {"entities"} -> {"ingredients"} -> get_id($ingred -> {"name"}) my $ingid = $self -> {"entities"} -> {"ingredients"} -> get_id($ingred -> {"name"})
or return $self -> self_error("Unable to get ingreditent ID for '".$ingred -> {"name"}."': ".$self -> {"entities"} -> {"ingredients"} -> errstr()); or return $self -> self_error("Unable to get ingreditent ID for '".$ingred -> {"name"}."': ".$self -> {"entities"} -> {"ingredients"} -> errstr());
my $unitid = $self -> {"entities"} -> {"units"} -> get_id($ingred -> {"units"}) # Increase the entity refcounts
or return $self -> self_error("Unable to get unit ID for '".$ingred -> {"units"}."': ".$self -> {"entities"} -> {"units"} -> errstr()); $self -> {"entities"} -> {"ingredients"} -> increase_refcount($ingid)
or return $self -> self_error("Ingredient refcount error: ".$self -> {"entities"} -> {"ingredients"} -> errstr());
my $prepid = $self -> {"entities"} -> {"prep"} -> get_id($ingred -> {"prep"}) my ($unitid, $prepid);
or return $self -> self_error("Unable to get preparation method ID for '".$ingred -> {"prep"}."': ".$self -> {"entities"} -> {"prep"} -> errstr());
if($ingred -> {"units"}) {
$unitid = $self -> {"entities"} -> {"units"} -> get_id($ingred -> {"units"})
or return $self -> self_error("Unable to get unit ID for '".$ingred -> {"units"}."': ".$self -> {"entities"} -> {"units"} -> errstr());
$self -> {"entities"} -> {"units"} -> increase_refcount($unitid)
or return $self -> self_error("Unit refcount error: ".$self -> {"entities"} -> {"ingredients"} -> errstr());
}
if($ingred -> {"prep"}) {
$prepid = $self -> {"entities"} -> {"prep"} -> get_id($ingred -> {"prep"})
or return $self -> self_error("Unable to get preparation method ID for '".$ingred -> {"prep"}."': ".$self -> {"entities"} -> {"prep"} -> errstr());
$self -> {"entities"} -> {"prep"} -> increase_refcount($prepid)
or return $self -> self_error("Prep refcount error: ".$self -> {"entities"} -> {"ingredients"} -> errstr());
}
# If we have an ID we can add the ingredient. # If we have an ID we can add the ingredient.
$addh -> execute($recipeid, $position, $unitid, $prepid, $ingid, $ingred -> {"quantity"}, $ingred -> {"notes"}, undef) $addh -> execute($recipeid, $position, $unitid, $prepid, $ingid, $ingred -> {"quantity"}, $ingred -> {"notes"}, undef)
or return $self -> self_error("Unable to add ingredient '".$ingred -> {"name"}."' to recipe '$recipeid': ".$self -> {"dbh"} -> errstr()); or return $self -> self_error("Unable to add ingredient '".$ingred -> {"name"}."' to recipe '$recipeid': ".$self -> {"dbh"} -> errstr());
# And increase the entity refcounts
$self -> {"entities"} -> {"ingredients"} -> increase_refcount($ingid);
$self -> {"entities"} -> {"units"} -> increase_refcount($unitid);
$self -> {"entities"} -> {"prep"} -> increase_refcount($prepid);
} }
++$position; ++$position;