[Koha-cvs] CVS: koha/members memberentry.pl,1.3,1.4

[Paul POULAIN]

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

Modified Files:
	memberentry.pl 
Log Message:
modularizing (with Members.pm) members management
(beginning of...)

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** memberentry.pl	6 Jul 2004 08:24:18 -0000	1.3
--- memberentry.pl	30 Aug 2004 13:48:58 -0000	1.4
***************
*** 118,178 ****
  		$sth->execute($data{'borrowernumber'});
  		if (my $data2=$sth->fetchrow_hashref){
! 			$data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
! 			$data{'joining'}=format_date_in_iso($data{'joining'});
! 			$data{'expiry'}=format_date_in_iso($data{'expiry'});
! 			$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'}',physstreet='$data{'streetaddress'}',ethnicity='$data{'ethnicity'}',
! 			gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}',
! 			textmessaging='$data{'textmessaging'}', branchcode = '$data{'branchcode'}',
! 			zipcode = '$data{'zipcode'}',homezipcode='$data{'homezipcode'}', sort1='$data{'sort1'}', sort2='$data{'sort2'}'
! 			where borrowernumber=$data{'borrowernumber'}";
  		}else{
! 			$data{'dateofbirth'}=format_date_in_iso($data{'dateofbirth'});
! 			$data{'joining'}=format_date_in_iso($data{'joining'});
! 			$data{'expiry'}=format_date_in_iso($data{'expiry'});
! 			$data{'borrowernumber'}=NewBorrowerNumber();
! 			$query="insert into borrowers (title,expiry,cardnumber,sex,ethnotes,streetaddress,faxnumber,
! 			firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity,
! 			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'}')";
  		}
! 		# ok if its an adult (type) it may have borrowers that depend on it as a guarantor
! 		# so when we update information for an adult we should check for guarantees and update the relevant part
! 		# of their records, ie addresses and phone numbers
! 		if ($data{'categorycode'} eq 'A' || $data{'categorycode'} eq 'W'){
! 			# is adult check guarantees;
! 			my ($count,$guarantees)=findguarantees($data{'borrowernumber'});
! 			for (my $i=0;$i<$count;$i++){
! 				# FIXME
! 				# It looks like the $i is only being returned to handle walking through
! 				# the array, which is probably better done as a foreach loop.
! 				#
! 				my $guaquery="update borrowers set streetaddress='$data{'address'}',faxnumber='$data{'faxnumber'}',
! 				streetcity='$data{'streetcity'}',phoneday='$data{'phoneday'}',city='$data{'city'}',area='$data{'area'}',phone='$data{'phone'}'
! 				,streetaddress='$data{'address'}'
! 				where borrowernumber='$guarantees->[$i]->{'borrowernumber'}'";
! 				my $sth3=$dbh->prepare($guaquery);
! 				$sth3->execute;
! 				$sth3->finish;
! 			}
! 		}
! 		my $sth2=$dbh->prepare($query);
! 		$sth2->execute;
! 		$sth2->finish;
! 		$sth->finish;
! 		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$data{'borrowernumber'}");	}
  }
  if ($delete){
--- 118,127 ----
  		$sth->execute($data{'borrowernumber'});
  		if (my $data2=$sth->fetchrow_hashref){
! 			&modmember(%data);
  		}else{
! 			$data{borrowernumber} = &newmember(%data);
  		}
! 		print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$data{'borrowernumber'}");
! 	}
  }
  if ($delete){