[Koha-cvs] koha membersdeletemem.pl updater/updatedatabase

[Bruno Toumi]

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     Bruno Toumi <btoumi>    06/06/16 09:45:02

Modified files:
        members        : deletemem.pl 
        updater        : updatedatabase 

Log message:
        updatedatabase.pl: add change of borrowers table to deletedborrowers 
table
        deletemem.pl: delete use of warn function

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/members/deletemem.pl?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/updater/updatedatabase?cvsroot=koha&r1=1.144&r2=1.145

Patches:
Index: members/deletemem.pl
===================================================================
RCS file: /sources/koha/koha/members/deletemem.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- members/deletemem.pl        6 Jun 2006 16:18:00 -0000       1.7
+++ members/deletemem.pl        16 Jun 2006 09:45:02 -0000      1.8
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: deletemem.pl,v 1.7 2006/06/06 16:18:00 btoumi Exp $
+# $Id: deletemem.pl,v 1.8 2006/06/16 09:45:02 btoumi Exp $
 
 #script to delete items
 #written 2/5/00
@@ -46,7 +46,6 @@
 #print $input->header;
 my $member=$input->param('member');
 my %env;
-warn "user num".$member;
 $env{'nottodayissues'}=1;
 my %member2;
 $member2{'borrowernumber'}=$member;

Index: updater/updatedatabase
===================================================================
RCS file: /sources/koha/koha/updater/updatedatabase,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -b -r1.144 -r1.145
--- updater/updatedatabase      8 Jun 2006 15:36:31 -0000       1.144
+++ updater/updatedatabase      16 Jun 2006 09:45:02 -0000      1.145
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# $Id: updatedatabase,v 1.144 2006/06/08 15:36:31 alaurin Exp $
+# $Id: updatedatabase,v 1.145 2006/06/16 09:45:02 btoumi Exp $
 
 # Database Updater
 # This script checks for required updates to the database.
@@ -193,6 +193,7 @@
 my %uselessfields = (
 # tablename => "field1,field2",
        borrowers => 
"suburb,altstreetaddress,altsuburb,altcity,studentnumber,school,area,preferredcont,altcp",
+       deletedborrowers=> 
"suburb,altstreetaddress,altsuburb,altcity,studentnumber,school,area,preferredcont,altcp",
        );
 # the other hash contains other actions that can't be done elsewhere. they are 
done
 # either BEFORE of AFTER everything else, depending on "when" entry (default 
=> AFTER)
@@ -585,6 +586,68 @@
                },
        ],
        
+       deletedborrowers => [
+               {       field => 'B_email',
+                       type => 'text',
+                       null => 'NULL',
+                       after => 'B_zipcode',
+                },
+                {
+                       field => 'streetnumber', # street number (hidden if 
streettable table is empty)
+                       type => 'char(10)',
+                       null => 'NULL',
+                       after => 'initials',
+               },
+               {
+                       field => 'streettype', # street table, list builded 
from a system table
+                       type => 'char(50)',
+                       null => 'NULL',
+                       after => 'streetnumber',
+               },
+                {
+                       field => 'B_streetnumber', # street number (hidden if 
streettable table is empty)
+                       type => 'char(10)',
+                       null => 'NULL',
+                       after => 'fax',
+               },
+               {
+                       field => 'B_streettype', # street table, list builded 
from a system table
+                       type => 'char(50)',
+                       null => 'NULL',
+                       after => 'B_streetnumber',
+               },
+               {
+                       field => 'phonepro',
+                       type => 'text',
+                       null => 'NULL',
+                       after => 'fax',
+               },
+               {
+                       field => 'address2', # complement address
+                       type => 'text',
+                       null => 'NULL',
+                       after => 'address',
+               },
+               {
+                       field => 'emailpro',
+                       type => 'text',
+                       null => 'NULL',
+                       after => 'fax',
+               },
+               {
+                       field => 'contactfirstname', # contact's firstname
+                       type => 'text',
+                       null => 'NULL',
+                       after => 'contactname',
+               },
+               {
+                       field => 'contacttitle', # contact's title
+                       type => 'text',
+                       null => 'NULL',
+                       after => 'contactfirstname',
+               },
+       ],
+       
        branches =>  [
                {
                        field   => 'branchip',
@@ -898,6 +961,21 @@
                        onDelete => 'RESTRICT',
                },
        ],
