X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=C4%2FSQLHelper.pm;h=44707428216e19b706e2d02c5f591fdcbe192ae9;hb=7279f55b60e02780df6b65c4c92ade9f413d5c01;hp=44ecd6afe9542d7290b0d740f16b63b034b88c29;hpb=687943ff38e76cd4d842858542479170e726f55d;p=koha.git diff --git a/C4/SQLHelper.pm b/C4/SQLHelper.pm index 44ecd6afe9..4470742821 100644 --- a/C4/SQLHelper.pm +++ b/C4/SQLHelper.pm @@ -13,9 +13,9 @@ package C4::SQLHelper; # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use strict; @@ -75,23 +75,29 @@ This module contains routines for adding, modifying and Searching Data in MysqlD =back $tablename Name of the table (string) + $data may contain - string + - data_hashref : will be considered as an AND of all the data searched + - data_array_ref on hashrefs : Will be considered as an OR of Datahasref elements $orderby is an arrayref of hashref with fieldnames as key and 0 or 1 as values (ASCENDING or DESCENDING order) -$limit is an array ref on 2 values + +$limit is an array ref on 2 values in order to limit results to MIN..MAX + $columns_out is an array ref on field names is used to limit results on those fields (* by default) + $filtercolums is an array ref on field names : is used to limit expansion of research for strings -$searchtype is string Can be "wide" or "exact" + +$searchtype is string Can be "start_with" or "exact" =cut sub SearchInTable{ my ($tablename,$filters,$orderby, $limit, $columns_out, $filter_columns,$searchtype) = @_; -warn "searchtype : ",$searchtype; -# $searchtype||="start_with"; + $searchtype||="exact"; my $dbh = C4::Context->dbh; $columns_out||=["*"]; my $sql = do { local $"=', '; @@ -110,10 +116,13 @@ warn "searchtype : ",$searchtype; } if ($orderby){ #Order by desc by default - my @orders=map{ "$_".($$orderby{$_}? " DESC" : "") } keys %$orderby; - $sql.= do { local $"=', '; - qq{ ORDER BY @orders} - }; + my @orders; + foreach my $order (@$orderby){ + push @orders,map{ "$_".($order->{$_}? " DESC " : "") } keys %$order; + } + $sql.= do { local $"=', '; + qq{ ORDER BY @orders} + }; } if ($limit){ $sql.=qq{ LIMIT }.join(",",@$limit); @@ -121,7 +130,8 @@ warn "searchtype : ",$searchtype; $debug && $values && warn $sql," ",join(",",@$values); $sth = $dbh->prepare_cached($sql); - $sth->execute(@$values); + eval{$sth->execute(@$values)}; + warn $@ if ($@ && $debug); my $results = $sth->fetchall_arrayref( {} ); return $results; } @@ -130,7 +140,7 @@ warn "searchtype : ",$searchtype; =over 4 - $data_id_in_table = &InsertInTable($tablename,$data_hashref); + $data_id_in_table = &InsertInTable($tablename,$data_hashref,$withprimarykeys); =back @@ -139,14 +149,15 @@ warn "searchtype : ",$searchtype; =cut sub InsertInTable{ - my ($tablename,$data) = @_; + my ($tablename,$data,$withprimarykeys) = @_; my $dbh = C4::Context->dbh; - my ($keys,$values)=_filter_hash($tablename,$data,0); + my ($keys,$values)=_filter_hash($tablename,$data,($withprimarykeys?"exact":0)); my $query = qq{ INSERT INTO $tablename SET }.join(", ",@$keys); $debug && warn $query, join(",",@$values); my $sth = $dbh->prepare_cached($query); - $sth->execute( @$values); + eval{$sth->execute(@$values)}; + warn $@ if ($@ && $debug); return $dbh->last_insert_id(undef, undef, $tablename, undef); } @@ -176,8 +187,10 @@ sub UpdateInTable{ $debug && warn $query, join(",",@$values,@ids); my $sth = $dbh->prepare_cached($query); - return $sth->execute( @$values,@ids); - + my $result; + eval{$result=$sth->execute(@$values,@ids)}; + warn $@ if ($@ && $debug); + return $result; } =head2 DeleteInTable @@ -202,7 +215,10 @@ sub DeleteInTable{ }; $debug && warn $query, join(",",@$values); my $sth = $dbh->prepare_cached($query); - return $sth->execute( @$values); + my $result; + eval{$result=$sth->execute(@$values)}; + warn $@ if ($@ && $debug); + return $result; } } @@ -220,7 +236,7 @@ sub DeleteInTable{ sub GetPrimaryKeys($) { my $tablename=shift; my $hash_columns=_get_columns($tablename); - return grep { $$hash_columns{$_}{'Key'} =~/PRI/i} keys %$hash_columns; + return grep { $hash_columns->{$_}->{'Key'} =~/PRI/i} keys %$hash_columns; } =head2 _get_columns @@ -328,7 +344,15 @@ sub _filter_fields{ } } else{ - return _filter_string($tablename,$filter_input,$searchtype,$filtercolumns); + $debug && warn "filterstring : $filter_input"; + my ($keys, $values) = _filter_string($tablename,$filter_input, $searchtype,$filtercolumns); + if ($keys){ + my $stringkey="(".join (") AND (",@$keys).")"; + return [$stringkey],$values; + } + else { + return (); + } } return (\@keys,\@values); @@ -344,8 +368,8 @@ sub _filter_hash{ my $elements=join "|",@columns_filtered; 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},"$tablename.$field",$searchtype,$columns); + $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},"$tablename.$field",$searchtype,$columns); if (@$tmpkeys){ push @values, @$localvalues; push @keys, @$tmpkeys; @@ -366,8 +390,8 @@ sub _filter_string{ my @columns_filtered= _filter_columns($tablename,$searchtype,$filtercolumns); my $columns= _get_columns($tablename); my (@values,@keys); - my @localkeys; foreach my $operand (@operands){ + my @localkeys; foreach my $field (@columns_filtered){ my ($tmpkeys, $localvalues)=_Process_Operands($operand,"$tablename.$field",$searchtype,$columns); if ($tmpkeys){ @@ -375,9 +399,9 @@ sub _filter_string{ push @localkeys,@$tmpkeys; } } + my $sql= join (' OR ', @localkeys); + push @keys, $sql; } - my $sql= join (' OR ', @localkeys); - push @keys, $sql; if (@keys){ return (\@keys,\@values); @@ -393,19 +417,29 @@ sub _Process_Operands{ my @localkeys; push @tmpkeys, " $field = ? "; push @values, $operand; - unless ($searchtype){ + #By default, exact search + if (!$searchtype ||$searchtype eq "exact"){ return \@tmpkeys,\@values; } - if ($searchtype eq "start_with"){ - my $col_field=(index($field,".")>0?substr($field, index($field,".")+1):$field); - if ($field=~/(?0?substr($field, index($field,".")+1):$field); + if ($field=~/(?{$col_field}->{Type}=~/varchar|text/i){ + my @localvaluesextended; + if ($searchtype eq "contain"){ + push @tmpkeys,(" $field LIKE ? "); + push @localvaluesextended,("\%$operand\%") ; + } + if ($searchtype eq "field_start_with"){ + push @tmpkeys,("$field LIKE ?"); + push @localvaluesextended, ("$operand\%") ; + } + if ($searchtype eq "start_with"){ + push @tmpkeys,("$field LIKE ?","$field LIKE ?"); + push @localvaluesextended, ("$operand\%", " $operand\%") ; + } + push @values,@localvaluesextended; } push @localkeys,qq{ (}.join(" OR ",@tmpkeys).qq{) }; return (\@localkeys,\@values);