[Koha-cvs] koha/C4 Bookfund.pm Suggestions.pm [rel_3_0]
Antoine Farnault
antoine at koha-fr.org
Tue Dec 19 16:15:13 CET 2006
CVSROOT: /sources/koha
Module name: koha
Branch: rel_3_0
Changes by: Antoine Farnault <toins> 06/12/19 15:15:13
Modified files:
C4 : Bookfund.pm Suggestions.pm
Log message:
removing compilation warn & POD error.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Bookfund.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.3.2.1&r2=1.3.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Suggestions.pm?cvsroot=koha&only_with_tag=rel_3_0&r1=1.12.2.2&r2=1.12.2.3
Patches:
Index: Bookfund.pm
===================================================================
RCS file: /sources/koha/koha/C4/Bookfund.pm,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- Bookfund.pm 17 Oct 2006 16:18:14 -0000 1.3.2.1
+++ Bookfund.pm 19 Dec 2006 15:15:13 -0000 1.3.2.2
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Bookfund.pm,v 1.3.2.1 2006/10/17 16:18:14 hdl Exp $
+# $Id: Bookfund.pm,v 1.3.2.2 2006/12/19 15:15:13 toins Exp $
use strict;
@@ -25,7 +25,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.3.2.1 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.3.2.2 $' =~ /\d+/g; shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -55,15 +55,11 @@
=head1 FUNCTIONS
-=over 2
-
=cut
#-------------------------------------------------------------#
-=head3 GetBookFund
-
-=over 4
+=head2 GetBookFund
$dataaqbookfund = &GetBookFund($bookfundid);
@@ -73,8 +69,6 @@
C<$dataaqbookfund> is a hashref full of bookfundid, bookfundname, bookfundgroup,
and branchcode.
-=back
-
=cut
sub GetBookFund {
@@ -100,8 +94,6 @@
=head3 GetBookFundsId
-=over 4
-
$sth = &GetBookFundsId
Read on aqbookfund table and execute a simple SQL query.
@@ -111,8 +103,6 @@
C<@results> is an array of id existing on the database.
-=back
-
=cut
sub GetBookFundsId {
@@ -131,8 +121,6 @@
=head3 GetBookFunds
-=over 4
-
@results = &GetBookFunds;
Returns a list of all book funds.
@@ -140,15 +128,12 @@
C<@results> is an array of references-to-hash, whose keys are fields from the aqbookfund and aqbudget tables of the Koha database. Results are ordered
alphabetically by book fund name.
-=back
-
=cut
sub GetBookFunds {
my ($branch) = @_;
my $dbh = C4::Context->dbh;
my $userenv = C4::Context->userenv;
- my $branch = $userenv->{branch};
my $strsth;
if ( $branch ne '' ) {
@@ -191,8 +176,6 @@
=head3 GetCurrencies
-=over 4
-
@currencies = &GetCurrencies;
Returns the list of all known currencies.
@@ -200,8 +183,6 @@
C<$currencies> is a array; its elements are references-to-hash, whose
keys are the fields from the currency table in the Koha database.
-=back
-
=cut
sub GetCurrencies {
@@ -224,15 +205,11 @@
=head3 GetBookFundBreakdown
-=over 4
-
( $spent, $comtd ) = &GetBookFundBreakdown( $id, $year, $start, $end );
returns the total comtd & spent for a given bookfund, and a given year
used in acqui-home.pl
-=back
-
=cut
sub GetBookFundBreakdown {
@@ -274,7 +251,7 @@
# then do a seperate query for commited totals, (pervious single query was
# returning incorrect comitted results.
- my $query = "
+ $query = "
SELECT quantity,datereceived,freight,unitprice,
listprice,ecost,quantityreceived AS qrev,
subscription,title,itemtype,aqorders.biblionumber,
@@ -293,7 +270,7 @@
AND (datecancellationprinted IS NULL OR datecancellationprinted='0000-00-00')
";
- my $sth = $dbh->prepare($query);
+ $sth = $dbh->prepare($query);
$sth->execute( $id, $start, $end );
my $comtd;
@@ -318,14 +295,10 @@
=head3 NewBookFund
-=over 4
-
&NewBookFund(bookfundid, bookfundname, branchcode);
this function create a new bookfund into the database.
-=back
-
=cut
sub NewBookFund{
@@ -347,14 +320,10 @@
=head3 ModBookFund
-=over 4
-
&ModBookFund($bookfundname,$branchcode,$bookfundid);
this function update the bookfundname and the branchcode on aqbookfund table
on database.
-=back
-
=cut
sub ModBookFund {
@@ -385,15 +354,12 @@
=head3 SearchBookFund
-=over 4
@results = SearchBookFund(
$bookfundid,$filter,$filter_bookfundid,
$filter_bookfundname,$filter_branchcode);
this function searchs among the bookfunds corresponding to our filtering rules.
-=back
-
=cut
sub SearchBookFund {
@@ -443,14 +409,10 @@
=head3 ModCurrencies
-=over 4
-
&ModCurrencies($currency, $newrate);
Sets the exchange rate for C<$currency> to be C<$newrate>.
-=back
-
=cut
sub ModCurrencies {
@@ -469,16 +431,12 @@
=head3 Countbookfund
-=over 4
-
$number = Countbookfund($bookfundid);
this function count the number of bookfund with id given on input arg.
return :
the result of the SQL query as a number.
-=back
-
=cut
sub Countbookfund {
@@ -501,8 +459,6 @@
=head3 ConvertCurrency
-=over 4
-
$foreignprice = &ConvertCurrency($currency, $localprice);
Converts the price C<$localprice> to foreign currency C<$currency> by
@@ -511,8 +467,6 @@
If no exchange rate is found, C<&ConvertCurrency> assumes the rate is one
to one.
-=back
-
=cut
sub ConvertCurrency {
@@ -536,13 +490,9 @@
=head3 DelBookFund
-=over 4
-
&DelBookFund($bookfundid);
this function delete a bookfund which has $bokfundid as parameter on aqbookfund table and delete the approriate budget.
-=back
-
=cut
sub DelBookFund {
@@ -571,8 +521,6 @@
__END__
-=back
-
=head1 AUTHOR
Koha Developement team <info at koha.org>
Index: Suggestions.pm
===================================================================
RCS file: /sources/koha/koha/C4/Suggestions.pm,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -b -r1.12.2.2 -r1.12.2.3
--- Suggestions.pm 19 Dec 2006 15:03:38 -0000 1.12.2.2
+++ Suggestions.pm 19 Dec 2006 15:15:13 -0000 1.12.2.3
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Suggestions.pm,v 1.12.2.2 2006/12/19 15:03:38 toins Exp $
+# $Id: Suggestions.pm,v 1.12.2.3 2006/12/19 15:15:13 toins Exp $
use strict;
require Exporter;
@@ -27,7 +27,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.12.2.2 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.12.2.3 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -40,8 +40,6 @@
=head1 DESCRIPTION
-=over 4
-
The functions in this module deal with the suggestions in OPAC and in librarian interface
A suggestion is done in the OPAC. It has the status "ASKED"
@@ -55,8 +53,6 @@
All suggestions of a borrower can be seen by the borrower itself.
Suggestions done by other borrowers can be seen when not "AVAILABLE"
-=back
-
=head1 FUNCTIONS
=cut
@@ -76,8 +72,6 @@
=head2 SearchSuggestion
-=over 4
-
(\@array) = &SearchSuggestion($user,$author,$title,$publishercode,$status,$suggestedbyme)
searches for a suggestion
@@ -88,8 +82,6 @@
* in the status field
* as parameter ( for example ASKED => 1, or REJECTED => 1) . This is for template & translation purposes.
-=back
-
=cut
sub SearchSuggestion {
@@ -141,7 +133,6 @@
} else {
$query .= " and managedby is NULL";
}
- warn $query;
my $sth=$dbh->prepare($query);
$sth->execute(@sql_params);
my @results;
@@ -161,8 +152,6 @@
=head2 GetSuggestion
-=over 4
-
\%sth = &GetSuggestion($suggestionid)
this function get the detail of the suggestion $suggestionid (input arg)
@@ -170,8 +159,6 @@
return :
the result of the SQL query as a hash : $sth->fetchrow_hashref.
-=back
-
=cut
sub GetSuggestion {
@@ -189,8 +176,6 @@
=head2 GetSuggestionFromBiblionumber
-=over 4
-
$suggestionid = &GetSuggestionFromBiblionumber($dbh,$biblionumber)
Get a suggestion from it's biblionumber.
@@ -198,8 +183,6 @@
return :
the id of the suggestion which is related to the biblionumber given on input args.
-=back
-
=cut
sub GetSuggestionFromBiblionumber {
@@ -217,8 +200,6 @@
=head2 GetSuggestionByStatus
-=over 4
-
$suggestions = &GetSuggestionByStatus($status)
Get a suggestion from it's status
@@ -226,8 +207,6 @@
return :
all the suggestion with C<$status>
-=back
-
=cut
sub GetSuggestionByStatus {
@@ -250,16 +229,12 @@
=head2 CountSuggestion
-=over 4
-
&CountSuggestion($status)
Count the number of suggestions with the status given on input argument.
the arg status can be :
-=over
-
-=over
+=over 2
=item * ASKED : asked by the user, not dealed by the librarian
@@ -271,13 +246,9 @@
=back
-=back
-
return :
the number of suggestion with this status.
-=back
-
=cut
sub CountSuggestion {
@@ -323,14 +294,10 @@
=head2 NewSuggestion
-=over 4
-
&NewSuggestion($borrowernumber,$title,$author,$publishercode,$note,$copyrightdate,$volumedesc,$publicationyear,$place,$isbn,$biblionumber)
Insert a new suggestion on database with value given on input arg.
-=back
-
=cut
sub NewSuggestion {
@@ -348,8 +315,6 @@
=head2 ModStatus
-=over 4
-
&ModStatus($suggestionid,$status,$managedby,$biblionumber)
Modify the status (status can be 'ASKED', 'ACCEPTED', 'REJECTED', 'ORDERED')
@@ -357,8 +322,6 @@
Note that there is no function to modify a suggestion : only the status can be modified, thus the name of the function.
-=back
-
=cut
sub ModStatus {
@@ -445,14 +408,10 @@
=head2 ConnectSuggestionAndBiblio
-=over 4
-
&ConnectSuggestionAndBiblio($suggestionid,$biblionumber)
connect a suggestion to an existing biblio
-=back
-
=cut
sub ConnectSuggestionAndBiblio {
@@ -469,14 +428,10 @@
=head2 DelSuggestion
-=over 4
-
&DelSuggestion($borrowernumber,$suggestionid)
Delete a suggestion. A borrower can delete a suggestion only if he is its owner.
-=back
-
=cut
sub DelSuggestion {
@@ -504,7 +459,6 @@
1;
__END__
-=back
=head1 AUTHOR
More information about the Koha-cvs
mailing list