From 9684ad629a2346302daaf657e4b8fda9a0907399 Mon Sep 17 00:00:00 2001 From: tipaul Date: Mon, 30 Dec 2002 09:26:33 +0000 Subject: [PATCH] bugfixes for 1.3.3 release --- misc/Install.pm | 39 ++++++++++++++++++++++----------------- misc/buildrelease | 3 +-- misc/installer.pl | 2 +- 3 files changed, 24 insertions(+), 20 deletions(-) diff --git a/misc/Install.pm b/misc/Install.pm index 449f5d724e..33386a484b 100644 --- a/misc/Install.pm +++ b/misc/Install.pm @@ -1024,6 +1024,8 @@ opacdir=$::opacdir kohalogdir=$::kohalogdir kohaversion=$::kohaversion httpduser=$::httpduser +intrahtdocs=$::intranetdir/htdocs/includes/templates +opachtdocs=$::opacdir/htdocs/includes/templates |; close(SITES); umask($old_umask); @@ -1224,27 +1226,30 @@ es : a few intranet is translated (including pictures) |; sub updatedatabase { - my $result=system ("perl -I $::intranetdir/modules scripts/updater/updatedatabase"); - if ($result) { - print "Problem updating database...\n"; - exit; - } - - my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 123', '1'); + my $result=system ("perl -I $::intranetdir/modules scripts/updater/updatedatabase"); + if ($result) { + print "Problem updating database...\n"; + exit; + } - if ($response == 1) { - system("cat script/misc/marc_datas/marc21_en/structure_def.sql | $::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname"); - } - if ($response == 2) { - system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname"); - system("cat scripts/misc/lang-datas/fr/stopwords.sql | $::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname"); - } + my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 123', '1'); - system ("perl -I $::kohadir/modules scripts/marc/updatedb2marc.pl"); + if ($response == 1) { + system("cat script/misc/marc_datas/marc21_en/structure_def.sql | $::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname"); + } + if ($response == 2) { + system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname"); + system("cat scripts/misc/lang-datas/fr/stopwords.sql | $::mysqldir/bin/mysql -u$::mysqluser -p$::mysqlpass $::dbname"); + } + my $result=system ("perl -I $::intranetdir/modules scripts/marc/updatedb2marc.pl"); + if ($result) { + print "Problem updating database to MARC...\n"; + exit; + } - print "\n\nFinished updating database. Press to continue..."; - ; + print "\n\nFinished updating database. Press to continue..."; + ; } sub populatedatabase { diff --git a/misc/buildrelease b/misc/buildrelease index 5e659bd12b..7f576dbd2c 100644 --- a/misc/buildrelease +++ b/misc/buildrelease @@ -269,9 +269,8 @@ system("mv $rootdir/intranet-cgi/C4 $rootdir/modules"); # Move files from intranet-cgi to root of tarball system("mv $rootdir/intranet-cgi/misc/info/* $rootdir"); system("mv $rootdir/intranet-cgi/misc/installer.pl $rootdir"); -system("mv $rootdir/intranet-cgi/misc/installer.pm $rootdir"); system("mv $rootdir/intranet-cgi/misc/koha.upgrade $rootdir"); -#system("mv $rootdir/intranet-cgi/Install.pm $rootdir"); #does not exist ?? +system("mv $rootdir/intranet-cgi/Install.pm $rootdir"); #does not exist ?? #system("mv $rootdir/intranet-cgi/kohareporter $rootdir"); # does not exist ?? chmod 0770, "$rootdir/installer.pl"; chmod 0770, "$rootdir/koha.upgrade"; diff --git a/misc/installer.pl b/misc/installer.pl index 329eca3af5..2a65e3c906 100644 --- a/misc/installer.pl +++ b/misc/installer.pl @@ -94,7 +94,7 @@ databasesetup(); updatedatabase(); -updatemarc(); +#updatemarc(); populatedatabase(); -- 2.39.5