[Koha-patches] [PATCH 2/2] C4::SQLHelper Changing $$ notation to $ ->

Henri-Damien LAURENT henridamien.laurent at biblibre.com
Thu Dec 24 09:26:43 CET 2009


---
 C4/SQLHelper.pm |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/C4/SQLHelper.pm b/C4/SQLHelper.pm
index 1d60034..7760531 100644
--- a/C4/SQLHelper.pm
+++ b/C4/SQLHelper.pm
@@ -118,7 +118,7 @@ sub SearchInTable{
 		#Order by desc by default
 		my @orders;
 		foreach my $order (@$orderby){
-			push @orders,map{ "$_".($$order{$_}? " DESC " : "") } keys %$order; 
+			push @orders,map{ "$_".($order->{$_}? " DESC " : "") } keys %$order; 
 		}
 		$sql.= do { local $"=', '; 
 				qq{ ORDER BY @orders} 
@@ -236,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
@@ -367,8 +367,8 @@ sub _filter_hash{
     my $elements=join "|", at 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;
@@ -424,7 +424,7 @@ sub _Process_Operands{
 	if ($field=~/(?<!zip)code|(?<!card)number/ && $searchtype ne "exact"){
 		push @tmpkeys,(" $field= '' ","$field IS NULL");
 	}
-	if ($$columns{$col_field}{Type}=~/varchar|text/i){
+	if ($columns{$col_field}->{Type}=~/varchar|text/i){
 		my @localvaluesextended;
 		if ($searchtype eq "contain"){
 			push @tmpkeys,(" $field LIKE ? ");
-- 
1.6.3.3




More information about the Koha-patches mailing list