Doing a simple Perltidy commit so that I can evaluate differences between the branches and make sure patches are up to date

git-svn-id: https://ledger-smb.svn.sourceforge.net/svnroot/ledger-smb/trunk@1103 4979c152-3d1c-0410-bac9-87ea11338e46

1 files changed, 370 insertions, 364 deletions

diff --git a/LedgerSMB.pm b/LedgerSMB.pm
index 51f10115..5727edbe 100755
--- a/LedgerSMB.pm
+++ b/LedgerSMB.pm
@@ -1,3 +1,4 @@
+
 =head1 NAME
 
 LedgerSMB  The Base class for many LedgerSMB objects, including DBObject.
@@ -96,460 +97,465 @@ non-numbers.
 =cut
 
 use CGI;
-use Math::BigFloat lib=>'GMP';
+use Math::BigFloat lib => 'GMP';
 use LedgerSMB::Sysconfig;
 use Data::Dumper;
 use strict;
 
 package LedgerSMB;
 
-
 sub new {
-	my $type = shift @_;
-	my $argstr = shift @_;
+    my $type   = shift @_;
+    my $argstr = shift @_;
 
-	my $self = {};
-	$self->{version} = "1.3.0 Alpha 0 Pre";
-	$self->{dbversion} = "1.2.0";
-	bless $self, $type;
-	
-	my $query =  ($argstr) ? new CGI($argstr) : new CGI;
-	my $params = $query->Vars;
+    my $self = {};
+    $self->{version}   = "1.3.0 Alpha 0 Pre";
+    $self->{dbversion} = "1.2.0";
+    bless $self, $type;
 
-	$self->merge($params);
+    my $query = ($argstr) ? new CGI($argstr) : new CGI;
+    my $params = $query->Vars;
 
-	$self->{action} =~ s/\W/_/g;
-	$self->{action} = lc $self->{action};
+    $self->merge($params);
 
+    $self->{action} =~ s/\W/_/g;
+    $self->{action} = lc $self->{action};
 
-	if ($self->{path} eq "bin/lynx"){
-		$self->{menubar} = 1; 
-		#menubar will be deprecated, replaced with below
-		$self->{lynx} = 1;
-		$self->{path} = "bin/lynx";
-	} else {
-		$self->{path} = "bin/mozilla";
+    if ( $self->{path} eq "bin/lynx" ) {
+        $self->{menubar} = 1;
 
-	}
+        #menubar will be deprecated, replaced with below
+        $self->{lynx} = 1;
+        $self->{path} = "bin/lynx";
+    }
+    else {
+        $self->{path} = "bin/mozilla";
 
-	if (($self->{script} =~ m#(..|\\|/)#)){
-		$self->error("Access Denied");
-	}
-		
+    }
 
-	$self;
+    if ( ( $self->{script} =~ m#(..|\\|/)# ) ) {
+        $self->error("Access Denied");
+    }
 
-}
+    $self;
 
+}
 
 sub debug {
-	my $self = shift @_;
-	my %args = @_;
-	my $file = $args{file};
-	my $d = Data::Dumper->new([@_]);
-	$d->Sortkeys(1);
-
-	if ($file) {
-		open(FH, '>', "$file") or die $!;
-		print FH $d->Dump();
-		close(FH);
-	} else {
-		print "\n";
-		print $d->Dump();	
-	}
-
-} 
+    my $self = shift @_;
+    my %args = @_;
+    my $file = $args{file};
+    my $d    = Data::Dumper->new( [@_] );
+    $d->Sortkeys(1);
+
+    if ($file) {
+        open( FH, '>', "$file" ) or die $!;
+        print FH $d->Dump();
+        close(FH);
+    }
+    else {
+        print "\n";
+        print $d->Dump();
+    }
 
+}
 
 sub escape {
-	my ($self) = @_;
-	my %args = @_;
-	my $str = $args{string};
+    my ($self) = @_;
+    my %args   = @_;
+    my $str    = $args{string};
 
-	my $regex = qr/([^a-zA-Z0-9_.-])/;
-	$str =~ s/$regex/sprintf("%%%02x", ord($1))/ge;
-	$str;
+    my $regex = qr/([^a-zA-Z0-9_.-])/;
+    $str =~ s/$regex/sprintf("%%%02x", ord($1))/ge;
+    $str;
 }
 
