[Koha-cvs] CVS: koha/misc Install.pm,1.25,1.26

[Ambrose Li]

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

Modified Files:
	Install.pm 
Log Message:
Added check for MARC::Charset, used in acqui.simple/marcimport.pl
(see bug 179)


Index: Install.pm
===================================================================
RCS file: /cvsroot/koha/koha/misc/Install.pm,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -r1.25 -r1.26
*** Install.pm	26 Jan 2003 16:18:34 -0000	1.25
--- Install.pm	26 Jan 2003 23:34:48 -0000	1.26
***************
*** 134,141 ****
--- 134,155 ----
  |;
  
+ $messages->{'MARCCharsetMissing'}->{en}=qq|
+ 
+ The MARC::Charset module is missing.  This module is necessary if you want to
+ be able to upload MARC records from Simple Acquisitions.
+ 
+ To install this module, you will need to either have Perl 5.8.0, or have Perl
+ 5.6.1 and are willing to manually patch the MARC::Charset module. If you have
+ Perl 5.8.0, the module can be installed with
+ 
+ perl -MCPAN -e 'install MARC::Charset'
+ 
+ Press the <ENTER> key to continue: |;
+ 
  $messages->{'NETZ3950Missing'}->{en}=qq|
  
  The Net::Z3950 module is missing.  This module is necessary if you want to use
  Koha's Z39.50 client to download bibliographic records from other libraries.
+ 
  To install this module, you will need the yaz client installed from
  http://www.indexdata.dk/yaz/ and then you can install the perl module with the
***************
*** 626,640 ****
  
      my @missing = ();
!     unless (eval {require DBI})               { push @missing,"DBI" };
!     unless (eval {require Date::Manip})       { push @missing,"Date::Manip" };
!     unless (eval {require DBD::mysql})        { push @missing,"DBD::mysql" };
!     unless (eval {require HTML::Template})          { push @missing,"HTML::Template" };
!     unless (eval {require Set::Scalar})       { push @missing,"Set::Scalar" };
!     unless (eval {require Digest::MD5})       { push @missing,"Digest::MD5" };
!     unless (eval {require MARC::Record})       { push @missing,"MARC::Record" };
!     unless (eval {require Net::Z3950})        {
! 	my $message = getmessage('NETZ3950Missing');
! 	showmessage($message, 'PressEnter', '', 1);
! 	if ($#missing>=0) {
  	    push @missing, "Net::Z3950";
  	}
--- 640,659 ----
  
      my @missing = ();
!     unless (eval {require DBI})              { push @missing,"DBI" };
!     unless (eval {require Date::Manip})      { push @missing,"Date::Manip" };
!     unless (eval {require DBD::mysql})       { push @missing,"DBD::mysql" };
!     unless (eval {require HTML::Template})   { push @missing,"HTML::Template" };
!     unless (eval {require Set::Scalar})      { push @missing,"Set::Scalar" };
!     unless (eval {require Digest::MD5})      { push @missing,"Digest::MD5" };
!     unless (eval {require MARC::Record})     { push @missing,"MARC::Record" };
!     unless (eval {require MARC::Charset})    {
! 	showmessage(getmessage('MARCCharsetMissing'), 'PressEnter', '', 1);
! 	if ($#missing>=0) { # XXX why only when $#missing >= 0?
! 	    push @missing, "MARC::Charset";
! 	}
!     }
!     unless (eval {require Net::Z3950})       {
! 	showmessage(getmessage('NETZ3950Missing'), 'PressEnter', '', 1);
! 	if ($#missing>=0) { # XXX why only when $#missing >= 0?
  	    push @missing, "Net::Z3950";
  	}