[Koha-cvs] CVS: koha/misc buildrelease,1.5,1.6 installer.pl,1.7,1.8 Install.pm,1.2,1.3

[Paul POULAIN]

Update of /cvsroot/koha/koha/misc
In directory sc8-pr-cvs1:/tmp/cvs-serv11816/misc

Modified Files:
	buildrelease installer.pl Install.pm 
Log Message:
bugfixes for 1.3.3 release

Index: buildrelease
===================================================================
RCS file: /cvsroot/koha/koha/misc/buildrelease,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** buildrelease	20 Dec 2002 13:58:34 -0000	1.5
--- buildrelease	30 Dec 2002 09:26:33 -0000	1.6
***************
*** 270,276 ****
  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/kohareporter $rootdir"); # does not exist ??
  chmod 0770, "$rootdir/installer.pl";
--- 270,275 ----
  system("mv $rootdir/intranet-cgi/misc/info/* $rootdir");
  system("mv $rootdir/intranet-cgi/misc/installer.pl $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/kohareporter $rootdir"); # does not exist ??
  chmod 0770, "$rootdir/installer.pl";

Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/misc/installer.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** installer.pl	20 Dec 2002 13:58:34 -0000	1.7
--- installer.pl	30 Dec 2002 09:26:33 -0000	1.8
***************
*** 95,99 ****
  updatedatabase();
  
! updatemarc();
  
  populatedatabase();
--- 95,99 ----
  updatedatabase();
  
! #updatemarc();
  
  populatedatabase();

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Install.pm	20 Dec 2002 10:30:15 -0000	1.2
--- Install.pm	30 Dec 2002 09:26:33 -0000	1.3
***************
*** 1025,1028 ****
--- 1025,1030 ----
  kohaversion=$::kohaversion
  httpduser=$::httpduser
+ intrahtdocs=$::intranetdir/htdocs/includes/templates
+ opachtdocs=$::opacdir/htdocs/includes/templates
  |;
      close(SITES);
***************
*** 1225,1249 ****
  
  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');
  
!     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");
!     }
! 
!     system ("perl -I $::kohadir/modules scripts/marc/updatedb2marc.pl");
  
  
!     print "\n\nFinished updating database. Press <ENTER> to continue...";
!     <STDIN>;
  }
  
--- 1227,1254 ----
  
  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');
  
! 	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 <ENTER> to continue...";
! 	<STDIN>;
  }