From e638b13de536a07ff26f81e096988d9531f41955 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Tue, 14 Jul 2015 17:26:55 +0200 Subject: [PATCH] Bug 14201: Plugin marc21_leader_book is useless A closer look at this plugin revealed the following: [1] The leader_book builder redirects to leader.pl; the launcher code with leader_book.tt is dead. [2] A diff of the two templates showed that most changes are minimal and irrelevant. Some updates to leader have not been incorporated into the unused leader_book. [3] Leader_book does not use Focus while leader does. This patch removes all traces of leader_book :) It includes a tiny db revision for those brave people using it. The only behavior change for them is the focus change. Another small change: we do not need Search.pm in marc21_leader. Test plan: [1] Run the db revision. If you had some field attached to leader_book, it should be gone. [2] Check if the leader plugin still works as expected. [3] Run the FrameworkPlugin unit test. Ignore warnings from field_007. [4] Git grep on marc21_leader_book. You will only find references to PO files in misc/translator. Signed-off-by: Hector Castro Signed-off-by: Jonathan Druart --- cataloguing/value_builder/marc21_leader.pl | 9 +- cataloguing/value_builder/marc21_leader_book.pl | 91 ------ .../atomicupdate/14201_marc21_leader_book.sql | 2 + .../value_builder/marc21_leader_book.tt | 338 --------------------- 4 files changed, 5 insertions(+), 435 deletions(-) delete mode 100755 cataloguing/value_builder/marc21_leader_book.pl create mode 100644 installer/data/mysql/atomicupdate/14201_marc21_leader_book.sql delete mode 100644 koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tt diff --git a/cataloguing/value_builder/marc21_leader.pl b/cataloguing/value_builder/marc21_leader.pl index 4366c62..755300a 100755 --- a/cataloguing/value_builder/marc21_leader.pl +++ b/cataloguing/value_builder/marc21_leader.pl @@ -20,12 +20,10 @@ # along with Koha; if not, see . use Modern::Perl; +use CGI qw ( -utf8 ); use C4::Auth; -use CGI qw ( -utf8 ); use C4::Context; - -use C4::Search; use C4::Output; my $builder = sub { @@ -39,14 +37,13 @@ function Focus$function_name(event) { if(!document.getElementById(event.data.id).value){ document.getElementById(event.data.id).value = ' nam a22 7a 4500'; } - return 1; } function Click$function_name(event) { defaultvalue=document.getElementById(event.data.id).value; newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=marc21_leader.pl&index=\"+ event.data.id +\"&result=\"+defaultvalue,\"tag_editor\",'width=1000,height=600,toolbar=false,scrollbars=yes'); - } + //]]> "; @@ -94,4 +91,4 @@ my $launcher = sub { output_html_with_http_headers $input, $cookie, $template->output; }; -return { builder => $builder, launcher => $launcher }; \ No newline at end of file +return { builder => $builder, launcher => $launcher }; diff --git a/cataloguing/value_builder/marc21_leader_book.pl b/cataloguing/value_builder/marc21_leader_book.pl deleted file mode 100755 index 0707347..0000000 --- a/cataloguing/value_builder/marc21_leader_book.pl +++ /dev/null @@ -1,91 +0,0 @@ -#!/usr/bin/perl - -# Converted to new plugin style (Bug 13437) - -# Copyright 2000-2002 Katipo Communications -# -# This file is part of Koha. -# -# Koha is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# Koha is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Koha; if not, see . - -use Modern::Perl; - -use C4::Auth; -use CGI qw ( -utf8 ); -use C4::Context; - -use C4::Search; -use C4::Output; - -my $builder = sub { - my ( $params ) = @_; - my $function_name = $params->{id}; - my $res = " - -"; - - return $res; -}; - -my $launcher = sub { - my ( $params ) = @_; - my $input = $params->{cgi}; - my $index = $input->param('index'); - my $result = $input->param('result'); - - my $dbh = C4::Context->dbh; - - my ( $template, $loggedinuser, $cookie ) = get_template_and_user( - { template_name => "cataloguing/value_builder/marc21_leader.tt", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => { editcatalogue => '*' }, - debug => 1, - } - ); - $result = " nam 7a " unless $result; - my $f5 = substr( $result, 5, 1 ); - my $f6 = substr( $result, 6, 1 ); - my $f7 = substr( $result, 7, 1 ); - my $f8 = substr( $result, 8, 1 ); - my $f9 = substr( $result, 9, 1 ); - my $f17 = substr( $result, 17, 1 ); - my $f18 = substr( $result, 18, 1 ); - my $f19 = substr( $result, 19, 1 ); - - $template->param( - index => $index, - "f5$f5" => 1, - "f6$f6" => 1, - "f7$f7" => 1, - "f8$f8" => 1, - "f9$f9" => 1, - "f17$f17" => 1, - "f18$f18" => 1, - "f19$f19" => 1, - ); - output_html_with_http_headers $input, $cookie, $template->output; -}; - -return { builder => $builder, launcher => $launcher }; \ No newline at end of file diff --git a/installer/data/mysql/atomicupdate/14201_marc21_leader_book.sql b/installer/data/mysql/atomicupdate/14201_marc21_leader_book.sql new file mode 100644 index 0000000..a485b6c --- /dev/null +++ b/installer/data/mysql/atomicupdate/14201_marc21_leader_book.sql @@ -0,0 +1,2 @@ +-- move marc21_leader_book to marc21_leader +update marc_subfield_structure set value_builder='marc21_leader.pl' where value_builder='marc21_leader_book.pl'; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tt deleted file mode 100644 index be967d7..0000000 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/marc21_leader_book.tt +++ /dev/null @@ -1,338 +0,0 @@ -[% INCLUDE 'doc-head-open.inc' %] -Koha › Cataloging › Leader builder -[% INCLUDE 'doc-head-close.inc' %] - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
1-4 Record size(auto-filled)
5- Record status - -
6- Type of record - -
7- Bibliographic level - -
8- Hierarchic level - -
9- Encoding - -
10-16 indicator/subfields/size(auto-filled)
17- Encoding - -
18 - Descriptive cataloging form - -
19 - Linked record requirement - -
20-24 entry map & lengths(auto-filled)
-
Cancel
-
- - -[% INCLUDE 'popup-bottom.inc' %] -- 2.1.0