Bugzilla – Attachment 17052 Details for
Bug 9752
Set marcflavor = normarc when NORMARC is chosen in the web installer
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 9752: Set marcflavour to NORMARC when NORMARC is chosen
PASSED-QA-Bug-9752-Set-marcflavour-to-NORMARC-when.patch (text/plain), 2.28 KB, created by
Katrin Fischer
on 2013-03-30 19:58:47 UTC
(
hide
)
Description:
[PASSED QA] Bug 9752: Set marcflavour to NORMARC when NORMARC is chosen
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2013-03-30 19:58:47 UTC
Size:
2.28 KB
patch
obsolete
>From 9147b4d9c2c45ae21bfdbeaeedf87de2cb485652 Mon Sep 17 00:00:00 2001 >From: Magnus Enger <magnus@enger.priv.no> >Date: Wed, 6 Mar 2013 15:20:59 +0100 >Subject: [PATCH] [PASSED QA] Bug 9752: Set marcflavour to NORMARC when > NORMARC is chosen > >Currently, if you install the Norwegian translations and run >through the web installer in Norwegian, choosing NORMARC as you >marcflavour, the marcflavour syspref is set to MARC21. > >To test: >- Apply the patch >- Install nb-NO >- Run through the web installer, choosing nb-NO as the language >- Choose NORMARC as the MARC dialect >- When the web installer is done, check the value of the > marcflavour syspref. It should be NORMARC, not MARC21. > >Signed-off-by: Galen Charlton <gmc@esilibrary.com> >Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> >Did a regression test installing UNIMARC too. >All tests and QA script pass. >--- > C4/Installer.pm | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > >diff --git a/C4/Installer.pm b/C4/Installer.pm >index 9c173dc..5bb9662 100644 >--- a/C4/Installer.pm >+++ b/C4/Installer.pm >@@ -407,10 +407,10 @@ sub load_sql_in_order { > Set the 'marcflavour' system preference. The incoming > C<$marcflavour> references to a subdirectory of > installer/data/$dbms/$lang/marcflavour, and is >-normalized to MARC21 or UNIMARC. >+normalized to MARC21, UNIMARC or NORMARC. > > FIXME: this method assumes that the MARC flavour will be either >-MARC21 or UNIMARC. >+MARC21, UNIMARC or NORMARC. > > =cut > >@@ -422,9 +422,10 @@ sub set_marcflavour_syspref { > # marc_cleaned finds the marcflavour, without the variant. > my $marc_cleaned = 'MARC21'; > $marc_cleaned = 'UNIMARC' if $marcflavour =~ /unimarc/i; >+ $marc_cleaned = 'NORMARC' if $marcflavour =~ /normarc/i; > my $request = > $self->{'dbh'}->prepare( >- "INSERT IGNORE INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','$marc_cleaned','Define global MARC flavor (MARC21 or UNIMARC) used for character encoding','MARC21|UNIMARC','Choice');" >+ "INSERT IGNORE INTO `systempreferences` (variable,value,explanation,options,type) VALUES('marcflavour','$marc_cleaned','Define global MARC flavor (MARC21, UNIMARC or NORMARC) used for character encoding','MARC21|UNIMARC|NORMARC','Choice');" > ); > $request->execute; > } >-- >1.7.9.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 9752
:
15909
|
16080
| 17052