koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] koha/acqui newbiblio.pl


From: Mason James
Subject: [Koha-cvs] koha/acqui newbiblio.pl
Date: Wed, 07 Jun 2006 04:01:00 +0000

CVSROOT:        /sources/koha
Module name:    koha
Changes by:     Mason James <sushi>     06/06/07 04:01:00

Modified files:
        acqui          : newbiblio.pl 

Log message:
        perltidy before commit.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/acqui/newbiblio.pl?cvsroot=koha&r1=1.30&r2=1.31

Patches:
Index: newbiblio.pl
===================================================================
RCS file: /sources/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- newbiblio.pl        18 Jan 2006 14:52:07 -0000      1.30
+++ newbiblio.pl        7 Jun 2006 04:01:00 -0000       1.31
@@ -3,7 +3,6 @@
 #script to show display basket of orders
 #written by address@hidden 24/2/2000
 
-
 # Copyright 2000-2002 Katipo Communications
 #
 # This file is part of Koha.
@@ -37,58 +36,64 @@
 use C4::Interface::CGI::Output;
 use HTML::Template;
 
-my $input=new CGI;
-my $booksellerid=$input->param('booksellerid');
-my $title=$input->param('title');
-my $author=$input->param('author');
-my $copyright=$input->param('copyright');
-my ($count,@booksellers)=bookseller($booksellerid);
-my $ordnum=$input->param('ordnum');
-my $biblio=$input->param('biblio');
-my $basketno=$input->param('basketno');
+my $input        = new CGI;
+my $booksellerid = $input->param('booksellerid');
+my $title        = $input->param('title');
+my $author       = $input->param('author');
+my $copyright    = $input->param('copyright');
+my ( $count, @booksellers ) = bookseller($booksellerid);
+my $ordnum       = $input->param('ordnum');
+my $biblio       = $input->param('biblio');
+my $basketno     = $input->param('basketno');
 my $suggestionid = $input->param('suggestionid');
-my $close= $input->param('close');
+my $close        = $input->param('close');
 my $data;
 my $new;
 my $dbh = C4::Context->dbh;
-if ($ordnum eq ''){ # create order
-       $new='yes';
-#      $ordnum=newordernum;
-       if ($biblio && !$suggestionid) {
-                       $data=bibdata($biblio);
+
+if ( $ordnum eq '' ) {    # create order
+    $new = 'yes';
+
+    #  $ordnum=newordernum;
+    if ( $biblio && !$suggestionid ) {
+        $data = bibdata($biblio);
        }
-       # get suggestion fields if applicable. If it's a subscription renewal, 
then the biblio already exists
-       # otherwise, retrieve suggestion information.
+
+# get suggestion fields if applicable. If it's a subscription renewal, then 
the biblio already exists
+# otherwise, retrieve suggestion information.
        if ($suggestionid) {
                if ($biblio) {
-                       $data=bibdata($biblio);
-               } else {
+            $data = bibdata($biblio);
+        }
+        else {
                        $data = getsuggestion($suggestionid);
                }
        }
-       if ($data->{'title'} eq ''){
-               $data->{'title'}=$title;
-               $data->{'author'}=$author;
-               $data->{'copyrightdate'}=$copyright;
-       }
-}else { #modify order
-       $data=getsingleorder($ordnum);
-       $biblio=$data->{'biblionumber'};
+    if ( $data->{'title'} eq '' ) {
+        $data->{'title'}         = $title;
+        $data->{'author'}        = $author;
+        $data->{'copyrightdate'} = $copyright;
+    }
 }
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "acqui/newbiblio.tmpl",
+else {    #modify order
+    $data   = getsingleorder($ordnum);
+    $biblio = $data->{'biblionumber'};
+}
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "acqui/newbiblio.tmpl",
                             query => $input,
                             type => "intranet",
                             authnotrequired => 0,
-                            flagsrequired => {acquisition => 1},
+        flagsrequired   => { acquisition => 1 },
                             debug => 1,
-                            });
-
+    }
+);
 
 # get currencies (for change rates calcs if needed
-my ($count,$rates)=getcurrencies();
+my ( $count, $rates ) = getcurrencies();
 my @loop_currency = ();
