[Koha-cvs] koha/misc Install.pm [rel_3_0]
Antoine Farnault
antoine at koha-fr.org
Mon Sep 4 10:18:35 CEST 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/09/04 08:18:35
Modified files:
misc : Install.pm
Log message:
sync with rel_2_2.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/misc/Install.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.94&r2=1.94.2.1
Patches:
Index: Install.pm
===================================================================
RCS file: /sources/koha/koha/misc/Install.pm,v
retrieving revision 1.94
retrieving revision 1.94.2.1
diff -u -b -r1.94 -r1.94.2.1
--- Install.pm 4 Jul 2006 14:36:52 -0000 1.94
+++ Install.pm 4 Sep 2006 08:18:35 -0000 1.94.2.1
@@ -838,22 +838,27 @@
# The following modules are not mandatory, depends on how the library want to use Koha
unless (eval {require PDF::API2}) {
if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
- push @missing,"You will need PDF::API2 for barcode generator"
+ push @missing,"You will need PDF::API2 for barcode generator";
}
}
- unless (eval {require PDF::API2::PDF}) {
+ unless (eval {require GD::Barcorde}) {
if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
- push @missing,"You will need PDF::API2::PDF for spine and barcode printing"
+ push @missing,"You will need GD::Barcode for the new barcode generator";
}
}
- unless (eval {require PDF::Reuse}) {
+ unless (eval {require GD::Barcorde}) {
if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
- push @missing,"You will need PDF::Reuse for spine and barcode printing"
+ push @missing,"You will need GD::Barcode for the new barcode generator";
+ }
+ }
+ unless (eval {require Data::Random}) {
+ if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
+ push @missing,"You will need Data::Random for the new barcode generator";
}
}
unless (eval {require PDF::Reuse::Barcode}) {
if ($#missing>=0) { # only when $#missing >= 0 so this isn't fatal
- push @missing,"You will need PDF::Reuse::Barcode for spine and barcode printing"
+ push @missing,"You will need PDF::Reuse::Barcode for the new barcode generator";
}
}
unless (eval {require PDF::Report}) {
@@ -890,13 +895,13 @@
push @missing, "Net::Z3950";
}
}
- unless (eval {require LWP::Simple) {
+ unless (eval {require LWP::Simple}) {
showmessage(getmessage('LWP::Simple'), 'PressEnter', '', 1);
if ($#missing>=0) { # see above note
push @missing, "LWP::Simple";
}
}
- unless (eval {require XML::Simple) {
+ unless (eval {require XML::Simple}) {
showmessage(getmessage('XML::Simple'), 'PressEnter', '', 1);
if ($#missing>=0) { # see above note
push @missing, "XML::Simple";
@@ -1813,7 +1818,7 @@
# Set up permissions
startsysout();
print system("$mysqldir/bin/mysql -u$mysqluser -e \"insert into user (Host,User,Password) values ('$hostname','$user',password('$pass'))\" mysql\;");
- system("$mysqldir/bin/mysql -u$mysqluser -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')\" mysql");
+ system("$mysqldir/bin/mysql '-u$mysqluser' -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')\" mysql");
system("$mysqldir/bin/mysqladmin -u$mysqluser reload");
# Change to admin user login
setmysqlclipass($pass);
@@ -1849,8 +1854,10 @@
heading('MARC FIELD DEFINITIONS') . qq|
You can import MARC settings for:
- 1 MARC21
- 2 UNIMARC
+ 1 MARC21 in english
+ 2 UNIMARC in french
+ 3 UNIMARC in english
+ 4 UNIMARC in ukrainian
N none
NOTE: If you choose N,
@@ -1896,7 +1903,7 @@
$response=$auto_install->{UpdateMarcTables};
print ON_YELLOW.BLACK."auto-setting UpdateMarcTable to : $response".RESET."\n";
} else {
- $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12Nn', '1');
+ $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 1234Nn', '1');
}
startsysout();
if ($response eq '1') {
@@ -1905,6 +1912,12 @@
if ($response eq '2') {
system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql '-u$user' '$database'");
}
+ if ($response eq '3') {
+ system("cat scripts/misc/marc_datas/unimarc_en/structure_def.sql | $mysqldir/bin/mysql '-u$user' '$database'");
+ }
+ if ($response eq '4') {
+ system("cat scripts/misc/marc_datas/unimarc_uk/structure_def.sql | $mysqldir/bin/mysql '-u$user' '$database'");
+ }
delete($ENV{"KOHA_CONF"});
print RESET."\nFinished updating of database. Press <ENTER> to continue..." unless ($auto_install->{NoPressEnter});
@@ -1954,9 +1967,9 @@
$branchcode or $branchcode='DEF';
startsysout();
- system("$mysqldir/bin/mysql -u$user -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\" $database");
- system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\" $database");
- system("$mysqldir/bin/mysql -u$user -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\" $database");
+ system("$mysqldir/bin/mysql '-u$user' -e \"insert into branches (branchcode,branchname,issuing) values ('$branchcode', '$branch', 1)\" $database");
+ system("$mysqldir/bin/mysql '-u$user' -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'IS')\" $database");
+ system("$mysqldir/bin/mysql '-u$user' -e \"insert into branchrelations (branchcode,categorycode) values ('MAIN', 'CU')\" $database");
my $printername='lp';
my $printerqueue='/dev/lp0';
@@ -1975,7 +1988,7 @@
$printerqueue=~s/[^A-Za-z0-9]//g;
}
startsysout();
- system("$mysqldir/bin/mysql -u$user -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\" $database");
+ system("$mysqldir/bin/mysql '-u$user' -e \"insert into printers (printername,printqueue,printtype) values ('$printername', '$printerqueue', '')\" $database");
}
my $language;
if ($auto_install->{Language}) {
@@ -1985,7 +1998,7 @@
$language=showmessage(getmessage('Language'), 'free', 'en');
}
startsysout();
- system("$mysqldir/bin/mysql -u$user -e \"update systempreferences set value='$language' where variable='opaclanguages'\" $database");
+ system("$mysqldir/bin/mysql '-u$user' -e \"update systempreferences set value='$language' where variable='opaclanguages'\" $database");
my @dirs;
if (-d "scripts/misc/sql-datas") {
# ask for directory to look for files to append
More information about the Koha-cvs
mailing list