Bug 17600: Standardize our EXPORT_OK

[srvgit] / cataloguing / value_builder / unimarc_field_210c.pl

diff --git a/cataloguing/value_builder/unimarc_field_210c.pl b/cataloguing/value_builder/unimarc_field_210c.pl
index 0d0a070..4ffc85f 100755 (executable)
--- a/cataloguing/value_builder/unimarc_field_210c.pl
+++ b/cataloguing/value_builder/unimarc_field_210c.pl
@@ -18,17 +18,14 @@
 # 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;
-
-use C4::AuthoritiesMarc;
-use C4::Auth;
+use Modern::Perl;
+use C4::Auth qw( get_template_and_user );
+use C4::Auth qw( get_template_and_user );
 use C4::Context;
-use C4::Output;
+use C4::Output qw( pagination_bar output_html_with_http_headers );
 use CGI qw ( -utf8 );
 use C4::Search;
-use MARC::Record;
-use C4::Koha;
+use C4::Koha qw( getnbpages );
 
 ###TODO To rewrite in order to use SearchAuthorities
 
@@ -44,7 +41,7 @@ my $function_name= $field_number;
 
 
 my $res  = "
-<script type=\"text/javascript\">
+<script>
 function Clic$function_name(subfield_managed) {
     defaultvalue=escape(document.getElementById(\"$field_number\").value);
     newin=window.open(\"../cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&index=\"+subfield_managed,\"unimarc_225a\",'width=500,height=600,toolbar=false,scrollbars=yes');
@@ -56,7 +53,7 @@ return ($function_name,$res);
 
 sub plugin {
 my ($input) = @_;
-    my $query=new CGI;
+    my $query=CGI->new;
     my $op = $query->param('op');
     my $authtypecode = $query->param('authtypecode');
     my $index = $query->param('index');
@@ -64,28 +61,25 @@ my ($input) = @_;
     my $resultstring = $query->param('result');
     my $dbh = C4::Context->dbh;
 
-    my $startfrom=$query->param('startfrom');
-    $startfrom=0 if(!defined $startfrom);
+    my $startfrom = $query->param('startfrom') // 1; # Page number starting at 1
     my ($template, $loggedinuser, $cookie);
-    my $resultsperpage;
+    my $resultsperpage = $query->param('resultsperpage') // 20; # TODO hardcoded
+    my $offset = ( $startfrom - 1 ) * $resultsperpage;
 
     if ($op eq "do_search") {
-        my @marclist = $query->param('marclist');
-        my @and_or = $query->param('and_or');
-        my @excluding = $query->param('excluding');
-        my @operator = $query->param('operator');
-        my @value = $query->param('value');
+        my @marclist = $query->multi_param('marclist');
+        my @and_or = $query->multi_param('and_or');
+        my @excluding = $query->multi_param('excluding');
+        my @operator = $query->multi_param('operator');
+        my @value = $query->multi_param('value');
         my $orderby   = $query->param('orderby');
 
-        $resultsperpage= $query->param('resultsperpage');
-        $resultsperpage = 19 if(!defined $resultsperpage);
-
         # builds tag and subfield arrays
         my @tags;
 
         my ($results,$total) = SearchAuthorities( \@tags,\@and_or,
                                             \@excluding, \@operator, \@value,
-                                            $startfrom*$resultsperpage, $resultsperpage,$authtypecode, $orderby);
+                                            $offset, $resultsperpage,$authtypecode, $orderby);
 
        # Getting the $b if it exists
        for (@$results) {
@@ -99,54 +93,21 @@ my ($input) = @_;
             = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_210c.tt",
                     query => $query,
                     type => 'intranet',
-                    authnotrequired => 0,
                     flagsrequired => {editcatalogue => '*'},
-                    debug => 1,
                     });
 
-        # multi page display gestion
-        my $displaynext=0;
-        my $displayprev=$startfrom;
-        if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) {
-            $displaynext = 1;
-        }
-
-        my @numbers = ();
-
-        if ($total>$resultsperpage) {
-            for (my $i=1; $i<$total/$resultsperpage+1; $i++) {
-                if ($i<16) {
-                    my $highlight=0;
-                    ($startfrom==($i-1)) && ($highlight=1);
-                    push @numbers, { number => $i,
-                        highlight => $highlight ,
-                        startfrom => ($i-1)};
-                }
-            }
-        }
-
-        my $from = $startfrom*$resultsperpage+1;
-        my $to;
-
-        if($total < (($startfrom+1)*$resultsperpage)) {
-            $to = $total;
-        } else {
-            $to = (($startfrom+1)*$resultsperpage);
-        }
+        # Results displayed in current page
+        my $from = $offset + 1;
+        my $to = ( $offset + $resultsperpage > $total ) ? $total : $offset + $resultsperpage;
+
         my $link="../cataloguing/plugin_launcher.pl?plugin_name=unimarc_field_210c.pl&amp;authtypecode=EDITORS&amp;".join("&amp;",map {"value=".$_} @value)."&amp;op=do_search&amp;type=intranet&amp;index=$index";
 
         $template->param(result => $results) if $results;
-        $template->param('index' => $query->param('index'));
-        $template->param(startfrom=> $startfrom,
-                                displaynext=> $displaynext,
-                                displayprev=> $displayprev,
-                                resultsperpage => $resultsperpage,
-                                startfromnext => $startfrom+1,
-                                startfromprev => $startfrom-1,
+        $template->param('index' => scalar $query->param('index'));
+        $template->param(
                                 total=>$total,
                                 from=>$from,
                                 to=>$to,
-                                numbers=>\@numbers,
                                 authtypecode =>$authtypecode,
                                 resultstring =>$value[0],
                                 pagination_bar => pagination_bar(
@@ -161,9 +122,7 @@ my ($input) = @_;
             = get_template_and_user({template_name => "cataloguing/value_builder/unimarc_field_210c.tt",
                     query => $query,
                     type => 'intranet',
-                    authnotrequired => 0,
                     flagsrequired => {editcatalogue => '*'},
-                    debug => 1,
                     });
 
         $template->param(index => $index,