Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 53c7990b

Von Moritz Bunkus vor mehr als 16 Jahren hinzugefügt

  • ID 53c7990b4993f759c1ddfa33f84d1b3560b0a61e
  • Vorgänger 38e559c1
  • Nachfolger 5df2b57a

Kosmetik

Unterschiede anzeigen:

SL/DBUpgrade2.pm
my $control = {
"priority" => 1000,
"depends" => [],
"depends" => [],
};
while (<IN>) {
......
$control->{charset} ||= Common::DEFAULT_CHARSET;
_control_error($form, $file_name,
$locale->text("Missing 'tag' field."))
unless ($control->{"tag"});
_control_error($form, $file_name,
$locale->text("The 'tag' field must only consist of " .
"alphanumeric characters or the carachters " .
"- _ ( )"))
if ($control->{"tag"} =~ /[^a-zA-Z0-9_\(\)\-]/);
if (!$control->{"tag"}) {
_control_error($form, $file_name, $locale->text("Missing 'tag' field.")) ;
}
_control_error($form, $file_name,
sprintf($locale->text("More than one control file " .
"with the tag '%s' exist."),
$control->{"tag"}))
if (defined($all_controls{$control->{"tag"}}));
if ($control->{"tag"} =~ /[^a-zA-Z0-9_\(\)\-]/) {
_control_error($form, $file_name, $locale->text("The 'tag' field must only consist of alphanumeric characters or the carachters - _ ( )"))
}
_control_error($form, $file_name,
sprintf($locale->text("Missing 'description' field.")))
unless ($control->{"description"});
if (defined($all_controls{$control->{"tag"}})) {
_control_error($form, $file_name, sprintf($locale->text("More than one control file with the tag '%s' exist."), $control->{"tag"}))
}
$control->{"priority"} *= 1;
$control->{"priority"} = 1000 unless ($control->{"priority"});
if (!$control->{"description"}) {
_control_error($form, $file_name, sprintf($locale->text("Missing 'description' field."))) ;
}
$control->{"file"} = $file;
$control->{"priority"} *= 1;
$control->{"priority"} ||= 1000;
$control->{"file"} = $file;
map({ delete($control->{$_}); } qw(depth applied));
delete @{$control}{qw(depth applied)};
$all_controls{$control->{"tag"}} = $control;
......
foreach my $control (values(%all_controls)) {
foreach my $dependency (@{$control->{"depends"}}) {
_control_error($form, $control->{"file"},
sprintf($locale->text("Unknown dependency '%s'."),
$dependency))
if (!defined($all_controls{$dependency}));
_control_error($form, $control->{"file"}, sprintf($locale->text("Unknown dependency '%s'."), $dependency)) if (!defined($all_controls{$dependency}));
}
map({ $_->{"loop"} = 0; } values(%all_controls));
_check_for_loops($form, $control->{"file"}, \%all_controls,
$control->{"tag"});
_check_for_loops($form, $control->{"file"}, \%all_controls, $control->{"tag"});
}
map({ _dbupdate2_calculate_depth(\%all_controls, $_->{"tag"}) }
......
if ($ctrl->{"loop"} == 1) {
# Not done yet.
_control_error($form, $file_name,
$main::locale->text("Dependency loop detected:") .
" " . join(" -> ", @path))
_control_error($form, $file_name, $main::locale->text("Dependency loop detected:") . " " . join(" -> ", @path))
} elsif ($ctrl->{"loop"} == 0) {
# Not checked yet.
$ctrl->{"loop"} = 1;
map({ _check_for_loops($form, $file_name, $controls, $_, @path); }
@{ $ctrl->{"depends"} });
map({ _check_for_loops($form, $file_name, $controls, $_, @path); } @{ $ctrl->{"depends"} });
$ctrl->{"loop"} = 2;
}
}
......
$form = $main::form;
my $locale = $main::locale;
$form->error(sprintf($locale->text("Error in database control file '%s': %s"),
$file_name, $message));
$form->error(sprintf($locale->text("Error in database control file '%s': %s"), $file_name, $message));
}
sub _dbupdate2_calculate_depth {
......
}
sub sort_dbupdate_controls {
return
sort({ $a->{"depth"} != $b->{"depth"} ? $a->{"depth"} <=> $b->{"depth"} :
$a->{"priority"} != $b->{"priority"} ?
$a->{"priority"} <=> $b->{"priority"} :
$a->{"tag"} cmp $b->{"tag"} } values(%{$_[0]}));
return sort({ $a->{"depth"} != $b->{"depth"} ? $a->{"depth"} <=> $b->{"depth"}
: $a->{"priority"} != $b->{"priority"} ? $a->{"priority"} <=> $b->{"priority"}
: $a->{"tag"} cmp $b->{"tag"} } values(%{$_[0]}));
}
1;

Auch abrufbar als: Unified diff