-for (my $i=0;$i<$count;$i++){
+for ( my $i = 0 ; $i < $count ; $i++ ) {
        my %line;
        $line{currency} = $rates->[$i]->{'currency'};
        $line{rate} = $rates->[$i]->{'rate'};
@@ -96,80 +101,97 @@
 }
 
 # build itemtype list
-my $sth=$dbh->prepare("Select itemtype,description from itemtypes order by 
description");
+my $sth =
+  $dbh->prepare(
+    "Select itemtype,description from itemtypes order by description");
 $sth->execute;
 my  @itemtype;
 my %itemtypes;
-while (my ($value,$lib) = $sth->fetchrow_array) {
+while ( my ( $value, $lib ) = $sth->fetchrow_array ) {
        push @itemtype, $value;
-       $itemtypes{$value}=$lib;
+    $itemtypes{$value} = $lib;
 }
-my $CGIitemtype=CGI::scrolling_list( -name     => 'format',
+my $CGIitemtype = CGI::scrolling_list(
+    -name     => 'format',
                        -values   => address@hidden,
                        -default  => $data->{'itemtype'},
                        -labels   => \%itemtypes,
                        -size     => 1,
-                       -multiple => 0 );
+    -multiple => 0
+);
 $sth->finish;
 
 # build branches list
 my $branches = getbranches;
 my @branchloop;
-foreach my $thisbranch (sort keys %$branches) {
-       my %row =(value => $thisbranch,
+foreach my $thisbranch ( sort keys %$branches ) {
+    my %row = (
+        value      => $thisbranch,
                                branchname => 
$branches->{$thisbranch}->{'branchname'},
                        );
        push @branchloop, \%row;
 }
-$template->param(branchloop =>address@hidden);
+$template->param( branchloop => address@hidden );
 
 # build bookfund list
-my $sthtemp = $dbh->prepare("Select flags, branchcode from borrowers where 
borrowernumber = ?");
+my $sthtemp =
+  $dbh->prepare(
+    "Select flags, branchcode from borrowers where borrowernumber = ?");
 $sthtemp->execute($loggedinuser);
-my ($flags, $homebranch)=$sthtemp->fetchrow;
+my ( $flags, $homebranch ) = $sthtemp->fetchrow;
 
 my $count2;
 my @bookfund;
 my @select_bookfund;
 my %select_bookfunds;
-($count2,@bookfund)=bookfunds($homebranch);
-for (my $i=0;$i<$count2;$i++){
+( $count2, @bookfund ) = bookfunds($homebranch);
+for ( my $i = 0 ; $i < $count2 ; $i++ ) {
        push @select_bookfund, $bookfund[$i]->{'bookfundid'};
-       $select_bookfunds{$bookfund[$i]->{'bookfundid'}} = 
$bookfund[$i]->{'bookfundname'}
+    $select_bookfunds{ $bookfund[$i]->{'bookfundid'} } =
+      $bookfund[$i]->{'bookfundname'};
 }
-my $CGIbookfund=CGI::scrolling_list( -name     => 'bookfund',
+my $CGIbookfund = CGI::scrolling_list(
+    -name     => 'bookfund',
                        -values   => address@hidden,
                        -default  => $data->{'bookfundid'},
                        -labels   => \%select_bookfunds,
                        -size     => 1,
-                       -multiple => 0 );
+    -multiple => 0
+);
 my $bookfundname;
 my $bookfundid;
-if ($close){
-       $bookfundid=$data->{'bookfundid'};
-       $bookfundname= $select_bookfunds{$bookfundid};
+if ($close) {
+    $bookfundid   = $data->{'bookfundid'};
+    $bookfundname = $select_bookfunds{$bookfundid};
 }
 
 #Build sort lists
-my $CGIsort1 = buildCGIsort("Asort1","sort1",$data->{'sort1'});
+my $CGIsort1 = buildCGIsort( "Asort1", "sort1", $data->{'sort1'} );
 if ($CGIsort1) {
-       $template->param(CGIsort1 => $CGIsort1);
-} else {
-       $template->param( sort1 => $data->{'sort1'});
+    $template->param( CGIsort1 => $CGIsort1 );
+}
+else {
+    $template->param( sort1 => $data->{'sort1'} );
 }
 
-my $CGIsort2 = buildCGIsort("Asort2","sort2",$data->{'sort2'});
+my $CGIsort2 = buildCGIsort( "Asort2", "sort2", $data->{'sort2'} );
 if ($CGIsort2) {
-       $template->param(CGIsort2 =>$CGIsort2);
-} else {
-       $template->param( sort2 => $data->{'sort2'});
+    $template->param( CGIsort2 => $CGIsort2 );
+}
+else {
+    $template->param( sort2 => $data->{'sort2'} );
 }
 
 # fill template
-$template->param( close=> $close, bookfundid=>$bookfundid, 
bookfundname=>$bookfundname) if ($close);
-
+$template->param(
+    close        => $close,
+    bookfundid   => $bookfundid,
+    bookfundname => $bookfundname
+  )
+  if ($close);
 
-$template->param( existing => $biblio,
+$template->param(
+    existing         => $biblio,
                                                title => $title,
                                                ordnum => $ordnum,
                                                basketno => $basketno,
@@ -187,9 +209,9 @@
                                                nocalc => 
$booksellers[0]->{'nocalc'},
                                                name => 
$booksellers[0]->{'name'},
                                                currency => 
$booksellers[0]->{'listprice'},
-                                               gstrate => 
C4::Context->preference("gist") ,
+    gstrate          => C4::Context->preference("gist"),
                                                loop_currencies => 
address@hidden,
-                                               orderexists => ($new eq 
'yes')?0:1,
+    orderexists      => ( $new eq 'yes' ) ? 0 : 1,
                                                title => $data->{'title'},
                                                author => $data->{'author'},
                                                copyrightdate => 
$data->{'copyrightdate'},
@@ -203,6 +225,7 @@
                                                invoice => 
$data->{'booksellerinvoicenumber'},
                                                ecost => $data->{'ecost'},
                                                notes => $data->{'notes'},
-                                               publishercode => 
$data->{'publishercode'});
+    publishercode    => $data->{'publishercode'}
+);
 
 output_html_with_http_headers $input, $cookie, $template->output;




reply via email to

[Prev in Thread] Current Thread [Next in Thread]