[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/C4 Circulation.pm Letters.pm Members.pm Ou...
|
From: |
Antoine Farnault |
|
Subject: |
[Koha-cvs] koha/C4 Circulation.pm Letters.pm Members.pm Ou... |
|
Date: |
Thu, 26 Jul 2007 15:18:47 +0000 |
CVSROOT: /sources/koha
Module name: koha
Changes by: Antoine Farnault <toins> 07/07/26 15:18:47
Modified files:
C4 : Circulation.pm Letters.pm Members.pm Output.pm
Reserves.pm
Log message:
really minor change : POD fixing, indentation & some compilation warn
removing.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation.pm?cvsroot=koha&r1=1.31&r2=1.32
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Letters.pm?cvsroot=koha&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Members.pm?cvsroot=koha&r1=1.56&r2=1.57
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Output.pm?cvsroot=koha&r1=1.65&r2=1.66
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Reserves.pm?cvsroot=koha&r1=1.16&r2=1.17
Patches:
Index: Circulation.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation.pm,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- Circulation.pm 25 Jul 2007 14:09:39 -0000 1.31
+++ Circulation.pm 26 Jul 2007 15:18:46 -0000 1.32
@@ -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: Circulation.pm,v 1.31 2007/07/25 14:09:39 btoumi Exp $
+# $Id: Circulation.pm,v 1.32 2007/07/26 15:18:46 toins Exp $
use strict;
require Exporter;
@@ -45,7 +45,7 @@
our ($VERSION,@ISA,@EXPORT,@EXPORT_OK,%EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.31 $' =~ /\d+/g; shift(@v).".".join(
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.32 $' =~ /\d+/g; shift(@v).".".join(
"_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -838,7 +838,7 @@
=item C<$date> contains the max date of return. calculated if empty.
AddIssue does the following things :
-- step 0�: check that there is a borrowernumber & a barcode provided
+- step 01: check that there is a borrowernumber & a barcode provided
- check for RENEWAL (book issued & being issued to the same patron)
- renewal YES = Calculate Charge & renew
- renewal NO =
@@ -870,9 +870,9 @@
# get biblioinformation for this item
my $biblio = GetBiblioFromItemNumber($item->{itemnumber});
-#
-# check if we just renew the issue.
-#
+ #
+ # check if we just renew the issue.
+ #
if ( $actualissue->{borrowernumber} eq $borrower->{'borrowernumber'} ) {
# we renew, do we need to add some charge ?
my ( $charge, $itemtype ) = GetIssuingCharges(
Index: Letters.pm
===================================================================
RCS file: /sources/koha/koha/C4/Letters.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- Letters.pm 27 Apr 2007 14:00:49 -0000 1.7
+++ Letters.pm 26 Jul 2007 15:18:47 -0000 1.8
@@ -1,6 +1,5 @@
package C4::Letters;
-
# Copyright 2000-2002 Katipo Communications
#
# This file is part of Koha.
@@ -27,10 +26,10 @@
use C4::Log;
require Exporter;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
+our ( $VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS );
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.7 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.8 $' =~ /\d+/g;
shift(@v) . "." . join( "_", map { sprintf "%03d", $_ } @v );
};
@@ -52,8 +51,8 @@
=cut
@ISA = qw(Exporter);
address@hidden = qw(&GetLetters &getletter &addalert &getalert &delalert
&findrelatedto &SendAlerts);
-
address@hidden =
+ qw(&GetLetters &getletter &addalert &getalert &delalert &findrelatedto
&SendAlerts);
=head2 GetLetters
@@ -68,7 +67,8 @@
my @letterloop;
foreach my $thisletter (keys %$letters) {
my $selected = 1 if $thisletter eq $letter;
- my %row =(value => $thisletter,
+ my %row =(
+ value => $thisletter,
selected => $selected,
lettername => $letters->{$thisletter},
);
@@ -76,6 +76,7 @@
}
=head3 in TEMPLATE
+
<select name="letter">
<option value="">Default</option>
<!-- TMPL_LOOP name="letterloop" -->
@@ -86,33 +87,34 @@
=cut
sub GetLetters {
-# returns a reference to a hash of references to ALL letters...
+
+ # returns a reference to a hash of references to ALL letters...
my $cat = shift;
my %letters;
my $dbh = C4::Context->dbh;
$dbh->quote($cat);
my $sth;
- if ($cat ne ""){
+ if ( $cat ne "" ) {
my $query = "SELECT * FROM letter WHERE module = ? ORDER BY name";
$sth = $dbh->prepare($query);
$sth->execute($cat);
- } else {
+ }
+ else {
my $query = " SELECT * FROM letter ORDER BY name";
$sth = $dbh->prepare($query);
$sth->execute;
}
- while (my $letter=$sth->fetchrow_hashref){
- $letters{$letter->{'code'}}=$letter->{'name'};
+ while ( my $letter = $sth->fetchrow_hashref ) {
+ $letters{ $letter->{'code'} } = $letter->{'name'};
}
return \%letters;
}
-
sub getletter {
- my ($module,$code) = @_;
+ my ( $module, $code ) = @_;
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare("select * from letter where module=? and
code=?");
- $sth->execute($module,$code);
+ $sth->execute( $module, $code );
my $line = $sth->fetchrow_hashref;
return $line;
}
@@ -129,24 +131,30 @@
=cut
sub addalert {
- my ($borrowernumber,$type,$externalid) = @_;
- my $dbh=C4::Context->dbh;
- my $sth = $dbh->prepare("insert into alert (borrowernumber, type,
externalid) values (?,?,?)");
- $sth->execute($borrowernumber,$type,$externalid);
+ my ( $borrowernumber, $type, $externalid ) = @_;
+ my $dbh = C4::Context->dbh;
+ my $sth =
+ $dbh->prepare(
+ "insert into alert (borrowernumber, type, externalid) values (?,?,?)");
+ $sth->execute( $borrowernumber, $type, $externalid );
+
# get the alert number newly created and return it
my $alertid = $dbh->{'mysql_insertid'};
return $alertid;
}
=head2 delalert
+
parameters :
- alertid : the alert id
deletes the alert
+
=cut
sub delalert {
- my ($alertid)address@hidden;
-# warn "ALERTID : $alertid";
+ my ($alertid) = @_;
+
+ #warn "ALERTID : $alertid";
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare("delete from alert where alertid=?");
$sth->execute($alertid);
@@ -163,34 +171,35 @@
=cut
sub getalert {
- my ($borrowernumber,$type,$externalid) = @_;
- my $dbh=C4::Context->dbh;
+ my ( $borrowernumber, $type, $externalid ) = @_;
+ my $dbh = C4::Context->dbh;
my $query = "select * from alert where";
my @bind;
if ($borrowernumber) {
$query .= " borrowernumber=? and";
- push @bind,$borrowernumber;
+ push @bind, $borrowernumber;
}
if ($type) {
$query .= " type=? and";
- push @bind,$type;
+ push @bind, $type;
}
if ($externalid) {
$query .= " externalid=? and";
- push @bind,$externalid;
+ push @bind, $externalid;
}
$query =~ s/ and$//;
my $sth = $dbh->prepare($query);
$sth->execute(@bind);
my @result;
- while (my $line = $sth->fetchrow_hashref) {
- push @result,$line;
+ while ( my $line = $sth->fetchrow_hashref ) {
+ push @result, $line;
}
- return address@hidden if $#result >=0; # return only if there is one
result.
+ return address@hidden if $#result >= 0; # return only if there is one
result.
return;
}
=head2 findrelatedto
+
parameters :
- $type : the type of alert
- $externalid : the id of the "object" to query
@@ -201,14 +210,20 @@
=cut
sub findrelatedto {
- my ($type,$externalid) = @_;
- my $dbh=C4::Context->dbh;
+ my ( $type, $externalid ) = @_;
+ my $dbh = C4::Context->dbh;
my $sth;
- if ($type eq 'issue') {
- $sth=$dbh->prepare("select title as result from subscription
left join biblio on subscription.biblionumber=biblio.biblionumber where
subscriptionid=?");
+ if ( $type eq 'issue' ) {
+ $sth =
+ $dbh->prepare(
+"select title as result from subscription left join biblio on
subscription.biblionumber=biblio.biblionumber where subscriptionid=?"
+ );
}
- if ($type eq 'borrower') {
- $sth=$dbh->prepare("select concat(firstname,' ',surname) from
borrowers where borrowernumber=?");
+ if ( $type eq 'borrower' ) {
+ $sth =
+ $dbh->prepare(
+"select concat(firstname,' ',surname) from borrowers where borrowernumber=?"
+ );
}
$sth->execute($externalid);
my ($result) = $sth->fetchrow;
@@ -227,124 +242,182 @@
=cut
sub SendAlerts {
- my ($type,$externalid,$letter)address@hidden;
- my $dbh=C4::Context->dbh;
- if ($type eq 'issue') {
-# warn "sending issues...";
- my $letter = getletter('serial',$letter);
+ my ( $type, $externalid, $letter ) = @_;
+ my $dbh = C4::Context->dbh;
+ if ( $type eq 'issue' ) {
+
+ # warn "sending issues...";
+ my $letter = getletter( 'serial', $letter );
+
# prepare the letter...
# search the biblionumber
- my $sth=$dbh->prepare("select biblionumber from subscription
where subscriptionid=?");
+ my $sth =
+ $dbh->prepare(
+ "select biblionumber from subscription where subscriptionid=?");
$sth->execute($externalid);
- my ($biblionumber)=$sth->fetchrow;
+ my ($biblionumber) = $sth->fetchrow;
+
# parsing branch info
my $userenv = C4::Context->userenv;
- parseletter($letter,'branches',$userenv->{branch});
+ parseletter( $letter, 'branches', $userenv->{branch} );
+
# parsing librarian name
$letter->{content} =~
s/<<LibrarianFirstname>>/$userenv->{firstname}/g;
$letter->{content} =~
s/<<LibrarianSurname>>/$userenv->{surname}/g;
- $letter->{content} =~
s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
+ $letter->{content} =~
+ s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
+
# parsing biblio information
- parseletter($letter,'biblio',$biblionumber);
- parseletter($letter,'biblioitems',$biblionumber);
+ parseletter( $letter, 'biblio', $biblionumber );
+ parseletter( $letter, 'biblioitems', $biblionumber );
+
# find the list of borrowers to alert
- my $alerts = getalert('','issue',$externalid);
+ my $alerts = getalert( '', 'issue', $externalid );
foreach (@$alerts) {
+
# and parse borrower ...
my $innerletter = $letter;
- my $borinfo =
GetMember($_->{'borrowernumber'},'borrowernumber');
-
parseletter($innerletter,'borrowers',$_->{'borrowernumber'});
+ my $borinfo = GetMember( $_->{'borrowernumber'}, 'borrowernumber'
);
+ parseletter( $innerletter, 'borrowers', $_->{'borrowernumber'} );
+
# ... then send mail
- if ($borinfo->{emailaddress}) {
- my %mail = ( To => $borinfo->{emailaddress},
+ if ( $borinfo->{emailaddress} ) {
+ my %mail = (
+ To => $borinfo->{emailaddress},
From =>
$userenv->{emailaddress},
- Subject =>
"".$innerletter->{title},
- Message =>
"".$innerletter->{content},
+ Subject => "" . $innerletter->{title},
+ Message => "" . $innerletter->{content},
);
sendmail(%mail);
+
# warn "sending to $mail{To} From $mail{From}
subj $mail{Subject} Mess $mail{Message}";
}
}
}
- elsif ($type eq 'claimacquisition') {
-# warn "sending issues...";
- my $letter = getletter('claimacquisition',$letter);
+ elsif ( $type eq 'claimacquisition' ) {
+
+ # warn "sending issues...";
+ my $letter = getletter( 'claimacquisition', $letter );
+
# prepare the letter...
# search the biblionumber
- my $strsth="select aqorders.*,aqbasket.*,biblio.*,biblioitems.*
from aqorders LEFT JOIN aqbasket on aqbasket.basketno=aqorders.basketno LEFT
JOIN biblio on aqorders.biblionumber=biblio.biblionumber LEFT JOIN biblioitems
on aqorders.biblioitemnumber=biblioitems.biblioitemnumber where
aqorders.ordernumber IN (".join(",",@$externalid).")";
- my $sthorders=$dbh->prepare($strsth);
+ my $strsth =
+"select aqorders.*,aqbasket.*,biblio.*,biblioitems.* from aqorders LEFT JOIN
aqbasket on aqbasket.basketno=aqorders.basketno LEFT JOIN biblio on
aqorders.biblionumber=biblio.biblionumber LEFT JOIN biblioitems on
aqorders.biblioitemnumber=biblioitems.biblioitemnumber where
aqorders.ordernumber IN ("
+ . join( ",", @$externalid ) . ")";
+ my $sthorders = $dbh->prepare($strsth);
$sthorders->execute;
- my $dataorders=$sthorders->fetchall_arrayref({});
-
parseletter($letter,'aqbooksellers',$dataorders->[0]->{booksellerid});
- my $sthbookseller = $dbh->prepare("select * from aqbooksellers
where id=?");
- $sthbookseller->execute($dataorders->[0]->{booksellerid});
- my $databookseller=$sthbookseller->fetchrow_hashref;
+ my $dataorders = $sthorders->fetchall_arrayref( {} );
+ parseletter( $letter, 'aqbooksellers',
+ $dataorders->[0]->{booksellerid} );
+ my $sthbookseller =
+ $dbh->prepare("select * from aqbooksellers where id=?");
+ $sthbookseller->execute( $dataorders->[0]->{booksellerid} );
+ my $databookseller = $sthbookseller->fetchrow_hashref;
+
# parsing branch info
my $userenv = C4::Context->userenv;
- parseletter($letter,'branches',$userenv->{branch});
+ parseletter( $letter, 'branches', $userenv->{branch} );
+
# parsing librarian name
$letter->{content} =~
s/<<LibrarianFirstname>>/$userenv->{firstname}/g;
$letter->{content} =~
s/<<LibrarianSurname>>/$userenv->{surname}/g;
- $letter->{content} =~
s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
- foreach my $data (@$dataorders){
- my $line=$1 if ($letter->{content}=~m/(<<.*>>)/);
- foreach my $field (keys %$data){
+ $letter->{content} =~
+ s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
+ foreach my $data (@$dataorders) {
+ my $line = $1 if ( $letter->{content} =~ m/(<<.*>>)/ );
+ foreach my $field ( keys %$data ) {
$line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
}
- $letter->{content}=~ s/(<<.*>>)/$line\n\1/;
+ $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
}
$letter->{content} =~ s/<<[^>]*>>//g;
my $innerletter = $letter;
+
# ... then send mail
- if ($databookseller->{bookselleremail}||$databookseller->{contemail}) {
- my %mail = ( To =>
$databookseller->{bookselleremail}.($databookseller->{contemail}?",".$databookseller->{contemail}:""),
+ if ( $databookseller->{bookselleremail}
+ || $databookseller->{contemail} )
+ {
+ my %mail = (
+ To => $databookseller->{bookselleremail}
+ . (
+ $databookseller->{contemail}
+ ? "," . $databookseller->{contemail}
+ : ""
+ ),
From => $userenv->{emailaddress},
- Subject => "".$innerletter->{title},
- Message => "".$innerletter->{content},
+ Subject => "" . $innerletter->{title},
+ Message => "" . $innerletter->{content},
'Content-Type' => 'text/plain; charset="utf8"',
);
sendmail(%mail);
- warn "sending to $mail{To} From $mail{From} subj
$mail{Subject} Mess $mail{Message}";
+ warn
+"sending to $mail{To} From $mail{From} subj $mail{Subject} Mess
$mail{Message}";
}
- if (C4::Context->preference("LetterLog")){
- logaction($userenv->{number},"ACQUISITION","Send Acquisition claim
letter","","order list :
".join(",",@$externalid)."\n$innerletter->{title}\n$innerletter->{content}")
+ if ( C4::Context->preference("LetterLog") ) {
+ logaction(
+ $userenv->{number},
+ "ACQUISITION",
+ "Send Acquisition claim letter",
+ "",
+ "order list : "
+ . join( ",", @$externalid )
+ . "\n$innerletter->{title}\n$innerletter->{content}"
+ );
}
}
- elsif ($type eq 'claimissues') {
-# warn "sending issues...";
- my $letter = getletter('claimissues',$letter);
+ elsif ( $type eq 'claimissues' ) {
+
+ # warn "sending issues...";
+ my $letter = getletter( 'claimissues', $letter );
+
# prepare the letter...
# search the biblionumber
- my $strsth="select serial.*,subscription.*, biblio.title from
serial LEFT JOIN subscription on
serial.subscriptionid=subscription.subscriptionid LEFT JOIN biblio on
serial.biblionumber=biblio.biblionumber where serial.serialid IN
(".join(",",@$externalid).")";
- my $sthorders=$dbh->prepare($strsth);
+ my $strsth =
+"select serial.*,subscription.*, biblio.title from serial LEFT JOIN
subscription on serial.subscriptionid=subscription.subscriptionid LEFT JOIN
biblio on serial.biblionumber=biblio.biblionumber where serial.serialid IN ("
+ . join( ",", @$externalid ) . ")";
+ my $sthorders = $dbh->prepare($strsth);
$sthorders->execute;
- my $dataorders=$sthorders->fetchall_arrayref({});
-
parseletter($letter,'aqbooksellers',$dataorders->[0]->{aqbooksellerid});
- my $sthbookseller = $dbh->prepare("select * from aqbooksellers
where id=?");
- $sthbookseller->execute($dataorders->[0]->{aqbooksellerid});
- my $databookseller=$sthbookseller->fetchrow_hashref;
+ my $dataorders = $sthorders->fetchall_arrayref( {} );
+ parseletter( $letter, 'aqbooksellers',
+ $dataorders->[0]->{aqbooksellerid} );
+ my $sthbookseller =
+ $dbh->prepare("select * from aqbooksellers where id=?");
+ $sthbookseller->execute( $dataorders->[0]->{aqbooksellerid} );
+ my $databookseller = $sthbookseller->fetchrow_hashref;
+
# parsing branch info
my $userenv = C4::Context->userenv;
- parseletter($letter,'branches',$userenv->{branch});
+ parseletter( $letter, 'branches', $userenv->{branch} );
+
# parsing librarian name
$letter->{content} =~
s/<<LibrarianFirstname>>/$userenv->{firstname}/g;
$letter->{content} =~
s/<<LibrarianSurname>>/$userenv->{surname}/g;
- $letter->{content} =~
s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
- foreach my $data (@$dataorders){
- my $line=$1 if ($letter->{content}=~m/(<<.*>>)/);
- foreach my $field (keys %$data){
+ $letter->{content} =~
+ s/<<LibrarianEmailaddress>>/$userenv->{emailaddress}/g;
+ foreach my $data (@$dataorders) {
+ my $line = $1 if ( $letter->{content} =~ m/(<<.*>>)/ );
+ foreach my $field ( keys %$data ) {
$line =~ s/(<<[^\.]+.$field>>)/$data->{$field}/;
}
- $letter->{content}=~ s/(<<.*>>)/$line\n\1/;
+ $letter->{content} =~ s/(<<.*>>)/$line\n$1/;
}
$letter->{content} =~ s/<<[^>]*>>//g;
my $innerletter = $letter;
+
# ... then send mail
- if ($databookseller->{bookselleremail}||$databookseller->{contemail}) {
- my %mail = ( To =>
$databookseller->{bookselleremail}.($databookseller->{contemail}?",".$databookseller->{contemail}:""),
+ if ( $databookseller->{bookselleremail}
+ || $databookseller->{contemail} )
+ {
+ my %mail = (
+ To => $databookseller->{bookselleremail}
+ . (
+ $databookseller->{contemail}
+ ? "," . $databookseller->{contemail}
+ : ""
+ ),
From => $userenv->{emailaddress},
- Subject => "".$innerletter->{title},
- Message => "".$innerletter->{content},
+ Subject => "" . $innerletter->{title},
+ Message => "" . $innerletter->{content},
);
sendmail(%mail);
&logaction(
@@ -352,12 +425,16 @@
"ACQUISITION",
"CLAIM ISSUE",
undef,
- "To=".$databookseller->{contemail}.
- " Title=".$innerletter->{title}.
- " Content=".$innerletter->{content}
+ "To="
+ . $databookseller->{contemail}
+ . " Title="
+ . $innerletter->{title}
+ . " Content="
+ . $innerletter->{content}
) if C4::Context->preference("LetterLog");
}
- warn "sending to From $userenv->{emailaddress} subj
$innerletter->{title} Mess $innerletter->{content}";
+ warn
+"sending to From $userenv->{emailaddress} subj $innerletter->{title} Mess
$innerletter->{content}";
}
}
@@ -373,31 +450,39 @@
=cut
sub parseletter {
- my ($letter,$table,$pk) = @_;
-# warn "Parseletter : ($letter,$table,$pk)";
- my $dbh=C4::Context->dbh;
+ my ( $letter, $table, $pk ) = @_;
+
+ # warn "Parseletter : ($letter,$table,$pk)";
+ my $dbh = C4::Context->dbh;
my $sth;
- if ($table eq 'biblio') {
+ if ( $table eq 'biblio' ) {
$sth = $dbh->prepare("select * from biblio where
biblionumber=?");
- } elsif ($table eq 'biblioitems') {
+ }
+ elsif ( $table eq 'biblioitems' ) {
$sth = $dbh->prepare("select * from biblioitems where
biblionumber=?");
- } elsif ($table eq 'borrowers') {
+ }
+ elsif ( $table eq 'borrowers' ) {
$sth = $dbh->prepare("select * from borrowers where
borrowernumber=?");
- } elsif ($table eq 'branches') {
+ }
+ elsif ( $table eq 'branches' ) {
$sth = $dbh->prepare("select * from branches where
branchcode=?");
- } elsif ($table eq 'aqbooksellers') {
+ }
+ elsif ( $table eq 'aqbooksellers' ) {
$sth = $dbh->prepare("select * from aqbooksellers where id=?");
}
$sth->execute($pk);
+
# store the result in an hash
my $values = $sth->fetchrow_hashref;
+
# and get all fields from the table
$sth = $dbh->prepare("show columns from $table");
$sth->execute;
- while ((my $field) = $sth->fetchrow_array) {
- my $replacefield="<<$table.$field>>";
+ while ( ( my $field ) = $sth->fetchrow_array ) {
+ my $replacefield = "<<$table.$field>>";
my $replacedby = $values->{$field};
-# warn "REPLACE $replacefield by $replacedby";
+
+ # warn "REPLACE $replacefield by $replacedby";
$letter->{title} =~ s/$replacefield/$replacedby/g;
$letter->{content} =~ s/$replacefield/$replacedby/g;
}
Index: Members.pm
===================================================================
RCS file: /sources/koha/koha/C4/Members.pm,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -b -r1.56 -r1.57
--- Members.pm 12 Jul 2007 15:22:09 -0000 1.56
+++ Members.pm 26 Jul 2007 15:18:47 -0000 1.57
@@ -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: Members.pm,v 1.56 2007/07/12 15:22:09 toins Exp $
+# $Id: Members.pm,v 1.57 2007/07/26 15:18:47 toins Exp $
use strict;
require Exporter;
@@ -31,7 +31,7 @@
our ($VERSION,@ISA,@EXPORT,@EXPORT_OK);
-$VERSION = do { my @v = '$Revision: 1.56 $' =~ /\d+/g; shift(@v) . "." . join(
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.57 $' =~ /\d+/g; shift(@v) . "." . join(
"_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -118,6 +118,7 @@
&fixup_cardnumber
&checkcardnumber
);
+
=item SearchMember
($count, $borrowers) = &SearchMember($searchstring, $type,$category_type);
@@ -440,8 +441,7 @@
}
$flags{'ODUES'} = \%flaginfo;
}
- my @itemswaiting =
- GetReservesFromBorrowernumber(
$patroninformation->{'borrowernumber'},'W' );
+ my @itemswaiting = GetReservesFromBorrowernumber(
$patroninformation->{'borrowernumber'},'W' );
my $nowaiting = scalar @itemswaiting;
if ( $nowaiting > 0 ) {
my %flaginfo;
Index: Output.pm
===================================================================
RCS file: /sources/koha/koha/C4/Output.pm,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -b -r1.65 -r1.66
--- Output.pm 20 Jun 2007 09:45:09 -0000 1.65
+++ Output.pm 26 Jul 2007 15:18:47 -0000 1.66
@@ -21,7 +21,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Output.pm,v 1.65 2007/06/20 09:45:09 toins Exp $
+# $Id: Output.pm,v 1.66 2007/07/26 15:18:47 toins Exp $
# NOTE: I'm pretty sure this module is deprecated in favor of
# templates.
@@ -35,7 +35,7 @@
use vars qw($VERSION @ISA @EXPORT);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.65 $' =~ /\d+/g; shift(@v) . "." . join(
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.66 $' =~ /\d+/g; shift(@v) . "." . join(
"_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -55,7 +55,7 @@
#Output
push @EXPORT, qw(
&output_html_with_http_headers
- );
+);
#FIXME: this is a quick fix to stop rc1 installing broken
Index: Reserves.pm
===================================================================
RCS file: /sources/koha/koha/C4/Reserves.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- Reserves.pm 12 Jul 2007 15:22:09 -0000 1.16
+++ Reserves.pm 26 Jul 2007 15:18:47 -0000 1.17
@@ -20,7 +20,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Reserves.pm,v 1.16 2007/07/12 15:22:09 toins Exp $
+# $Id: Reserves.pm,v 1.17 2007/07/26 15:18:47 toins Exp $
use strict;
require Exporter;
@@ -34,7 +34,7 @@
my $library_name = C4::Context->preference("LibraryName");
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.16 $' =~ /\d+/g; shift(@v) . "." . join(
"_", map { sprintf "%03d", $_ } @v ); };
+$VERSION = do { my @v = '$Revision: 1.17 $' =~ /\d+/g; shift(@v) . "." . join(
"_", map { sprintf "%03d", $_ } @v ); };
=head1 NAME
@@ -275,6 +275,7 @@
$borrowerreserv = GetReservesFromBorrowernumber($borrowernumber,$tatus);
TODO :: Descritpion
+
=cut
sub GetReservesFromBorrowernumber {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha/C4 Circulation.pm Letters.pm Members.pm Ou...,
Antoine Farnault <=