Bugzilla – Attachment 56622 Details for
Bug 10337
Add a script to insert all sample data automatically
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 10337: (QA followup) Allow choosing MARC flavour
Bug-10337-QA-followup-Allow-choosing-MARC-flavour.patch (text/plain), 4.24 KB, created by
Tomás Cohen Arazi (tcohen)
on 2016-10-18 13:28:12 UTC
(
hide
)
Description:
Bug 10337: (QA followup) Allow choosing MARC flavour
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2016-10-18 13:28:12 UTC
Size:
4.24 KB
patch
obsolete
>From 2cdcf3420e77c36651a6c0a882c3105a4ab5d337 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Tue, 18 Oct 2016 09:47:26 -0300 >Subject: [PATCH] Bug 10337: (QA followup) Allow choosing MARC flavour > >This patch enables the --marcflavour option switch so the user >can specify the desired marc flavour. The code for handling it >was already in place, just not used. > >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > misc/devel/populate_db.pl | 96 ++++++++++++++++++++++++++++++++++++++++------- > 1 file changed, 82 insertions(+), 14 deletions(-) > mode change 100644 => 100755 misc/devel/populate_db.pl > >diff --git a/misc/devel/populate_db.pl b/misc/devel/populate_db.pl >old mode 100644 >new mode 100755 >index 9289c14..ab0503d >--- a/misc/devel/populate_db.pl >+++ b/misc/devel/populate_db.pl >@@ -19,10 +19,68 @@ > > use Modern::Perl; > >+use Getopt::Long; >+use Pod::Usage; >+ > use C4::Installer; > use C4::Context; > use t::lib::Mocks; > >+=head1 NAME >+ >+populate_db.pl - Load included sample data into the DB >+ >+=head1 SYNOPSIS >+ >+populate_db.pl [--marcflavour MARCFLAVOUR] >+ >+ Options: >+ --help Brief help message >+ --marcflavour m Specify the MARC flavour to use (MARC21|UNIMARC). Defaults >+ to MARC21. >+ -v Be verbose. >+ >+=head1 OPTIONS >+ >+=over 8 >+ >+=item B<--help> >+ >+Prints a brief help message and exits. >+ >+=item B<--marcflavour> >+ >+Lets you choose the desired MARC flavour for the sample data. Valid options are MARC21 and UNIMARC. >+It defaults to MARC21. >+ >+=item B<--verbose> >+ >+Make the output more verbose. >+ >+=back >+ >+=cut >+ >+my $help; >+my $verbose; >+my $marcflavour = 'MARC21'; >+ >+GetOptions( >+ 'help|?' => \$help, >+ 'verbose' => \$verbose, >+ 'marcflavour=s' => \$marcflavour >+) or pod2usage; >+ >+if ( $help ) { >+ pod2usage; >+} >+ >+if ( $marcflavour ne 'MARC21' >+ and $marcflavour ne 'UNIMARC' ) { >+ say "Invalid MARC flavour '$marcflavour' passed."; >+ pod2usage; >+} >+ > $ENV{KOHA_DB_DO_NOT_RAISE_OR_PRINT_ERROR} = 1; > my $dbh = C4::Context->dbh; # At the beginning to die if DB does not exist. > >@@ -57,7 +115,8 @@ initialize_data(); > update_database(); > > sub initialize_data { >- say "Inserting koha db structure..."; >+ say "Inserting koha db structure..." >+ if $verbose; > my $error = $installer->load_db_schema; > die $error if $error; > >@@ -73,31 +132,39 @@ sub initialize_data { > execute_sqlfile($f); > } > >- for my $f (@marc21_sample_files_mandatory) { >- execute_sqlfile($f); >+ if ( $marcflavour eq 'UNIMARC' ) { >+ for my $f (@unimarc_sample_files_mandatory) { >+ execute_sqlfile($f); >+ } >+ } else { >+ for my $f (@marc21_sample_files_mandatory) { >+ execute_sqlfile($f); >+ } > } > > # set marcflavour (MARC21) > my $dbh = C4::Context->dbh; >- $dbh->do( >- q{ >+ >+ say "Setting the MARC flavour on the sysprefs..." >+ if $verbose; >+ $dbh->do(qq{ > INSERT INTO `systempreferences` (variable,value,explanation,options,type) >- VALUES ('marcflavour','MARC21','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice') >- } >- ); >+ VALUES ('marcflavour',?,'Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice') >+ },undef,$marcflavour); > > # set version >- $dbh->do( >- qq{ >+ say "Setting Koha version to $version..." >+ if $verbose; >+ $dbh->do(qq{ > INSERT INTO systempreferences(variable, value, options, explanation, type) > VALUES ('Version', '$version', NULL, 'The Koha database version. WARNING: Do not change this value manually, it is maintained by the webinstaller', NULL) >- } >- ); >+ }); > } > > sub execute_sqlfile { > my ($filepath) = @_; >- say "Inserting $filepath..."; >+ say "Inserting $filepath..." >+ if $verbose; > my $error = $installer->load_sql($filepath); > die $error if $error; > } >@@ -111,7 +178,8 @@ sub get_version { > > sub update_database { > my $update_db_path = $root . '/installer/data/mysql/updatedatabase.pl'; >- >+ say "Updating database..." >+ if $verbose; > my $file = `cat $update_db_path`; > $file =~ s/exit;//; > eval $file; >-- >2.10.1
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 10337
:
18389
|
18390
|
42784
|
56607
|
56614
|
56621
| 56622 |
56625