X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FMenu.pm;h=bdac42c0de54a5a11904540a48767bcf0802f68e;hb=bc40bcabc425b99f3b79a5544684a6fe8674adfe;hp=6bbcffb9c8af8adbfc42883522e3298b47a2e5cd;hpb=8f3e8a0254bc848d02958cc5e1fcdf600d5632a8;p=kivitendo-erp.git diff --git a/SL/Menu.pm b/SL/Menu.pm index 6bbcffb9c..bdac42c0d 100644 --- a/SL/Menu.pm +++ b/SL/Menu.pm @@ -28,11 +28,24 @@ sub new { my $nodes_by_id = {}; for my $file (@files) { my $data; - if ($yaml_xs) { - $data = YAML::XS::LoadFile(File::Spec->catfile($path, $file)); - } else { - $data = YAML::LoadFile(File::Spec->catfile($path, $file)); - } + eval { + if ($yaml_xs) { + $data = YAML::XS::LoadFile(File::Spec->catfile($path, $file)); + } else { + $data = YAML::LoadFile(File::Spec->catfile($path, $file)); + } + 1; + } or do { + die "Error while parsing $file: $@"; + }; + + # check if this file is internally consistent. + die 'not an array ref' unless $data && 'ARRAY' eq ref $data; # TODO get better diag to user + + # in particular duplicate ids tend to come up as a user error when editing the menu files + my %uniq_ids; + $uniq_ids{$_->{id}}++ && die "Error in $file: duplicate id $_->{id}" for @$data; + _merge($nodes, $nodes_by_id, $data); } @@ -57,8 +70,6 @@ sub new { sub _merge { my ($nodes, $by_id, $data) = @_; - die 'not an array ref' unless $data && 'ARRAY' eq ref $data; # TODO check this sooner, to get better diag to user - for my $node (@$data) { my $id = $node->{id};