From d81440c91e5b47b62b61c3af614ae85d45055b45 Mon Sep 17 00:00:00 2001 From: toins Date: Thu, 26 Jul 2007 15:20:22 +0000 Subject: [PATCH] reindenting + removing unused syspref. --- authorities/auth_finder.pl | 243 ++++++++++++------------- authorities/authorities-home.pl | 381 ++++++++++++++++++++-------------------- 2 files changed, 314 insertions(+), 310 deletions(-) diff --git a/authorities/auth_finder.pl b/authorities/auth_finder.pl index b6b526b384..2ba7584505 100755 --- a/authorities/auth_finder.pl +++ b/authorities/auth_finder.pl @@ -23,144 +23,149 @@ require Exporter; use CGI; use C4::Output; use C4::Auth; - use C4::Context; use C4::AuthoritiesMarc; use C4::Acquisition; -use C4::Koha; # XXX subfield_is_koha_internal_p +use C4::Koha; # XXX subfield_is_koha_internal_p -my $query=new CGI; -my $op = $query->param('op'); +my $query = new CGI; +my $op = $query->param('op'); my $authtypecode = $query->param('authtypecode'); -my $index = $query->param('index'); -my $tagid=$query->param('tagid'); +my $index = $query->param('index'); +my $tagid = $query->param('tagid'); my $resultstring = $query->param('result'); -my $dbh = C4::Context->dbh; +my $dbh = C4::Context->dbh; -my $startfrom=$query->param('startfrom'); -$startfrom=0 if(!defined $startfrom); -my ($template, $loggedinuser, $cookie); +my $startfrom = $query->param('startfrom'); +$startfrom = 0 if ( !defined $startfrom ); +my ( $template, $loggedinuser, $cookie ); my $resultsperpage; my $authtypes = getauthtypes; my @authtypesloop; -foreach my $thisauthtype (keys %$authtypes) { +foreach my $thisauthtype ( keys %$authtypes ) { my $selected = 1 if $thisauthtype eq $authtypecode; - my %row =(value => $thisauthtype, - selected => $selected, - authtypetext => $authtypes->{$thisauthtype}{'authtypetext'}, - index => $index, - ); + my %row = ( + value => $thisauthtype, + selected => $selected, + authtypetext => $authtypes->{$thisauthtype}{'authtypetext'}, + index => $index, + ); push @authtypesloop, \%row; } -if ($op eq "do_search") { - my @marclist = $query->param('marclist'); - my @and_or = $query->param('and_or'); +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'); - - $resultsperpage= $query->param('resultsperpage'); - $resultsperpage = 19 if(!defined $resultsperpage); - - my ($results,$total) = SearchAuthorities(\@marclist,\@and_or, - \@excluding, \@operator, \@value, - $startfrom*$resultsperpage, $resultsperpage,$authtypecode);# $orderby); - - # multi page display gestion - my $displaynext=0; - my $displayprev=$startfrom; - if(($total - (($startfrom+1)*($resultsperpage))) > 0 ) { - $displaynext = 1; - } - - my @field_data = (); - - - my @marclist_ini = $query->param('marclist'); # get marclist again, as the previous one has been modified by catalogsearch (mainentry replaced by field name - 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] }; - } - - 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 , - searchdata=> \@field_data, - startfrom => ($i-1)}; - } - } - } - - my $from = $startfrom*$resultsperpage+1; - my $to; - - if($total < (($startfrom+1)*$resultsperpage)) { - $to = $total; - } else { - $to = (($startfrom+1)*$resultsperpage); - } - ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "authorities/searchresultlist-auth.tmpl", - query => $query, - type => 'intranet', - authnotrequired => 0, - flagsrequired => {catalogue => 1}, - debug => 1, - }); - - $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, - index => $index, - tagid => $tagid, - searchdata=>\@field_data, - total=>$total, - from=>$from, - to=>$to, - numbers=>\@numbers, - authtypecode =>$authtypecode, - mainmainstring =>$value[0], - mainstring =>$value[1], - anystring =>$value[2], - ); + my @operator = $query->param('operator'); + my @value = $query->param('value'); + + $resultsperpage = $query->param('resultsperpage'); + $resultsperpage = 19 if ( !defined $resultsperpage ); + + my ( $results, $total ) = + SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator, \@value, + $startfrom * $resultsperpage, + $resultsperpage, $authtypecode ); # $orderby); + + # multi page display gestion + my $displaynext = 0; + my $displayprev = $startfrom; + if ( ( $total - ( ( $startfrom + 1 ) * ($resultsperpage) ) ) > 0 ) { + $displaynext = 1; + } + + my @field_data = (); + + my @marclist_ini = + $query->param('marclist') + ; # get marclist again, as the previous one has been modified by catalogsearch (mainentry replaced by field name + 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] }; + } + + 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, + searchdata => \@field_data, + startfrom => ( $i - 1 ) + }; + } + } + } + + my $from = $startfrom * $resultsperpage + 1; + my $to; + + if ( $total < ( ( $startfrom + 1 ) * $resultsperpage ) ) { + $to = $total; + } + else { + $to = ( ( $startfrom + 1 ) * $resultsperpage ); + } + ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "authorities/searchresultlist-auth.tmpl", + query => $query, + type => 'intranet', + authnotrequired => 0, + flagsrequired => { catalogue => 1 }, + } + ); + + $template->param( result => $results ) if $results; + $template->param( + startfrom => $startfrom, + displaynext => $displaynext, + displayprev => $displayprev, + resultsperpage => $resultsperpage, + startfromnext => $startfrom + 1, + startfromprev => $startfrom - 1, + searchdata => \@field_data, + total => $total, + from => $from, + to => $to, + numbers => \@numbers, + authtypecode => $authtypecode, + mainmainstring => $value[0], + mainstring => $value[1], + anystring => $value[2], + ); } else { - ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "authorities/auth_finder.tmpl", - query => $query, - type => 'intranet', - authnotrequired => 0, - flagsrequired => {catalogue => 1}, - debug => 1, - }); - - $template->param(index=>$query->param('index')."", - tagid => $tagid, - resultstring => $resultstring, - ); + ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "authorities/auth_finder.tmpl", + query => $query, + type => 'intranet', + authnotrequired => 0, + flagsrequired => { catalogue => 1 }, + } + ); + + $template->param( + resultstring => $resultstring, + ); } -$template->param(authtypesloop => \@authtypesloop, - authtypecode => $authtypecode, - intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), - intranetstylesheet => C4::Context->preference("intranetstylesheet"), - IntranetNav => C4::Context->preference("IntranetNav"), - ); +$template->param( + tagid => $tagid, + index => $index, + authtypesloop => \@authtypesloop, + authtypecode => $authtypecode, +); # Print the page output_html_with_http_headers $query, $cookie, $template->output; diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl index efe3259dbb..bd89d0d249 100755 --- a/authorities/authorities-home.pl +++ b/authorities/authorities-home.pl @@ -1,5 +1,4 @@ #!/usr/bin/perl -# WARNING: 4-character tab stops here # Copyright 2000-2002 Katipo Communications # @@ -28,233 +27,233 @@ use C4::Auth; use C4::Output; use C4::AuthoritiesMarc; use C4::Acquisition; -use C4::Koha; # XXX subfield_is_koha_internal_p +use C4::Koha; # XXX subfield_is_koha_internal_p use C4::Biblio; -my $query=new CGI; -my $op = $query->param('op'); +my $query = new CGI; +my $op = $query->param('op'); my $authtypecode = $query->param('authtypecode'); -my $dbh = C4::Context->dbh; +my $dbh = C4::Context->dbh; -my $authid=$query->param('authid'); -my ($template, $loggedinuser, $cookie); +my $authid = $query->param('authid'); +my ( $template, $loggedinuser, $cookie ); my $authtypes = getauthtypes; my @authtypesloop; -foreach my $thisauthtype (sort { $authtypes->{$a} <=> $authtypes->{$b} } keys %$authtypes) { - my $selected = 1 if $thisauthtype eq $authtypecode; - my %row =(value => $thisauthtype, - selected => $selected, - authtypetext => $authtypes->{$thisauthtype}{'authtypetext'}, - ); - push @authtypesloop, \%row; +foreach my $thisauthtype ( sort { $authtypes->{$a} <=> $authtypes->{$b} } + keys %$authtypes ) +{ + my $selected = 1 if $thisauthtype eq $authtypecode; + my %row = ( + value => $thisauthtype, + selected => $selected, + authtypetext => $authtypes->{$thisauthtype}{'authtypetext'}, + ); + push @authtypesloop, \%row; } -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 $orderby = $query->param('orderby'); - my @value = $query->param('value'); +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 $orderby = $query->param('orderby'); + my @value = $query->param('value'); - my $startfrom = $query->param('startfrom') || 1; + my $startfrom = $query->param('startfrom') || 1; my $resultsperpage = $query->param('resultsperpage') || 19; - my ($results,$total) = SearchAuthorities( - \@marclist, - \@and_or, - \@excluding, - \@operator, - \@value, - ($startfrom - 1)*$resultsperpage, - $resultsperpage, - $authtypecode, - $orderby - ); + my ( $results, $total ) = + SearchAuthorities( \@marclist, \@and_or, \@excluding, \@operator, \@value, + ( $startfrom - 1 ) * $resultsperpage, + $resultsperpage, $authtypecode, $orderby ); - ($template, $loggedinuser, $cookie) - = get_template_and_user({ - template_name => "authorities/searchresultlist.tmpl", - query => $query, - type => 'intranet', + ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "authorities/searchresultlist.tmpl", + query => $query, + type => 'intranet', authnotrequired => 0, - flagsrequired => {catalogue => 1}, - debug => 1, - }); - - my @field_data = (); - - # we must get parameters once again. Because if there is a mainentry, it - # has been replaced by something else during the search, thus the links - # 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] }; - } + flagsrequired => { catalogue => 1 }, + debug => 1, + } + ); + + my @field_data = (); + + # we must get parameters once again. Because if there is a mainentry, it + # has been replaced by something else during the search, thus the links + # 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] }; + } # construction of the url of each page my $base_url = 'authorities-home.pl?' - .join( - '&', - map { $_->{term}.'='.$_->{val} } @field_data + . join( '&', map { $_->{term} . '=' . $_->{val} } @field_data ) + . '&' + . join( + '&', + map { $_->{term} . '=' . $_->{val} } ( + { term => 'resultsperpage', val => $resultsperpage }, + { term => 'type', val => 'intranet' }, + { term => 'op', val => 'do_search' }, + { term => 'authtypecode', val => $authtypecode }, + { term => 'orderby', val => $orderby }, ) - .'&' - .join( - '&', - map { $_->{term}.'='.$_->{val} } ( - {term => 'resultsperpage', val => $resultsperpage}, - {term => 'type' , val => 'intranet'}, - {term => 'op' , val => 'do_search'}, - {term => 'authtypecode' , val => $authtypecode}, - {term => 'orderby' , val => $orderby}, - ) - ) - ; + ); - my $from = ($startfrom - 1) * $resultsperpage + 1; - my $to; + my $from = ( $startfrom - 1 ) * $resultsperpage + 1; + my $to; - if ($total < $startfrom * $resultsperpage) { - $to = $total; - } + if ( $total < $startfrom * $resultsperpage ) { + $to = $total; + } else { - $to = $startfrom * $resultsperpage; - } + $to = $startfrom * $resultsperpage; + } - $template->param(result => $results) if $results; + $template->param( result => $results ) if $results; - $template->param( + $template->param( pagination_bar => pagination_bar( - $base_url, - int($total/$resultsperpage)+1, - $startfrom, - 'startfrom' - ), - total=>$total, - from=>$from, - to=>$to, + $base_url, int( $total / $resultsperpage ) + 1, + $startfrom, 'startfrom' + ), + total => $total, + from => $from, + to => $to, isEDITORS => $authtypecode eq 'EDITORS', ); -} elsif ($op eq "delete") { +} +elsif ( $op eq "delete" ) { + + &DelAuthority( $authid, 1 ); - &DelAuthority($authid, 1); + ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "authorities/authorities-home.tmpl", + query => $query, + type => 'intranet', + authnotrequired => 0, + flagsrequired => { catalogue => 1 }, + debug => 1, + } + ); - ($template, $loggedinuser, $cookie) - = get_template_and_user({template_name => "authorities/authorities-home.tmpl", - query => $query, - type => 'intranet', - authnotrequired => 0, - flagsrequired => {catalogue => 1}, - debug => 1, - }); -# $template->param("statements" => \@statements, -# "nbstatements" => $nbstatements); + # $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); +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({template_name => "authorities/authorities-home.tmpl", - query => $query, - type => 'intranet', - authnotrequired => 0, - flagsrequired => {catalogue => 1}, - debug => 1, - }); + ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => "authorities/authorities-home.tmpl", + query => $query, + type => 'intranet', + authnotrequired => 0, + flagsrequired => { catalogue => 1 }, + debug => 1, + } + ); } -$template->param(authtypesloop => \@authtypesloop, - intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), - intranetstylesheet => C4::Context->preference("intranetstylesheet"), - IntranetNav => C4::Context->preference("IntranetNav"), - ); +$template->param( + authtypesloop => \@authtypesloop, +); # Print the page output_html_with_http_headers $query, $cookie, $template->output; - -# Local Variables: -# tab-width: 4 -# End: -- 2.11.0