[Koha-cvs] CVS: koha/misc Install.pm,1.63,1.64 koha.upgrade,1.12,1.13
MJ Ray
slef at users.sourceforge.net
Fri Oct 31 18:58:18 CET 2003
Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv30808
Modified Files:
Install.pm koha.upgrade
Log Message:
Merged $database and $dbname. That could have been nasty in a release
Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** Install.pm 31 Oct 2003 17:40:51 -0000 1.63
--- Install.pm 31 Oct 2003 17:58:16 -0000 1.64
***************
*** 60,64 ****
&showmessage
&releasecandidatewarning
- &setkohaversion
&getinstallationdirectories
&getdatabaseinfo
--- 60,63 ----
***************
*** 90,94 ****
use vars qw( $database $mysqluser );
use vars qw( $mysqlpass ); # normally should not be used
! use vars qw( $dbname $hostname $user $pass ); # virtual hosting
=item heading
--- 89,93 ----
use vars qw( $database $mysqluser );
use vars qw( $mysqlpass ); # normally should not be used
! use vars qw( $hostname $user $pass ); # virtual hosting
=item heading
***************
*** 1044,1048 ****
sub getdatabaseinfo {
! $dbname = 'Koha';
$hostname = 'localhost';
$user = 'kohaadmin';
--- 1043,1047 ----
sub getdatabaseinfo {
! $database = 'Koha';
$hostname = 'localhost';
$user = 'kohaadmin';
***************
*** 1051,1056 ****
#Get the database name
! my $message=getmessage('DatabaseName', [$dbname]);
! $dbname=showmessage($message, 'free', $dbname);
#Get the hostname for the database
--- 1050,1055 ----
#Get the database name
! my $message=getmessage('DatabaseName', [$database]);
! $database=showmessage($message, 'free', $database);
#Get the hostname for the database
***************
*** 1061,1065 ****
#Get the username for the database
! $message=getmessage('DatabaseUser', [$dbname, $hostname, $user]);
$user=showmessage($message, 'free', $user);
--- 1060,1064 ----
#Get the username for the database
! $message=getmessage('DatabaseUser', [$database, $hostname, $user]);
$user=showmessage($message, 'free', $user);
***************
*** 1528,1532 ****
print getmessage('CopyingFiles', ["old ".$desc,$tgt.strftime("%Y%m%d%H%M",localtime())]);
startsysout();
! system("mv ".$tgt." ".$tgt.".old");
}
--- 1527,1531 ----
print getmessage('CopyingFiles', ["old ".$desc,$tgt.strftime("%Y%m%d%H%M",localtime())]);
startsysout();
! system("mv ".$tgt." ".$tgt.strftime("%Y%m%d%H%M",localtime()));
}
***************
*** 1558,1562 ****
open(SITES,">$etcdir/koha.conf.tmp") or warn "Couldn't create file at $etcdir. Must have write capability.\n";
print SITES qq|
! database=$dbname
hostname=$hostname
user=$user
--- 1557,1561 ----
open(SITES,">$etcdir/koha.conf.tmp") or warn "Couldn't create file at $etcdir. Must have write capability.\n";
print SITES qq|
! database=$database
hostname=$hostname
user=$user
***************
*** 1670,1678 ****
startsysout();
print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");
! system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$dbname','$user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
# Change to admin user login
setmysqlclipass($pass);
! my $result=system("$mysqldir/bin/mysqladmin", "-u$user", "create", "$dbname");
if ($result) {
showmessage(getmessage('CreatingDatabaseError'),'PressEnter', '', 1);
--- 1669,1677 ----
startsysout();
print system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\"\;");
! system("$mysqldir/bin/mysql -u$mysqluser mysql -e \"insert into db (Host,Db,User,Select_priv,Insert_priv,Update_priv,Delete_priv,Create_priv,Drop_priv, index_priv, alter_priv) values ('%','$database','$user','Y','Y','Y','Y','Y','Y','Y','Y')\"");
system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
# Change to admin user login
setmysqlclipass($pass);
! my $result=system("$mysqldir/bin/mysqladmin", "-u$user", "create", "$database");
if ($result) {
showmessage(getmessage('CreatingDatabaseError'),'PressEnter', '', 1);
***************
*** 1680,1684 ****
# Create the database structure
startsysout();
! system("$mysqldir/bin/mysql -u$user $dbname < koha.mysql");
}
--- 1679,1683 ----
# Create the database structure
startsysout();
! system("$mysqldir/bin/mysql -u$user $database < koha.mysql");
}
***************
*** 1752,1760 ****
startsysout();
if ($response eq '1') {
! system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname");
}
if ($response eq '2') {
! system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $dbname");
! system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $dbname");
}
delete($ENV{"KOHA_CONF"});
--- 1751,1759 ----
startsysout();
if ($response eq '1') {
! system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql | $mysqldir/bin/mysql -u$user $database");
}
if ($response eq '2') {
! system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$user $database");
! system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$user $database");
}
delete($ENV{"KOHA_CONF"});
***************
*** 1782,1790 ****
# or updated to use -u$user and no mysqlpass_quoted
#
! # system("gunzip -d < sampledata-1.2.gz | $mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $dbname");
! # system("$mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $dbname -e \"insert into branches (branchcode,branchname,issuing) values ('MAIN', 'Main Library', 1)\"");
! # system("$mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
! # system("$mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
! # system("$mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $dbname -e \"insert into printers (printername,printqueue,printtype) values ('Circulation Desk Printer', 'lp', 'hp')\"");
# showmessage(getmessage('SampleDataInstalled'), 'PressEnter','',1);
# } else {
--- 1781,1789 ----
# or updated to use -u$user and no mysqlpass_quoted
#
! # system("gunzip -d < sampledata-1.2.gz | $mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $database");
! # system("$mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $database -e \"insert into branches (branchcode,branchname,issuing) values ('MAIN', 'Main Library', 1)\"");
! # system("$mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
! # system("$mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
! # system("$mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $database -e \"insert into printers (printername,printqueue,printtype) values ('Circulation Desk Printer', 'lp', 'hp')\"");
# showmessage(getmessage('SampleDataInstalled'), 'PressEnter','',1);
# } else {
***************
*** 1808,1814 ****
startsysout();
! system("$mysqldir/bin/mysql -u$user $dbname -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\"");
! system("$mysqldir/bin/mysql -u$user $dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
! system("$mysqldir/bin/mysql -u$user $dbname -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
my $printername='Library Printer';
--- 1807,1813 ----
startsysout();
! system("$mysqldir/bin/mysql -u$user $database -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\"");
! system("$mysqldir/bin/mysql -u$user $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\"");
! system("$mysqldir/bin/mysql -u$user $database -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\"");
my $printername='Library Printer';
***************
*** 1820,1828 ****
$printerqueue=~s/[^A-Za-z0-9]//g;
startsysout();
! system("$mysqldir/bin/mysql -u$user $dbname -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\"");
# }
my $language=showmessage(getmessage('Language'), 'free', 'en');
startsysout();
! system("$mysqldir/bin/mysql -u$user $dbname -e \"update systempreferences set value='$language' where variable='opaclanguages'\"");
}
}
--- 1819,1827 ----
$printerqueue=~s/[^A-Za-z0-9]//g;
startsysout();
! system("$mysqldir/bin/mysql -u$user $database -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\"");
# }
my $language=showmessage(getmessage('Language'), 'free', 'en');
startsysout();
! system("$mysqldir/bin/mysql -u$user $database -e \"update systempreferences set value='$language' where variable='opaclanguages'\"");
}
}
Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/misc/koha.upgrade,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** koha.upgrade 31 Oct 2003 17:40:51 -0000 1.12
--- koha.upgrade 31 Oct 2003 17:58:16 -0000 1.13
***************
*** 5,9 ****
use Install;
! setlanguage('en');
###############################################
--- 5,9 ----
use Install;
! Install::setlanguage('en');
###############################################
***************
*** 32,36 ****
};
! setkohaversion($::newversion);
checkperlmodules();
backupkoha();
--- 32,36 ----
};
! Install::setkohaversion($::newversion);
checkperlmodules();
backupkoha();
***************
*** 43,47 ****
showmessage(getmessage('UpgradeCompleted',['FIXME','FIXME','FIXME','FIXME','FIXME','FIXME']),'PressEnter');
! my $reply=showmessage('Would you like to complete a survey about your library?', 'yn', 'y');
if ($reply=~/y/i) {
system("perl kohareporter");
--- 43,47 ----
showmessage(getmessage('UpgradeCompleted',['FIXME','FIXME','FIXME','FIXME','FIXME','FIXME']),'PressEnter');
! my $reply=showmessage('Would you like to complete a survey about your library? [Y]/N: ', 'yn', 'y');
if ($reply=~/y/i) {
system("perl kohareporter");
More information about the Koha-cvs
mailing list