subs renamed & POD added

diff --git a/search.marc/search.pl b/search.marc/search.pl
index 24a2015..d21b2ce 100755 (executable)
--- a/search.marc/search.pl
+++ b/search.marc/search.pl
@@ -353,7 +353,7 @@ else {
        my @branches;
        my @select_branch;
        my %select_branches;
-       my $branches=getbranches();
+       my $branches=GetBranches();
        my @branchloop;
        foreach my $thisbranch (sort keys %$branches) {
 #              my $selected = 1 if $thisbranch eq $branch;

diff --git a/serials/acqui-search-result.pl b/serials/acqui-search-result.pl
index 7d81526..853759d 100755 (executable)
--- a/serials/acqui-search-result.pl
+++ b/serials/acqui-search-result.pl
@@ -22,6 +22,24 @@
 
 # $Id$
 
+=head1 NAME
+
+acqui-search-result.pl
+
+=head1 DESCRIPTION
+ TODO
+ 
+=head1 PARAMETERS
+
+=over 4
+
+=item supplier
+
+=back
+
+=cut
+
+
 use strict;
 use C4::Auth;
 use C4::Biblio;
@@ -36,47 +54,50 @@ use C4::Date;
 my $query=new CGI;
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "serials/acqui-search-result.tmpl",
-                            query => $query,
-                            type => "intranet",
-                            authnotrequired => 0,
-                            flagsrequired => {acquisition => 1},
-                            debug => 1,
-                            });
+                 query => $query,
+                 type => "intranet",
+                 authnotrequired => 0,
+                 flagsrequired => {acquisition => 1},
+                 debug => 1,
+                 });
 
 my $supplier=$query->param('supplier');
-my ($count,@suppliers)=bookseller($supplier);
+my @suppliers = GetBookSeller($supplier);
+my $count = scalar @suppliers;
 
-#build reult page
+#build result page
 my $toggle=0;
 my @loop_suppliers;
 for (my $i=0; $i<$count; $i++) {
-       my ($ordcount,$orders)=getorders($suppliers[$i]->{'id'});
-       my %line;
-       if ($toggle==0){
-               $line{even}=1;
-               $toggle=1;
-       } else {
-               $line{even}=0;
-               $toggle=0;
-       }
-       $line{aqbooksellerid} =$suppliers[$i]->{'id'};
-       $line{name} = $suppliers[$i]->{'name'};
-       $line{active} = $suppliers[$i]->{'active'};
-       my @loop_basket;
-       for (my $i2=0;$i2<$ordcount;$i2++){
-               my %inner_line;
-               $inner_line{basketno} =$orders->[$i2]->{'basketno'};
-               $inner_line{total} =$orders->[$i2]->{'count(*)'};
-               $inner_line{authorisedby} = $orders->[$i2]->{'authorisedby'};
-               $inner_line{creationdate} = format_date($orders->[$i2]->{'creationdate'});
-               $inner_line{closedate} = format_date($orders->[$i2]->{'closedate'});
-               push @loop_basket, \%inner_line;
-       }
-       $line{loop_basket} = \@loop_basket;
-       push @loop_suppliers, \%line;
+    my $orders = GetOrders($suppliers[$i]->{'id'});
+    my $ordcount = scalar @$orders;
+    
+    my %line;
+    if ($toggle==0){
+        $line{even}=1;
+        $toggle=1;
+    } else {
+        $line{even}=0;
+        $toggle=0;
+    }
+    $line{aqbooksellerid} =$suppliers[$i]->{'id'};
+    $line{name} = $suppliers[$i]->{'name'};
+    $line{active} = $suppliers[$i]->{'active'};
+    my @loop_basket;
+    for (my $i2=0;$i2<$ordcount;$i2++){
+        my %inner_line;
+        $inner_line{basketno} =$orders->[$i2]->{'basketno'};
+        $inner_line{total} =$orders->[$i2]->{'count(*)'};
+        $inner_line{authorisedby} = $orders->[$i2]->{'authorisedby'};
+        $inner_line{creationdate} = format_date($orders->[$i2]->{'creationdate'});
+        $inner_line{closedate} = format_date($orders->[$i2]->{'closedate'});
+        push @loop_basket, \%inner_line;
+    }
+    $line{loop_basket} = \@loop_basket;
+    push @loop_suppliers, \%line;
 }
 $template->param(loop_suppliers => \@loop_suppliers,
-                                               supplier => $supplier,
-                                               count => $count);
+                        supplier => $supplier,
+                        count => $count);
 
 output_html_with_http_headers $query, $cookie, $template->output;

diff --git a/serials/acqui-search.pl b/serials/acqui-search.pl
index 2f06abc..d982ff9 100755 (executable)
--- a/serials/acqui-search.pl
+++ b/serials/acqui-search.pl
@@ -45,7 +45,9 @@ my $dbh = C4::Context->dbh;
 my $sthtemp = $dbh->prepare("Select flags, branchcode from borrowers where borrowernumber = ?");
 $sthtemp->execute($loggedinuser);
 my ($flags, $homebranch)=$sthtemp->fetchrow;
-my ($count,@results)=bookfunds($homebranch);
+my @results=GetBookFunds($homebranch);
+my $count = scalar(@results);
+
 my $classlist='';
 my $total=0;
 my $totspent=0;
@@ -53,7 +55,7 @@ my $totcomtd=0;
 my $totavail=0;
 my @loop_budget = ();
 for (my $i=0;$i<$count;$i++){
-       my ($spent,$comtd)=bookfundbreakdown($results[$i]->{'bookfundid'});
+       my ($spent,$comtd)=GetBookFundBreakdown($results[$i]->{'bookfundid'});
        my $avail=$results[$i]->{'budgetamount'}-($spent+$comtd);
        my %line;
        $line{bookfundname} = $results[$i]->{'bookfundname'};
@@ -68,7 +70,9 @@ for (my $i=0;$i<$count;$i++){
        $totavail+=$avail;
 }
 #currencies
-my ($count,$rates)=getcurrencies();
+my $rates=GetCurrencies();
+my $count = scalar @$rates;
+
 my @loop_currency = ();
 for (my $i=0;$i<$count;$i++){
        my %line;