February 2001 - Koha-devel - lists.koha-community.org

CVS: koha delbiblio.pl,1.1.1.1,1.2
by Chris Cornack 27 Feb '01

27 Feb '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv22597 Modified Files: delbiblio.pl Log Message: Quick fix to stop ppl from being able to delete biblios that have items attached Index: delbiblio.pl =================================================================== RCS file: /cvsroot/koha/koha/delbiblio.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** delbiblio.pl 2000/12/19 23:45:51 1.1.1.1 --- delbiblio.pl 2001/02/27 22:08:57 1.2 *************** *** 17,21 **** my $biblio=$input->param('biblio'); ! delbiblio($biblio); print $input->redirect("/catalogue/"); --- 17,32 ---- my $biblio=$input->param('biblio'); + #print $input->header; + #check no items attached + my $count=C4::Acquisitions::itemcount($biblio); ! ! #print $count; ! if ($count > 0){ ! print $input->header; ! print "This biblio has $count items attached, please delete them before deleting this biblio<p> ! "; ! } else { ! #delbiblio($biblio); print $input->redirect("/catalogue/"); + }

1 0

CVS: koha/circ circulation.pl,1.13,1.14
by Chris Cornack 21 Feb '01

21 Feb '01

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv3991/circ Modified Files: circulation.pl Log Message: Rejigged printing issues, to print out everything on issue to the borrower Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** circulation.pl 2001/02/14 02:41:43 1.13 --- circulation.pl 2001/02/21 22:33:48 1.14 *************** *** 31,35 **** $env{'branchcode'}=$branch; $env{'printer'}=$printer; ! #$env{'queue'}=$printer; my $branchcount=0; my $printercount=0; --- 31,35 ---- $env{'branchcode'}=$branch; $env{'printer'}=$printer; ! $env{'queue'}=$printer; my $branchcount=0; my $printercount=0; *************** *** 330,334 **** <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd> <tr><th colspan=6 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Returned Items</font></th></tr> ! <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th><th>Borrower</th></tr> EOF my $color=''; --- 330,334 ---- <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd> <tr><th colspan=6 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Returned Items</font></th></tr> ! <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>Borrower</th></tr> EOF my $color=''; *************** *** 345,349 **** my ($borrower) = getpatroninformation(\%env,$borrowernumber,0); my ($iteminformation) = getiteminformation(\%env, 0, $barcode); ! print "<tr><td bgcolor=$color>$overduetext</td><td bgcolor=$color align=center><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a></td><td bgcolor=$color>$iteminformation->{'title'}</td><td bgcolor=$color>$iteminformation->{'author'}</td><td bgcolor=$color align=center>$iteminformation->{'dewey'} $iteminformation->{'subclass'}</td><td bgcolor=$color><img src=/images/blackdot.gif><a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}</td></tr>\n"; } print "</table>\n"; --- 345,349 ---- my ($borrower) = getpatroninformation(\%env,$borrowernumber,0); my ($iteminformation) = getiteminformation(\%env, 0, $barcode); ! print "<tr><td bgcolor=$color>$overduetext</td><td bgcolor=$color align=center><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$barcode</a></td><td bgcolor=$color>$iteminformation->{'title'}</td><td bgcolor=$color>$iteminformation->{'author'}</td><td bgcolor=$color align=center>$iteminformation->{'itemtype'}</td><td bgcolor=$color><img src=/images/blackdot.gif><a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this,'Member', 480, 640)\">$borrower->{'cardnumber'}</a> $borrower->{'firstname'} $borrower->{'surname'}</td></tr>\n"; } print "</table>\n"; *************** *** 360,369 **** my $borrowernumber=$query->param('borrnumber'); my $barcode=$query->param('barcode'); - # if (!$barcode){ - # $barcode=' '; - # } if ($barcode eq ''){ ! $print='yes'; ! } elsif ($barcode eq ' '){ $query->param('barcode',''); --- 360,365 ---- my $borrowernumber=$query->param('borrnumber'); my $barcode=$query->param('barcode'); if ($barcode eq ''){ ! $print='yes'; } elsif ($barcode eq ' '){ $query->param('barcode',''); *************** *** 374,390 **** $env{'todaysissues'}=1; my ($borrowerissues) = currentissues(\%env, $borrower); my $i=0; my @issues; foreach (sort keys %$borrowerissues) { $issues[$i]=$borrowerissues->{$_}; - #print $issues[$i]->{'date_due'}; $i++; ! ! #print $i; } - # print $i; remoteprint(\%env,\@issues,$borrower); $query->param('borrnumber','') - # $borrowernumber=''; } unless ($noheader) { --- 370,389 ---- $env{'todaysissues'}=1; my ($borrowerissues) = currentissues(\%env, $borrower); + $env{'nottodaysissues'}=1; + $env{'todaysissues'}=0; + my ($borroweriss2)=currentissues(\%env, $borrower); + $env{'nottodaysissues'}=0; my $i=0; my @issues; foreach (sort keys %$borrowerissues) { $issues[$i]=$borrowerissues->{$_}; $i++; ! } ! foreach (sort keys %$borroweriss2) { ! $issues[$i]=$borroweriss2->{$_}; ! $i++; } remoteprint(\%env,\@issues,$borrower); $query->param('borrnumber','') } unless ($noheader) {

