From ae706f0d7a769c3ae74a71d8589ed0256f5b7588 Mon Sep 17 00:00:00 2001 From: toins Date: Tue, 31 Jul 2007 16:14:15 +0000 Subject: [PATCH] fix indentation. --- catalogue/detailprint.pl | 82 ++-- cataloguing/plugin_launcher.pl | 1 - .../intranet-tmpl/prog/en/tools/letter.tmpl | 60 +-- .../blinddetail-biblio-search.tmpl | 4 +- .../prog/fr/cataloguing/addbiblio.tmpl | 17 +- opac/opac-rss.pl | 122 ++--- opac/opac-search.pl | 13 +- tools/letter.pl | 429 ++++++++++-------- 8 files changed, 390 insertions(+), 338 deletions(-) diff --git a/catalogue/detailprint.pl b/catalogue/detailprint.pl index 3440f16e70..d9e3f39ec9 100755 --- a/catalogue/detailprint.pl +++ b/catalogue/detailprint.pl @@ -1,5 +1,4 @@ #!/usr/bin/perl -# NOTE: Use standard 8-space tabs for this file (indents are 4 spaces) # Copyright 2000-2002 Katipo Communications # @@ -27,17 +26,17 @@ use C4::Biblio; use C4::Output; use C4::Date; -my $query=new CGI; -my $type=$query->param('type'); -($type) || ($type='intra'); +my $query = new CGI; +my $type = $query->param('type'); +($type) || ( $type = 'intra' ); -my $biblionumber=$query->param('biblionumber'); +my $biblionumber = $query->param('biblionumber'); # change back when ive fixed request.pl -my @items = GetItemsInfo($biblionumber, $type); +my @items = GetItemsInfo( $biblionumber, $type ); my $norequests = 1; foreach my $itm (@items) { - $norequests = 0 unless $itm->{'notforloan'}; + $norequests = 0 unless $itm->{'notforloan'}; } my $dat = GetBiblioData($biblionumber); @@ -45,54 +44,51 @@ my $record = GetMarcBiblio($biblionumber); my $addauthor = GetMarcAuthors($record,C4::Context->preference("marcflavour")); my $authorcount = scalar @$addauthor; -$dat->{'additional'} =""; +$dat->{'additional'} = ""; foreach (@$addauthor) { - $dat->{'additional'} .= "|" . $_->{'a'}; -} # for + $dat->{'additional'} .= "|" . $_->{'a'}; +} # for - -$dat->{'count'}=@items; +$dat->{'count'} = @items; $dat->{'norequests'} = $norequests; my @results; -$results[0]=$dat; +$results[0] = $dat; -my $resultsarray=\@results; -my $itemsarray=\@items; +my $resultsarray = \@results; +my $itemsarray = \@items; -my $startfrom=$query->param('startfrom'); -($startfrom) || ($startfrom=0); +my $startfrom = $query->param('startfrom'); +($startfrom) || ( $startfrom = 0 ); -my ($template, $loggedinuser, $cookie) = get_template_and_user({ - template_name => ('catalogue/detailprint.tmpl'), - query => $query, - type => "intranet", - authnotrequired => ($type eq 'opac'), - flagsrequired => {catalogue => 1}, - }); +my ( $template, $loggedinuser, $cookie ) = get_template_and_user( + { + template_name => ('catalogue/detailprint.tmpl'), + query => $query, + type => "intranet", + authnotrequired => ( $type eq 'opac' ), + flagsrequired => { catalogue => 1 }, + } +); -my $count=1; +my $count = 1; # now to get the items into a hash we can use and whack that thru - -my $nextstartfrom=($startfrom+20<$count-20) ? ($startfrom+20) : ($count-20); -my $prevstartfrom=($startfrom-20>0) ? ($startfrom-20) : (0); -$template->param(startfrom => $startfrom+1, - endat => $startfrom+20, - numrecords => $count, - nextstartfrom => $nextstartfrom, - prevstartfrom => $prevstartfrom, - BIBLIO_RESULTS => $resultsarray, - ITEM_RESULTS => $itemsarray, - loggedinuser => $loggedinuser, - biblionumber => $biblionumber, - ); +my $nextstartfrom = ( $startfrom + 20 < $count - 20 ) ? ( $startfrom + 20 ) : ( $count - 20 ); +my $prevstartfrom = ( $startfrom - 20 > 0 ) ? ( $startfrom - 20 ) : (0); + +$template->param( + startfrom => $startfrom + 1, + endat => $startfrom + 20, + numrecords => $count, + nextstartfrom => $nextstartfrom, + prevstartfrom => $prevstartfrom, + BIBLIO_RESULTS => $resultsarray, + ITEM_RESULTS => $itemsarray, + loggedinuser => $loggedinuser, + biblionumber => $biblionumber, +); output_html_with_http_headers $query, $cookie, $template->output; - - -# Local Variables: -# tab-width: 8 -# End: diff --git a/cataloguing/plugin_launcher.pl b/cataloguing/plugin_launcher.pl index ce6e9b9a20..a3b166b433 100755 --- a/cataloguing/plugin_launcher.pl +++ b/cataloguing/plugin_launcher.pl @@ -22,7 +22,6 @@ use strict; use CGI; use C4::Context; - use C4::Output; my $input = new CGI; diff --git a/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl b/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl index d5576f96d4..54bd931c31 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/tools/letter.tmpl @@ -145,36 +145,36 @@

