Bug 17600: Standardize our EXPORT_OK

[srvgit] / cataloguing / value_builder / macles.pl

diff --git a/cataloguing/value_builder/macles.pl b/cataloguing/value_builder/macles.pl
index c99508e..8579dc0 100755 (executable)
--- a/cataloguing/value_builder/macles.pl
+++ b/cataloguing/value_builder/macles.pl
@@ -1,93 +1,56 @@
 #!/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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-#use warnings; FIXME - Bug 2505
-use CGI;
-use C4::Context;
-use C4::Output;
-use C4::Auth;
-
-# use Data::Dumper;
-use vars qw( $tagslib);
-use vars qw( $authorised_values_sth);
-use vars qw( $is_a_modif );
-use utf8;
-
-=head1
-
-plugin_parameters : other parameters added when the plugin is called by the dopop function
-
-=cut
-
-sub plugin_parameters {
-my ($dbh,$record,$tagslib,$i,$tabloop) = @_;
-return "";
-}
-
-sub plugin_javascript {
-my ($dbh,$record,$tagslib,$field_number,$tabloop) = @_;
-my $function_name= "macles".(int(rand(100000))+1);
-my $res="
-<script type=\"text/javascript\">
-//<![CDATA[
-
-function Focus$function_name(subfield_managed) {
-return 1;
-}
-
-function Blur$function_name(subfield_managed) {
-       return 1;
-}
-
-function Clic$function_name(i) {
-       newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=macles.pl&index=\"+i,\"MACLES\",',toolbar=false,scrollbars=yes');
+use Modern::Perl;
+use CGI qw ( -utf8 );
 
+use C4::Context;
+use C4::Output qw( output_html_with_http_headers );
+use C4::Auth qw( get_template_and_user );
+
+my $builder = sub {
+    my ( $params ) = @_;
+    my $function_name = $params->{id};
+    my $res="
+<script>
+function Click$function_name(i) {
+    newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=macles.pl&index=\"+i,\"MACLES\",',toolbar=false,scrollbars=yes');
 }
-//]]>
 </script>
 ";
+    return $res;
+};
 
-return ($function_name,$res);
-}
-
-sub plugin {
-my ($input) = @_;
-       my %env;
-
-#      my $input = new CGI;
+my $launcher = sub {
+    my ( $params ) = @_;
+    my $input = $params->{cgi};
        my $index= $input->param('index');
 
-
        my $dbh = C4::Context->dbh;
     my $rq=$dbh->prepare("SELECT authorised_value, lib from authorised_values where category=\"MACLES\" order by authorised_value DESC");
     #tabs
     $rq->execute;
     my @BIGLOOP;
-    my @innerloop;
-    my (%numbers,%cells,@colhdr,@rowhdr,@multiplelines,@lists,$table);
+    my (%numbers,@lists,$table);
     while (my $tab = $rq->fetchrow_hashref){
-#       if (! utf8::is_utf8($tab->{lib})) {
-#         utf8::decode($tab->{lib});
-#       }
-#       warn $tab->{lib};
       my $number=substr($tab->{authorised_value},0,1);
       if ($tab->{authorised_value}=~/[0-9]XX/){
         $numbers{$number}->{'hdr_tab'}=$tab->{lib};
@@ -115,7 +78,6 @@ my ($input) = @_;
       } else {
         unshift @{$numbers{$number}->{$tab->{'authorised_value'}}},$tab->{'lib'};
       }
-#        use Data::Dumper;warn "BIGLOOP IN".Dumper(@BIGLOOP);
     }
     foreach my $num ( sort keys %numbers ) {
         my @tmpcolhdr;
@@ -193,19 +155,16 @@ my ($input) = @_;
         $BIGLOOPcell{'number'}  = $num;
         push @BIGLOOP, \%BIGLOOPcell;
     }
-#     warn "BIGLOOP OUT".Dumper(@BIGLOOP);
+
     my ($template, $loggedinuser, $cookie)
-        = get_template_and_user({template_name => "cataloguing/value_builder/macles.tmpl",
+        = get_template_and_user({template_name => "cataloguing/value_builder/macles.tt",
                     query => $input,
                     type => "intranet",
-                    authnotrequired => 0,
                     flagsrequired => {editcatalogue => '*'},
-                    debug => 1,
                     });
     $template->param(BIGLOOP=>\@BIGLOOP);
        $template->param("index"=>$index);
        output_html_with_http_headers $input, $cookie, $template->output;
-}
-1;
-
+};
 
+return { builder => $builder, launcher => $launcher };