1 0

CVS: koha stats.pl,1.2,1.3
by Chris Cornack 21 Feb '01

21 Feb '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv1935 Modified Files: stats.pl Log Message: Fixed a little glitch in the daily stats script that meant it wasnt counting renewals Index: stats.pl =================================================================== RCS file: /cvsroot/koha/koha/stats.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** stats.pl 2001/01/31 23:40:25 1.2 --- stats.pl 2001/02/21 22:27:59 1.3 *************** *** 46,50 **** my %shannon; my $oldtime; ! #my $totalc=0; #my $totalcf=0; print mktablehdr; --- 46,50 ---- my %shannon; my $oldtime; ! my $totalw=0; #my $totalcf=0; print mktablehdr; *************** *** 55,60 **** my $sec=substr($payments[$i]{'timestamp'},12,2); my $time="$hour:$min:$sec"; ! $payments[$i]{'amount'}*=-1; ! $total+=$payments[$i]{'amount'}; my @charges=getcharges($payments[$i]{'borrowernumber'},$payments[$i]{'timestamp'}); my $count=@charges; --- 55,63 ---- my $sec=substr($payments[$i]{'timestamp'},12,2); my $time="$hour:$min:$sec"; ! if ($payments[$i]{'accounttype'} ne 'W'){ ! $payments[$i]{'amount'}*=-1; ! $total+=$payments[$i]{'amount'}; ! } ! my @charges=getcharges($payments[$i]{'borrowernumber'},$payments[$i]{'timestamp'}); my $count=@charges; *************** *** 63,84 **** my $temptotalres=0; my $temptotalren=0; ! for (my $i2=0;$i2<$count;$i2++){ if ($charges[$i2]->{'amountoutstanding'} != $oldtime){ ! print mktablerow(6,'red',$charges[$i2]->{'description'},$charges[$i2]->{'accounttype'},'', ! $charges[$i2]->{'amount'},$charges[$i2]->{'amountoutstanding'}); ! if ($charges[$i2]->{'accounttype'} eq 'Rent'){ ! $temptotalr+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; ! } ! if ($charges[$i2]->{'accounttype'} eq 'F' || $charges[$i2]->{'accounttype'} eq 'FU'){ ! $temptotalf+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; ! } ! if ($charges[$i2]->{'accounttype'} eq 'Res'){ ! $temptotalres+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; } ! if ($charges[$i2]->{'accounttype'} eq 'R'){ ! $temptotalren+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; ! } ! } ! } my $time2="$payments[$i]{'date'} $time"; my $branch=Getpaidbranch($time2); --- 66,96 ---- my $temptotalres=0; my $temptotalren=0; ! my $temptotalw=0; ! ! ! for (my $i2=0;$i2<$count;$i2++){ if ($charges[$i2]->{'amountoutstanding'} != $oldtime){ ! print mktablerow(6,'red',$charges[$i2]->{'description'},$charges[$i2]->{'accounttype'},'', ! $charges[$i2]->{'amount'},$charges[$i2]->{'amountoutstanding'}); ! if ($payments[$i]{'accounttype'} ne 'W'){ ! # print $payments[$i]{'accounttype'}; ! if ($charges[$i2]->{'accounttype'} eq 'Rent'){ ! $temptotalr+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; ! } ! if ($charges[$i2]->{'accounttype'} eq 'F' || $charges[$i2]->{'accounttype'} eq 'FU'){ ! $temptotalf+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; ! } ! if ($charges[$i2]->{'accounttype'} eq 'Res'){ ! $temptotalres+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; ! } ! if ($charges[$i2]->{'accounttype'} eq 'R'){ ! $temptotalren+=$charges[$i2]->{'amount'}-$charges[$i2]->{'amountoutstanding'}; ! } ! } } ! } ! if ($payments[$i]{'accounttype'} eq 'W'){ ! $totalw+=$payments[$i]{'amount'}; ! } my $time2="$payments[$i]{'date'} $time"; my $branch=Getpaidbranch($time2); *************** *** 112,117 **** print mktableft; print endcenter; ! print "<p><b>$total</b>"; ! #print "<b print mktablehdr; $levin{'issues'}=Count('issue','C',$date,$date2); --- 124,130 ---- print mktableft; print endcenter; ! #$totalw=$totalw * -1; ! print "<p><b>Total Paid $total</b>"; ! print "<br><b>total written off $totalw</b>"; print mktablehdr; $levin{'issues'}=Count('issue','C',$date,$date2); *************** *** 121,130 **** $foxton{'returns'}=Count('return','F',$date,$date2); $shannon{'returns'}=Count('return','S',$date,$date2); print mktablerow(9,'white',"<b>Levin</b>","Fines $levin{'totalf'}","Rental Charges $levin{'totalr'}", ! "Reserve Charges $levin{'totalres'}","Renewal Charges $levin{'totalren'}","Total $levin{'total'}", "Issues $levin{'issues'}","Renewals $levin{'renewals'}","Returns $levin{'returns'}"); ! print mktablerow(9,'white',"<b>foxton</b>","Fines $foxton{'totalf'}","Rental Charges $foxton{'totalr'}","Reserve Charges $foxton{'totalres'}","Renewal Charges $foxton{'totalren'}","Total $foxton{'total'}", "Issues $foxton{'issues'}","Renewals $foxton{'renewals'}","Returns $foxton{'returns'}"); ! print mktablerow(9,'white',"<b>shannon</b>","Fines $shannon{'totalf'}","Rental Charges $shannon{'totalr'}","Reserve Charges $shannon{'totalres'}","Renewal Charges $shannon{'totalren'}","Total $shannon{'total'}", "Issues $shannon{'issues'}","Renewals $shannon{'renewals'}","Returns $shannon{'returns'}"); print mktableft; --- 134,147 ---- $foxton{'returns'}=Count('return','F',$date,$date2); $shannon{'returns'}=Count('return','S',$date,$date2); + $levin{'renewals'}=Count('renew','C',$date,$date2); + $foxton{'renewals'}=Count('renew','F',$date,$date2); + $shannon{'renewals'}=Count('renew','S',$date,$date2); + print mktablerow(9,'white',"<b>Levin</b>","Fines $levin{'totalf'}","Rental Charges $levin{'totalr'}", ! "Reserve Charges $levin{'totalres'}","Renewal Charges $levin{'totalren'}","<b>Total $levin{'total'}</b>", "Issues $levin{'issues'}","Renewals $levin{'renewals'}","Returns $levin{'returns'}"); ! print mktablerow(9,'white',"<b>foxton</b>","Fines $foxton{'totalf'}","Rental Charges $foxton{'totalr'}","Reserve Charges $foxton{'totalres'}","Renewal Charges $foxton{'totalren'}","<b>Total $foxton{'total'}</b>", "Issues $foxton{'issues'}","Renewals $foxton{'renewals'}","Returns $foxton{'returns'}"); ! print mktablerow(9,'white',"<b>shannon</b>","Fines $shannon{'totalf'}","Rental Charges $shannon{'totalr'}","Reserve Charges $shannon{'totalres'}","Renewal Charges $shannon{'totalren'}","<b>Total $shannon{'total'}</b>", "Issues $shannon{'issues'}","Renewals $shannon{'renewals'}","Returns $shannon{'returns'}"); print mktableft;

