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

Explicitly record ingredient ordering

Browse Source 
Previous versions relied on ID ordering, which theoretically is safe,
so it'll probably break horribly at some point.
This commit is contained in:
Chris 2016-09-20 23:02:27 +01:00
parent d91f9d45de
commit e9de229605
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -261,15 +261,16 @@ sub _add_recipe_ingredients {
# Prepare the add query to make work easier later # Prepare the add query to make work easier later
my $addh = $self -> {"dbh"} -> prepare("INSERT INTO `".$self -> {"settings"} -> {"database"} -> {"recipeing"}."` my $addh = $self -> {"dbh"} -> prepare("INSERT INTO `".$self -> {"settings"} -> {"database"} -> {"recipeing"}."`
(`recipe_id`, `unit_id`, `prep_id`, `ingred_id`, `quantity`, `notes`, `separator`) (`recipe_id`, `position`, `unit_id`, `prep_id`, `ingred_id`, `quantity`, `notes`, `separator`)
VALUES(?, ?, ?, ?, ?, ?, ?)"); VALUES(?, ?, ?, ?, ?, ?, ?, ?)");
# Now go through each of the ingredients # Now go through each of the ingredients
my $position = 0;
foreach my $ingred (@{$ingredients}) { foreach my $ingred (@{$ingredients}) {
# Handle serparators... separately # Handle serparators... separately
if($ingred -> {"separator"}) { if($ingred -> {"separator"}) {
$addh -> execute($recipeid, undef, undef, undef, undef, undef, $ingred -> {"name"}) $addh -> execute($recipeid, $position, undef, undef, undef, undef, undef, $ingred -> {"name"})
or return $self -> self_error("Error adding separator '".$ingred -> {"name"}."': ".$self -> {"dbh"} -> errstr()); or return $self -> self_error("Error adding separator '".$ingred -> {"name"}."': ".$self -> {"dbh"} -> errstr());
# Otherwise, it's a real ingredient, so we need to do the more complex work # Otherwise, it's a real ingredient, so we need to do the more complex work
@ -279,12 +280,14 @@ sub _add_recipe_ingredients {
or return $self -> self_error("Unable to get ingreditent ID for '".$ingred -> {"name"}."': ".$self -> {"ingredient"} -> errstr()); or return $self -> self_error("Unable to get ingreditent ID for '".$ingred -> {"name"}."': ".$self -> {"ingredient"} -> errstr());
# If we have an ID we can add the ingredient. # If we have an ID we can add the ingredient.
$addh -> execute($recipeid, $ingred -> {"quant"}, $ingred -> {"units"}, $ingred -> {"prepid"}, $ingid, $ingred -> {"notes"}, undef) $addh -> execute($recipeid, $position, $ingred -> {"units"}, $ingred -> {"prepid"}, $ingid, $ingred -> {"quant"}, $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 ingredient refcount # And increase the ingredient refcount
$self -> {"system"} -> {"ingredients"} -> increase_refcount($ingid); $self -> {"system"} -> {"ingredients"} -> increase_refcount($ingid);
} }
++$position;
} }
# Get here and all worked out okay # Get here and all worked out okay