[Koha-cvs] CVS: koha/misc Install.pm,1.67,1.68

[Paul POULAIN]

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

Modified Files:
        Install.pm 
Log Message:
asking again for MARC structure & language definition :
* the test was wrong (installer didn't ask if you do a fresh install), 
* the user can answer N if he don't want to import marc definition

Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -r1.67 -r1.68
*** Install.pm  2 Dec 2003 22:13:26 -0000       1.67
--- Install.pm  4 Dec 2003 12:08:36 -0000       1.68
***************
*** 158,164 ****
     heading('RELEASE CANDIDATE') . qq|
  WARNING: You are about to install Koha version %s.  This is a
! release candidate, not intended for production systems.
! It is being released so that users can test it before we release a final
! version and report bugs to us.
  
  Most people should answer Yes here.
--- 158,164 ----
     heading('RELEASE CANDIDATE') . qq|
  WARNING: You are about to install Koha version %s.  This is a
! release candidate, It is NOT bugfree.
! However, it worked, and has been declared stable enough to
! be released.
  
  Most people should answer Yes here.
***************
*** 1761,1777 ****
        }
  
!       if ($kohaversion =~ /^1\.[012]\./) {
!               my $response=showmessage(getmessage('UpdateMarcTables'), 
'restrictchar 12N', '1');
  
!               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"});
        }
  
        print RESET."\n\nFinished updating of database. Press <ENTER> to 
continue...";
--- 1761,1776 ----
        }
  
!       my $response=showmessage(getmessage('UpdateMarcTables'), 'restrictchar 
12N', '1');
  
!       startsysout();
!       if ($response eq '1') {
!               system("cat scripts/misc/marc_datas/marc21_en/structure_def.sql 
| $mysqldir/bin/mysql -u$user $database");
!               system("cat scripts/misc/lang-datas/en/stopwords.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"});
  
        print RESET."\n\nFinished updating of database. Press <ENTER> to 
continue...";