1 0

CVS: koha moremember.pl,1.2,1.3
by Chris Cornack 21 Feb '01

21 Feb '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv1568 Modified Files: moremember.pl Log Message: Got a link from items on issue thru to item details (like in the circ module) And also stopped already renewed books from being renewable in the issues list Index: moremember.pl =================================================================== RCS file: /cvsroot/koha/koha/moremember.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** moremember.pl 2001/01/31 19:34:12 1.2 --- moremember.pl 2001/02/21 22:17:58 1.3 *************** *** 91,96 **** <P> ! General Notes: <A HREF="popbox.html" onclick="messenger(200,250,'Form that lets you add to and delete notes.'); return false"> ! $data->{'borrowernotes'}</a> <p align=right> <form action=/cgi-bin/koha/memberentry.pl method=post> --- 91,96 ---- <P> ! General Notes:  ! $data->{'borrowernotes'} <p align=right> <form action=/cgi-bin/koha/memberentry.pl method=post> *************** *** 181,185 **** print "<font color=red>"; } ! print "$issue->[$i]{'title'} $issue->[$i]{'barcode'}</td> <TD>$issue->[$i]{'date_due'}</td>"; #find the charge for an item --- 181,187 ---- print "<font color=red>"; } ! print "$issue->[$i]{'title'} ! <a href=/cgi-bin/koha/moredetail.pl?item=$issue->[$i]->{'itemnumber'}&bib=$issue->[$i]->{'biblionumber'}&bi=$issue->[$i]->{'biblioitemnumber'}> ! $issue->[$i]{'barcode'}</a></td> <TD>$issue->[$i]{'date_due'}</td>"; #find the charge for an item *************** *** 197,200 **** --- 199,204 ---- if ($rescount >0){ print "<TD><a href=/cgi-bin/koha/request.pl?bib=$issue->[$i]{'biblionumber'}>On Request - no renewals</a></td></tr>"; + } elsif ($issue->[$i]->{'renewals'} > 0) { + print "<TD>Previously Renewed - no renewals</td></tr>"; } else { print "<TD>";

