@@ -, +, @@ wrapper Unimarc plugins work as usual. No regression. Simple code factorization. --- Koha/Util/FrameworkPlugin.pm | 55 ++++++++++++++++++++++ cataloguing/value_builder/unimarc_field_100.pl | 9 +--- .../value_builder/unimarc_field_100_authorities.pl | 9 +--- cataloguing/value_builder/unimarc_field_105.pl | 8 +--- cataloguing/value_builder/unimarc_field_110.pl | 8 +--- cataloguing/value_builder/unimarc_field_115a.pl | 8 +--- cataloguing/value_builder/unimarc_field_115b.pl | 8 +--- cataloguing/value_builder/unimarc_field_116.pl | 10 +--- cataloguing/value_builder/unimarc_field_117.pl | 10 +--- cataloguing/value_builder/unimarc_field_120.pl | 9 +--- cataloguing/value_builder/unimarc_field_121a.pl | 8 +--- cataloguing/value_builder/unimarc_field_125b.pl | 8 +--- cataloguing/value_builder/unimarc_field_126a.pl | 8 +--- cataloguing/value_builder/unimarc_field_128b.pl | 7 +-- cataloguing/value_builder/unimarc_field_130.pl | 8 +--- cataloguing/value_builder/unimarc_field_135a.pl | 8 +--- cataloguing/value_builder/unimarc_field_140.pl | 9 +--- cataloguing/value_builder/unimarc_leader.pl | 8 +--- 18 files changed, 89 insertions(+), 109 deletions(-) create mode 100644 Koha/Util/FrameworkPlugin.pm --- a/Koha/Util/FrameworkPlugin.pm +++ a/Koha/Util/FrameworkPlugin.pm @@ -0,0 +1,55 @@ +package Koha::Util::FrameworkPlugin; + +# Module contains subroutines used in the framework plugins +# +# Copyright 2014 Koha Development Team +# +# 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, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# + +use Modern::Perl; + +our ( @ISA, @EXPORT, @EXPORT_OK ); +BEGIN { + require Exporter; + @ISA = qw( Exporter ); + @EXPORT = qw( ); + @EXPORT_OK = qw( wrapper ); +} + +=head1 NAME + +Koha::Util::Plugin - utility class with routines for framework plugins + +=head1 FUNCTIONS + +=head2 wrapper + + wrapper returns a text for strings containing spaces, pipe chars, ... + The wrapper subroutine is used in several UNIMARC plugins. + +=cut + +sub wrapper { + my ( $str ) = @_; + return "space" if $str eq " "; + return "dblspace" if $str eq " "; + return "pipe" if $str eq "|"; + return "dblpipe" if $str eq "||"; + return $str; +} + +1; --- a/cataloguing/value_builder/unimarc_field_100.pl +++ a/cataloguing/value_builder/unimarc_field_100.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -67,13 +69,6 @@ sub plugin_javascript { return ( $field_number, $res ); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "dblspace" if $char eq " "; - return "pipe" if $char eq "|"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_100_authorities.pl +++ a/cataloguing/value_builder/unimarc_field_100_authorities.pl @@ -18,6 +18,8 @@ # along with Koha; if not, see . use Modern::Perl; + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -65,13 +67,6 @@ sub plugin_javascript { return ( $field_number, $res ); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "dblspace" if $char eq " "; - return "pipe" if $char eq "|"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_105.pl +++ a/cataloguing/value_builder/unimarc_field_105.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -63,12 +65,6 @@ sub plugin_javascript { return ($field_number,$res); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "pipe" if $char eq "|"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_110.pl +++ a/cataloguing/value_builder/unimarc_field_110.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -63,12 +65,6 @@ sub plugin_javascript { return ($field_number,$res); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "pipe" if $char eq "|"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_115a.pl +++ a/cataloguing/value_builder/unimarc_field_115a.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -69,12 +71,6 @@ sub plugin_javascript { return ( $field_number, $res ); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "pipe" if $char eq "|"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_115b.pl +++ a/cataloguing/value_builder/unimarc_field_115b.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -63,12 +65,6 @@ function Clic$field_number() { return ( $field_number, $res ); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "pipe" if $char eq "|"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_116.pl +++ a/cataloguing/value_builder/unimarc_field_116.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -63,14 +65,6 @@ function Clic$field_number(i) { return ( $field_number, $res ); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "dblspace" if $char eq " "; - return "pipe" if $char eq "|"; - return "dblpipe" if $char eq "||"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_117.pl +++ a/cataloguing/value_builder/unimarc_field_117.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -63,14 +65,6 @@ function Clic$field_number(i) { return ($field_number,$res); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "dblspace" if $char eq " "; - return "pipe" if $char eq "|"; - return "dblpipe" if $char eq "||"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_120.pl +++ a/cataloguing/value_builder/unimarc_field_120.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -64,13 +66,6 @@ function Clic$function_name(i) { return ($function_name,$res); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "dblspace" if $char eq " "; - return "pipe" if $char eq "|"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_121a.pl +++ a/cataloguing/value_builder/unimarc_field_121a.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -64,12 +66,6 @@ function Clic$function_name(i) { return ($function_name,$res); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "pipe" if $char eq "|"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_125b.pl +++ a/cataloguing/value_builder/unimarc_field_125b.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -61,12 +63,6 @@ function Clic$function_name(i) { return ($function_name,$res); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "pipe" if $char eq "|"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_126a.pl +++ a/cataloguing/value_builder/unimarc_field_126a.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -61,12 +63,6 @@ function Clic$function_name(i) { return ($function_name,$res); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "pipe" if $char eq "|"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_128b.pl +++ a/cataloguing/value_builder/unimarc_field_128b.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -61,11 +63,6 @@ function Clic$function_name(i) { return ($function_name,$res); } -sub wrapper { - my ($char) = @_; - return "dblpipe" if $char eq "||"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_130.pl +++ a/cataloguing/value_builder/unimarc_field_130.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -62,12 +64,6 @@ function Clic$function_name(i) { return ($function_name,$res); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "pipe" if $char eq "|"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_135a.pl +++ a/cataloguing/value_builder/unimarc_field_135a.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -64,12 +66,6 @@ function Clic$function_name(i) { return ($function_name,$res); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "pipe" if $char eq "|"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_field_140.pl +++ a/cataloguing/value_builder/unimarc_field_140.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -64,13 +66,6 @@ function Clic$function_name(i) { return ($function_name,$res); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "dblspace" if $char eq " "; - return "pipe" if $char eq "|"; - return $char; -} sub plugin { my ($input) = @_; --- a/cataloguing/value_builder/unimarc_leader.pl +++ a/cataloguing/value_builder/unimarc_leader.pl @@ -20,6 +20,8 @@ use strict; #use warnings; FIXME - Bug 2505 + +use Koha::Util::FrameworkPlugin qw(wrapper); use C4::Auth; use CGI; use C4::Context; @@ -68,12 +70,6 @@ function Clic$function_name(i) { return ( $function_name, $res ); } -sub wrapper { - my ($char) = @_; - return "space" if $char eq " "; - return "pipe" if $char eq "|"; - return $char; -} sub plugin { my ($input) = @_; --