Attachment 25135 Details for Bug 11611 – Bug 11611: Rephrase description and examples of 5 MARC related sysprefs

[patch] Bug 11611: Rephrase description and examples of 5 MARC related sysprefs

Bug-11611-Rephrase-description-and-examples-of-5-M.patch (text/plain), 10.59 KB, created by Kyle M Hall (khall) on 2014-02-07 14:28:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kyle M Hall (khall)

Created: 2014-02-07 14:28:48 UTC

Size: 10.59 KB

patch

obsolete

>From 3989fa36092e28899467b4918c90224ae68c3b2c Mon Sep 17 00:00:00 2001
>From: Mathieu Saby <mathsabypro@gmail.com>
>Date: Sun, 26 Jan 2014 19:55:46 +0100
>Subject: [PATCH] Bug 11611: Rephrase description and examples of 5 MARC related sysprefs
>
>This patch rephrases the description or examples of 5 sysprefs:
>1/ MARCAuthorityControlField008: "MARC" -> "MARC21"
>2/ itemcallnumber: "Examples" -> "Examples (for MARC21 records)"
>3/ DefaultLanguageField008: "Range 35-37" -> "Range 35-37 of MARC21 records"
>4/ MARCOrgCode: "new MARC records" -> "new MARC21 records"
>5/ UNIMARCAuthorityField100 description: "Do NOT include the date (position 00-05)." -> "position 08-35. Do NOT include the date (position 00-07)."
>It also adds description in sql systempreferences table for UNIMARCAuthorityField100, MARCAuthorityControlField008 and MARCOrgCode
>
>Test plan:
>Apply and run updatedatabase.pl
>Check the changes are taken into account in syspref administration page
>Check the changes are taken into account in systempreferences table (for UNIMARCAuthorityField100, MARCAuthorityControlField008 and MARCOrgCode)
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
>---
> installer/data/mysql/sysprefs.sql | 8 +++---
> installer/data/mysql/updatedatabase.pl | 21 ++++++++++++++++++++
> .../en/modules/admin/preferences/authorities.pref | 4 +-
> .../en/modules/admin/preferences/cataloguing.pref | 6 ++--
> 4 files changed, 30 insertions(+), 9 deletions(-)
>
>diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql
>index 1668d37..9df6f9b 100644
>--- a/installer/data/mysql/sysprefs.sql
>+++ b/installer/data/mysql/sysprefs.sql
>@@ -89,7 +89,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('decreaseLoanHighHoldsDuration',NULL,'','Specifies a number of days that a loan is reduced to when used in conjunction with decreaseLoanHighHolds','Integer'),
> ('decreaseLoanHighHoldsValue',NULL,'','Specifies a threshold for the minimum number of holds needed to trigger a reduction in loan duration (used with decreaseLoanHighHolds)','Integer'),
> ('DefaultClassificationSource','ddc',NULL,'Default classification scheme used by the collection. E.g., Dewey, LCC, etc.','ClassSources'),
>-('DefaultLanguageField008','','','Fill in the default language for field 008 Range 35-37 (e.g. eng, nor, ger, see <a href=\"http://www.loc.gov/marc/languages/language_code.html\">MARC Code List for Languages</a>)','Free'),
>+('DefaultLanguageField008','','','Fill in the default language for field 008 Range 35-37 of MARC21 records (e.g. eng, nor, ger, see <a href=\"http://www.loc.gov/marc/languages/language_code.html\">MARC Code List for Languages</a>)','Free'),
> ('defaultSortField','relevance','relevance|popularity|call_number|pubdate|acqdate|title|author','Specify the default field used for sorting','Choice'),
> ('defaultSortOrder','dsc','asc|dsc|az|za','Specify the default sort order','Choice'),
> ('delimiter',';',';|tabulation|,|/|\\|#||','Define the default separator character for exporting reports','Choice'),
>@@ -174,8 +174,8 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('LinkerRelink','1',NULL,'If ON the authority linker will relink headings that have previously been linked every time it runs.','YesNo'),
> ('LocalCoverImages','0','1','Display local cover images on intranet details pages.','YesNo'),
> ('ManInvInNoissuesCharge','1',NULL,'MANUAL_INV charges block checkouts (added to noissuescharge).','YesNo'),
>-('MARCAuthorityControlField008','|| aca||aabn | a|a d',NULL,NULL,'Textarea'),
>-('MARCOrgCode','OSt','','Define MARC Organization Code - http://www.loc.gov/marc/organizations/orgshome.html','free'),
>+('MARCAuthorityControlField008','|| aca||aabn | a|a d',NULL,'Define the contents of MARC21 authority control field 008 position 06-39','Textarea'),
>+('MARCOrgCode','OSt','','Define MARC Organization Code for MARC21 records - http://www.loc.gov/marc/organizations/orgshome.html','free'),
> ('MaxFine',NULL,'','Maximum fine a patron can have for all late returns at one moment. Single item caps are specified in the circulation rules matrix.','Integer'),
> ('maxItemsInSearchResults','20',NULL,'Specify the maximum number of items to display for each result on a page of results','free'),
> ('maxoutstanding','5','','maximum amount withstanding to be able make holds','Integer'),
>@@ -395,7 +395,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `
> ('TrackClicks','0',NULL,'Track links clicked','Integer'),
> ('TransfersMaxDaysWarning','3',NULL,'Define the days before a transfer is suspected of having a problem','Integer'),
> ('TransferWhenCancelAllWaitingHolds','0',NULL,'Transfer items when cancelling all waiting holds','YesNo'),
>-('UNIMARCAuthorityField100','afrey50 ba0',NULL,NULL,'Textarea'),
>+('UNIMARCAuthorityField100','afrey50 ba0',NULL,'Define the contents of UNIMARC authority control field 100 position 08-35','Textarea'),
> ('UNIMARCAuthorsFacetsSeparator',', ',NULL,'UNIMARC authors facets separator','short'),
> ('UNIMARCField100Language','fre',NULL,'UNIMARC field 100 default language','short'),
> ('UniqueItemFields','barcode','','Space-separated list of fields that should be unique (used in acquisition module for item creation). Fields must be valid SQL column names of items table','Free'),
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index f043d0b..c1d8bf1 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -7953,6 +7953,27 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
> SetVersion($DBversion);
> }
> 
>+$DBversion = "3.15.00.XXX";
>+if(CheckVersion($DBversion)) {
>+ $dbh->do(q{
>+ UPDATE systempreferences
>+ SET explanation = 'Define the contents of UNIMARC authority control field 100 position 08-35'
>+ WHERE variable = "UNIMARCAuthorityField100"
>+ });
>+ $dbh->do(q{
>+ UPDATE systempreferences
>+ SET explanation = 'Define the contents of MARC21 authority control field 008 position 06-39'
>+ WHERE variable = "MARCAuthorityControlField008"
>+ });
>+ $dbh->do(q{
>+ UPDATE systempreferences
>+ SET explanation = 'Define MARC Organization Code for MARC21 records - http://www.loc.gov/marc/organizations/orgshome.html'
>+ WHERE variable = "MARCOrgCode"
>+ });
>+ print "Upgrade to $DBversion done (Bug 11611 - fix possible confusion between UNIMARC and MARC21 in some sysprefs)\n";
>+ SetVersion($DBversion);
>+}
>+
> =head1 FUNCTIONS
> 
> =head2 TableExists($table)
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref
>index 2369e2f..2762411 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/authorities.pref
>@@ -31,7 +31,7 @@ Authorities:
> no: Do
> - automatically update attached biblios when changing an authority record. If this is off, please ask your administrator to enable the merge_authority.pl cronjob.
> -
>- - Use the following text for the contents of MARC authority control field 008 position 06-39 (fixed length data elements). Do NOT include the date (position 00-05).
>+ - Use the following text for the contents of MARC21 authority control field 008 position 06-39 (fixed length data elements). Do NOT include the date (position 00-05).
> - pref: MARCAuthorityControlField008
> default: "|| aca||aabn | a|a d"
> type: textarea
>@@ -44,7 +44,7 @@ Authorities:
> no: "Don't use"
> - authority record numbers instead of text strings for searches from subject tracings.
> -
>- - Use the following text for the contents of UNIMARC authority field 100 position (fixed length data elements). Do NOT include the date (position 00-05).
>+ - Use the following text for the contents of UNIMARC authority field 100 position 08-35 (fixed length data elements). Do NOT include the date (position 00-07).
> - pref: UNIMARCAuthorityField100
> defautl: "afrey50 ba0"
> type: textarea
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
>index 5eb493b..169aec4 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/cataloguing.pref
>@@ -40,7 +40,7 @@ Cataloging:
> -
> Record Structure:
> -
>- - Fill in the default language for field 008 Range 35-37 (e.g. eng, nor, ger, see <a href="http://www.loc.gov/marc/languages/language_code.html">MARC Code List for Languages</a>)
>+ - Fill in the default language for field 008 Range 35-37 of MARC21 records (e.g. eng, nor, ger, see <a href="http://www.loc.gov/marc/languages/language_code.html">MARC Code List for Languages</a>)
> - pref: DefaultLanguageField008
> - " Empty defaults to eng."
> -
>@@ -61,7 +61,7 @@ Cataloging:
> -
> - Map the MARC subfield
> - pref: itemcallnumber
>- - "to an item's callnumber. (This can contain multiple subfields to look in; for instance <code>082ab</code> would look in 082 subfields a and b.) Examples: Dewey: <code>082ab</code> or <code>092ab</code>; LOC: <code>050ab</code> or <code>090ab</code>; from the item record: <code>852hi</code>"
>+ - "to an item's callnumber. (This can contain multiple subfields to look in; for instance <code>082ab</code> would look in 082 subfields a and b.) Examples (for MARC21 records): Dewey: <code>082ab</code> or <code>092ab</code>; LOC: <code>050ab</code> or <code>090ab</code>; from the item record: <code>852hi</code>"
> -
> - Display MARC subfield
> - pref: AlternateHoldingsField
>@@ -71,7 +71,7 @@ Cataloging:
> -
> - Fill in the <a href="http://www.loc.gov/marc/organizations/orgshome.html">MARC organization code</a>
> - pref: MARCOrgCode
>- - by default in new MARC records (leave blank to disable).
>+ - by default in new MARC21 records (leave blank to disable).
> -
> - When items are created, give them the temporary location of
> - pref: NewItemsDefaultLocation
>-- 
>1.7.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 11611: 24734 | 25122 | 25135