1 0

CVS: koha/C4/Circulation Circ2.pm,1.12,1.13
by Chris Cornack 18 Feb '01

18 Feb '01

Update of /cvsroot/koha/koha/C4/Circulation In directory usw-pr-cvs1:/tmp/cvs-serv24194/C4/Circulation Modified Files: Circ2.pm Log Message: Little fix to the returnbook routine so the correct branchcode is passed to the updatestats routine Index: Circ2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** Circ2.pm 2001/02/14 00:27:36 1.12 --- Circ2.pm 2001/02/18 22:13:26 1.13 *************** *** 420,424 **** push (@$messages, "<b><font color=red>RESERVED</font></b> for collection by $borrower->{'firstname'} $borrower->{'surname'} ($borrower->{'cardnumber'}) at $branchname"); } ! UpdateStats($env,'branch','return','0','',$iteminformation->{'itemnumber'}); } $dbh->disconnect; --- 420,424 ---- push (@$messages, "<b><font color=red>RESERVED</font></b> for collection by $borrower->{'firstname'} $borrower->{'surname'} ($borrower->{'cardnumber'}) at $branchname"); } ! UpdateStats($env,$env->{'branchcode'},'return','0','',$iteminformation->{'itemnumber'}); } $dbh->disconnect;

1 0

Packaging
by Tonnesen Steve 18 Feb '01

18 Feb '01

Early free form thoughts on packaging Koha. I need to specify directories for things. I'm thinking of using: /usr/share/koha/opac/... /usr/share/koha/intranet/... /usr/lib/perl5/C4/... In my current install, I have two seperate cgi-bin directories for opac and intranet, although they currently are identical in their content. Should I maintain seperate directories in case we want to clean this up later, or should I just lump them into one /usr/share/koha/cgi-bin/ directory and configure apache for both virtual servers to point to this one cgi-bin dir? Is it possible to rearrange files in CVS? It'd be a lot easier for me if the cgi-bin scripts were in a subdirectory (say /scripts/) rather than right in the root of the CVS tree. My quick perusal of the cvs manpage seems to indicate that this isn't possible just using the cvs command, although I suppose we could just add them to the new location and remove from the old location. That would mean losing any cvs history info though. Steve.

2 1

CVS: koha/circ circulation.pl,1.12,1.13
by Chris Cornack 14 Feb '01

