CVars: beim Einlesen für Sub-Modules Gültigkeit richtig bestimmen

[mfinanz.git] / SL / IC.pm

diff --git a/SL/IC.pm b/SL/IC.pm
index 1a02c59c62627a0b776e9e244f1cf1eccd09fd28..8f265029f2c587894dfc89f1ab29e542b045d136 100644 (file)
--- a/SL/IC.pm
+++ b/SL/IC.pm
@@ -42,6 +42,7 @@ use SL::CVar;
 use SL::DBUtils;
 use SL::HTML::Restrict;
 use SL::TransNumber;
 use SL::DBUtils;
 use SL::HTML::Restrict;
 use SL::TransNumber;

+use SL::Util qw(trim);

 
 use strict;
 
 
 use strict;
 


@@ -590,12 +591,12 @@ sub retrieve_assemblies {
 
   if ($form->{partnumber}) {
     $where .= qq| AND (p.partnumber ILIKE ?)|;
 
   if ($form->{partnumber}) {
     $where .= qq| AND (p.partnumber ILIKE ?)|;

-    push(@values, '%' . $form->{partnumber} . '%');
+    push(@values, like($form->{partnumber}));

   }
 
   if ($form->{description}) {
     $where .= qq| AND (p.description ILIKE ?)|;
   }
 
   if ($form->{description}) {
     $where .= qq| AND (p.description ILIKE ?)|;

-    push(@values, '%' . $form->{description} . '%');
+    push(@values, like($form->{description}));

   }
 
   # retrieve assembly items
   }
 
   # retrieve assembly items


@@ -651,7 +652,7 @@ sub assembly_item {
   while (my ($column, $table) = each(%columns)) {
     next unless ($form->{"${column}_$i"});
     $where .= qq| AND ${table}.${column} ILIKE ?|;
   while (my ($column, $table) = each(%columns)) {
     next unless ($form->{"${column}_$i"});
     $where .= qq| AND ${table}.${column} ILIKE ?|;

-    push(@values, '%' . $form->{"${column}_$i"} . '%');
+    push(@values, like($form->{"${column}_$i"}));

   }
 
   if ($form->{id}) {
   }
 
   if ($form->{id}) {


@@ -862,13 +863,14 @@ sub all_parts {
   #===== switches and simple filters ========#
 
   # special case transdate
   #===== switches and simple filters ========#
 
   # special case transdate

-  if (grep { $form->{$_} } qw(transdatefrom transdateto)) {
+  if (grep { trim($form->{$_}) } qw(transdatefrom transdateto)) {

     $form->{"l_transdate"} = 1;
     push @select_tokens, 'transdate';
     for (qw(transdatefrom transdateto)) {
     $form->{"l_transdate"} = 1;
     push @select_tokens, 'transdate';
     for (qw(transdatefrom transdateto)) {

-      next unless $form->{$_};
+      my $value = trim($form->{$_});
+      next unless $value;

       push @where_tokens, sprintf "transdate %s ?", /from$/ ? '>=' : '<=';
       push @where_tokens, sprintf "transdate %s ?", /from$/ ? '>=' : '<=';

-      push @bind_vars,    $form->{$_};
+      push @bind_vars,    $value;

     }
   }
 
     }
   }
 


@@ -876,11 +878,11 @@ sub all_parts {
   if ($form->{all}) {
     $form->{"l_$_"} = 1 for qw(partnumber description unit sellprice lastcost cvar_packaging linetotal);
     push @where_tokens, "p.partnumber ILIKE ? OR p.description ILIKE ?";
   if ($form->{all}) {
     $form->{"l_$_"} = 1 for qw(partnumber description unit sellprice lastcost cvar_packaging linetotal);
     push @where_tokens, "p.partnumber ILIKE ? OR p.description ILIKE ?";

-    push @bind_vars,    "%$form->{all}%", "%$form->{all}%";
+    push @bind_vars,    (like($form->{all})) x 2;

   }
 
   # special case insertdate
   }
 
   # special case insertdate

-  if (grep { $form->{$_} } qw(insertdatefrom insertdateto)) {
+  if (grep { trim($form->{$_}) } qw(insertdatefrom insertdateto)) {

     $form->{"l_insertdate"} = 1;
     push @select_tokens, 'insertdate';
 
     $form->{"l_insertdate"} = 1;
     push @select_tokens, 'insertdate';
 


@@ -888,9 +890,10 @@ sub all_parts {
     my $token = $token_builder->('insertdate');
 
     for (qw(insertdatefrom insertdateto)) {
     my $token = $token_builder->('insertdate');
 
     for (qw(insertdatefrom insertdateto)) {

-      next unless $form->{$_};
+      my $value = trim($form->{$_});
+      next unless $value;

       push @where_tokens, sprintf "$token %s ?", /from$/ ? '>=' : '<=';
       push @where_tokens, sprintf "$token %s ?", /from$/ ? '>=' : '<=';

-      push @bind_vars,    $form->{$_};
+      push @bind_vars,    $value;

     }
   }
 
     }
   }
 


@@ -914,7 +917,7 @@ sub all_parts {
     next unless $form->{$_};
     $form->{"l_$_"} = '1'; # show the column
     push @where_tokens, "$table_prefix{$_}$_ ILIKE ?";
     next unless $form->{$_};
     $form->{"l_$_"} = '1'; # show the column
     push @where_tokens, "$table_prefix{$_}$_ ILIKE ?";

-    push @bind_vars,    "%$form->{$_}%";
+    push @bind_vars,    like($form->{$_});

   }
 
   foreach (@simple_l_switches) {
   }
 
   foreach (@simple_l_switches) {


@@ -955,11 +958,11 @@ sub all_parts {
   # fortunately makemodel doesn't need to be displayed later, so adding a special clause to where_token is sufficient.
   if ($form->{make}) {
     push @where_tokens, 'mv.name ILIKE ?';
   # fortunately makemodel doesn't need to be displayed later, so adding a special clause to where_token is sufficient.
   if ($form->{make}) {
     push @where_tokens, 'mv.name ILIKE ?';

-    push @bind_vars, "%$form->{make}%";
+    push @bind_vars, like($form->{make});

   }
   if ($form->{model}) {
     push @where_tokens, 'mm.model ILIKE ?';
   }
   if ($form->{model}) {
     push @where_tokens, 'mm.model ILIKE ?';

-    push @bind_vars, "%$form->{model}%";
+    push @bind_vars, like($form->{model});

   }
 
   # special case: sorting by partnumber
   }
 
   # special case: sorting by partnumber


@@ -1153,14 +1156,14 @@ sub _create_filter_for_priceupdate {
     next unless ($form->{$column});
 
     $where .= qq| AND $item ILIKE ?|;
     next unless ($form->{$column});
 
     $where .= qq| AND $item ILIKE ?|;

-    push(@where_values, '%' . $form->{$column} . '%');
+    push(@where_values, like($form->{$column}));

   }
 
   foreach my $item (qw(description serialnumber)) {
     next unless ($form->{$item});
 
     $where .= qq| AND (${item} ILIKE ?)|;
   }
 
   foreach my $item (qw(description serialnumber)) {
     next unless ($form->{$item});
 
     $where .= qq| AND (${item} ILIKE ?)|;

-    push(@where_values, '%' . $form->{$item} . '%');
+    push(@where_values, like($form->{$item}));

   }
 
 
   }
 
 


@@ -1194,7 +1197,7 @@ sub _create_filter_for_priceupdate {
   foreach my $column (qw(make model)) {
     next unless ($form->{$column});
     $where .= qq| AND p.id IN (SELECT DISTINCT parts_id FROM makemodel WHERE $column ILIKE ?|;
   foreach my $column (qw(make model)) {
     next unless ($form->{$column});
     $where .= qq| AND p.id IN (SELECT DISTINCT parts_id FROM makemodel WHERE $column ILIKE ?|;

-    push(@where_values, '%' . $form->{$column} . '%');
+    push(@where_values, like($form->{$column}));

   }
 
   $main::lxdebug->leave_sub();
   }
 
   $main::lxdebug->leave_sub();


@@ -1339,7 +1342,7 @@ sub create_links {
   # connect to database
   my $dbh = $form->get_standard_dbh;
 
   # connect to database
   my $dbh = $form->get_standard_dbh;
 

-  my @values = ('%' . $module . '%');
+  my @values = like($module);

   my $query;
 
   if ($form->{id}) {
   my $query;
 
   if ($form->{id}) {


@@ -1408,15 +1411,15 @@ sub get_parts {
 
   if ($sortorder eq "all") {
     $where .= qq| AND (partnumber ILIKE ?) AND (description ILIKE ?)|;
 
   if ($sortorder eq "all") {
     $where .= qq| AND (partnumber ILIKE ?) AND (description ILIKE ?)|;

-    push(@values, '%' . $form->{partnumber} . '%', '%' . $form->{description} . '%');
+    push(@values, like($form->{partnumber}), like($form->{description}));

 
   } elsif ($sortorder eq "partnumber") {
     $where .= qq| AND (partnumber ILIKE ?)|;
 
   } elsif ($sortorder eq "partnumber") {
     $where .= qq| AND (partnumber ILIKE ?)|;

-    push(@values, '%' . $form->{partnumber} . '%');
+    push(@values, like($form->{partnumber}));

 
   } elsif ($sortorder eq "description") {
     $where .= qq| AND (description ILIKE ?)|;
 
   } elsif ($sortorder eq "description") {
     $where .= qq| AND (description ILIKE ?)|;

-    push(@values, '%' . $form->{description} . '%');
+    push(@values, like($form->{description}));

     $order = "description";
 
   }
     $order = "description";
 
   }