Followup 300bd572d3d21bbde1e91e8682611ad224992a7a
authorHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Tue, 13 Oct 2009 10:12:46 +0000 (12:12 +0200)
committerHenri-Damien LAURENT <henridamien.laurent@biblibre.com>
Wed, 14 Oct 2009 16:19:09 +0000 (18:19 +0200)
Adding Tablename to SQLHelper

C4/SQLHelper.pm

index e1eea39..44ecd6a 100644 (file)
@@ -90,6 +90,7 @@ $searchtype is string Can be "wide" or "exact"
 
 sub SearchInTable{
     my ($tablename,$filters,$orderby, $limit, $columns_out, $filter_columns,$searchtype) = @_; 
+warn "searchtype : ",$searchtype;
 #      $searchtype||="start_with";
     my $dbh      = C4::Context->dbh; 
        $columns_out||=["*"];
@@ -396,9 +397,11 @@ sub _Process_Operands{
                return \@tmpkeys,\@values;
        }
        if ($searchtype eq "start_with"){
+                       my $col_field=(index($field,".")>0?substr($field, index($field,".")+1):$field);
                        if ($field=~/(?<!zip)code|(?<!card)number/ ){
                                push @tmpkeys,(" $field= '' ","$field IS NULL");
-                       } elsif ($$columns{$field}{Type}=~/varchar|text/){
+                       } elsif ($$columns{$col_field}{Type}=~/varchar|text/i){
+                               warn "in text Type";
                                push @tmpkeys,(" $field LIKE ? ","$field LIKE ?");
                                my @localvaluesextended=("\% $operand\%","$operand\%") ;
                                push @values,@localvaluesextended;