diff --git a/koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl index 503be495e0..709593dc1f 100644 --- a/koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/fr/authorities/blinddetail-biblio-search.tmpl @@ -6,7 +6,7 @@ function go() { -var index_start = ; +var index_start = ""; var whichfield = opener.opener.document.f.tag[index_start].value; i=index_start // go forward, until reaching the end of the field. @@ -56,4 +56,4 @@ while (i>=0) { - \ No newline at end of file + diff --git a/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/addbiblio.tmpl b/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/addbiblio.tmpl index a5ee59a71c..5df98e5edb 100644 --- a/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/addbiblio.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/fr/cataloguing/addbiblio.tmpl @@ -20,8 +20,6 @@ Avec la grille : - - " /> " /> " /> @@ -317,20 +315,8 @@ function Changefwk(FwkList) { } function openAuth(tagid,authtype,X) { -// defaultid=document.getElementById(subfieldid); -// alert("X"+X); Y=X.parentNode.getAttribute("id"); -// alert("tagid"+Y); - newin=window.open("../authorities/auth_finder.pl?authtypecode="+ authtype+ "&tagid="+Y, "value builder",'width=700,height=550,toolbar=false,scrollbars=yes'); -} - - -function AddField(field,cntrepeatfield) { - document.forms['f'].op.value = "addfield"; - document.forms['f'].addfield_field.value=field; - document.forms['f'].repeat_field.value=cntrepeatfield; - //alert(document.forms['f'].repeat_field.value); - document.f.submit(); + window.open("../authorities/auth_finder.pl?authtypecode="+ authtype+ "&tagid="+Y, "value builder",'width=700,height=550,toolbar=false,scrollbars=yes'); } function cloneSubfield(index) { @@ -349,7 +335,6 @@ function cloneSubfield(index) { CloneButtonPlus = clone.getElementsByTagName('a')[0]; CloneButtonPlus.setAttribute('onclick',"cloneSubfield('" + index + index + "')"); var buttonUp = clone.getElementsByTagName('img')[0]; -// alert(buttonUp.getAttribute('id')); buttonUp.setAttribute('onclick',"upSubfield('" + index + index + "')"); } catch(e){ diff --git a/opac/opac-rss.pl b/opac/opac-rss.pl index eb4fb891e2..fc625d305f 100755 --- a/opac/opac-rss.pl +++ b/opac/opac-rss.pl @@ -1,16 +1,5 @@ #!/usr/bin/perl -use strict; # always use - -use XML::RSS; -use Digest::MD5 qw(md5_base64); -use POSIX qw(ceil floor); -use Date::Calc qw(Today_and_Now Delta_YMDHMS); -use C4::Context; -use C4::Search; -use C4::Koha; -use C4::Biblio; - # Copyright 2007 Paul POULAIN # # This file is part of Koha @@ -28,9 +17,20 @@ use C4::Biblio; # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA +use strict; # always use + +use XML::RSS; +use Digest::MD5 qw(md5_base64); +use POSIX qw(ceil floor); +use Date::Calc qw(Today_and_Now Delta_YMDHMS); +use C4::Context; +use C4::Search; +use C4::Koha; +use C4::Biblio; + =head1 NAME -opac-search.pl : script to have RSS feeds automatically on each OPAC search +opac-rss.pl : script to have RSS feeds automatically on each OPAC search =head1 SYNOPSIS @@ -68,78 +68,92 @@ my $query = $cgi->param('q'); $query =~ s/:/=/g; # the number of lines to retrieve -my $size=$cgi->param('size') || 50; +my $size = $cgi->param('size') || 50; # the filename of the cached rdf file. my $filename = md5_base64($query); -my $rss = new XML::RSS (version => '1.0'); +my $rss = new XML::RSS( version => '1.0' ); # the site URL my $url = $cgi->url(); $url =~ s/opac-rss\.pl.*//; $url =~ /(http:\/\/.*?)\//; -my $short_url=$1; +my $short_url = $1; -my $RDF_update_needed=1; - my ($year,$month,$day, $hour,$min,$sec) = Today_and_Now(); +my $RDF_update_needed = 1; +my ( $year, $month, $day, $hour, $min, $sec ) = Today_and_Now(); -if (-e "rss/$filename") { +if ( -e "rss/$filename" ) { $rss->parsefile("rss/$filename"); - # check if we have to rebuild the RSS feed (once every 30mn), or just return the actual rdf + +# check if we have to rebuild the RSS feed (once every 30mn), or just return the actual rdf my $rdf_stamp = $rss->{'channel'}->{'dc'}->{'date'}; $rdf_stamp =~ /(.*)-(.*)-(.*):(.*):(.*):(.*)/; - my ($stamp_year,$stamp_month,$stamp_day,$stamp_hour,$stamp_min,$stamp_sec) = ($1,$2,$3,$4,$5,$6); - # if more than 30 mn since the last RDF update, rebuild the RDF. Otherwise, just return it - unless (($year-$stamp_year >0) or ($month-$stamp_month >0) or ($day-$stamp_day >0) or ($hour-$stamp_hour >0) or ($min-$stamp_min >30)) { - $RDF_update_needed =0; + my ( + $stamp_year, $stamp_month, $stamp_day, + $stamp_hour, $stamp_min, $stamp_sec + ) = ( $1, $2, $3, $4, $5, $6 ); + +# if more than 30 mn since the last RDF update, rebuild the RDF. Otherwise, just return it + unless ( ( $year - $stamp_year > 0 ) + or ( $month - $stamp_month > 0 ) + or ( $day - $stamp_day > 0 ) + or ( $hour - $stamp_hour > 0 ) + or ( $min - $stamp_min > 30 ) ) + { + $RDF_update_needed = 0; } } if ($RDF_update_needed) { -# warn "RDF update in progress"; + + # warn "RDF update in progress"; $rss->channel( - title => "Koha : $query", - description => C4::Context->preference("LibraryName"), - link => $short_url, - dc => { - date => "$year-$month-$day:$hour:$min:$sec", - subject => "Koha", - creator => C4::Context->preference("LibraryName"), - rights => "Copyright $year" , - language => C4::Context->preference("opaclanguages"), - }, + title => "Koha : $query", + description => C4::Context->preference("LibraryName"), + link => $short_url, + dc => { + date => "$year-$month-$day:$hour:$min:$sec", + subject => "Koha", + creator => C4::Context->preference("LibraryName"), + rights => "Copyright $year", + language => C4::Context->preference("opaclanguages"), + }, ); - + my $total; # the total results for the whole set - my ($error, $marcresults) = SimpleSearch($query); - + my ( $error, $marcresults ) = SimpleSearch($query); + my $hits = scalar @$marcresults; - $hits=$size if $hits > $size; + $hits = $size if $hits > $size; my @results; - for(my $i=0;$i<$hits;$i++) { + for ( my $i = 0 ; $i < $hits ; $i++ ) { my %resultsloop; - my $marcrecord = MARC::File::USMARC::decode($marcresults->[$i]); - my $biblio = TransformMarcToKoha(C4::Context->dbh,$marcrecord,''); - # check if the entry is already in the feed. Otherwise, pop the $line th line and add this new one. - my $already_in_feed=0; - foreach (@{$rss->{'items'}}) { - if ($_->{'link'} =~ /biblionumber=$biblio->{'biblionumber'}/) { - $already_in_feed=1; + my $marcrecord = MARC::File::USMARC::decode( $marcresults->[$i] ); + my $biblio = TransformMarcToKoha( C4::Context->dbh, $marcrecord, '' ); + +# check if the entry is already in the feed. Otherwise, pop the $line th line and add this new one. + my $already_in_feed = 0; + foreach ( @{ $rss->{'items'} } ) { + if ( $_->{'link'} =~ /biblionumber=$biblio->{'biblionumber'}/ ) { + $already_in_feed = 1; } } unless ($already_in_feed) { - pop(@{$rss->{'items'}}) if (@{$rss->{'items'}} >= $size); - $rss->add_item(title => $biblio->{'title'}, - description => $biblio->{'author'}, - link => "$url/opac-detail.pl?biblionumber=".$biblio->{'biblionumber'}, - mode =>'insert', + pop( @{ $rss->{'items'} } ) if ( @{ $rss->{'items'} } >= $size ); + $rss->add_item( + title => $biblio->{'title'}, + description => $biblio->{'author'}, + link => "$url/opac-detail.pl?biblionumber=" + . $biblio->{'biblionumber'}, + mode => 'insert', ); } } + # save the rss feed. $rss->save("rss/$filename"); -} else { -# warn "RDF CACHE used" } -print $cgi->header(-type => "application/rss+xml"); + +print $cgi->header( -type => "application/rss+xml" ); print $rss->as_string; diff --git a/opac/opac-search.pl b/opac/opac-search.pl index aa0287c5dd..73d6a2d164 100755 --- a/opac/opac-search.pl +++ b/opac/opac-search.pl @@ -418,12 +418,11 @@ my $expanded_facet = $params->{'expand'}; # Define some global variables my $error; # used for error handling my $search_desc; # the query expressed in terms that humans understand -my $koha_query - ; # the query expressed in terms that zoom understands with field weighting and stemming +my $koha_query; # the query expressed in terms that zoom understands with field weighting and stemming my $federated_query; -my $query_type - ; # usually not needed, but can be used to trigger ccl, cql, or pqf queries if set +my $query_type; # usually not needed, but can be used to trigger ccl, cql, or pqf queries if set my @results; + ## I. BUILD THE QUERY ( $error, $search_desc, $koha_query, $federated_query, $query_type ) = buildQuery( $query, \@operators, \@operands, \@indexes, \@limits ); @@ -431,8 +430,7 @@ my @results; # warn "query : $koha_query"; ## II. DO THE SEARCH AND GET THE RESULTS my $total; # the total results for the whole set -my $facets - ; # this object stores the faceted results that display on the left-hand of the results page +my $facets; # this object stores the faceted results that display on the left-hand of the results page my @results_array; my $results_hashref; @@ -556,8 +554,7 @@ $template->param( searchdesc => $search_desc, opacfacets => 1, facets_loop => $facets, - "BiblioDefaultView" - . C4::Context->preference("BiblioDefaultView") => 1, + "BiblioDefaultView" . C4::Context->preference("BiblioDefaultView") => 1, scan_use => $scan, search_error => $error, RequestOnOpac => $RequestOnOpac, diff --git a/tools/letter.pl b/tools/letter.pl index 9be77f7806..f585708dc8 100755 --- a/tools/letter.pl +++ b/tools/letter.pl @@ -1,25 +1,5 @@ #!/usr/bin/perl -#script to administer the aqbudget table -#written 20/02/2002 by paul.poulain@free.fr -# This software is placed under the gnu General Public License, v2 (http://www.gnu.org/licenses/gpl.html) - -# ALGO : -# this script use an $op to know what to do. -# if $op is empty or none of the above values, -# - the default screen is build (with all records, or filtered datas). -# - the user can clic on add, modify or delete record. -# if $op=add_form -# - if primkey exists, this is a modification,so we read the $primkey record -# - builds the add/modify form -# if $op=add_validate -# - the user has just send datas, so we create/modify the record -# if $op=delete_form -# - we show the record having primkey=$primkey and ask for deletion validation form -# if $op=delete_confirm -# - we delete the record having primkey=$primkey - - # Copyright 2000-2002 Katipo Communications # # This file is part of Koha. @@ -37,6 +17,25 @@ # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place, # Suite 330, Boston, MA 02111-1307 USA +=head1 tools/letter.pl + + ALGO : + this script use an $op to know what to do. + if $op is empty or none of the above values, + - the default screen is build (with all records, or filtered datas). + - the user can clic on add, modify or delete record. + if $op=add_form + - if primkey exists, this is a modification,so we read the $primkey record + - builds the add/modify form + if $op=add_validate + - the user has just send datas, so we create/modify the record + if $op=delete_form + - we show the record having primkey=$primkey and ask for deletion validation form + if $op=delete_confirm + - we delete the record having primkey=$primkey + +=cut + use strict; use CGI; use C4::Date; @@ -44,231 +43,293 @@ use C4::Auth; use C4::Context; use C4::Output; - -sub StringSearch { - my ($searchstring,$type)=@_; +sub StringSearch { + my ( $searchstring, $type ) = @_; my $dbh = C4::Context->dbh; - $searchstring=~ s/\'/\\\'/g; - my @data=split(' ',$searchstring); - my $count=@data; - my $sth=$dbh->prepare("Select * from letter where (code like ?) order by module,code"); + $searchstring =~ s/\'/\\\'/g; + my @data = split( ' ', $searchstring ); + my $count = @data; + my $sth = + $dbh->prepare( + "Select * from letter where (code like ?) order by module,code"); $sth->execute("$data[0]%"); my @results; - my $cnt=0; - while (my $data=$sth->fetchrow_hashref){ - push(@results,$data); - $cnt ++; + my $cnt = 0; + + while ( my $data = $sth->fetchrow_hashref ) { + push( @results, $data ); + $cnt++; } + # $sth->execute; $sth->finish; - return ($cnt,\@results); + return ( $cnt, \@results ); } -my $input = new CGI; -my $searchfield=$input->param('searchfield'); -my $offset=$input->param('offset'); -my $script_name="/cgi-bin/koha/tools/letter.pl"; -my $code=$input->param('code'); -my $module = $input->param('module'); -my $content = $input->param('content'); -my $pagesize=20; -my $op = $input->param('op'); -$searchfield=~ s/\,//g; +my $input = new CGI; +my $searchfield = $input->param('searchfield'); +my $offset = $input->param('offset'); +my $script_name = "/cgi-bin/koha/tools/letter.pl"; +my $code = $input->param('code'); +my $module = $input->param('module'); +my $content = $input->param('content'); +my $pagesize = 20; +my $op = $input->param('op'); +$searchfield =~ s/\,//g; my $dbh = C4::Context->dbh; -my ($template, $borrowernumber, $cookie) - = get_template_and_user({template_name => "tools/letter.tmpl", - query => $input, - type => "intranet", - authnotrequired => 0, - flagsrequired => {tools => 1}, - debug => 1, - }); +my ( $template, $borrowernumber, $cookie ) = get_template_and_user( + { + template_name => "tools/letter.tmpl", + query => $input, + type => "intranet", + authnotrequired => 0, + flagsrequired => { tools => 1 }, + debug => 1, + } +); if ($op) { -$template->param(script_name => $script_name, - $op => 1); # we show only the TMPL_VAR names $op -} else { -$template->param(script_name => $script_name, - else => 1); # we show only the TMPL_VAR names $op + $template->param( + script_name => $script_name, + $op => 1 + ); # we show only the TMPL_VAR names $op +} +else { + $template->param( + script_name => $script_name, + else => 1 + ); # we show only the TMPL_VAR names $op } -$template->param(action => $script_name); +$template->param( action => $script_name ); ################## ADD_FORM ################################## # called by default. Used to create form to add or modify a record -if ($op eq 'add_form') { +if ( $op eq 'add_form' ) { + #---- if primkey exists, it's a modify action, so read values to modify... my $letter; if ($code) { - my $sth=$dbh->prepare("select * from letter where module=? and code=?"); - $sth->execute($module,$code); - $letter=$sth->fetchrow_hashref; + my $sth = + $dbh->prepare("select * from letter where module=? and code=?"); + $sth->execute( $module, $code ); + $letter = $sth->fetchrow_hashref; $sth->finish; } + # build field list my @SQLfieldname; - my %line = ('value' => "LibrarianFirstname", 'text' => 'LibrarianFirstname'); + my %line = ( 'value' => "LibrarianFirstname", 'text' => 'LibrarianFirstname' ); push @SQLfieldname, \%line; - my %line = ('value' => "LibrarianSurname", 'text' => 'LibrarianSurname'); + my %line = ( 'value' => "LibrarianSurname", 'text' => 'LibrarianSurname' ); push @SQLfieldname, \%line; - my %line = ('value' => "LibrarianEmailaddress", 'text' => 'LibrarianEmailaddress'); + my %line = ( 'value' => "LibrarianEmailaddress", 'text' => 'LibrarianEmailaddress' ); push @SQLfieldname, \%line; - my $sth2=$dbh->prepare("SHOW COLUMNS from branches"); + my $sth2 = $dbh->prepare("SHOW COLUMNS from branches"); $sth2->execute; - my %line = ('value' => "", 'text' => '---BRANCHES---'); + my %line = ( 'value' => "", 'text' => '---BRANCHES---' ); push @SQLfieldname, \%line; - while ((my $field) = $sth2->fetchrow_array) { - my %line = ('value' => "branches.".$field, 'text' => "branches.".$field); + + while ( ( my $field ) = $sth2->fetchrow_array ) { + my %line = ( 'value' => "branches." . $field, 'text' => "branches." . $field ); push @SQLfieldname, \%line; } + # add acquisition specific tables - if (index($module,"acquisition")>0){ - my $sth2=$dbh->prepare("SHOW COLUMNS from aqbooksellers"); - $sth2->execute; - my %line = ('value' => "", 'text' => '---BOOKSELLERS---'); - push @SQLfieldname, \%line; - while ((my $field) = $sth2->fetchrow_array) { - my %line = ('value' => "aqbooksellers.".$field, 'text' => "aqbooksellers.".$field); + if ( index( $module, "acquisition" ) > 0 ) { + my $sth2 = $dbh->prepare("SHOW COLUMNS from aqbooksellers"); + $sth2->execute; + my %line = ( 'value' => "", 'text' => '---BOOKSELLERS---' ); push @SQLfieldname, \%line; - } - my $sth2=$dbh->prepare("SHOW COLUMNS from aqorders"); - $sth2->execute; - my %line = ('value' => "", 'text' => '---ORDERS---'); - push @SQLfieldname, \%line; - while ((my $field) = $sth2->fetchrow_array) { - my %line = ('value' => "aqorders.".$field, 'text' => "aqorders.".$field); + while ( ( my $field ) = $sth2->fetchrow_array ) { + my %line = ( + 'value' => "aqbooksellers." . $field, + 'text' => "aqbooksellers." . $field + ); + push @SQLfieldname, \%line; + } + my $sth2 = $dbh->prepare("SHOW COLUMNS from aqorders"); + $sth2->execute; + my %line = ( 'value' => "", 'text' => '---ORDERS---' ); push @SQLfieldname, \%line; + while ( ( my $field ) = $sth2->fetchrow_array ) { + my %line = ( + 'value' => "aqorders." . $field, + 'text' => "aqorders." . $field + ); + push @SQLfieldname, \%line; + } + + # add issues specific tables } - # add issues specific tables - }elsif (index($module,"issues")>0){ - my $sth2=$dbh->prepare("SHOW COLUMNS from aqbooksellers"); - $sth2->execute; - my %line = ('value' => "", 'text' => '---BOOKSELLERS---'); - push @SQLfieldname, \%line; - while ((my $field) = $sth2->fetchrow_array) { - my %line = ('value' => "aqbooksellers.".$field, 'text' => "aqbooksellers.".$field); + elsif ( index( $module, "issues" ) > 0 ) { + my $sth2 = $dbh->prepare("SHOW COLUMNS from aqbooksellers"); + $sth2->execute; + my %line = ( 'value' => "", 'text' => '---BOOKSELLERS---' ); push @SQLfieldname, \%line; - } - my $sth2=$dbh->prepare("SHOW COLUMNS from serial"); - $sth2->execute; - my %line = ('value' => "", 'text' => '---SERIALS---'); - push @SQLfieldname, \%line; - while ((my $field) = $sth2->fetchrow_array) { - my %line = ('value' => "serial.".$field, 'text' => "serial.".$field); + while ( ( my $field ) = $sth2->fetchrow_array ) { + my %line = ( + 'value' => "aqbooksellers." . $field, + 'text' => "aqbooksellers." . $field + ); + push @SQLfieldname, \%line; + } + my $sth2 = $dbh->prepare("SHOW COLUMNS from serial"); + $sth2->execute; + my %line = ( 'value' => "", 'text' => '---SERIALS---' ); push @SQLfieldname, \%line; - } - my $sth2=$dbh->prepare("SHOW COLUMNS from subscription"); - $sth2->execute; - my %line = ('value' => "", 'text' => '---SUBSCRIPTION---'); - push @SQLfieldname, \%line; - while ((my $field) = $sth2->fetchrow_array) { - my %line = ('value' => "subscription.".$field, 'text' => "subscription.".$field); + while ( ( my $field ) = $sth2->fetchrow_array ) { + my %line = ( 'value' => "serial." . $field, 'text' => "serial." . $field ); + push @SQLfieldname, \%line; + } + my $sth2 = $dbh->prepare("SHOW COLUMNS from subscription"); + $sth2->execute; + my %line = ( 'value' => "", 'text' => '---SUBSCRIPTION---' ); push @SQLfieldname, \%line; + while ( ( my $field ) = $sth2->fetchrow_array ) { + my %line = ( + 'value' => "subscription." . $field, + 'text' => "subscription." . $field + ); + push @SQLfieldname, \%line; + } + + # add biblio specific tables. } - # add biblio specific tables. - } else { - my $sth2=$dbh->prepare("SHOW COLUMNS from biblio"); - $sth2->execute; - my %line = ('value' => "", 'text' => '---BIBLIO---'); + else { + my $sth2 = $dbh->prepare("SHOW COLUMNS from biblio"); + $sth2->execute; + my %line = ( 'value' => "", 'text' => '---BIBLIO---' ); - push @SQLfieldname, \%line; - while ((my $field) = $sth2->fetchrow_array) { - # note : %line is redefined, otherwise \%line contains the same value for every entry of the list - my %line = ('value' => "biblio.".$field, 'text' => "biblio.".$field); push @SQLfieldname, \%line; - } - my $sth2=$dbh->prepare("SHOW COLUMNS from biblioitems"); - $sth2->execute; - my %line = ('value' => "", 'text' => '---BIBLIOITEMS---'); - push @SQLfieldname, \%line; - while ((my $field) = $sth2->fetchrow_array) { - my %line = ('value' => "biblioitems.".$field, 'text' => "biblioitems.".$field); + while ( ( my $field ) = $sth2->fetchrow_array ) { + +# note : %line is redefined, otherwise \%line contains the same value for every entry of the list + my %line = ( 'value' => "biblio." . $field, 'text' => "biblio." . $field ); + push @SQLfieldname, \%line; + } + my $sth2 = $dbh->prepare("SHOW COLUMNS from biblioitems"); + $sth2->execute; + my %line = ( 'value' => "", 'text' => '---BIBLIOITEMS---' ); push @SQLfieldname, \%line; - } - my %line = ('value' => "", 'text' => '---ITEMS---'); - push @SQLfieldname, \%line; - my %line = ('value' => "items.content", 'text' => 'items.content'); - push @SQLfieldname, \%line; - - my $sth2=$dbh->prepare("SHOW COLUMNS from borrowers"); - $sth2->execute; - my %line = ('value' => "", 'text' => '---BORROWERS---'); - push @SQLfieldname, \%line; - while ((my $field) = $sth2->fetchrow_array) { - my %line = ('value' => "borrowers.".$field, 'text' => "borrowers.".$field); + while ( ( my $field ) = $sth2->fetchrow_array ) { + my %line = ( + 'value' => "biblioitems." . $field, + 'text' => "biblioitems." . $field + ); + push @SQLfieldname, \%line; + } + my %line = ( 'value' => "", 'text' => '---ITEMS---' ); push @SQLfieldname, \%line; - } + my %line = ( 'value' => "items.content", 'text' => 'items.content' ); + push @SQLfieldname, \%line; + + my $sth2 = $dbh->prepare("SHOW COLUMNS from borrowers"); + $sth2->execute; + my %line = ( 'value' => "", 'text' => '---BORROWERS---' ); + push @SQLfieldname, \%line; + while ( ( my $field ) = $sth2->fetchrow_array ) { + my %line = ( + 'value' => "borrowers." . $field, + 'text' => "borrowers." . $field + ); + push @SQLfieldname, \%line; + } } if ($code) { - $template->param(modify => 1); - $template->param(code => $letter->{code}); - } else { - $template->param(adding => 1); + $template->param( modify => 1 ); + $template->param( code => $letter->{code} ); } - $template->param(name => $letter->{name},title => $letter->{title}, - content => ($content?$content:$letter->{content}), - ($module?$module:$letter->{module}) => 1, - SQLfieldname => \@SQLfieldname,); - # END $OP eq ADD_FORM + else { + $template->param( adding => 1 ); + } + $template->param( + name => $letter->{name}, + title => $letter->{title}, + content => ( $content ? $content : $letter->{content} ), + ( $module ? $module : $letter->{module} ) => 1, + SQLfieldname => \@SQLfieldname, + ); + + # END $OP eq ADD_FORM ################## ADD_VALIDATE ################################## -# called by add_form, used to insert/modify data in DB -} elsif ($op eq 'add_validate') { + # called by add_form, used to insert/modify data in DB +} +elsif ( $op eq 'add_validate' ) { my $dbh = C4::Context->dbh; - my $sth=$dbh->prepare("replace letter (module,code,name,title,content) values (?,?,?,?,?)"); - $sth->execute($input->param('module'),$input->param('code'),$input->param('name'),$input->param('title'),$input->param('content')); + my $sth = + $dbh->prepare( + "replace letter (module,code,name,title,content) values (?,?,?,?,?)"); + $sth->execute( + $input->param('module'), $input->param('code'), + $input->param('name'), $input->param('title'), + $input->param('content') + ); $sth->finish; print $input->redirect("letter.pl"); exit; -# END $OP eq ADD_VALIDATE + + # END $OP eq ADD_VALIDATE ################## DELETE_CONFIRM ################################## -# called by default form, used to confirm deletion of data in DB -} elsif ($op eq 'delete_confirm') { + # called by default form, used to confirm deletion of data in DB +} +elsif ( $op eq 'delete_confirm' ) { my $dbh = C4::Context->dbh; - my $sth=$dbh->prepare("select * from letter where code=?"); + my $sth = $dbh->prepare("select * from letter where code=?"); $sth->execute($code); - my $data=$sth->fetchrow_hashref; + my $data = $sth->fetchrow_hashref; $sth->finish; - $template->param(module => $data->{module}); - $template->param(code => $code); - $template->param(name => $data->{'name'}); - $template->param(content => $data->{'content'}); - # END $OP eq DELETE_CONFIRM + $template->param( module => $data->{module} ); + $template->param( code => $code ); + $template->param( name => $data->{'name'} ); + $template->param( content => $data->{'content'} ); + + # END $OP eq DELETE_CONFIRM ################## DELETE_CONFIRMED ################################## -# called by delete_confirm, used to effectively confirm deletion of data in DB -} elsif ($op eq 'delete_confirmed') { - my $dbh = C4::Context->dbh; - my $code=uc($input->param('code')); - my $module=$input->param('module'); - my $sth=$dbh->prepare("delete from letter where module=? and code=?"); - $sth->execute($module,$code); + # called by delete_confirm, used to effectively confirm deletion of data in DB +} +elsif ( $op eq 'delete_confirmed' ) { + my $dbh = C4::Context->dbh; + my $code = uc( $input->param('code') ); + my $module = $input->param('module'); + my $sth = $dbh->prepare("delete from letter where module=? and code=?"); + $sth->execute( $module, $code ); $sth->finish; - print $input->redirect("letter.pl"); + print $input->redirect("/cgi-bin/koha/tools/letter.pl"); return; - # END $OP eq DELETE_CONFIRMED + + # END $OP eq DELETE_CONFIRMED ################## DEFAULT ################################## -} else { # DEFAULT - if ($searchfield ne '') { - $template->param(search => 1); - $template->param(searchfield => $searchfield); +} +else { # DEFAULT + if ( $searchfield ne '' ) { + $template->param( search => 1 ); + $template->param( searchfield => $searchfield ); } - my ($count,$results)=StringSearch($searchfield,'web'); - my $toggle="white"; - my @loop_data =(); - for (my $i=$offset; $i < ($offset+$pagesize<$count?$offset+$pagesize:$count); $i++){ - if ($toggle eq 'white'){ - $toggle="#ffffcc"; - } else { - $toggle="white"; + my ( $count, $results ) = StringSearch( $searchfield, 'web' ); + my $toggle = 0; + my @loop_data = (); + for ( + my $i = $offset ; + $i < ( $offset + $pagesize < $count ? $offset + $pagesize : $count ) ; + $i++ + ) + { + if ( $toggle ) { + $toggle = 0; + } + else { + $toggle = 1; } - my %row_data; - $row_data{toggle} = $toggle; - $row_data{module} = $results->[$i]{'module'}; - $row_data{code} = $results->[$i]{'code'}; - $row_data{name} = $results->[$i]{'name'}; - push(@loop_data, \%row_data); + my %row_data; + $row_data{toggle} = $toggle; + $row_data{module} = $results->[$i]{'module'}; + $row_data{code} = $results->[$i]{'code'}; + $row_data{name} = $results->[$i]{'name'}; + push( @loop_data, \%row_data ); } - $template->param(letter => \@loop_data); -} #---- END $OP eq DEFAULT + $template->param( letter => \@loop_data ); +} #---- END $OP eq DEFAULT output_html_with_http_headers $input, $cookie, $template->output; -- 2.39.5