[Koha-cvs] CVS: koha/C4 Members.pm,1.6,1.6.2.1

[Paul POULAIN]

Update of /cvsroot/koha/koha/C4
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11694/C4

Modified Files:
      Tag: rel_2_2
        Members.pm 
Log Message:
some bugfixes in physaddress and streetaddress. members table is really clumsy. 
Should be rewritten in 2.4...

NELSONVILLE : those are only bugfixes, but may have some consequences on NPL 
templates. Check twice please

Index: Members.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Members.pm,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -C2 -r1.6 -r1.6.2.1
*** Members.pm  4 Oct 2004 20:19:08 -0000       1.6
--- Members.pm  25 Mar 2005 16:30:32 -0000      1.6.2.1
***************
*** 104,108 ****
        my $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'}',
--- 104,108 ----
        my $query="update borrowers set 
title='$data{'title'}',expiry='$data{'expiry'}',
        
cardnumber='$data{'cardnumber'}',sex='$data{'sex'}',ethnotes='$data{'ethnicnotes'}',
!       
streetaddress='$data{'streetaddress'}',faxnumber='$data{'faxnumber'}',firstname='$data{'firstname'}',
        
altnotes='$data{'altnotes'}',dateofbirth='$data{'dateofbirth'}',contactname='$data{'contactname'}',
        
emailaddress='$data{'emailaddress'}',dateenrolled='$data{'joining'}',streetcity='$data{'streetcity'}',
***************
*** 110,114 ****
        
categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
        
borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}',
!       
initials='$data{'initials'}',physstreet='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}',
        
gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}',
        textmessaging='$data{'textmessaging'}', branchcode = 
'$data{'branchcode'}',
--- 110,114 ----
        
categorycode='$data{'categorycode'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}',
        
borrowernotes='$data{'borrowernotes'}',altphone='$data{'altphone'}',surname='$data{'surname'}',
!       
initials='$data{'initials'}',physstreet='$data{'physstreet'}',ethnicity='$data{'ethnicity'}',
        
gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}',
        textmessaging='$data{'textmessaging'}', branchcode = 
'$data{'branchcode'}',
***************
*** 138,147 ****
        
altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
        
initials,ethnicity,physstreet,branchcode,zipcode,homezipcode,sort1,sort2) 
values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}',
!       
'$data{'sex'}','$data{'ethnotes'}','$data{'address'}','$data{'faxnumber'}',
        
'$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}',
        
'$data{'joining'}','$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}',
        
'$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}',
        
'$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}',
!       
'$data{'ethnicity'}','$data{'streetaddress'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}','$data{'sort1'}','$data{'sort2'}')";
        my $sth=$dbh->prepare($query);
        $sth->execute;
--- 138,147 ----
        
altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
        
initials,ethnicity,physstreet,branchcode,zipcode,homezipcode,sort1,sort2) 
values ('$data{'title'}','$data{'expiry'}','$data{'cardnumber'}',
!       
'$data{'sex'}','$data{'ethnotes'}','$data{'streetaddress'}','$data{'faxnumber'}',
        
'$data{'firstname'}','$data{'altnotes'}','$data{'dateofbirth'}','$data{'contactname'}','$data{'emailaddress'}','$data{'textmessaging'}',
        
'$data{'joining'}','$data{'streetcity'}','$data{'altrelationship'}','$data{'othernames'}',
        
'$data{'phoneday'}','$data{'categorycode'}','$data{'city'}','$data{'area'}','$data{'phone'}',
        
'$data{'borrowernotes'}','$data{'altphone'}','$data{'surname'}','$data{'initials'}',
!       
'$data{'ethnicity'}','$data{'physstreet'}','$data{'branchcode'}','$data{'zipcode'}','$data{'homezipcode'}','$data{'sort1'}','$data{'sort2'}')";
        my $sth=$dbh->prepare($query);
        $sth->execute;