[Koha-cvs] CVS: koha/admin branches.pl,1.18,1.19

[Paul POULAIN]

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv16157/admin

Modified Files:
        branches.pl 
Log Message:
fix for #184

Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** branches.pl 9 Feb 2003 08:31:04 -0000       1.18
--- branches.pl 7 Apr 2003 12:13:41 -0000       1.19
***************
*** 58,62 ****
  
#######################################################################################
  # Main loop....
- 
  my $input = new CGI;
  my $branchcode=$input->param('branchcode');
--- 58,61 ----
***************
*** 353,357 ****
      $sth->execute(@query_args);
      my @results;
!     while (my $data = $sth->fetchrow_hashref) { 
        push(@results, $data);
      }
--- 352,356 ----
      $sth->execute(@query_args);
      my @results;
!     while (my $data = $sth->fetchrow_hashref) {
        push(@results, $data);
      }
***************
*** 368,372 ****
      my $query = "replace branches 
(branchcode,branchname,branchaddress1,branchaddress2,branchaddress3,branchphone,branchfax,branchemail)
 values (?,?,?,?,?,?,?,?)";
      my $sth=$dbh->prepare($query);
!     $sth->execute($data->{'branchcode'}, $data->{'branchname'},
            $data->{'branchaddress1'}, $data->{'branchaddress2'},
            $data->{'branchaddress3'}, $data->{'branchphone'},
--- 367,371 ----
      my $query = "replace branches 
(branchcode,branchname,branchaddress1,branchaddress2,branchaddress3,branchphone,branchfax,branchemail)
 values (?,?,?,?,?,?,?,?)";
      my $sth=$dbh->prepare($query);
!     $sth->execute(uc($data->{'branchcode'}), $data->{'branchname'},
            $data->{'branchaddress1'}, $data->{'branchaddress2'},
            $data->{'branchaddress3'}, $data->{'branchphone'},
***************
*** 383,387 ****
        }
      }
!     my $branchcode = $data->{'branchcode'};
      my $branch = getbranchinfo($branchcode);
      $branch = $branch->[0];
--- 382,386 ----
        }
      }
!     my $branchcode =uc($data->{'branchcode'});
      my $branch = getbranchinfo($branchcode);
      $branch = $branch->[0];
***************
*** 398,402 ****
            push(@addcats, $ccat);
        }
!     } 
      # FIXME - There's already a $dbh in this scope.
      my $dbh = C4::Context->dbh;
--- 397,401 ----
            push(@addcats, $ccat);
        }
!     }
      # FIXME - There's already a $dbh in this scope.
      my $dbh = C4::Context->dbh;