-
 sub is_blank {
-	my $self = shift @_;
-	my %args = @_;
-	my $name = $args{name};
-	my $rc;
-	if ($self->{$name} =~ /^\s*$/){
-		$rc = 1;
-	} else {
-		$rc = 0;
-	}
-	$rc;
+    my $self = shift @_;
+    my %args = @_;
+    my $name = $args{name};
+    my $rc;
+    if ( $self->{$name} =~ /^\s*$/ ) {
+        $rc = 1;
+    }
+    else {
+        $rc = 0;
+    }
+    $rc;
 }
 
 sub is_run_mode {
-	my $self = shift @_;
-	my $mode = lc shift @_;
-	my $rc = 0;
-	if ($mode eq 'cgi' && $ENV{GATEWAY_INTERFACE}){
-		$rc = 1;
-	}
-	elsif ($mode eq 'cli' && ! ($ENV{GATEWAY_INTERFACE} || $ENV{MOD_PERL})){
-		$rc = 1;
-	} elsif ($mode eq 'mod_perl' &&  $ENV{MOD_PERL}){
-		$rc = 1;
-	}
-	$rc;
+    my $self = shift @_;
+    my $mode = lc shift @_;
+    my $rc   = 0;
+    if ( $mode eq 'cgi' && $ENV{GATEWAY_INTERFACE} ) {
+        $rc = 1;
+    }
+    elsif ( $mode eq 'cli' && !( $ENV{GATEWAY_INTERFACE} || $ENV{MOD_PERL} ) ) {
+        $rc = 1;
+    }
+    elsif ( $mode eq 'mod_perl' && $ENV{MOD_PERL} ) {
+        $rc = 1;
+    }
+    $rc;
 }
 
 sub num_text_rows {
-	my $self = shift @_;
-	my %args = @_;
-	my $string = $args{string};
-	my $cols = $args{cols};
-	my $maxrows = $args{max};
-	
-	my $rows = 0;
-
-	for (split /\n/, $string) {
-		my $line = $_;
-		while (length($line) > $cols){
-			my $fragment = substr($line, 0, $cols + 1);
-			my $fragment = s/^(.*)\S*$/$1/;
-			$line = s/$fragment//;
-			if ($line eq $fragment){ # No word breaks!
-				$line = "";
-			}
-			++$rows;
-		}
-		++$rows;
-	}
-
-	if (! defined $maxrows){
-		$maxrows = $rows;
-	}
-
-	return ($rows > $maxrows) ? $maxrows : $rows;
+    my $self    = shift @_;
+    my %args    = @_;
+    my $string  = $args{string};
+    my $cols    = $args{cols};
+    my $maxrows = $args{max};
+
+    my $rows = 0;
+
+    for ( split /\n/, $string ) {
+        my $line = $_;
+        while ( length($line) > $cols ) {
+            my $fragment = substr( $line, 0, $cols + 1 );
+            my $fragment = s/^(.*)\S*$/$1/;
+            $line = s/$fragment//;
+            if ( $line eq $fragment ) {    # No word breaks!
+                $line = "";
+            }
+            ++$rows;
+        }
+        ++$rows;
+    }
+
+    if ( !defined $maxrows ) {
+        $maxrows = $rows;
+    }
+
+    return ( $rows > $maxrows ) ? $maxrows : $rows;
 
 }
 
