From 5c018a19c35042a4a50775e350d33641da9c1bdd Mon Sep 17 00:00:00 2001
From: acli <acli>
Date: Sun, 26 Jan 2003 23:34:48 +0000
Subject: [PATCH] Added check for MARC::Charset, used in
 acqui.simple/marcimport.pl (see bug 179)

---
 misc/Install.pm | 41 ++++++++++++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/misc/Install.pm b/misc/Install.pm
index 00ed49a7c2..d824e0f8e6 100644
--- a/misc/Install.pm
+++ b/misc/Install.pm
@@ -133,10 +133,24 @@ web site (http://www.koha.org/).
 
 |;
 
+$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
 command:
@@ -625,17 +639,22 @@ sub checkperlmodules {
     }
 
     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) {
+    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";
 	}
     }
-- 
2.39.5