+       deletedborrowers => [ # foreign keys are RESTRICT as we don't want to 
delete borrowers when a branch is deleted
+       # but prevent deleting a branch as soon as it has 1 borrower !
+               {       key => 'categorycode',
+                       foreigntable => 'categories',
+                       foreignkey => 'categorycode',
+                       onUpdate => 'RESTRICT',
+                       onDelete => 'RESTRICT',
+               },
+               {       key => 'branchcode',
+                       foreigntable => 'branches',
+                       foreignkey => 'branchcode',
+                       onUpdate => 'RESTRICT',
+                       onDelete => 'RESTRICT',
+               },
+       ],
        accountlines => [
                {       key => 'borrowernumber',
                        foreigntable => 'borrowers',
@@ -1009,6 +1087,90 @@
                                        after => 'borrowernotes',
                                },
                        ],
+
+       deletedborrowers => [
+                               {
+                                       from => 'emailaddress',
+                                       to => 'email',
+                                       after => 'city',
+                               },
+                               {
+                                       from => 'streetaddress',
+                                       to => 'address',
+                                       after => 'initials',
+                               },
+                               {
+                                       from => 'faxnumber',
+                                       to => 'fax',
+                                       after => 'phone',
+                               },
+                               {
+                                       from => 'textmessaging',
+                                       to => 'opacnote',
+                                       after => 'userid',
+                               },
+                               {
+                                       from => 'altnotes',
+                                       to => 'contactnote',
+                                       after => 'opacnote',
+                               },
+                               {
+                                       from => 'physstreet',
+                                       to => 'B_address',
+                                       after => 'fax',
+                               },
+                               {
+                                       from => 'streetcity',
+                                       to => 'B_city',
+                                       after => 'B_address',
+                               },
+                               {
+                                       from => 'phoneday',
+                                       to => 'mobile',
+                                       after => 'phone',
+                               },
+                               {
+                                       from => 'zipcode',
+                                       to => 'zipcode',
+                                       after => 'city',
+                               },
+                               {
+                                       from => 'homezipcode',
+                                       to => 'B_zipcode',
+                                       after => 'B_city',
+                               },
+                               {
+                                       from => 'altphone',
+                                       to => 'B_phone',
+                                       after => 'B_zipcode',
+                               },
+                               {
+                                       from => 'expiry',
+                                       to => 'dateexpiry',
+                                       after => 'dateenrolled',
+                               },
+                               {
+                                       from => 'guarantor',
+                                       to => 'guarantorid',
+                                       after => 'contactname',
+                               },
+                               {
+                                       from => 'textmessaging',
+                                       to => 'opacnotes',
+                                       after => 'flags',
+                               },
+                               {
+                                       from => 'altnotes',
+                                       to => 'contactnotes',
+                                       after => 'opacnotes',
+                               },
+                               {
+                                       from => 'altrelationship',
+                                       to => 'relationship',
+                                       after => 'borrowernotes',
+                               },
+                       ],
+
                );
                
 foreach my $table (keys %column_change) {
@@ -1613,6 +1775,10 @@
 exit;
 
 # $Log: updatedatabase,v $
+# Revision 1.145  2006/06/16 09:45:02  btoumi
+# updatedatabase.pl: add change of borrowers table to deletedborrowers table
+# deletemem.pl: delete use of warn function
+#
 # Revision 1.144  2006/06/08 15:36:31  alaurin
 # Add a new system preference 'AutomaticItemReturn' :
 #