-
 sub redirect {
-	my $self = shift @_;
-	my %args = @_;
-	my $msg = $args{msg};
+    my $self = shift @_;
+    my %args = @_;
+    my $msg  = $args{msg};
 
-	if ($self->{callback} || !$msg) {
+    if ( $self->{callback} || !$msg ) {
 
-		main::redirect();
-	} else {
+        main::redirect();
+    }
+    else {
 
-		$self->info($msg);
-	}
+        $self->info($msg);
+    }
 }
 
 # TODO:  Either we should have an amount class with formats and such attached
 # Or maybe we should move this into the user class...
 sub format_amount {
-	# Based on SQL-Ledger's Form::format_amount
-	my $self = shift @_;
-	my %args = @_;
-	my $myconfig = $args{user};
-	my $amount = $args{amount};
-	my $places = $args{precision};
-	my $dash = $args{neg_format};
-
-	my $negative ;
-	if ($amount){
-		$amount = $self->parse_amount($myconfig, $amount);
-		$negative = ($amount < 0);
-		$amount =~ s/-//;
-	}
-
-	if ($places =~ /\d+/) {
-		#$places = 4 if $places == 2;
-		$amount = $self->round_amount($amount, $places);
-	}
-
-	# is the amount negative
-
-	# Parse $myconfig->{numberformat}
-
-
-
-	my ($ts, $ds) = ($1, $2);
-
-	if ($amount) {
-
-		if ($myconfig->{numberformat}) {
-
-			my ($whole, $dec) = split /\./, "$amount";
-			$amount = join '', reverse split //, $whole;
-
-			if ($places) {
-				$dec .= "0" x $places;
-				$dec = substr($dec, 0, $places);
-			}
-
-			if ($myconfig->{numberformat} eq '1,000.00') {
-				$amount =~ s/\d{3,}?/$&,/g;
-				$amount =~ s/,$//;
-				$amount = join '', reverse split //, $amount;
-				$amount .= "\.$dec" if ($dec ne "");
-			}
-
-			if ($myconfig->{numberformat} eq '1 000.00') {
-				$amount =~ s/\d{3,}?/$& /g;
-				$amount =~ s/\s$//;
-				$amount = join '', reverse split //, $amount;
-				$amount .= "\.$dec" if ($dec ne "");
-			}
-
-			if ($myconfig->{numberformat} eq "1'000.00") {
-				$amount =~ s/\d{3,}?/$&'/g;
-				$amount =~ s/'$//;
-				$amount = join '', reverse split //, $amount;
-				$amount .= "\.$dec" if ($dec ne "");
-			}
-
-			if ($myconfig->{numberformat} eq '1.000,00') {
-				$amount =~ s/\d{3,}?/$&./g;
-				$amount =~ s/\.$//;
-				$amount = join '', reverse split //, $amount;
-				$amount .= ",$dec" if ($dec ne "");
-			}
-
-			if ($myconfig->{numberformat} eq '1000,00') {
-				$amount = "$whole";
-				$amount .= ",$dec" if ($dec ne "");
-			}
-
-			if ($myconfig->{numberformat} eq '1000.00') {
-				$amount = "$whole";
-				$amount .= ".$dec" if ($dec ne "");
-			}
-
-			if ($dash =~ /-/) {
-				$amount = ($negative) ? "($amount)" : "$amount";
-			} elsif ($dash =~ /DRCR/) {
-				$amount = ($negative) ? "$amount DR" : "$amount CR";
-			} else {
-				$amount = ($negative) ? "-$amount" : "$amount";
-			}
-		}
-
-	} else {
-
-		if ($dash eq "0" && $places) {
-
-			if ($myconfig->{numberformat} eq '1.000,00') {
-				$amount = "0".","."0" x $places;
-			} else {
-				$amount = "0"."."."0" x $places;
-			}
-
-		} else {
-			$amount = ($dash ne "") ? "$dash" : "";
-		}
-	}
-
-	$amount;
+
+    # Based on SQL-Ledger's Form::format_amount
+    my $self     = shift @_;
+    my %args     = @_;
+    my $myconfig = $args{user};
+    my $amount   = $args{amount};
+    my $places   = $args{precision};
+    my $dash     = $args{neg_format};
+
+    my $negative;
+    if ($amount) {
+        $amount = $self->parse_amount( $myconfig, $amount );
+        $negative = ( $amount < 0 );
+        $amount =~ s/-//;
+    }
+
+    if ( $places =~ /\d+/ ) {
+
+        #$places = 4 if $places == 2;
+        $amount = $self->round_amount( $amount, $places );
+    }
+
+    # is the amount negative
+
+    # Parse $myconfig->{numberformat}
+
+    my ( $ts, $ds ) = ( $1, $2 );
+
+    if ($amount) {
+
+        if ( $myconfig->{numberformat} ) {
+
+            my ( $whole, $dec ) = split /\./, "$amount";
+            $amount = join '', reverse split //, $whole;
+
+            if ($places) {
+                $dec .= "0" x $places;
+                $dec = substr( $dec, 0, $places );
+            }
+
+            if ( $myconfig->{numberformat} eq '1,000.00' ) {
+                $amount =~ s/\d{3,}?/$&,/g;
+                $amount =~ s/,$//;
+                $amount = join '', reverse split //, $amount;
+                $amount .= "\.$dec" if ( $dec ne "" );
+            }
+
+            if ( $myconfig->{numberformat} eq '1 000.00' ) {
+                $amount =~ s/\d{3,}?/$& /g;
+                $amount =~ s/\s$//;
+                $amount = join '', reverse split //, $amount;
+                $amount .= "\.$dec" if ( $dec ne "" );
+            }
+
+            if ( $myconfig->{numberformat} eq "1'000.00" ) {
+                $amount =~ s/\d{3,}?/$&'/g;
+                $amount =~ s/'$//;
+                $amount = join '', reverse split //, $amount;
+                $amount .= "\.$dec" if ( $dec ne "" );
+            }
+
+            if ( $myconfig->{numberformat} eq '1.000,00' ) {
+                $amount =~ s/\d{3,}?/$&./g;
+                $amount =~ s/\.$//;
+                $amount = join '', reverse split //, $amount;
+                $amount .= ",$dec" if ( $dec ne "" );
+            }
+
+            if ( $myconfig->{numberformat} eq '1000,00' ) {
+                $amount = "$whole";
+                $amount .= ",$dec" if ( $dec ne "" );
+            }
+
+            if ( $myconfig->{numberformat} eq '1000.00' ) {
+                $amount = "$whole";
+                $amount .= ".$dec" if ( $dec ne "" );
+            }
+
+            if ( $dash =~ /-/ ) {
+                $amount = ($negative) ? "($amount)" : "$amount";
+            }
+            elsif ( $dash =~ /DRCR/ ) {
+                $amount = ($negative) ? "$amount DR" : "$amount CR";
+            }
+            else {
+                $amount = ($negative) ? "-$amount" : "$amount";
+            }
+        }
+
+    }
+    else {
+
+        if ( $dash eq "0" && $places ) {
+
+            if ( $myconfig->{numberformat} eq '1.000,00' ) {
+                $amount = "0" . "," . "0" x $places;
+            }
+            else {
+                $amount = "0" . "." . "0" x $places;
+            }
+
+        }
+        else {
+            $amount = ( $dash ne "" ) ? "$dash" : "";
+        }
+    }
+
+    $amount;
 }
 
 # This should probably go to the User object too.
 sub parse_amount {
-	my $self = shift @_;
-	my %args = @_;
-	my $myconfig = $args{user};
-	my $amount = $args{amount};
-
-	if ($amount eq '' or $amount == undef){
-		return 0;
-	}
-
-	if (UNIVERSAL::isa($amount, 'Math::BigFloat')){ # Amount may not be an object	
-		return $amount;
-	}
-	my $numberformat = $myconfig->{numberformat};
-
-
-	if (($numberformat eq '1.000,00') ||
-		($numberformat eq '1000,00')) {
-
-		$amount =~ s/\.//g;
-		$amount =~ s/,/./;
-	}
-	if ($numberformat eq '1 000.00'){
-		$amount =~ s/\s//g;
-	}
-
-	if ($numberformat eq "1'000.00") {
-		$amount =~ s/'//g;
-	}
-
-
-	$amount =~ s/,//g;
-	if ($amount =~ s/\((\d*\.?\d*)\)/$1/){
-		$amount = $1 * -1;
-	}
-	if ($amount =~ s/(\d*\.?\d*)\s?DR/$1/){
-		$amount = $1 * -1;
-	}
-	$amount =~ s/\s?CR//;
-	$amount = new Math::BigFloat($amount);
-	return ($amount * 1);
+    my $self     = shift @_;
+    my %args     = @_;
+    my $myconfig = $args{user};
+    my $amount   = $args{amount};
+
+    if ( $amount eq '' or $amount == undef ) {
+        return 0;
+    }
+
+    if ( UNIVERSAL::isa( $amount, 'Math::BigFloat' ) )
+    {    # Amount may not be an object
+        return $amount;
+    }
+    my $numberformat = $myconfig->{numberformat};
+
+    if (   ( $numberformat eq '1.000,00' )
+        || ( $numberformat eq '1000,00' ) )
+    {
+
+        $amount =~ s/\.//g;
+        $amount =~ s/,/./;
+    }
+    if ( $numberformat eq '1 000.00' ) {
+        $amount =~ s/\s//g;
+    }
+
+    if ( $numberformat eq "1'000.00" ) {
+        $amount =~ s/'//g;
+    }
+
+    $amount =~ s/,//g;
+    if ( $amount =~ s/\((\d*\.?\d*)\)/$1/ ) {
+        $amount = $1 * -1;
+    }
+    if ( $amount =~ s/(\d*\.?\d*)\s?DR/$1/ ) {
+        $amount = $1 * -1;
+    }
+    $amount =~ s/\s?CR//;
+    $amount = new Math::BigFloat($amount);
+    return ( $amount * 1 );
 }
 