14 Feb '01

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv23468/circ Modified Files: circulation.pl Log Message: A bodgy hack so that hitting enter in issues (with no barcode) prints out the borrowers issue slip and starts a new borrower Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** circulation.pl 2001/02/14 00:29:17 1.12 --- circulation.pl 2001/02/14 02:41:43 1.13 *************** *** 359,362 **** --- 359,373 ---- my $print=$query->param('print'); my $borrowernumber=$query->param('borrnumber'); + my $barcode=$query->param('barcode'); + # if (!$barcode){ + # $barcode=' '; + # } + if ($barcode eq ''){ + $print='yes'; + + } elsif ($barcode eq ' '){ + $query->param('barcode',''); + $barcode=''; + } if ($print eq 'yes'){ my ($borrower, $flags) = getpatroninformation(\%env,$borrowernumber,0); *************** *** 375,379 **** remoteprint(\%env,\@issues,$borrower); $query->param('borrnumber','') ! } unless ($noheader) { --- 386,390 ---- remoteprint(\%env,\@issues,$borrower); $query->param('borrnumber','') ! # $borrowernumber=''; } unless ($noheader) { *************** *** 385,389 **** if (my $borrnumber=$query->param('borrnumber')) { my ($borrower, $flags) = getpatroninformation(\%env,$borrnumber,0); - # my ($borrower, $flags) = getpatroninformation(\%env,$borrnumber,0); my $year=$query->param('year'); my $month=$query->param('month'); --- 396,399 ---- *************** *** 675,678 **** --- 685,689 ---- if ($#borrowers == 0) { $query->param('borrnumber', $borrowers[0]->{'borrowernumber'}); + $query->param('barcode',' '); issues(1); return; *************** *** 682,685 **** --- 693,697 ---- print "<input type=hidden name=branch value=$branch>\n"; print "<input type=hidden name=printer value=$printer>\n"; + print "<input type=hidden name=barcode value=\" \">\n"; print "<table border=0 cellspacing=0 cellpadding=5 bgcolor=#dddddd>"; print "<tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Select a borrower</b></font></th></tr>\n"; *************** *** 704,707 **** --- 716,720 ---- <input type=hidden name=branch value=$branch> <input type=hidden name=printer value=$printer> + <input type=hidden name=barcode value=" "> </form> </td></tr></table>

1 0

CVS: koha-html/intranet-html/includes circulation-top.inc,1.1.1.1,1.2
by Chris Cornack 14 Feb '01

14 Feb '01

Update of /cvsroot/koha/koha-html/intranet-html/includes In directory usw-pr-cvs1:/tmp/cvs-serv11086/intranet-html/includes Modified Files: circulation-top.inc Log Message: Added in code to focus cursor on first form input Index: circulation-top.inc =================================================================== RCS file: /cvsroot/koha/koha-html/intranet-html/includes/circulation-top.inc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** circulation-top.inc 2001/02/04 20:52:45 1.1.1.1 --- circulation-top.inc 2001/02/14 00:30:08 1.2 *************** *** 24,28 **** parent.location.href=(form.dest.options[myindex].value); } ! if (document.images){ --- 24,35 ---- parent.location.href=(form.dest.options[myindex].value); } ! ! function focusinput() { ! document.forms[0].elements[0].select(); ! document.forms[0].elements[0].focus(); ! document.forms[0].elements[0].focus(); ! } ! ! if (document.images){ *************** *** 39,43 **** </head> <body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300" ! marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 > --- 46,50 ---- </head> <body text="black" bgcolor="white" link="#0000ff" vlink="#0000ff" "3366cc" Alink="#cc3300" ! marginheight=0 marginwidth=0 leftmargin=0 topmargin=0 onLoad=focusinput()>

1 0

CVS: koha/circ circulation.pl,1.11,1.12
by Chris Cornack 14 Feb '01

14 Feb '01

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv10893/circ Modified Files: circulation.pl Log Message: The Horowhenua libraries wanted less patron and item information displaying at returns So Added some if statements to not display patron addresses, and to only display the title of the item These presumably would be changed to suit individual libraries wants Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** circulation.pl 2001/02/05 17:24:13 1.11 --- circulation.pl 2001/02/14 00:29:17 1.12 *************** *** 218,224 **** <tr><td> Title: $iteminformation->{'title'}<br> Author: $iteminformation->{'author'}<br> Barcode: <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a><br> ! Date Due: $iteminformation->{'date_due'} </td></tr> </table> --- 218,226 ---- <tr><td> Title: $iteminformation->{'title'}<br> +  </td></tr> </table> *************** *** 755,759 **** } $itemswaiting.="</table>\n"; ! $flaginfotext.="<tr><td bgcolor=$color valign=top>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'}<br>Overdue items can be seen in the Previous Issues table below</td></tr>\n"; } else { $flaginfotext.="<tr><td bgcolor=$color valign=top>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>\n"; --- 757,765 ---- } $itemswaiting.="</table>\n"; ! if ($query->param('module') ne 'returns'){ ! $flaginfotext.="<tr><td bgcolor=$color valign=top>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'}<br>Overdue items can be seen in the Previous Issues table below</td></tr>\n"; ! } else { ! $flaginfotext.="<tr><td bgcolor=$color valign=top>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>\n"; ! } } else { $flaginfotext.="<tr><td bgcolor=$color valign=top>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>\n"; *************** *** 767,772 **** <tr><td> <a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'}</a> $borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}<br> ! $borrower->{'streetaddress'} $borrower->{'city'}<br> ! $borrower->{'categorycode'} $flagtext </td></tr> </table> --- 773,783 ---- <tr><td> <a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'}</a> $borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}<br> ! EOF ! if ($query->param('module') ne 'returns'){ ! $patrontable.="$borrower->{'streetaddress'} $borrower->{'city'}<br> ! $borrower->{'categorycode'} "; ! } ! $patrontable.=<< "EOF"; ! $flagtext </td></tr> </table>

