Bugzilla – Attachment 21015 Details for
Bug 10523
Remove two obsolete routines from Installer.pm
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10523: Remove two obsolete routines from Installer.pm
Bug-10523-Remove-two-obsolete-routines-from-Instal.patch (text/plain), 4.08 KB, created by
Kyle M Hall (khall)
on 2013-09-12 13:03:05 UTC
(
hide
)
Description:
Bug 10523: Remove two obsolete routines from Installer.pm
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2013-09-12 13:03:05 UTC
Size:
4.08 KB
patch
obsolete
>From 9803f8c1c77b01c5185c44ccf839d2ebe08b2025 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Mon, 1 Jul 2013 15:12:53 +0200 >Subject: [PATCH] Bug 10523: Remove two obsolete routines from Installer.pm > >The routines sql_file_list and marcflavour_list in Installer.pm are not used. >There are some references to them in probably obsolete '/lib' test units. >I changed these test units for the record too. > >Also: removed the not-existing marcflavour parameter of sample_data_sql_list >in its call in install.pl. > >Test plan: >Run a new install. > >Signed-off-by: Paola Rossi <paola.rossi@cineca.it> >Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> >--- > C4/Installer.pm | 59 +------------------------------------------------ > installer/install.pl | 2 +- > 2 files changed, 3 insertions(+), 58 deletions(-) > >diff --git a/C4/Installer.pm b/C4/Installer.pm >index 5bb9662..2add0e8 100644 >--- a/C4/Installer.pm >+++ b/C4/Installer.pm >@@ -34,7 +34,8 @@ 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 $list; >+ #fill $list with list of sql files > my ($fwk_language, $error_list) = $installer->load_sql_in_order($all_languages, @$list); > $installer->set_version_syspref(); > $installer->set_marcflavour_syspref('MARC21'); >@@ -77,27 +78,6 @@ sub new { > return $self; > } > >-=head2 marcflavour_list >- >- 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 >-for the language does not exist. >- >-=cut >- >-sub marcflavour_list { >- my $self = shift; >- my $lang = shift; >- >- my $dir = C4::Context->config('intranetdir') . "/installer/data/$self->{dbms}/$lang/marcflavour"; >- opendir(MYDIR, $dir) or return; >- my @list = grep { !/^\.|CVS/ && -d "$dir/$_" } readdir(MYDIR); >- closedir MYDIR; >- return \@list; >-} >- > =head2 marc_framework_sql_list > > my ($defaulted_to_en, $list) = >@@ -257,41 +237,6 @@ sub sample_data_sql_list { > return ($defaulted_to_en, \@levellist); > } > >-=head2 sql_file_list >- >- 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 >-specify the desired language and MARC flavour. while C<$subset_wanted> >-is a hashref containing possible named parameters 'mandatory' and 'optional'. >- >-=cut >- >-sub sql_file_list { >- my $self = shift; >- my $lang = shift; >- my $marcflavour = shift; >- my $subset_wanted = shift; >- >- 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 { >- if ($subset_wanted->{'mandatory'}) { >- push @sql_list, $_->{'fwkfile'} if $_->{'mandatory'}; >- } >- if ($subset_wanted->{'optional'}) { >- push @sql_list, $_->{'fwkfile'} unless $_->{'mandatory'}; >- } >- } @{ $_->{'frameworks'} } >- } (@$marc_sql, @$sample_sql); >- >- return \@sql_list >-} >- > =head2 load_db_schema > > my $error = $installer->load_db_schema(); >diff --git a/installer/install.pl b/installer/install.pl >index 58388cb..39ba0fe 100755 >--- a/installer/install.pl >+++ b/installer/install.pl >@@ -241,7 +241,7 @@ elsif ( $step && $step == 3 ) { > $template->param( "frameworksloop" => $fwklist ); > $template->param( "marcflavour" => ucfirst($marcflavour)); > >- my ($sample_defaulted_to_en, $levellist) = $installer->sample_data_sql_list($langchoice, $marcflavour); >+ my ($sample_defaulted_to_en, $levellist) = $installer->sample_data_sql_list($langchoice); > $template->param( "en_sample_data" => $sample_defaulted_to_en); > $template->param( "levelloop" => $levellist ); > $template->param( "$op" => 1 ); >-- >1.7.2.5
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 10523
:
19314
|
19323
|
21012
|
21013
| 21015 |
21016