}
if ($form->{no_assemblies}) {
- $filter .= qq| AND (NOT COALESCE(assembly, 'f'))|;
+ $filter .= qq| AND (NOT COALESCE(assembly, FALSE))|;
+ }
+ if ($form->{assemblies}) {
+ $filter .= qq| AND assembly=TRUE|; # alles was assembly ist rausgeben erweiterung für bin/mozilla/wh.pl -> transfer_assembly_update_part
+# eigentlich möchte ich diesen filter abbilden:
+# select distinct partnumber from parts inner join assembly on (parts.id = assembly.id) where assembly='t';
+# und so common ist die anweisung gar nicht. wie wäre es mit auslagern in WH.pm? -> get_all_working_assemblies? jb 21.2.2009
}
if ($form->{no_services}) {
- $filter .= qq| AND (COALESCE(inventory_accno_id, 0) > 0)|;
+ $filter .= qq| AND (inventory_accno_id is not NULL or assembly=TRUE)|; # @mb hier nochmal optimieren ... nach kurzer ruecksprache alles i.o.
}
substr($filter, 1, 3) = "WHERE" if ($filter);
my $base_path = substr($ENV{'SCRIPT_NAME'}, 1);
$base_path =~ s|[^/]+$||;
$base_path =~ s|/$||;
-
- if (opendir $dir, $path) {
+ # wo kommt der wert für dir her? es wird doch gar nichts übergeben? fix für strict my $dir jb 21.2.
+ if (opendir my $dir, $path) {
foreach my $file (sort { lc $a cmp lc $b } readdir $dir) {
next if (($file eq '.') || ($file eq '..'));
my $params = shift;
foreach my $key (@_) {
- if (!defined $params->{$key}) {
+ if ((ref $key eq '') && !defined $params->{$key}) {
my $subroutine = (caller(1))[3];
$main::form->error($main::locale->text("Missing parameter #1 in call to sub #2.", $key, $subroutine));
+
+ } elsif (ref $key eq 'ARRAY') {
+ my $found = 0;
+ foreach my $subkey (@{ $key }) {
+ if (defined $params->{$subkey}) {
+ $found = 1;
+ last;
+ }
+ }
+
+ if (!$found) {
+ my $subroutine = (caller(1))[3];
+ $main::form->error($main::locale->text("Missing parameter (at least one of #1) in call to sub #2.", join(', ', @{ $key }), $subroutine));
+ }
}
}
}
my $params = shift;
foreach my $key (@_) {
- if (!exists $params->{$key}) {
+ if ((ref $key eq '') && !exists $params->{$key}) {
my $subroutine = (caller(1))[3];
$main::form->error($main::locale->text("Missing parameter #1 in call to sub #2.", $key, $subroutine));
+
+ } elsif (ref $key eq 'ARRAY') {
+ my $found = 0;
+ foreach my $subkey (@{ $key }) {
+ if (exists $params->{$subkey}) {
+ $found = 1;
+ last;
+ }
+ }
+
+ if (!$found) {
+ my $subroutine = (caller(1))[3];
+ $main::form->error($main::locale->text("Missing parameter (at least one of #1) in call to sub #2.", join(', ', @{ $key }), $subroutine));
+ }
}
}
}