-
 sub round_amount {
 
-	my ($self, $amount, $places) = @_;
+    my ( $self, $amount, $places ) = @_;
 
-	# These rounding rules follow from the previous implementation.
-	# They should be changed to allow different rules for different accounts.
-	Math::BigFloat->round_mode('+inf') if $amount >= 0;
-	Math::BigFloat->round_mode('-inf') if $amount < 0;
+    # These rounding rules follow from the previous implementation.
+    # They should be changed to allow different rules for different accounts.
+    Math::BigFloat->round_mode('+inf') if $amount >= 0;
+    Math::BigFloat->round_mode('-inf') if $amount < 0;
 
-	$amount = Math::BigFloat->new($amount)->ffround(-$places) if $places >= 0;
-	$amount = Math::BigFloat->new($amount)->ffround(-($places-1)) if $places < 0;
+    $amount = Math::BigFloat->new($amount)->ffround( -$places ) if $places >= 0;
+    $amount = Math::BigFloat->new($amount)->ffround( -( $places - 1 ) )
+      if $places < 0;
 
-	return $amount;
+    return $amount;
 }
 
 sub call_procedure {
-	my $self = shift @_;
-	my %args = @_;
-	my $procname = $args{procname};
-	my @args = @{$args{args}};
-	my $argstr = "";
-	my @results;
-	for (1 .. scalar @args){
-		$argstr .= "?, ";
-	}
-	$argstr =~ s/\, $//;
-	my $query = "SELECT * FROM $procname()";
-	$query =~ s/\(\)/($argstr)/;
-	my $sth = $self->{dbh}->prepare($query);
-	$sth->execute(@args);
-	while (my $ref = $sth->fetchrow_hashref('NAME_lc')){
-		push @results, $ref;
-	}
-	@results;
+    my $self     = shift @_;
+    my %args     = @_;
+    my $procname = $args{procname};
+    my @args     = @{ $args{args} };
+    my $argstr   = "";
+    my @results;
+    for ( 1 .. scalar @args ) {
+        $argstr .= "?, ";
+    }
+    $argstr =~ s/\, $//;
+    my $query = "SELECT * FROM $procname()";
+    $query =~ s/\(\)/($argstr)/;
+    my $sth = $self->{dbh}->prepare($query);
+    $sth->execute(@args);
+    while ( my $ref = $sth->fetchrow_hashref('NAME_lc') ) {
+        push @results, $ref;
+    }
+    @results;
 }
 
 # This should probably be moved to User too...
 sub date_to_number {
-	#based on SQL-Ledger's Form::datetonum
-	my $self = shift @_;
-	my %args = @_;
-	my $myconfig = $args{user};
-	my $date = $args{date};
 
-	my ($yy, $mm, $dd);
-	if ($date && $date =~ /\D/) {
+    #based on SQL-Ledger's Form::datetonum
+    my $self     = shift @_;
+    my %args     = @_;
+    my $myconfig = $args{user};
+    my $date     = $args{date};
 
-		if ($myconfig->{dateformat} =~ /^yy/) {
-			($yy, $mm, $dd) = split /\D/, $date;
-		}
+    my ( $yy, $mm, $dd );
+    if ( $date && $date =~ /\D/ ) {
 
-		if ($myconfig->{dateformat} =~ /^mm/) {
-			($mm, $dd, $yy) = split /\D/, $date;
-		}
+        if ( $myconfig->{dateformat} =~ /^yy/ ) {
+            ( $yy, $mm, $dd ) = split /\D/, $date;
+        }
 
-		if ($myconfig->{dateformat} =~ /^dd/) {
-			($dd, $mm, $yy) = split /\D/, $date;
-		}
+        if ( $myconfig->{dateformat} =~ /^mm/ ) {
+            ( $mm, $dd, $yy ) = split /\D/, $date;
+        }
 
-		$dd *= 1;
-		$mm *= 1;
-		$yy += 2000 if length $yy == 2;
+        if ( $myconfig->{dateformat} =~ /^dd/ ) {
+            ( $dd, $mm, $yy ) = split /\D/, $date;
+        }
 
-		$dd = substr("0$dd", -2);
-		$mm = substr("0$mm", -2);
+        $dd *= 1;
+        $mm *= 1;
+        $yy += 2000 if length $yy == 2;
 
-		$date = "$yy$mm$dd";
-	}
+        $dd = substr( "0$dd", -2 );
+        $mm = substr( "0$mm", -2 );
 
-	$date;
-}
+        $date = "$yy$mm$dd";
+    }
 
