[Koha-cvs] CVS: koha installer.pl,1.2.2.57,1.2.2.58 koha.upgrade,1.1.2.13,1.1.2.14

[Steve Tonnesen]

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

Modified Files:
      Tag: rel-1-2
	installer.pl koha.upgrade 
Log Message:
Test for Net::Z3950


Index: installer.pl
===================================================================
RCS file: /cvsroot/koha/koha/installer.pl,v
retrieving revision 1.2.2.57
retrieving revision 1.2.2.58
diff -C2 -r1.2.2.57 -r1.2.2.58
*** installer.pl	11 Jul 2002 20:48:22 -0000	1.2.2.57
--- installer.pl	22 Jul 2002 22:41:59 -0000	1.2.2.58
***************
*** 1,5 ****
  #!/usr/bin/perl -w # please develop with -w
  
! use diagnostics;
  use strict; # please develop with the strict pragma
  
--- 1,5 ----
  #!/usr/bin/perl -w # please develop with -w
  
! #use diagnostics;
  use strict; # please develop with the strict pragma
  
***************
*** 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>;
! }
  
  #
***************
*** 331,334 ****
--- 331,359 ----
     }
  }
+ unless ($realhttpdconf) {
+     print qq|
+ 
+ I was not able to find your apache configuration file.  It is usually
+ called httpd.conf or apache.conf.
+ |;
+     print "Where is your Apache configuratin file? ";
+     chomp($input = <STDIN>);
+ 
+     if ($input) {
+ 	$realhttpdconf = $input;
+     } else {
+ 	$realhttpdconf='';
+     }
+     if ( -f $realhttpdconf ) {
+ 	open (HTTPDCONF, $realhttpdconf) or warn "Insufficient privileges to open $realhttpdconf for reading.\n";
+ 	while (<HTTPDCONF>) {
+ 	    if (/^\s*User\s+"?([-\w]+)"?\s*$/) {
+ 		$httpduser = $1;
+ 	    }
+ 	}
+ 	close(HTTPDCONF);
+     }
+ }
+ 
  unless ($httpduser) {
      print qq|

Index: koha.upgrade
===================================================================
RCS file: /cvsroot/koha/koha/koha.upgrade,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -C2 -r1.1.2.13 -r1.1.2.14
*** koha.upgrade	11 Jul 2002 19:56:33 -0000	1.1.2.13
--- koha.upgrade	22 Jul 2002 22:41:59 -0000	1.1.2.14
***************
*** 1,5 ****
  #!/usr/bin/perl -w
  
! use diagnostics;
  use strict; # please develop with the strict pragma
  
--- 1,5 ----
  #!/usr/bin/perl -w
  
! #use diagnostics;
  use strict; # please develop with the strict pragma
  
***************
*** 124,144 ****
  unless (eval {require DBD::mysql})        { push @missing,"DBD::mysql" };
  unless (eval {require Set::Scalar})       { push @missing,"Set::Scalar" };
! unless (eval {require Digest::MD5})       { push @missing,"Digest::MD5" };
! unless (eval {require HTML::Template})       { push @missing,"HTML::Template" };
! #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>;
! #}
  
  #
--- 124,142 ----
  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>;
! }
  
  #