X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=authorities%2Fauthorities-home.pl;h=e4eae8474940186960cca1a5ad478c4295248662;hb=HEAD;hp=cccab218d99ddf8d647b410c7873c1afc8e5b70c;hpb=30fbc40061287caa48216a29a48af905d858f151;p=koha_gimpoz

diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl
index cccab218d9..e4eae84749 100755
--- a/authorities/authorities-home.pl
+++ b/authorities/authorities-home.pl
@@ -13,12 +13,13 @@
 # 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., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# 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 strict;
-require Exporter;
+use warnings;
+
 use CGI;
 use C4::Auth;
 
@@ -32,7 +33,9 @@ use C4::Biblio;
 
 my $query        = new CGI;
 my $op           = $query->param('op');
+$op ||= q{};
 my $authtypecode = $query->param('authtypecode');
+$authtypecode ||= q{};
 my $dbh          = C4::Context->dbh;
 
 my $authid = $query->param('authid');
@@ -43,10 +46,9 @@ my @authtypesloop;
 foreach my $thisauthtype ( sort { $authtypes->{$a}{'authtypetext'} cmp $authtypes->{$b}{'authtypetext'} }
     keys %$authtypes )
 {
-    my $selected = 1 if $thisauthtype eq $authtypecode;
     my %row = (
         value        => $thisauthtype,
-        selected     => $selected,
+        selected     => $thisauthtype eq $authtypecode,
         authtypetext => $authtypes->{$thisauthtype}{'authtypetext'},
     );
     push @authtypesloop, \%row;
@@ -61,13 +63,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 +88,19 @@ 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] };
+          if (!defined $and_or[$i]) {
+              $and_or[$i] = q{};
+          }
+          push @field_data, { term => "and_or",    val => $and_or[$i] };
+          if (!defined $excluding[$i]) {
+              $excluding[$i] = q{};
+          }
+          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
@@ -111,6 +121,9 @@ if ( $op eq "do_search" ) {
 
     my $from = ( $startfrom - 1 ) * $resultsperpage + 1;
     my $to;
+    if (!defined $total) {
+        $total = 0;
+    }
 
     if ( $total < $startfrom * $resultsperpage ) {
         $to = $total;
@@ -134,9 +147,6 @@ if ( $op eq "do_search" ) {
 
 }
 elsif ( $op eq "delete" ) {
-
-    &DelAuthority( $authid, 1 );
-
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
             template_name   => "authorities/authorities-home.tmpl",
@@ -147,95 +157,7 @@ elsif ( $op eq "delete" ) {
             debug           => 1,
         }
     );
-
-    # 	$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
-    );
-
+    &DelAuthority( $authid, 1 );
 }
 else {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(