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

[Paul POULAIN]

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

Modified Files:
	insertjdata.pl memberentry.pl 
Log Message:
adding 2 free fields that can be used for sorting purposes

Index: insertjdata.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/insertjdata.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** insertjdata.pl	21 Jun 2004 20:36:24 -0000	1.3
--- insertjdata.pl	6 Jul 2004 08:24:18 -0000	1.4
***************
*** 57,61 ****
  		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;
--- 57,61 ----
  		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'}',sort1='$data{sort1}',sort2='$data{'sort2'}'
  		where borrowernumber=$data{'borrowernumber'}";
  		#  print $query;
***************
*** 80,84 ****
  		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',
--- 80,84 ----
  		firstname,altnotes,dateofbirth,contactname,emailaddress,dateenrolled,streetcity,
  		altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
! 		initials,ethnicity,borrowernumber,guarantor,school,physstreet,sort1,sort2)
  		values ('','$data{'expiry'}',
  		'$cardnumber',
***************
*** 88,92 ****
  		'$data{'phoneday'}','C','$data{'city'}','$data{'area'}','$data{'phone'}',
  		'$notes','$data{'altphone'}','$surname','$data{'initials'}',
! 		'$data{'ethnicity'}','$bornum','$guarant','$school','$data{'physstreet'}')";
  
  	}
--- 88,92 ----
  		'$data{'phoneday'}','C','$data{'city'}','$data{'area'}','$data{'phone'}',
  		'$notes','$data{'altphone'}','$surname','$data{'initials'}',
! 		'$data{'ethnicity'}','$bornum','$guarant','$school','$data{'physstreet'}','$data{'sort1'}','$data{'sort2'}')";
  
  	}

Index: memberentry.pl
===================================================================
RCS file: /cvsroot/koha/koha/members/memberentry.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** memberentry.pl	24 Mar 2004 15:08:19 -0000	1.2
--- memberentry.pl	6 Jul 2004 08:24:18 -0000	1.3
***************
*** 132,136 ****
  			gonenoaddress='$data{'gna'}',lost='$data{'lost'}',debarred='$data{'debarred'}',
  			textmessaging='$data{'textmessaging'}', branchcode = '$data{'branchcode'}',
! 			zipcode = '$data{'zipcode'}',homezipcode='$data{'homezipcode'}'
  			where borrowernumber=$data{'borrowernumber'}";
  		}else{
--- 132,136 ----
  			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{
***************
*** 142,146 ****
  			firstname,altnotes,dateofbirth,contactname,emailaddress,textmessaging,dateenrolled,streetcity,
  			altrelationship,othernames,phoneday,categorycode,city,area,phone,borrowernotes,altphone,surname,
! 			initials,ethnicity,physstreet,branchcode,zipcode,homezipcode) 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'}',
--- 142,146 ----
  			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'}',
***************
*** 148,152 ****
  			'$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'}')";
  		}
  		# ok if its an adult (type) it may have borrowers that depend on it as a guarantor
--- 148,152 ----
  			'$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
***************
*** 309,312 ****
--- 309,314 ----
  				cardnumber	=> $cardnumber,
  				dateofbirth	=> $data->{'dateofbirth'},
+ 				sort1 => $data->{'sort1'},
+ 				sort2 => $data->{'sort2'},
  				dateformat      => display_date_format(),
  			        modify          => $modify,