[Koha-cvs] CVS: koha insertjdata.pl,1.3,1.4 jmemberentry.pl,1.9,1.10 moremember.pl,1.28,1.29

[Paul POULAIN]

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

Modified Files:
        insertjdata.pl jmemberentry.pl moremember.pl 
Log Message:
fix for #218

Index: insertjdata.pl
===================================================================
RCS file: /cvsroot/koha/koha/insertjdata.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** insertjdata.pl      5 Oct 2002 09:45:32 -0000       1.3
--- insertjdata.pl      5 May 2003 13:26:00 -0000       1.4
***************
*** 41,101 ****
  my $env;
  foreach my $key (@names){
!   $data{$key}=$input->param($key);
  }
  my $dbh = C4::Context->dbh;
! 
  for (my $i=0;$i<3;$i++){
! my $query="Select * from borrowers where 
borrowernumber=$data{'bornumber_child_$i'}";
! my $sth=$dbh->prepare($query);
! $sth->execute;
! if (my $data=$sth->fetchrow_hashref){
!   $query="update borrowers set 
title='$data{'title'}',expiry='$data{'expiry'}',
!   
cardnumber='$data{'cardnumber'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}',
!   
streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
!   
altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
!   
emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}',
!   
altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
!   
categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
!   
borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}',
!   
initials='$data{'initials'}',streetaddress='$data{'address'}',ethnicity='$data{'ethnicity'}'
!   where borrowernumber=$data{'borrowernumber'}";
! #  print $query;
! 
! }elsif ($data{"cardnumber_child_$i"} ne ''){
!   my $dob=$data{"dateofbirth_child_$i"};
!   $dob=ParseDate($dob);
!   $dob=UnixDate($dob,'%Y-%m-%d');
!   $data{'joining'}=ParseDate("today");
!   $data{'joining'}=UnixDate($data{'joining'},'%Y-%m-%d');
!   my $cardnumber=$data{"cardnumber_child_$i"};
!   my $bornum=$data{"bornumber_child_$i"};
!   my $firstname=$data{"firstname_child_$i"};
!   my $surname=$data{"surname_child_$i"};
!   my $school=$data{"school_child_$i"};
!   my $guarant=$data{'borrowernumber'};
!   my $notes=$data{"altnotes_child_$i"};
!   my $sex=$data{"sex_child_$i"};
!   $data{'contactname'}=$data{'firstname_guardian'}." 
".$data{'surname_guardian'};
!   $data{'altrelationship'}="Guarantor";
!   $data{'altphone'}=$data{'phone'};
!   $query="insert into borrowers 
(title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber,
!   
firstname,altnotes,dateofbirth,contactname,emailaddress,dateenrolled,streetcity,
!   
altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
!   initials,ethnicity,borrowernumber,guarantor,school) 
!   values ('','$data{'expiry'}',
!   '$cardnumber',
!   '$sex','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
!   
'$firstname','$data{'altnotes'}','$dob','$data{'contactname'}','$data{'emailaddress'}',
!   
'$data{'joining'}','$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}',
!   '$data{'phoneday'}','C','$data{'city'}','$data{'area'}','$data{'phone'}',
!   '$notes','$data{'altphone'}','$surname','$data{'initials'}',
!   '$data{'ethnicity'}','$bornum','$guarant','$school')";
! }
  
! #print $query;
!   my $sth2=$dbh->prepare($query);
!   $sth2->execute;
!   $sth2->finish;
! $sth->finish;
  }
  print 
$input->redirect("/cgi-bin/koha/moremember.pl?bornum=$data{'borrowernumber'}");
--- 41,102 ----
  my $env;
  foreach my $key (@names){
!       $data{$key}=$input->param($key);
  }
  my $dbh = C4::Context->dbh;
