From: Henri-Damien LAURENT Date: Thu, 1 Oct 2009 14:32:47 +0000 (+0200) Subject: SQLHelper Adding tablename to filters output X-Git-Tag: v3.02.00-alpha~54^2~186 X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=300bd572d3d21bbde1e91e8682611ad224992a7a;hp=9da06d5a81704bf192ef60847fcaf3ca29f94e36;p=koha_fer SQLHelper Adding tablename to filters output --- diff --git a/C4/SQLHelper.pm b/C4/SQLHelper.pm index 20d9520403..e1eea3967a 100644 --- a/C4/SQLHelper.pm +++ b/C4/SQLHelper.pm @@ -344,7 +344,7 @@ sub _filter_hash{ foreach my $field (grep {/\b($elements)\b/} keys %$filter_input){ ## supposed to be a hash of simple values, hashes of arrays could be implemented $$filter_input{$field}=format_date_in_iso($$filter_input{$field}) if ($$columns{$field}{Type}=~/date/ && $$filter_input{$field} !~C4::Dates->regexp("iso")); - my ($tmpkeys, $localvalues)=_Process_Operands($$filter_input{$field},$field,$searchtype,$columns); + my ($tmpkeys, $localvalues)=_Process_Operands($$filter_input{$field},"$tablename.$field",$searchtype,$columns); if (@$tmpkeys){ push @values, @$localvalues; push @keys, @$tmpkeys; @@ -368,7 +368,7 @@ sub _filter_string{ my @localkeys; foreach my $operand (@operands){ foreach my $field (@columns_filtered){ - my ($tmpkeys, $localvalues)=_Process_Operands($operand,$field,$searchtype,$columns); + my ($tmpkeys, $localvalues)=_Process_Operands($operand,"$tablename.$field",$searchtype,$columns); if ($tmpkeys){ push @values,@$localvalues; push @localkeys,@$tmpkeys;