[Koha-cvs] CVS: koha installer.pl,1.2.2.56.2.1,1.2.2.56.2.2 koha.upgrade,1.1.2.11,1.1.2.11.2.1

[Steve Tonnesen]

Update of /cvsroot/koha/koha
In directory usw-pr-cvs1:/tmp/cvs-serv20387

Modified Files:
      Tag: koha-1_2_2
	installer.pl koha.upgrade 
Log Message:
Added in Net::Z3950 test, and added module test to koha.upgrade script


Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.2.2.56.2.1
retrieving revision 1.2.2.56.2.2
diff -C2 -r1.2.2.56.2.1 -r1.2.2.56.2.2
*** installer.pl	15 Jul 2002 20:06:21 -0000	1.2.2.56.2.1
--- installer.pl	22 Jul 2002 21:57:03 -0000	1.2.2.56.2.2
***************
*** 129,147 ****
  unless (eval {require DBD::mysql})        { push @missing,"DBD::mysql" };
  unless (eval {require Set::Scalar})       { push @missing,"Set::Scalar" };
! #unless (eval {require Net::Z3950})        { 
! #    print 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
! #command:
! #
! #perl -MCPAN -e 'install Net::Z3950'
! #
! #Press the <ENTER> key to continue:
! #|;
! #    <STDIN>;
! #}
  
  #
--- 129,147 ----
  unless (eval {require DBD::mysql})        { push @missing,"DBD::mysql" };
  unless (eval {require Set::Scalar})       { push @missing,"Set::Scalar" };
! unless (eval {require Net::Z3950})        { 
!     print 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
! command:
! 
! perl -MCPAN -e 'install Net::Z3950'
! 
! Press the <ENTER> key to continue:
! |;
!     <STDIN>;
! }
  
  #

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/koha.upgrade,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.11.2.1
diff -C2 -r1.1.2.11 -r1.1.2.11.2.1
*** koha.upgrade	9 Jul 2002 20:16:41 -0000	1.1.2.11
--- koha.upgrade	22 Jul 2002 21:57:03 -0000	1.1.2.11.2.1
***************
*** 102,105 ****
--- 102,158 ----
  };
  
+ 
+ #
+ # Test for Perl and Modules
+ #
+ print qq|
+ 
+ PERL & MODULES
+ ==============
+ 
+ |;
+ 
+ print "\nChecking perl modules ...\n";
+     unless (eval "require 5.004") {
+     die "Sorry, you need at least Perl 5.004\n";
+ }
+ 
+ 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 Set::Scalar})       { push @missing,"Set::Scalar" };
+ unless (eval {require Net::Z3950})        { 
+     print 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
+ command:
+ 
+ perl -MCPAN -e 'install Net::Z3950'
+ 
+ Press the <ENTER> key to continue:
+ |;
+     <STDIN>;
+ }
+ 
+ #
+ # Print out a list of any missing modules
+ #
+ if (@missing > 0) {
+     print "\n\n";
+     print "You are missing some Perl modules which are required by Koha.\n";
+     print "Once these modules have been installed, rerun this installer.\n";
+     print "They can be installed by running (as root) the following:\n";
+     foreach my $module (@missing) {
+ 	print "   perl -MCPAN -e 'install \"$module\"'\n";
+ 	exit(1);
+     }} else{
+     print "All modules appear to be installed, continuing...\n";
+ };
+ 
+ 
  my $backupdir='/usr/local/koha/backups';
  print "Please specify a backup directory [$backupdir]: ";