X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FInstaller.pm;h=43fd724bf2a6ae886e6645544cce34253ac54647;hb=0c40ff9f9814295fe27f52047bfbe4ef7b47e78b;hp=2e1fe1aaa0e97e7535dd6bf2e8452be32e656674;hpb=08f0f8cba5b28db653ab1a5275ae4eb60e1ab1f2;p=koha_gimpoz diff --git a/C4/Installer.pm b/C4/Installer.pm old mode 100644 new mode 100755 index 2e1fe1aaa0..43fd724bf2 --- a/C4/Installer.pm +++ b/C4/Installer.pm @@ -13,14 +13,16 @@ package C4::Installer; # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR # A PARTICULAR PURPOSE. See the GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License along with -# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# You should have received a copy of the GNU General Public License along +# with Koha; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. use strict; +#use warnings; FIXME - Bug 2505 our $VERSION = 3.00; use C4::Context; +use C4::Installer::PerlModules 1.000000; =head1 NAME @@ -28,35 +30,25 @@ C4::Installer =head1 SYNOPSIS -use C4::Installer; - -my $installer = C4::Installer->new(); - -my $all_languages = getAllLanguages(); - -my $error = $installer->load_db_schema(); - -my $list = $installer->sql_file_list('en', 'marc21', { optional => 1, mandatory => 1 }); - -my ($fwk_language, $error_list) = $installer->load_sql_in_order($all_languages, @$list); - -$installer->set_version_syspref(); - -$installer->set_marcflavour_syspref('MARC21'); - -$installer->set_indexing_engine(0); + use C4::Installer; + my $installer = C4::Installer->new(); + my $all_languages = getAllLanguages(); + my $error = $installer->load_db_schema(); + my $list = $installer->sql_file_list('en', 'marc21', { optional => 1, mandatory => 1 }); + my ($fwk_language, $error_list) = $installer->load_sql_in_order($all_languages, @$list); + $installer->set_version_syspref(); + $installer->set_marcflavour_syspref('MARC21'); + $installer->set_indexing_engine(0); =head1 DESCRIPTION +=cut + =head1 METHODS =head2 new -=over 4 - -my $installer = C4::Installer->new(); - -=back + my $installer = C4::Installer->new(); Creates a new installer. @@ -74,13 +66,13 @@ sub new { $self->{'port'} = C4::Context->config("port"); $self->{'user'} = C4::Context->config("user"); $self->{'password'} = C4::Context->config("pass"); - $self->{'dbh'} = DBI->connect("DBI:$self->{dbms}:dbname=$self->{dbname};host=$self->{hostname}" . + $self->{'dbh'} = DBI->connect("DBI:$self->{dbms}:dbname=$self->{dbname};host=$self->{hostname}" . ( $self->{port} ? ";port=$self->{port}" : "" ), $self->{'user'}, $self->{'password'}); $self->{'language'} = undef; $self->{'marcflavour'} = undef; $self->{'dbh'}->do('set NAMES "utf8"'); - $self->{'dbh'}->{'mysql_enable_utf8'}=1; + $self->{'dbh'}->{'mysql_enable_utf8'}=1; bless $self, $class; return $self; @@ -88,11 +80,7 @@ sub new { =head2 marcflavour_list -=over 4 - -my ($marcflavours) = $installer->marcflavour_list($lang); - -=back + my ($marcflavours) = $installer->marcflavour_list($lang); Return a arrayref of the MARC flavour sets available for the specified language C<$lang>. Returns 'undef' if a directory @@ -113,11 +101,8 @@ sub marcflavour_list { =head2 marc_framework_sql_list -=over 4 - -my ($defaulted_to_en, $list) = $installer->marc_framework_sql_list($lang, $marcflavour); - -=back + my ($defaulted_to_en, $list) = + $installer->marc_framework_sql_list($lang, $marcflavour); Returns in C<$list> a structure listing the filename, description, section, and mandatory/optional status of MARC framework scripts available for C<$lang> @@ -150,7 +135,7 @@ sub marc_framework_sql_list { } my @listdir = sort grep { !/^\.|marcflavour/ && -d "$dir/$_" } readdir(MYDIR); closedir MYDIR; - + my @fwklist; my $request = $self->{'dbh'}->prepare("SELECT value FROM systempreferences WHERE variable='FrameworksLoaded'"); $request->execute; @@ -192,17 +177,13 @@ sub marc_framework_sql_list { $cell{"code"} = lc($requirelevel); push @fwklist, \%cell; } - + return ($defaulted_to_en, \@fwklist); } =head2 sample_data_sql_list -=over 4 - -my ($defaulted_to_en, $list) = $installer->sample_data_sql_list($lang); - -=back + my ($defaulted_to_en, $list) = $installer->sample_data_sql_list($lang); Returns in C<$list> a structure listing the filename, description, section, and mandatory/optional status of sample data scripts available for C<$lang>. @@ -279,11 +260,7 @@ sub sample_data_sql_list { =head2 sql_file_list -=over 4 - -my $list = $installer->sql_file_list($lang, $marcflavour, $subset_wanted); - -=back + my $list = $installer->sql_file_list($lang, $marcflavour, $subset_wanted); Returns an arrayref containing the filepaths of installer SQL scripts available for laod. The C<$lang> and C<$marcflavour> arguments @@ -300,9 +277,9 @@ sub sql_file_list { my ($marc_defaulted_to_en, $marc_sql) = $self->marc_framework_sql_list($lang, $marcflavour); my ($sample_defaulted_to_en, $sample_sql) = $self->sample_data_sql_list($lang); - + my @sql_list = (); - map { + map { map { if ($subset_wanted->{'mandatory'}) { push @sql_list, $_->{'fwkfile'} if $_->{'mandatory'}; @@ -312,17 +289,13 @@ sub sql_file_list { } } @{ $_->{'frameworks'} } } (@$marc_sql, @$sample_sql); - + return \@sql_list } -=head2 load_db_schema - -=over 4 +=head2 load_db_schema -my $error = $installer->load_db_schema(); - -=back + my $error = $installer->load_db_schema(); Loads the SQL script that creates Koha's tables and indexes. The return value is a string containing error messages reported by the @@ -341,11 +314,7 @@ sub load_db_schema { =head2 load_sql_in_order -=over 4 - -my ($fwk_language, $list) = $installer->load_sql_in_order($all_languages, @sql_list); - -=back + my ($fwk_language, $list) = $installer->load_sql_in_order($all_languages, @sql_list); Given a list of SQL scripts supplied in C<@sql_list>, loads each of them into the database and sets the FrameworksLoaded system preference to names @@ -356,15 +325,15 @@ directory path). This means that dependencies among the scripts are to be resolved by carefully naming them, keeping in mind that the directory name does *not* currently count. -FIXME: this is a rather delicate way of dealing with dependencies between - the install scripts. +B this is a rather delicate way of dealing with dependencies between +the install scripts. The return value C<$list> is an arrayref containing a hashref for each "level" or directory containing SQL scripts; the hashref in turns contains a list of hashrefs containing a list of each script load and any error messages associated with the loading of each script. -FIXME: The C<$fwk_language> code probably doesn't belong and needs to be +B The C<$fwk_language> code probably doesn't belong and needs to be moved to a different method. =cut @@ -385,6 +354,9 @@ sub load_sql_in_order { $request->execute; my ($systempreference) = $request->fetchrow; $systempreference = '' unless defined $systempreference; # avoid warning + # Make sure the global sysprefs.sql file is loaded first + my $globalsysprefs = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/sysprefs.sql"; + unshift(@fnames, $globalsysprefs); foreach my $file (@fnames) { # warn $file; undef $/; @@ -429,13 +401,9 @@ sub load_sql_in_order { return ($fwk_language, \@list); } -=head2 set_marcflavour_syspref - -=over 4 - -$installer->set_marcflavour_syspref($marcflavour); +=head2 set_marcflavour_syspref -=back + $installer->set_marcflavour_syspref($marcflavour); Set the 'marcflavour' system preference. The incoming C<$marcflavour> references to a subdirectory of @@ -462,13 +430,9 @@ sub set_marcflavour_syspref { $request->execute; } -=head2 set_indexing_engine +=head2 set_indexing_engine -=over 4 - -$installer->set_indexing_engine($nozebra); - -=back + $installer->set_indexing_engine($nozebra); Sets system preferences related to the indexing engine. The C<$nozebra> argument is a boolean; @@ -493,11 +457,7 @@ sub set_indexing_engine { =head2 set_version_syspref -=over 4 - -$installer->set_version_syspref(); - -=back + $installer->set_version_syspref(); Set or update the 'Version' system preference to the current Koha software version. @@ -524,24 +484,20 @@ sub set_version_syspref { =head2 load_sql -=over 4 - -my $error = $installer->load_sql($filename); - -=back + my $error = $installer->load_sql($filename); Runs a the specified SQL using the DB's command-line SQL tool, and returns any strings sent to STDERR by the command-line tool. -FIXME: there has been a long-standing desire to - replace this with an SQL loader that goes - through DBI; partly for portability issues - and partly to improve error handling. +B there has been a long-standing desire to +replace this with an SQL loader that goes +through DBI; partly for portability issues +and partly to improve error handling. -FIXME: even using the command-line loader, some more - basic error handling should be added - deal - with missing files, e.g. +B even using the command-line loader, some more +basic error handling should be added - deal +with missing files, e.g. =cut @@ -552,8 +508,13 @@ sub load_sql { my $datadir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}"; my $error; my $strcmd; + my $cmd; if ( $self->{dbms} eq 'mysql' ) { - $strcmd = "mysql " + $cmd = qx(which mysql 2>/dev/null || whereis mysql 2>/dev/null); + chomp $cmd; + $cmd = $1 if ($cmd && $cmd =~ /^(.+?)[\r\n]+$/); + $cmd = 'mysql' if (!$cmd || !-x $cmd); + $strcmd = "$cmd " . ( $self->{hostname} ? " -h $self->{hostname} " : "" ) . ( $self->{port} ? " -P $self->{port} " : "" ) . ( $self->{user} ? " -u $self->{user} " : "" ) @@ -561,7 +522,11 @@ sub load_sql { . " $self->{dbname} "; $error = qx($strcmd --default-character-set=utf8 <$filename 2>&1 1>/dev/null); } elsif ( $self->{dbms} eq 'Pg' ) { - $strcmd = "psql " + $cmd = qx(which psql 2>/dev/null || whereis psql 2>/dev/null); + chomp $cmd; + $cmd = $1 if ($cmd && $cmd =~ /^(.+?)[\r\n]+$/); + $cmd = 'psql' if (!$cmd || !-x $cmd); + $strcmd = "$cmd " . ( $self->{hostname} ? " -h $self->{hostname} " : "" ) . ( $self->{port} ? " -p $self->{port} " : "" ) . ( $self->{user} ? " -U $self->{user} " : "" ) @@ -569,19 +534,20 @@ sub load_sql { . " $self->{dbname} "; # Therefore, be sure to run 'trust' on localhost in pg_hba.conf -fbcit $error = qx($strcmd -f $filename 2>&1 1>/dev/null); # Be sure to set 'client_min_messages = error' in postgresql.conf - # so that only true errors are returned to stderr or else the installer will + # so that only true errors are returned to stderr or else the installer will # report the import a failure although it really succeded -fbcit } +# errors thrown while loading installer data should be logged + if($error) { + warn "C4::Installer::load_sql returned the following errors while attempting to load $filename:\n"; + warn "$error"; + } return $error; } =head2 get_file_path_from_name -=over 4 - -my $filename = $installer->get_file_path_from_name('script_name'); - -=back + my $filename = $installer->get_file_path_from_name('script_name'); searches through the set of known SQL scripts and finds the fully qualified path name for the script that mathches the input. @@ -596,7 +562,7 @@ sub get_file_path_from_name { my $partialname = shift; my $lang = 'en'; # FIXME: how do I know what language I want? - + my ($defaulted_to_en, $list) = $self->sample_data_sql_list($lang); # warn( Data::Dumper->Dump( [ $list ], [ 'list' ] ) ); @@ -623,7 +589,7 @@ sub get_file_path_from_name { C4::Installer is a refactoring of logic originally from installer/installer.pl, which was originally written by Henri-Damien Laurant. -Koha Developement team +Koha Development Team Galen Charlton