X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=authorities%2Fauthorities-home.pl;h=1eb58b07d3e6a9fabacfce7bf7cce3d7ebd68ff0;hb=76d1de381fb51c62e2b85ad25461c116a472651d;hp=cccab218d99ddf8d647b410c7873c1afc8e5b70c;hpb=30fbc40061287caa48216a29a48af905d858f151;p=koha.git

diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl
index cccab218d9..1eb58b07d3 100755
--- a/authorities/authorities-home.pl
+++ b/authorities/authorities-home.pl
@@ -18,7 +18,7 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 use strict;
-require Exporter;
+
 use CGI;
 use C4::Auth;
 
@@ -61,13 +61,13 @@ if ( $op eq "do_search" ) {
     my @value     = $query->param('value');
 
     my $startfrom      = $query->param('startfrom')      || 1;
-    my $resultsperpage = $query->param('resultsperpage') || 19;
+    my $resultsperpage = $query->param('resultsperpage') || 20;
 
     my ( $results, $total ) =
       SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator, \@value,
         ( $startfrom - 1 ) * $resultsperpage,
         $resultsperpage, $authtypecode, $orderby );
-
+#     use Data::Dumper; warn Data::Dumper::Dumper(@$results);
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
             template_name   => "authorities/searchresultlist.tmpl",
@@ -86,11 +86,13 @@ if ( $op eq "do_search" ) {
     # next/previous would not work anymore
     my @marclist_ini = $query->param('marclist');
     for ( my $i = 0 ; $i <= $#marclist ; $i++ ) {
-        push @field_data, { term => "marclist",  val => $marclist_ini[$i] };
-        push @field_data, { term => "and_or",    val => $and_or[$i] };
-        push @field_data, { term => "excluding", val => $excluding[$i] };
-        push @field_data, { term => "operator",  val => $operator[$i] };
-        push @field_data, { term => "value",     val => $value[$i] };
+        if ($value[$i]){   
+          push @field_data, { term => "marclist",  val => $marclist_ini[$i] };
+          push @field_data, { term => "and_or",    val => $and_or[$i] };
+          push @field_data, { term => "excluding", val => $excluding[$i] };
+          push @field_data, { term => "operator",  val => $operator[$i] };
+          push @field_data, { term => "value",     val => $value[$i] };
+        }    
     }
 
     # construction of the url of each page
@@ -123,7 +125,7 @@ if ( $op eq "do_search" ) {
 
     $template->param(
         pagination_bar => pagination_bar(
-            $base_url,  int( $total / $resultsperpage ) + 1,
+            $base_url,  getnbpages( $total, $resultsperpage ),
             $startfrom, 'startfrom'
         ),
         total     => $total,
@@ -151,92 +153,6 @@ elsif ( $op eq "delete" ) {
     # 	$template->param("statements" => \@statements,
     # 						"nbstatements" => $nbstatements);
 }
-elsif ( $op eq "AddStatement" ) {
-
-    ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-        {
-            template_name   => "authorities/authorities-home.tmpl",
-            query           => $query,
-            type            => 'intranet',
-            authnotrequired => 0,
-            flagsrequired   => { catalogue => 1 },
-            debug           => 1,
-        }
-    );
-
-    # Gets the entered information
-    my @marcfields = $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 @statements = ();
-
-    # List of the marc tags to display
-    my $marcarray = create_marclist();
-
-    my $nbstatements = $query->param('nbstatements');
-    $nbstatements = 1 if ( !defined $nbstatements );
-
-    for ( my $i = 0 ; $i < $nbstatements ; $i++ ) {
-        my %fields = ();
-
-        # Recreates the old scrolling lists with the previously selected values
-        my $marclist = create_scrolling_list(
-            {
-                name      => "marclist",
-                values    => $marcarray,
-                size      => 1,
-                -tabindex => '',
-                default   => $marcfields[$i],
-                onChange  => "sql_update()"
-            }
-        );
-
-        $fields{'marclist'} = $marclist;
-        $fields{'first'} = 1 if ( $i == 0 );
-
-# Restores the and/or parameters (no need to test the 'and' for activation because it's the default value)
-        $fields{'or'} = 1 if ( $and_or[$i] eq "or" );
-
-        #Restores the "not" parameters
-        $fields{'not'} = 1 if ( $excluding[$i] );
-
-        #Restores the operators (most common operators first);
-        if    ( $operator[$i] eq "=" )        { $fields{'eq'}       = 1; }
-        elsif ( $operator[$i] eq "contains" ) { $fields{'contains'} = 1; }
-        elsif ( $operator[$i] eq "start" )    { $fields{'start'}    = 1; }
-        elsif ( $operator[$i] eq ">" )  { $fields{'gt'} = 1; } #greater than
-        elsif ( $operator[$i] eq ">=" ) { $fields{'ge'} = 1; } #greater or equal
-        elsif ( $operator[$i] eq "<" )  { $fields{'lt'} = 1; } #lower than
-        elsif ( $operator[$i] eq "<=" ) { $fields{'le'} = 1; } #lower or equal
-
-        #Restores the value
-        $fields{'value'} = $value[$i];
-
-        push @statements, \%fields;
-    }
-    $nbstatements++;
-
-    # The new scrolling list
-    my $marclist = create_scrolling_list(
-        {
-            name      => "marclist",
-            values    => $marcarray,
-            size      => 1,
-            -tabindex => '',
-            onChange  => "sql_update()"
-        }
-    );
-    push @statements, { "marclist" => $marclist };
-
-    $template->param(
-        "statements"   => \@statements,
-        "nbstatements" => $nbstatements
-    );
-
-}
 else {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {