Attachment 106392 Details for Bug 23148 – Bug 23148: (follow-up) Correct image paths in sample data and tests

[patch] Bug 23148: (follow-up) Correct image paths in sample data and tests

Bug-23148-follow-up-Correct-image-paths-in-sample-.patch (text/plain), 12.78 KB, created by Owen Leonard on 2020-06-29 12:33:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2020-06-29 12:33:05 UTC

Size: 12.78 KB

patch

obsolete

>From 2020fb9405598f37b3f8367a4071086bace476b8 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 29 Jun 2020 11:57:52 +0000
>Subject: [PATCH] Bug 23148: (follow-up) Correct image paths in sample data and
> tests
>
>---
> installer/data/mysql/en/optional/sample_itemtypes.yml    | 16 ++++++++--------
> installer/data/mysql/it-IT/optional/sample_itemtypes.sql | 14 +++++++-------
> .../data/mysql/nb-NO/2-Valgfritt/sample_itemtypes.sql    | 14 +++++++-------
> installer/data/mysql/pl-PL/optional/sample_itemtypes.sql | 14 +++++++-------
> .../data/mysql/ru-RU/optional/library_item_types.sql     | 14 +++++++-------
> t/db_dependent/Search.t                                  | 14 +++++++-------
> t/db_dependent/Suggestions.t                             | 16 ++++++++--------
> 7 files changed, 51 insertions(+), 51 deletions(-)
>
>diff --git a/installer/data/mysql/en/optional/sample_itemtypes.yml b/installer/data/mysql/en/optional/sample_itemtypes.yml
>index 68ec6467ad..55f4d3d025 100644
>--- a/installer/data/mysql/en/optional/sample_itemtypes.yml
>+++ b/installer/data/mysql/en/optional/sample_itemtypes.yml
>@@ -29,54 +29,54 @@ tables:
>           description: "Books"
>           rentalcharge: 0
>           notforloan: 0
>-          imageurl: "bridge/book.gif"
>+          imageurl: "bridge/book.png"
>           summary: ""
> 
>         - itemtype: MX
>           description: "Mixed Materials"
>           rentalcharge: 5
>           notforloan: 0
>-          imageurl: "bridge/kit.gif"
>+          imageurl: "bridge/kit.png"
>           summary: ""
> 
>         - itemtype: CF
>           description: "Computer Files"
>           rentalcharge: 5
>           notforloan: 0
>-          imageurl: "bridge/computer_file.gif"
>+          imageurl: "bridge/computer_file.png"
>           summary: ""
> 
>         - itemtype: MP
>           description: "Maps"
>           rentalcharge: 5
>           notforloan: 0
>-          imageurl: "bridge/map.gif"
>+          imageurl: "bridge/map.png"
>           summary: ""
> 
>         - itemtype: VM
>           description: "Visual Materials"
>           rentalcharge: 5
>           notforloan: 1
>-          imageurl: "bridge/dvd.gif"
>+          imageurl: "bridge/dvd.png"
>           summary: ""
> 
>         - itemtype: MU
>           description: "Music"
>           rentalcharge: 5
>           notforloan: 0
>-          imageurl: "bridge/sound.gif"
>+          imageurl: "bridge/sound.png"
>           summary: ""
> 
>         - itemtype: CR
>           description: "Continuing Resources"
>           rentalcharge: 5
>           notforloan: 0
>-          imageurl: "bridge/periodical.gif"
>+          imageurl: "bridge/periodical.png"
>           summary: ""
> 
>         - itemtype: REF
>           description: "Reference"
>           rentalcharge: 0
>           notforloan: 1
>-          imageurl: "bridge/reference.gif"
>+          imageurl: "bridge/reference.png"
>           summary: ""
>diff --git a/installer/data/mysql/it-IT/optional/sample_itemtypes.sql b/installer/data/mysql/it-IT/optional/sample_itemtypes.sql
>index 3a931dcfa1..c12e2abc47 100644
>--- a/installer/data/mysql/it-IT/optional/sample_itemtypes.sql
>+++ b/installer/data/mysql/it-IT/optional/sample_itemtypes.sql
>@@ -1,12 +1,12 @@
> SET FOREIGN_KEY_CHECKS=0;
> 
>-INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('BK', 'Libro',0,0,'bridge/book.gif','');
>-INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('MX', 'Materiale misto',0,0,'bridge/kit.gif','');
>-INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('CF', 'Computer Files',0,0,'bridge/computer_file.gif','');
>-INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('MP', 'Mappe',0,0,'bridge/map.gif','');
>-INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('VM', 'Audiovisivi',0,1,'bridge/dvd.gif','');
>-INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('MU', 'Musica',0,0,'bridge/sound.gif','');
>-INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('CR', 'Periodici',0,0,'bridge/periodical.gif','');
>+INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('BK', 'Libro',0,0,'bridge/book.png','');
>+INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('MX', 'Materiale misto',0,0,'bridge/kit.png','');
>+INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('CF', 'Computer Files',0,0,'bridge/computer_file.png','');
>+INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('MP', 'Mappe',0,0,'bridge/map.png','');
>+INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('VM', 'Audiovisivi',0,1,'bridge/dvd.png','');
>+INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('MU', 'Musica',0,0,'bridge/sound.png','');
>+INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('CR', 'Periodici',0,0,'bridge/periodical.png','');
> INSERT INTO `itemtypes` (`itemtype`,`description`,`rentalcharge`,`notforloan`,`imageurl`,`summary`) VALUES ('REF', 'Reference',0,1,'','');
> 
> SET FOREIGN_KEY_CHECKS=1;
>diff --git a/installer/data/mysql/nb-NO/2-Valgfritt/sample_itemtypes.sql b/installer/data/mysql/nb-NO/2-Valgfritt/sample_itemtypes.sql
>index 7cba5ba9d8..6249b3b74a 100644
>--- a/installer/data/mysql/nb-NO/2-Valgfritt/sample_itemtypes.sql
>+++ b/installer/data/mysql/nb-NO/2-Valgfritt/sample_itemtypes.sql
>@@ -20,11 +20,11 @@
> -- along with Koha; if not, see <http://www.gnu.org/licenses>.
> 
> INSERT INTO itemtypes (itemtype, description, rentalcharge, notforloan, imageurl, summary) VALUES
>-('BK', 'BÃ¸ker',0,0,'bridge/book.gif',''),
>-('MX', 'Blandet innhold',0,0,'bridge/kit.gif',''),
>-('CF', 'Datafiler',0,0,'bridge/computer_file.gif',''),
>-('MP', 'Kart',0,0,'bridge/map.gif',''),
>-('VM', 'Visuelt materiale',0,1,'bridge/dvd.gif',''),
>-('MU', 'Musikk',5,0,'bridge/sound.gif',''),
>-('CR', 'Periodika',0,0,'bridge/periodical.gif',''),
>+('BK', 'BÃ¸ker',0,0,'bridge/book.png',''),
>+('MX', 'Blandet innhold',0,0,'bridge/kit.png',''),
>+('CF', 'Datafiler',0,0,'bridge/computer_file.png',''),
>+('MP', 'Kart',0,0,'bridge/map.png',''),
>+('VM', 'Visuelt materiale',0,1,'bridge/dvd.png',''),
>+('MU', 'Musikk',5,0,'bridge/sound.png',''),
>+('CR', 'Periodika',0,0,'bridge/periodical.png',''),
> ('REF', 'Oppslagsverk',0,1,'','');
>diff --git a/installer/data/mysql/pl-PL/optional/sample_itemtypes.sql b/installer/data/mysql/pl-PL/optional/sample_itemtypes.sql
>index c782d21af2..0e2ce5a18c 100644
>--- a/installer/data/mysql/pl-PL/optional/sample_itemtypes.sql
>+++ b/installer/data/mysql/pl-PL/optional/sample_itemtypes.sql
>@@ -1,9 +1,9 @@
> INSERT INTO itemtypes (itemtype, description, rentalcharge, notforloan, imageurl, summary) VALUES
>-('BK', 'KsiÄÅ¼ki',0,0,'bridge/book.gif',''),
>-('MX', 'MateriaÅy mieszane',5,0,'bridge/kit.gif',''),
>-('CF', 'Pliki komputerowe',5,0,'bridge/computer_file.gif',''),
>-('MP', 'Mapy',5,0,'bridge/map.gif',''),
>-('VM', 'MateriaÅy wziualne',5,1,'bridge/dvd.gif',''),
>-('MU', 'Muzyka',5,0,'bridge/sound.gif',''),
>-('CR', 'Wydawnictwa ciÄgÅe',5,0,'bridge/periodical.gif',''),
>+('BK', 'KsiÄÅ¼ki',0,0,'bridge/book.png',''),
>+('MX', 'MateriaÅy mieszane',5,0,'bridge/kit.png',''),
>+('CF', 'Pliki komputerowe',5,0,'bridge/computer_file.png',''),
>+('MP', 'Mapy',5,0,'bridge/map.png',''),
>+('VM', 'MateriaÅy wziualne',5,1,'bridge/dvd.png',''),
>+('MU', 'Muzyka',5,0,'bridge/sound.png',''),
>+('CR', 'Wydawnictwa ciÄgÅe',5,0,'bridge/periodical.png',''),
> ('REF', 'Reference',0,1,'','');
>diff --git a/installer/data/mysql/ru-RU/optional/library_item_types.sql b/installer/data/mysql/ru-RU/optional/library_item_types.sql
>index ba6262672c..75c1c25ac2 100644
>--- a/installer/data/mysql/ru-RU/optional/library_item_types.sql
>+++ b/installer/data/mysql/ru-RU/optional/library_item_types.sql
>@@ -2,11 +2,11 @@ SET foreign_key_checks = 0;
> TRUNCATE itemtypes;
> SET foreign_key_checks = 1;
> INSERT INTO itemtypes (itemtype, description, rentalcharge, notforloan, imageurl, summary) VALUES
>-('BK', ' ÐÐ½Ð¸Ð³Ð¸',0,0,'bridge/book.gif',''),
>-('MX', 'Ð¡Ð¼ÐµÑÐ°Ð½Ð½ÑÐµ Ð°ÑÐµÑÐ¸Ð°Ð»Ñ',5,0,'bridge/kit.gif',''),
>-('CF', 'ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ½ÑÐµ ÑÐ°Ð¹Ð»Ñ',5,0,'bridge/computer_file.gif',''),
>-('MP', 'ÐÐ°ÑÑÑ',5,0,'bridge/map.gif',''),
>-('VM', 'ÐÐ¸Ð·ÑÐ°Ð»ÑÐ½ÑÐµ Ð¼Ð°ÑÐµÑÐ¸Ð°Ð»Ñ',5,1,'bridge/dvd.gif',''),
>-('MU', 'ÐÑÐ·ÑÐºÐ°',5,0,'bridge/sound.gif',''),
>-('CR', 'ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð°ÑÑÐ¸ÐµÑÑ ÑÐµÑÑÑÑÑ',5,0,'bridge/periodical.gif',''),
>+('BK', ' ÐÐ½Ð¸Ð³Ð¸',0,0,'bridge/book.png',''),
>+('MX', 'Ð¡Ð¼ÐµÑÐ°Ð½Ð½ÑÐµ Ð°ÑÐµÑÐ¸Ð°Ð»Ñ',5,0,'bridge/kit.png',''),
>+('CF', 'ÐÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ½ÑÐµ ÑÐ°Ð¹Ð»Ñ',5,0,'bridge/computer_file.png',''),
>+('MP', 'ÐÐ°ÑÑÑ',5,0,'bridge/map.png',''),
>+('VM', 'ÐÐ¸Ð·ÑÐ°Ð»ÑÐ½ÑÐµ Ð¼Ð°ÑÐµÑÐ¸Ð°Ð»Ñ',5,1,'bridge/dvd.png',''),
>+('MU', 'ÐÑÐ·ÑÐºÐ°',5,0,'bridge/sound.png',''),
>+('CR', 'ÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð°ÑÑÐ¸ÐµÑÑ ÑÐµÑÑÑÑÑ',5,0,'bridge/periodical.png',''),
> ('REF', 'Ð¡Ð¿ÑÐ°Ð²Ð¾ÑÐ½Ð¸ÐºÐ¸',0,1,'','');
>diff --git a/t/db_dependent/Search.t b/t/db_dependent/Search.t
>index 024e9aba29..880f5205c3 100644
>--- a/t/db_dependent/Search.t
>+++ b/t/db_dependent/Search.t
>@@ -293,14 +293,14 @@ sub run_marc21_search_tests {
>         'UPL' => { 'branchaddress1' => 'Chestnut Hollow', 'branchcode' => 'UPL', 'branchname' => 'Union', },
>     );
>     my %itemtypes = (
>-        'BK' => { 'imageurl' => 'bridge/book.gif', 'summary' => '', 'itemtype' => 'BK', 'description' => 'Books' },
>-        'CF' => { 'imageurl' => 'bridge/computer_file.gif', 'summary' => '', 'itemtype' => 'CF', 'description' => 'Computer Files' },
>-        'CR' => { 'imageurl' => 'bridge/periodical.gif', 'summary' => '', 'itemtype' => 'CR', 'description' => 'Continuing Resources' },
>-        'MP' => { 'imageurl' => 'bridge/map.gif', 'summary' => '', 'itemtype' => 'MP', 'description' => 'Maps' },
>-        'MU' => { 'imageurl' => 'bridge/sound.gif', 'summary' => '', 'itemtype' => 'MU', 'description' => 'Music' },
>-        'MX' => { 'imageurl' => 'bridge/kit.gif', 'summary' => '', 'itemtype' => 'MX', 'description' => 'Mixed Materials' },
>+        'BK' => { 'imageurl' => 'bridge/book.png', 'summary' => '', 'itemtype' => 'BK', 'description' => 'Books' },
>+        'CF' => { 'imageurl' => 'bridge/computer_file.png', 'summary' => '', 'itemtype' => 'CF', 'description' => 'Computer Files' },
>+        'CR' => { 'imageurl' => 'bridge/periodical.png', 'summary' => '', 'itemtype' => 'CR', 'description' => 'Continuing Resources' },
>+        'MP' => { 'imageurl' => 'bridge/map.png', 'summary' => '', 'itemtype' => 'MP', 'description' => 'Maps' },
>+        'MU' => { 'imageurl' => 'bridge/sound.png', 'summary' => '', 'itemtype' => 'MU', 'description' => 'Music' },
>+        'MX' => { 'imageurl' => 'bridge/kit.png', 'summary' => '', 'itemtype' => 'MX', 'description' => 'Mixed Materials' },
>         'REF' => { 'imageurl' => '', 'summary' => '', 'itemtype' => 'REF', 'description' => 'Reference' },
>-        'VM' => { 'imageurl' => 'bridge/dvd.gif', 'summary' => '', 'itemtype' => 'VM', 'description' => 'Visual Materials' },
>+        'VM' => { 'imageurl' => 'bridge/dvd.png', 'summary' => '', 'itemtype' => 'VM', 'description' => 'Visual Materials' },
>     );
> 
>     index_sample_records_and_launch_zebra($datadir, 'marc21');
>diff --git a/t/db_dependent/Suggestions.t b/t/db_dependent/Suggestions.t
>index 3e2d5902ed..435771ff22 100644
>--- a/t/db_dependent/Suggestions.t
>+++ b/t/db_dependent/Suggestions.t
>@@ -48,14 +48,14 @@ t::lib::Mocks::mock_preference( "EmailPurchaseSuggestions", "0");
> $dbh->do(q|DELETE FROM itemtypes;|);
> my $sql = qq|
> INSERT INTO itemtypes (itemtype, description, rentalcharge, notforloan, imageurl, summary) VALUES
>-('BK', 'Books',5,0,'bridge/book.gif',''),
>-('MX', 'Mixed Materials',5,0,'bridge/kit.gif',''),
>-('CF', 'Computer Files',5,0,'bridge/computer_file.gif',''),
>-('MP', 'Maps',5,0,'bridge/map.gif',''),
>-('VM', 'Visual Materials',5,1,'bridge/dvd.gif',''),
>-('MU', 'Music',5,0,'bridge/sound.gif',''),
>-('CR', 'Continuing Resources',5,0,'bridge/periodical.gif',''),
>-('REF', 'Reference',0,1,'bridge/reference.gif','');|;
>+('BK', 'Books',5,0,'bridge/book.png',''),
>+('MX', 'Mixed Materials',5,0,'bridge/kit.png',''),
>+('CF', 'Computer Files',5,0,'bridge/computer_file.png',''),
>+('MP', 'Maps',5,0,'bridge/map.png',''),
>+('VM', 'Visual Materials',5,1,'bridge/dvd.png',''),
>+('MU', 'Music',5,0,'bridge/sound.png',''),
>+('CR', 'Continuing Resources',5,0,'bridge/periodical.png',''),
>+('REF', 'Reference',0,1,'bridge/reference.png','');|;
> $dbh->do($sql);
> $dbh->do(q|DELETE FROM suggestions|);
> $dbh->do(q|DELETE FROM issues|);
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 23148: 106337 | 106349 | 106350 | 106352 | 106353 | 106391 | 106392 | 106483 | 106484 | 106485 | 106486