1 0

CVS: koha/C4/Circulation Circ2.pm,1.11,1.12
by Chris Cornack 14 Feb '01

14 Feb '01

Update of /cvsroot/koha/koha/C4/Circulation In directory usw-pr-cvs1:/tmp/cvs-serv10801/C4/Circulation Modified Files: Circ2.pm Log Message: Made some changes to checkreserve and find_reserves, so that items are always displayed as reserved when returned, not just once Index: Circ2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -r1.11 -r1.12 *** Circ2.pm 2001/02/05 17:47:58 1.11 --- Circ2.pm 2001/02/14 00:27:36 1.12 *************** *** 418,422 **** my ($branches) = getbranches(); my $branchname=$branches->{$resrec->{'branchcode'}}->{'branchname'}; ! push (@$messages, "Reserved for collection by $borrower->{'firstname'} $borrower->{'surname'} ($borrower->{'cardnumber'}) at $branchname"); } UpdateStats($env,'branch','return','0','',$iteminformation->{'itemnumber'}); --- 418,422 ---- my ($branches) = getbranches(); my $branchname=$branches->{$resrec->{'branchcode'}}->{'branchname'}; ! push (@$messages, "<b><font color=red>RESERVED</font></b> for collection by $borrower->{'firstname'} $borrower->{'surname'} ($borrower->{'cardnumber'}) at $branchname"); } UpdateStats($env,'branch','return','0','',$iteminformation->{'itemnumber'}); *************** *** 540,544 **** $sth->execute(); my $resrec; ! if (my $data=$sth->fetchrow_hashref) { $resrec=$data; my $const = $data->{'constrainttype'}; --- 540,545 ---- $sth->execute(); my $resrec; ! my $data=$sth->fetchrow_hashref; ! while ($data && $resbor eq '') { $resrec=$data; my $const = $data->{'constrainttype'}; *************** *** 563,566 **** --- 564,568 ---- $csth->finish(); } + $data=$sth->fetchrow_hashref; } $sth->finish; *************** *** 777,781 **** my ($env,$dbh,$itemno) = @_; my ($itemdata) = getiteminformation($env,$itemno,0); ! my $query = "select * from reserves where found is null and biblionumber = $itemdata->{'biblionumber'} and cancellationdate is NULL order by priority,reservedate "; --- 779,785 ---- my ($env,$dbh,$itemno) = @_; my ($itemdata) = getiteminformation($env,$itemno,0); ! my $query = "select * from reserves where ! ((reserves.found = 'W') ! or (reserves.found is null)) and biblionumber = $itemdata->{'biblionumber'} and cancellationdate is NULL order by priority,reservedate "; *************** *** 791,795 **** $resfound = "y"; } ! } elsif ($resrec->{'constrainttype'} eq "a") { $resfound = "y"; } else { --- 795,800 ---- $resfound = "y"; } ! } ! if ($resrec->{'constrainttype'} eq "a") { $resfound = "y"; } else {

1 0