[Koha-cvs] koha C4/Members.pm members/deletemem.pl [rel_3_0]

[Bruno Toumi]

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	Bruno Toumi <btoumi>	06/11/09 10:45:12

Modified files:
	C4             : Members.pm 
	members        : deletemem.pl 

Log message:
	move and rename sub DeleteBorrower
	to Members.pm from deletemem.pm

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.32.2.11&r2=1.32.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/members/deletemem.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.9&r2=1.9.2.1

Patches:
Index: C4/Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.32.2.11
retrieving revision 1.32.2.12
diff -u -b -r1.32.2.11 -r1.32.2.12
--- C4/Members.pm	2 Nov 2006 14:11:04 -0000	1.32.2.11
+++ C4/Members.pm	9 Nov 2006 10:45:11 -0000	1.32.2.12
@@ -19,7 +19,7 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id: Members.pm,v 1.32.2.11 2006/11/02 14:11:04 btoumi Exp $
+# $Id: Members.pm,v 1.32.2.12 2006/11/09 10:45:11 btoumi Exp $
 
 use strict;
 require Exporter;
@@ -31,7 +31,7 @@
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
 
-$VERSION = do { my @v = '$Revision: 1.32.2.11 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.32.2.12 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
 
 =head1 NAME
 
@@ -58,6 +58,7 @@
 @EXPORT = qw(
  &BornameSearch &GetMember &borrdata &borrdata2 &fixup_cardnumber &findguarantees &findguarantor &GuarantornameSearch &NewBorrowerNumber   &modmember &newmember &changepassword &borrissues &allissues
   &checkuniquemember &getzipnamecity &getidcity &getguarantordata &getcategorytype
+  &DeleteBorrower
   &calcexpirydate &checkuserpassword
   &getboracctrecord
   &GetborCatFromCatType &getborrowercategory
@@ -1502,6 +1503,47 @@
 
 
 
+=head2 delmember 
+
+  () = &delmember($member);
+
+delete all data fo borrowers and add record to deletedborrowers table
+C<&$member>this is the borrowernumber
+
+
+=cut
+sub DeleteBorrower{
+	my ($member)=@_;
+	my $dbh = C4::Context->dbh;
+	my $query;
+	$query=qq|SELECT * 
+		  FROM borrowers 
+		  WHERE borrowernumber=?|;	
+	my $sth=$dbh->prepare($query);
+	$sth->execute($member);
+	my @data=$sth->fetchrow_array;
+	$sth->finish;
+	$sth=$dbh->prepare("Insert into deletedborrowers values (".("?,"x(scalar(@data)-1))."?)");
+	$sth->execute(@data);
+	$sth->finish;
+  	$query=qq|DELETE 
+ 		  FROM borrowers 
+ 		  WHERE borrowernumber=?|;
+ 	$sth=$dbh->prepare($query);
+  	$sth->execute($member);
+  	$sth->finish;
+ 	$query=qq|DELETE 
+ 		  FROM  reserves 
+ 		  WHERE borrowernumber=?|;
+  	$sth=$dbh->prepare($query);
+  	$sth->execute($member);
+  	$sth->finish;
+}
+
+
+
+
+
 =head2 member_reregistration (OUEST-PROVENCE)
 
 automatic reregistration in borrowers table 

Index: members/deletemem.pl
===================================================================
RCS file: /sources/koha/koha/members/deletemem.pl,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -b -r1.9 -r1.9.2.1
--- members/deletemem.pl	4 Jul 2006 14:36:52 -0000	1.9
+++ members/deletemem.pl	9 Nov 2006 10:45:12 -0000	1.9.2.1
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: deletemem.pl,v 1.9 2006/07/04 14:36:52 toins Exp $
+# $Id: deletemem.pl,v 1.9.2.1 2006/11/09 10:45:12 btoumi Exp $
 
 #script to delete items
 #written 2/5/00
@@ -33,6 +33,7 @@
 use C4::Output;
 use C4::Circulation::Circ2;
 use C4::Auth;
+use C4::Members;
 
 
 my $input = new CGI;
@@ -109,24 +110,8 @@
 output_html_with_http_headers $input, $cookie, $template->output;
 
 } else {
-	delmember($member);
+	DeleteBorrower($member);
 	print $input->redirect("/cgi-bin/koha/members/members-home.pl");
 }
 
-sub delmember{
-	my ($member)=@_;
-	my $dbh = C4::Context->dbh;
-	my $sth=$dbh->prepare("Select * from borrowers where borrowernumber=?");
-	$sth->execute($member);
-	my @data=$sth->fetchrow_array;
-	$sth->finish;
-	$sth=$dbh->prepare("Insert into deletedborrowers values (".("?,"x(scalar(@data)-1))."?)");
-	$sth->execute(@data);
-	$sth->finish;
-	$sth=$dbh->prepare("Delete from borrowers where borrowernumber=?");
-	$sth->execute($member);
-	$sth->finish;
-	$sth=$dbh->prepare("Delete from reserves where borrowernumber=?");
-	$sth->execute($member);
-	$sth->finish;
-}
+