[Koha-cvs] CVS: koha/misc Install.pm,1.23,1.24

[Ambrose Li]

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

Modified Files:
	Install.pm 
Log Message:
Removed the reference to INSTALL since the file does not exist any more

Changed "do not install MARC tables" option from 3 to N, to prepare for
adding more MARC flavours later

Minor prompt message modifs

Minor POD updates


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** Install.pm	25 Jan 2003 18:09:51 -0000	1.23
--- Install.pm	25 Jan 2003 19:00:05 -0000	1.24
***************
*** 214,218 ****
     http://%s\:%s/
  
! Be sure to read the INSTALL, and Hints files.
  
  For more information visit http://www.koha.org
--- 214,218 ----
     http://%s\:%s/
  
! Be sure to read the Hints file.
  
  For more information visit http://www.koha.org
***************
*** 1503,1506 ****
--- 1503,1512 ----
  The MARC tables are also populated in addition to being created.
  
+ Because updatedatabase calls scripts/updater/updatedatabase to
+ do the actual update, and that script uses C4::Context,
+ $etcdir/koha.conf must exist at this point. We use a symlink to
+ do this and to also at the same time faciliate detection of
+ ahorted installs. (See checkabortedinstall.)
+ 
  =cut
  
***************
*** 1511,1515 ****
    1 MARC21
    2 UNIMARC
!   3 none
  
  Please choose which parameter you want to install. Note if you choose 3,
--- 1517,1521 ----
    1 MARC21
    2 UNIMARC
!   N none
  
  Please choose which parameter you want to install. Note if you choose 3,
***************
*** 1520,1535 ****
  $messages->{'Language'}->{en} = heading('CHOOSE LANGUAGES') . qq|
  This version of koha supports a few languages.
! Enter you languages preferences : either en, fr, es or pl.
  Note that the en is always choosen when the system does not finds the
  language you choose in a specific screen.
! fr : opac is translated (except pictures)
  es : a few intranet is translated (including pictures)
! pl : opac is translated (UNTESTED in this release)
! |;
  
  sub updatedatabase {
      # At this point, $etcdir/koha.conf must exist, for C4::Context
-     # We must somehow temporarily enable $etcdir/koha.conf. A symlink can
-     # do this & at the same time facilitate detection of aborted installs.
  	my $result=system ("perl -I $intranetdir/modules scripts/updater/updatedatabase");
  	if ($result) {
--- 1526,1545 ----
  $messages->{'Language'}->{en} = heading('CHOOSE LANGUAGES') . qq|
  This version of koha supports a few languages.
! Enter your language preference : either en, fr, es or pl.
! 
  Note that the en is always choosen when the system does not finds the
  language you choose in a specific screen.
! 
! fr : OPAC is translated (except pictures)
  es : a few intranet is translated (including pictures)
! pl : OPAC is translated (UNTESTED in this release)
! 
! Whether you specify a language here, you can always go to the
! intranet interface and change it from the system preferences.
! 
! Which language do you choose? |;
  
  sub updatedatabase {
      # At this point, $etcdir/koha.conf must exist, for C4::Context
  	my $result=system ("perl -I $intranetdir/modules scripts/updater/updatedatabase");
  	if ($result) {
***************
*** 1538,1547 ****
  	}
  
! 	my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 123', '1');
  
! 	if ($response == 1) {
  		system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql | $mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $dbname");
  	}
! 	if ($response == 2) {
  		system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $dbname");
  		system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $dbname");
--- 1548,1557 ----
  	}
  
! 	my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 12N', '1');
  
! 	if ($response eq '1') {
  		system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql | $mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $dbname");
  	}
! 	if ($response eq '2') {
  		system("cat scripts/misc/marc_datas/unimarc_fr/structure_def.sql | $mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $dbname");
  		system("cat scripts/misc/lang-datas/fr/stopwords.sql | $mysqldir/bin/mysql -u$mysqluser $mysqlpass_quoted $dbname");