! my $query;
  for (my $i=0;$i<3;$i++){
!       my $x = "cardnumber_child_$i";
!       my $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
!       $sth->execute($x);
!       if (my $data=$sth->fetchrow_hashref){
!               $query="update borrowers set 
title='$data{'title'}',expiry='$data{'expiry'}',
!               
cardnumber='$data{'cardnumber'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}',
!               
streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
!               
altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
!               
emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}',
!               
altrelationship='$data{'altrelationship'}',othernames='$data{'othernames'}',phoneday='$data{'phoneday'}',
!               
categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
!               
borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}',
!               
initials='$data{'initials'}',streetaddress='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}',physstreet='$data{'physstreet'}'
!               where borrowernumber=$data{'borrowernumber'}";
!               #  print $query;
!       }elsif ($data{"cardnumber_child_$i"} ne ''){
!       warn "INSERT";
!               my $dob=$data{"dateofbirth_child_$i"};
!               $dob=ParseDate($dob);
!               $dob=UnixDate($dob,'%Y-%m-%d');
!               $data{'joining'}=ParseDate("today");
!               $data{'joining'}=UnixDate($data{'joining'},'%Y-%m-%d');
!               my $cardnumber=$data{"cardnumber_child_$i"};
!               my $bornum=$data{"bornumber_child_$i"};
!               my $firstname=$data{"firstname_child_$i"};
!               my $surname=$data{"surname_child_$i"};
!               my $school=$data{"school_child_$i"};
!               my $guarant=$data{'borrowernumber'};
!               my $notes=$data{"altnotes_child_$i"};
!               my $sex=$data{"sex_child_$i"};
!               $data{'contactname'}=$data{'firstname_guardian'}." 
".$data{'surname_guardian'};
!               $data{'altrelationship'}="Guarantor";
!               $data{'altphone'}=$data{'phone'};
!               $query="insert into borrowers 
(title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber,
!               
firstname,altnotes,dateofbirth,contactname,emailaddress,dateenrolled,streetcity,
!               
altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
!               initials,ethnicity,borrowernumber,guarantor,school,physstreet)
!               values ('','$data{'expiry'}',
!               '$cardnumber',
!               
'$sex','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
!               
'$firstname','$data{'altnotes'}','$dob','$data{'contactname'}','$data{'emailaddress'}',
!               
'$data{'joining'}','$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}',
!               
'$data{'phoneday'}','C','$data{'city'}','$data{'area'}','$data{'phone'}',
!               '$notes','$data{'altphone'}','$surname','$data{'initials'}',
!               
'$data{'ethnicity'}','$bornum','$guarant','$school','$data{'physstreet'}')";
  
!       }
!       #print $query;
!       my $sth2=$dbh->prepare($query);
!       warn "QQQ = $query";
!       $sth2->execute;
!       $sth2->finish;
!       $sth->finish;
  }
  print 
$input->redirect("/cgi-bin/koha/moremember.pl?bornum=$data{'borrowernumber'}");

Index: jmemberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/jmemberentry.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** jmemberentry.pl     22 Apr 2003 11:16:26 -0000      1.9
--- jmemberentry.pl     5 May 2003 13:26:00 -0000       1.10
***************
*** 82,86 ****
                        area            => $data->{'area'},
                        city            => $data->{'city'},
!                       address         => $data->{'address'},
                        streetaddress   => $data->{'streetaddress'},
                        streetcity      => $data->{'streetcity'},
--- 82,86 ----
                        area            => $data->{'area'},
                        city            => $data->{'city'},
!                       physstreet         => $data->{'physstreet'},
                        streetaddress   => $data->{'streetaddress'},
                        streetcity      => $data->{'streetcity'},

Index: moremember.pl
===================================================================
RCS file: /cvsroot/koha/koha/moremember.pl,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** moremember.pl       8 Apr 2003 09:39:18 -0000       1.28
--- moremember.pl       5 May 2003 13:26:00 -0000       1.29
***************
*** 79,83 ****
      $data->{'streetaddress'}=$data2->{'streetaddress'};
      $data->{'city'}=$data2->{'city'};
!     $data->{'physstreet'}=$data2->{'phystreet'};
      $data->{'streetcity'}=$data2->{'streetcity'};
      $data->{'phone'}=$data2->{'phone'};
--- 79,83 ----
      $data->{'streetaddress'}=$data2->{'streetaddress'};
      $data->{'city'}=$data2->{'city'};
!     $data->{'physstreet'}=$data2->{'physstreet'};
      $data->{'streetcity'}=$data2->{'streetcity'};
      $data->{'phone'}=$data2->{'phone'};
***************
*** 193,197 ****
        if ($reserveline->{'constrainttype'} eq 'o'){
                
$restitle=getreservetitle($reserveline->{'biblionumber'},$reserveline->{'borrowernumber'},$reserveline->{'reservedate'},$reserveline->{'timestamp'});
!               %row =  (%row , %$restitle);
        }
        push (@reservedata, \%row);
--- 193,197 ----
        if ($reserveline->{'constrainttype'} eq 'o'){
                
$restitle=getreservetitle($reserveline->{'biblionumber'},$reserveline->{'borrowernumber'},$reserveline->{'reservedate'},$reserveline->{'timestamp'});
!               %row =  (%row , %$restitle) if $restitle;
        }
        push (@reservedata, \%row);