+    $date;
+}
 
 # Database routines used throughout
 
 sub db_init {
-	my $self = shift @_;
-	my %args = @_;
-	my $myconfig = $args{user};
+    my $self     = shift @_;
+    my %args     = @_;
+    my $myconfig = $args{user};
 
-	my $dbh = DBI->connect($myconfig->{dbconnect}, $myconfig->{dbuser}, 
-		$myconfig->{dbpasswd}, {AutoCommit => 0}) or $self->dberror;
+    my $dbh = DBI->connect(
+        $myconfig->{dbconnect}, $myconfig->{dbuser},
+        $myconfig->{dbpasswd}, { AutoCommit => 0 }
+    ) or $self->dberror;
 
-	$dbh->{pg_server_prepare} = 0;
+    $dbh->{pg_server_prepare} = 0;
 
-	if ($myconfig->{dboptions}) {
-		$dbh->do($myconfig->{dboptions});
-	}
+    if ( $myconfig->{dboptions} ) {
+        $dbh->do( $myconfig->{dboptions} );
+    }
 
-	my $query = 
-		"SELECT t.extends, 
+    my $query = "SELECT t.extends, 
 			coalesce (t.table_name, 'custom_' || extends) 
 			|| ':' || f.field_name as field_def
 		FROM custom_table_catalog t
 		JOIN custom_field_catalog f USING (table_id)";
-	my $sth = $self->{dbh}->prepare($query);
-	$sth->execute;
-	my $ref;
-	while ($ref = $sth->fetchrow_hashref('NAME_lc')){
-		push @{$self->{custom_db_fields}{$ref->{extends}}},
-			$ref->{field_def};
-	}
+    my $sth = $self->{dbh}->prepare($query);
+    $sth->execute;
+    my $ref;
+    while ( $ref = $sth->fetchrow_hashref('NAME_lc') ) {
+        push @{ $self->{custom_db_fields}{ $ref->{extends} } },
+          $ref->{field_def};
+    }
 }
 
 sub redo_rows {
 
-	my $self = shift @_;
-	my %args = @_;
-	my @flds = @{$args{fields}};
-	my $count = $args{count};
-	my $index = ($args{index}) ? $args{index} : 'runningnumber';
-
-	my @rows;
-	my $i; # incriment counter use only
-	for $i (1 .. $count){
-		my $temphash = {_inc => $i};
-		for my $fld (@flds){
-			$temphash->{$fld} = $self->{"$fld"."_$i"}
-		}
-		push @rows, $temphash;
-	}
-	$i = 1;
-	for my $row (sort {$a->{index} <=> $b->{index}} @rows){
-		for my $fld (@flds){
-			$self->{"$fld"."_$i"} = $row->{$fld};
-		}
-		++$i;
-	}
+    my $self  = shift @_;
+    my %args  = @_;
+    my @flds  = @{ $args{fields} };
+    my $count = $args{count};
+    my $index = ( $args{index} ) ? $args{index} : 'runningnumber';
+
+    my @rows;
+    my $i;    # incriment counter use only
+    for $i ( 1 .. $count ) {
+        my $temphash = { _inc => $i };
+        for my $fld (@flds) {
+            $temphash->{$fld} = $self->{ "$fld" . "_$i" };
+        }
+        push @rows, $temphash;
+    }
+    $i = 1;
+    for my $row ( sort { $a->{index} <=> $b->{index} } @rows ) {
+        for my $fld (@flds) {
+            $self->{ "$fld" . "_$i" } = $row->{$fld};
+        }
+        ++$i;
+    }
 }
 
-
 sub merge {
-	my ($self, $src) = @_;
-	for my $arg ($self, $src){
-		shift;
-	}
-	my %args = @_;
-	my @keys = @{$args{keys}};
-	my $index = $args{index};
-	if (! scalar @keys){
-		@keys = keys %{$src};
-	}
-	for my $arg (keys %$src){
-		my $dst_arg;
-		if ($index){
-			$dst_arg = $arg . "_$index";
-		} else {
-			$dst_arg = $arg;
-		}
-		$self->{$dst_arg} = $src->{$arg};
-	}
+    my ( $self, $src ) = @_;
+    for my $arg ( $self, $src ) {
+        shift;
+    }
+    my %args  = @_;
+    my @keys  = @{ $args{keys} };
+    my $index = $args{index};
+    if ( !scalar @keys ) {
+        @keys = keys %{$src};
+    }
+    for my $arg ( keys %$src ) {
+        my $dst_arg;
+        if ($index) {
+            $dst_arg = $arg . "_$index";
+        }
+        else {
+            $dst_arg = $arg;
+        }
+        $self->{$dst_arg} = $src->{$arg};
+    }
 }
 
 1;