Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv14378 Modified Files: moremember.pl Log Message: moved ethnicity fixups into C4::Koha, eventually to be replaced with a better (non-NZ specific) solution. Index: moremember.pl =================================================================== RCS file: /cvsroot/koha/koha/moremember.pl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** moremember.pl 8 Apr 2002 23:44:43 -0000 1.10 --- moremember.pl 15 Apr 2002 16:17:21 -0000 1.11 *************** *** 1,11 **** #!/usr/bin/perl ! #script to do a borrower enquiery/brin up borrower details etc ! #written 20/12/99 by chris@katipo.co.nz ! #Displays all the detailas about a borrower ! #needs html removed and to use the C4::Output more, but its tricky ! #last modified 21/1/2000 by chris@katipo.co.nz ! #modifiecd 31/1/2001 by chris@katipo.co.nz to not allow items on request ! #to be renewed use strict; use C4::Output; --- 1,14 ---- #!/usr/bin/perl ! # script to do a borrower enquiry/bring up borrower details etc ! # Displays all the details about a borrower ! # written 20/12/99 by chris@katipo.co.nz ! # last modified 21/1/2000 by chris@katipo.co.nz ! # modified 31/1/2001 by chris@katipo.co.nz ! # to not allow items on request to be renewed ! # ! # needs html removed and to use the C4::Output more, but its tricky ! # ! use strict; use C4::Output; *************** *** 22,31 **** - # FIXME - # this hash is never assigned, though it is used (as a placeholder?) - # - my %env; - print $input->header; #start the page and read in includes print startpage(); --- 25,30 ---- print $input->header; + #start the page and read in includes print startpage(); *************** *** 38,69 **** $data->{'dateofbirth'} = slashifyDate($data->{'dateofbirth'}); ! # FIXME ! # turn the ethnicity into a function and make it generalizable ! # check these files to see if one convention or the other makes sense ! # boraccount.pl ! # imemberentry.pl ! # jmemberentry.pl ! # mancredit.pl ! # maninvoice.pl ! # member.pl ! # memberentry.pl ! # moremember.pl ! # moremember.pl ! # pay.pl ! # placerequest.pl ! # readingrec.pl ! # ! if ($data->{'ethnicity'} eq 'maori'){ ! $data->{'ethnicity'} = 'Maori'; ! } ! if ($data->{'ethnicity'}eq 'european'){ ! $data->{'ethnicity'} = 'European/Pakeha'; ! } ! if ($data->{'ethnicity'}eq 'pi'){ ! $data->{'ethnicity'} = 'Pacific Islander'; ! } ! if ($data->{'ethnicity'}eq 'asian'){ ! $data->{'ethnicity'} = 'Asian'; ! } print <<printend --- 37,41 ---- $data->{'dateofbirth'} = slashifyDate($data->{'dateofbirth'}); ! $data->{'ethnicity'} = fixEthnicity($data->{'ethnicity'}); print <<printend