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

CVS: koha moremember.pl,1.4,1.5
by Chris Cormack 29 Mar '01

29 Mar '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv9121 Modified Files: moremember.pl Log Message: Commenting out the code that doesnt allow renewals if a renewal has already occured Index: moremember.pl =================================================================== RCS file: /cvsroot/koha/koha/moremember.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** moremember.pl 2001/03/07 21:02:48 1.4 --- moremember.pl 2001/03/29 02:11:36 1.5 *************** *** 206,211 **** 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>"; --- 206,211 ---- 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/circ circulation.pl,1.16,1.17
by Chris Cormack 28 Mar '01

28 Mar '01

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv7477/circ Modified Files: circulation.pl Log Message: Adding in javscript code to open a new window for payments Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** circulation.pl 2001/03/28 02:23:03 1.16 --- circulation.pl 2001/03/28 03:00:56 1.17 *************** *** 76,80 **** ! if ($printer && $branch) { --- 76,88 ---- ! print <<EOF ! <script language="javascript" type="text/javascript"> !  ! </script> ! EOF if ($printer && $branch) {

1 0

CVS: koha/circ circulation.pl,1.15,1.16
by Chris Cormack 28 Mar '01

28 Mar '01

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv3526/circ Modified Files: circulation.pl Log Message: Reworked layout of issues section. Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** circulation.pl 2001/03/22 22:20:29 1.15 --- circulation.pl 2001/03/28 02:23:03 1.16 *************** *** 12,18 **** my $circbackgroundcolor='#ffffcc'; my $circbackgroundcolor='white'; ! my $linecolor1='#bbbbbb'; ! my $linecolor2='#dddddd'; ! my $backgroundimage="/koha/images/background-mem.gif"; my $query=new CGI; my $branches=getbranches(\%env); --- 12,18 ---- my $circbackgroundcolor='#ffffcc'; my $circbackgroundcolor='white'; ! my $linecolor1='#ffffcc'; ! my $linecolor2='white'; ! my $backgroundimage="/images/background-mem.gif"; my $query=new CGI; my $branches=getbranches(\%env); *************** *** 76,104 **** - print << "EOF"; - <center> - <p> - <table border=0 width=100% cellspacing=0 bgcolor=$headerbackgroundcolor background=$backgroundimage> - <tr> - <th width=5%></th> - <th width=30%><font color=black>$branchname</font></th> - <th width=10%> - <a href=circulation.pl?module=issues&branch=$branch&printer=$printer><font color=black><img src=/koha/images/issues.gif border=0 height=40></font></a> - </th> - <th width=10%> - <a href=circulation.pl?selectnewbranchprinter=1><font color=black>Branch/Printer</font></a> - </th> - <th width=10%> - <a href=circulation.pl?module=returns&branch=$branch&printer=$printer><font color=black><img src=/koha/images/returns.gif border=0 height=40></font></a> - </th> - <th width=30%><font color=black>$printername</font></th> - <th width=5%></th> - </tr> - </table> - - <br> - EOF - if ($printer && $branch) { --- 76,80 ---- *************** *** 113,116 **** --- 89,93 ---- if ($printercount>1) { $printerform=<<"EOF"; + <table border=0 cellspacing=0 cellpadding=5> <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Choose a Printer</font></td></tr> *************** *** 142,145 **** --- 119,123 ---- } print << "EOF"; + <center> Select a branch and a printer <form method=get> *************** *** 444,450 **** } unless ($noheader) { ! print << "EOF"; ! <table border=0 cellpadding=10 cellspacing=0><tr><th background=$backgroundimage><font color=black>Circulation - Issues ! </td></tr><tr><td bgcolor=$circbackgroundcolor align=center> EOF } --- 422,433 ---- } unless ($noheader) { ! print <<EOF ! <p align=right> ! <FONT SIZE=2 face="arial, helvetica"> ! <a href=circulation.pl?borrnumber=$borrowernumber&module=issues&branch=$branch&printer=$printer&print>Next Borrower</a> || ! <a href=circulation.pl?module=returns&branch=$branch&printer=$printer>Returns</a></font><p> ! ! ! </p> EOF } *************** *** 676,687 **** my ($patrontable, $flaginfotable) = patrontable($borrower); print << "EOF"; <form method=get> ! <table border=0 cellpadding=5> <tr> <td align=center valign=top> ! <table border=0 cellspacing=0 cellpadding=5 bgcolor=#dddddd width=100%> <tr><th align=center background=$backgroundimage><font color=black><b>Enter Book Barcode</b></font></th></tr> <tr><td align=center> ! <table border=0 bgcolor=#dddddd> <tr><td>Item Barcode:</td><td><input name=barcode size=10></td><td><input type=submit value=Issue></tr> <tr><td colspan=3 align=center> --- 659,675 ---- my ($patrontable, $flaginfotable) = patrontable($borrower); print << "EOF"; + $patrontable + $flaginfotable + <FONT SIZE=6><em>Issues</em></FONT>    <br> <a href=circulation.pl?selectnewbranchprinter=1><b>Branch:</b></a> $branch, + <a href=circulation.pl?selectnewbranchprinter=1><b>Printer:</b></a> $printer<P> + <p> <form method=get> ! <table border=1 cellpadding=5> <tr> <td align=center valign=top> ! <table border=0 cellspacing=0 cellpadding=5> <tr><th align=center background=$backgroundimage><font color=black><b>Enter Book Barcode</b></font></th></tr> <tr><td align=center> ! <table border=0> <tr><td>Item Barcode:</td><td><input name=barcode size=10></td><td><input type=submit value=Issue></tr> <tr><td colspan=3 align=center> *************** *** 695,705 **** </td></tr> </table> - <br> <input type=checkbox name=stickyduedate $selected> Sticky Due Date </td></tr> ! </table> ! </td></tr> ! </table> ! <input type=hidden name=module value=issues> <input type=hidden name=borrnumber value=$borrnumber> <input type=hidden name=branch value=$branch> --- 683,690 ---- </td></tr> </table> <input type=checkbox name=stickyduedate $selected> Sticky Due Date </td></tr> ! </table> ! <input type=hidden name=module value=issues> <input type=hidden name=borrnumber value=$borrnumber> <input type=hidden name=branch value=$branch> *************** *** 707,721 **** </form> </td> ! <td align=center valign=top> ! $patrontable ! <br> ! <a href=/cgi-bin/koha/circ/circulation.pl?borrnumber=$borrowernumber&module=issues&branch=$branch&printer=$printer&print=yes>Next borrower</a> ! <br> ! $flaginfotable ! </td> </tr> ! <tr> <td colspan=2 align=center> ! <table border=0 cellpadding=5 cellspacing=0 width=100% bgcolor=#dddddd> <tr><th colspan=5 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Issues Today</b></font></th></tr> <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th></tr> --- 692,706 ---- </form> </td> ! ! </tr> ! </table> ! </table> ! ! <p clear=all> !  ! <table border=1 cellpadding=5 cellspacing=0 width=90%> <td colspan=2 align=center> ! <table border=0 cellpadding=5 cellspacing=0 width=100% > <tr><th colspan=5 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Issues Today</b></font></th></tr> <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th></tr> *************** *** 724,730 **** </td> </tr> <tr> <td colspan=2 align=center> ! <table border=0 cellpadding=5 cellspacing=0 width=100% bgcolor=#dddddd> <tr><th colspan=5 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Previous Issues</b></font></th></tr> <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th></tr> --- 709,716 ---- </td> </tr> + <tr> <td colspan=2 align=center> ! <table border=0 cellpadding=5 cellspacing=0 width=100%> <tr><th colspan=5 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Previous Issues</b></font></th></tr> <tr><th>Due Date</th><th>Bar Code</th><th>Title</th><th>Author</th><th>Class</th></tr> *************** *** 806,816 **** if ($flags->{$flag}->{'noissues'}) { if ($flag eq 'CHARGES') { ! $flaginfotext.="<tr><td bgcolor=$color valign=top><font color=red>$flag</font></td><td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n"; } else { ! $flaginfotext.="<tr><td bgcolor=$color valign=top><font color=red>$flag</font></td><td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>\n"; } } else { if ($flag eq 'CHARGES') { ! $flaginfotext.="<tr><td valign=top bgcolor=$color>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'} <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n"; } elsif ($flag eq 'WAITING') { my $itemswaiting=''; --- 792,802 ---- if ($flags->{$flag}->{'noissues'}) { if ($flag eq 'CHARGES') { ! $flaginfotext.="<tr><td valign=top><font color=red>$flag</font></td><td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n"; } else { ! $flaginfotext.="<tr><td valign=top><font color=red>$flag</font></td><td bgcolor=$color>$flags->{$flag}->{'message'}</td></tr>\n"; } } else { if ($flag eq 'CHARGES') { ! $flaginfotext.="<tr><td valign=top>$flag</td><td $flags->{$flag}->{'message'} <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} onClick=\"openWindow(this, 'Payment', 480,640)\">Payment</a></td></tr>\n"; } elsif ($flag eq 'WAITING') { my $itemswaiting=''; *************** *** 820,824 **** $itemswaiting.="<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}</a> $iteminformation->{'title'} ($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})<br>\n"; } ! $flaginfotext.="<tr><td bgcolor=$color valign=top>$flag</td><td bgcolor=$color>$flags->{$flag}->{'message'}<br>$itemswaiting</td></tr>\n"; } elsif ($flag eq 'ODUES') { my $items=$flags->{$flag}->{'itemlist'}; --- 806,810 ---- $itemswaiting.="<a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}</a> $iteminformation->{'title'} ($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})<br>\n"; } ! $flaginfotext.="<tr><td valign=top>$flag</td><td>$itemswaiting</td></tr>\n"; } elsif ($flag eq 'ODUES') { my $items=$flags->{$flag}->{'itemlist'}; *************** *** 830,862 **** ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); my ($iteminformation) = getiteminformation($env, $item->{'itemnumber'}, 0); ! $itemswaiting.="<tr><td bgcolor=$color><font color=red>$iteminformation->{'date_due'}</font></td><td bgcolor=$color><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}</a></td><td bgcolor=$color>$iteminformation->{'title'}</td></tr>\n"; } } $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"; } } } ! ($flaginfotext) && ($flaginfotext="<table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd><tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2><font color=black>Patron Flags</font></th></tr>$flaginfotext</table>\n"); my $patrontable= << "EOF"; ! <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd> ! <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black><b>Patron Information</b></font></td></tr> ! <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> EOF return($patrontable, $flaginfotext); --- 816,849 ---- ($color eq $linecolor1) ? ($color=$linecolor2) : ($color=$linecolor1); my ($iteminformation) = getiteminformation($env, $item->{'itemnumber'}, 0); ! $itemswaiting.="<tr><td><font color=red>$iteminformation->{'date_due'}</font></td><td bgcolor=$color><a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra onClick=\"openWindow(this, 'Item', 480, 640)\">$iteminformation->{'barcode'}</a></td><td>$iteminformation->{'title'}</td></tr>\n"; } } $itemswaiting.="</table>\n"; if ($query->param('module') ne 'returns'){ ! $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}, See below</td></tr>\n"; } else { ! $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}</td></tr>\n"; } } else { ! $flaginfotext.="<tr><td valign=top>$flag</td><td>$flags->{$flag}->{'message'}</td></tr>\n"; } } } ! ($flaginfotext) && ($flaginfotext="<tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2><b>Flags</b></td></tr>$flaginfotext</table>\n"); my $patrontable= << "EOF"; ! <table border=1 ! cellpadding=5 cellspacing=0 align=right> ! <tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2><font color=black><b>Patron Information</b></font></td></tr> ! <tr><td colspan=2> <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'} Cat: $borrower->{'categorycode'} "; } $patrontable.=<< "EOF"; ! </td></tr> ! EOF return($patrontable, $flaginfotext);

1 0

CVS: koha/C4/Circulation Circ2.pm,1.13,1.14
by Chris Cormack 28 Mar '01

28 Mar '01

Update of /cvsroot/koha/koha/C4/Circulation In directory usw-pr-cvs1:/tmp/cvs-serv3526/C4/Circulation Modified Files: Circ2.pm Log Message: Reworked layout of issues section. Index: Circ2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -r1.13 -r1.14 *** Circ2.pm 2001/02/18 22:13:26 1.13 --- Circ2.pm 2001/03/28 02:23:03 1.14 *************** *** 201,204 **** --- 201,208 ---- last SWITCH; } + if ($patroninformation->{'debarred'}) { + $rejected="Patron is Debarred"; + last SWITCH; + } my $amount = checkaccount($env,$patroninformation->{'borrowernumber'}, $dbh); if ($amount>5) { *************** *** 452,455 **** --- 456,465 ---- $flags{'LOST'}=\%flaginfo; } + if ($patroninformation->{'debarred'} == 1) { + my %flaginfo; + $flaginfo{'message'}='Borrower is Debarred.'; + $flaginfo{'noissues'}=1; + $flags{'DBARRED'}=\%flaginfo; + } if ($patroninformation->{'borrowernotes'}) { my %flaginfo; *************** *** 460,464 **** if ($odues > 0) { my %flaginfo; ! $flaginfo{'message'}="Patron has overdue items"; $flaginfo{'itemlist'}=$itemsoverdue; foreach (sort {$a->{'date_due'} cmp $b->{'date_due'}} @$itemsoverdue) { --- 470,474 ---- if ($odues > 0) { my %flaginfo; ! $flaginfo{'message'}="Yes"; $flaginfo{'itemlist'}=$itemsoverdue; foreach (sort {$a->{'date_due'} cmp $b->{'date_due'}} @$itemsoverdue) { *************** *** 588,592 **** $crit=" and !(issues.timestamp like '$today%') "; } ! my $select="select * from issues,items,biblioitems,biblio where borrowernumber=$borrowernumber and issues.itemnumber=items.itemnumber and items.biblionumber=biblio.biblionumber and items.biblioitemnumber=biblioitems.biblioitemnumber and returndate is null $crit order by date_due"; # print $select; my $sth=$dbh->prepare($select); --- 598,606 ---- $crit=" and !(issues.timestamp like '$today%') "; } ! my $select="select * from issues,items,biblioitems,biblio where ! borrowernumber=$borrowernumber and issues.itemnumber=items.itemnumber and ! items.biblionumber=biblio.biblionumber and ! items.biblioitemnumber=biblioitems.biblioitemnumber and returndate is null ! $crit order by issues.timestamp desc"; # print $select; my $sth=$dbh->prepare($select);

1 0

CVS: koha/sec writeoff.pl,1.1.1.1,1.2
by Chris Cormack 27 Mar '01

27 Mar '01

Update of /cvsroot/koha/koha/sec In directory usw-pr-cvs1:/tmp/cvs-serv5450/sec Modified Files: writeoff.pl Log Message: Getting writeoff stats being stored as well Index: writeoff.pl =================================================================== RCS file: /cvsroot/koha/koha/sec/writeoff.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** writeoff.pl 2000/12/19 23:45:57 1.1.1.1 --- writeoff.pl 2001/03/27 21:45:50 1.2 *************** *** 7,10 **** --- 7,11 ---- use CGI; use C4::Database; + use C4::Stats; my $input=new CGI; *************** *** 44,48 **** --- 45,51 ---- sub writeoff{ my ($bornum,$accountnum,$itemnum,$accounttype,$amount)=@_; + my $user=$input->remote_user; my $dbh=C4Connect; + my $env; my $query="Update accountlines set amountoutstanding=0 where "; if ($accounttype eq 'Res'){ *************** *** 68,70 **** --- 71,74 ---- # print $query; $dbh->disconnect; + UpdateStats($env,$user,'writeoff',$amount,'','','',$bornum); }

1 0

CVS: koha/C4 Stats.pm,1.1.1.1,1.2 Accounts2.pm,1.1.1.1,1.2
by Chris Cormack 27 Mar '01

27 Mar '01

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv4889/C4 Modified Files: Stats.pm Accounts2.pm Log Message: Modified the update stats routine to store borrowernumbers also Passing borrowernumbers to update stats from Account routines Index: Stats.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Stats.pm,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Stats.pm 2000/12/19 23:45:55 1.1.1.1 --- Stats.pm 2001/03/27 21:43:37 1.2 *************** *** 54,65 **** sub UpdateStats { #module to insert stats data into stats table ! my ($env,$branch,$type,$amount,$other,$itemnum,$itemtype)=@_; my $dbh=C4Connect(); my $branch=$env->{'branchcode'}; my $user = $env->{'usercode'}; my $sth=$dbh->prepare("Insert into statistics ! (datetime,branch,type,usercode,value,other,itemnumber,itemtype) ! values (now(),'$branch', ! '$type','$user','$amount','$other','$itemnum','$itemtype')"); $sth->execute; $sth->finish; --- 54,67 ---- sub UpdateStats { #module to insert stats data into stats table ! my ($env,$branch,$type,$amount,$other,$itemnum,$itemtype,$borrowernumber)=@_; my $dbh=C4Connect(); my $branch=$env->{'branchcode'}; my $user = $env->{'usercode'}; + print $borrowernumber; my $sth=$dbh->prepare("Insert into statistics ! (datetime,branch,type,usercode,value, ! other,itemnumber,itemtype,borrowernumber) ! values (now(),'$branch','$type','$user','$amount', ! '$other','$itemnum','$itemtype','$borrowernumber')"); $sth->execute; $sth->finish; *************** *** 146,157 **** my ($time)=@_; my $dbh=C4Connect; ! my $query="Select * from accountlines,borrowers where accounttype = 'Pay' ! and accountlines.borrowernumber = borrowers.borrowernumber"; if ($time eq 'today'){ ! $query=$query." and date = now()"; } else { ! $query.=" and date='$time'"; } # $query.=" order by timestamp"; my $sth=$dbh->prepare($query); $sth->execute; --- 148,161 ---- my ($time)=@_; my $dbh=C4Connect; ! my $query="Select * from statistics,borrowers ! where statistics.borrowernumber= borrowers.borrowernumber ! and (statistics.type='payment' or statistics.type='writeoff')"; if ($time eq 'today'){ ! $query=$query." and datetime = now()"; } else { ! $query.=" and datetime > '$time'"; } # $query.=" order by timestamp"; + print $query; my $sth=$dbh->prepare($query); $sth->execute; *************** *** 173,188 **** my $timestamp2=$timestamp-1; my $query="Select * from accountlines where borrowernumber=$borrowerno ! and timestamp <= '$timestamp' and accounttype <> 'Pay' and accounttype <> 'W'"; my $sth=$dbh->prepare($query); ! # print $query,"<br>"; $sth->execute; my $i=0; my @results; while (my $data=$sth->fetchrow_hashref){ ! if ($data->{'timestamp'} == $timestamp){ $results[$i]=$data; $i++; ! } } $dbh->disconnect; --- 177,192 ---- my $timestamp2=$timestamp-1; my $query="Select * from accountlines where borrowernumber=$borrowerno ! and timestamp = '$timestamp' and accounttype <> 'Pay' and accounttype <> 'W'"; my $sth=$dbh->prepare($query); ! print $query,"<br>"; $sth->execute; my $i=0; my @results; while (my $data=$sth->fetchrow_hashref){ ! # if ($data->{'timestamp'} == $timestamp){ $results[$i]=$data; $i++; ! # } } $dbh->disconnect; Index: Accounts2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** Accounts2.pm 2000/12/19 23:45:54 1.1.1.1 --- Accounts2.pm 2001/03/27 21:43:37 1.2 *************** *** 101,105 **** $usth->execute; $usth->finish; ! UpdateStats($env,'branch','payment',$data); $sth->finish; $dbh->disconnect; --- 101,105 ---- $usth->execute; $usth->finish; ! UpdateStats($env,'branch','payment',$data,'','','',$bornumber); $sth->finish; $dbh->disconnect; *************** *** 134,138 **** $usth->execute; $usth->finish; ! UpdateStats($env,$user,'payment',$amount); $sth->finish; $dbh->disconnect; --- 134,138 ---- $usth->execute; $usth->finish; ! UpdateStats($env,$user,'payment',$amount,'','','',$bornumber); $sth->finish; $dbh->disconnect;

1 0

CVS: koha/circ circulation.pl,1.14,1.15
by Chris Cormack 22 Mar '01

22 Mar '01

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv11487/circ Modified Files: circulation.pl Log Message: Changes made by Glen to allow the circulation module to work with a ASCII-wand, or CueCat (weird encoded) input equally well. Do not bother installing the CueCat driver or any other software - it's not needed. Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** circulation.pl 2001/02/21 22:33:48 1.14 --- circulation.pl 2001/03/22 22:20:29 1.15 *************** *** 14,18 **** my $linecolor1='#bbbbbb'; my $linecolor2='#dddddd'; ! my $backgroundimage="/images/background-mem.gif"; my $query=new CGI; my $branches=getbranches(\%env); --- 14,18 ---- my $linecolor1='#bbbbbb'; my $linecolor2='#dddddd'; ! my $backgroundimage="/koha/images/background-mem.gif"; my $query=new CGI; my $branches=getbranches(\%env); *************** *** 84,88 **** <th width=30%><font color=black>$branchname</font></th> <th width=10%> ! <a href=circulation.pl?module=issues&branch=$branch&printer=$printer><font color=black><img src=/images/issues.gif border=0 height=40></font></a> </th> <th width=10%> --- 84,88 ---- <th width=30%><font color=black>$branchname</font></th> <th width=10%> ! <a href=circulation.pl?module=issues&branch=$branch&printer=$printer><font color=black><img src=/koha/images/issues.gif border=0 height=40></font></a> </th> <th width=10%> *************** *** 90,94 **** </th> <th width=10%> ! <a href=circulation.pl?module=returns&branch=$branch&printer=$printer><font color=black><img src=/images/returns.gif border=0 height=40></font></a> </th> <th width=30%><font color=black>$printername</font></th> --- 90,94 ---- </th> <th width=10%> ! <a href=circulation.pl?module=returns&branch=$branch&printer=$printer><font color=black><img src=/koha/images/returns.gif border=0 height=40></font></a> </th> <th width=30%><font color=black>$printername</font></th> *************** *** 167,170 **** --- 167,198 ---- + sub decode { + ($encoded) = @_; + $seq = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-'; + @s = map { index($seq,$_); } split(//,$encoded); + $l = ($#s+1) % 4; + if ($l) + { + if ($l == 1) + { + print "Error!"; + return; + } + $l = 4-$l; + $#s += $l; + } + $r = ''; + while ($#s >= 0) + { + $n = (($s[0] << 6 | $s[1]) << 6 | $s[2]) << 6 | $s[3]; + $r .=chr(($n >> 16) ^ 67) . + chr(($n >> 8 & 255) ^ 67) . + chr(($n & 255) ^ 67); + @s = @s[4..$#s]; + } + $r = substr($r,0,length($r)-$l); + return $r; + } + sub returns { my %returneditems; *************** *** 177,180 **** --- 205,218 ---- (next) if ($counter>20); my $barcode=$query->param("ri-$counter"); + # I'm not POSITIVE this decode belongs here - can't tell what causes it to run. + # decode cuecat + chomp($barcode); + @fields = split(/\./,$barcode); + @results = map(decode($_), @fields[1..$#fields]); + if ($#results == 2) + { + $barcode=$results[2]; + } + # end decode my $duedate=$query->param("dd-$counter"); my $borrowernumber=$query->param("bn-$counter"); *************** *** 188,191 **** --- 226,238 ---- } if (my $barcode=$query->param('barcode')) { + # decode cuecat + chomp($barcode); + @fields = split(/\./,$barcode); + @results = map(decode($_), @fields[1..$#fields]); + if ($#results == 2) + { + $barcode=$results[2]; + } + # end decode $ritext.="<input type=hidden name=ri-0 value=$barcode>\n"; $returneditems{0}=$barcode; *************** *** 204,207 **** --- 251,263 ---- EOF if ((my $barcode=$query->param('barcode')) || (%returneditems)) { + # decode cuecat + chomp($barcode); + @fields = split(/\./,$barcode); + @results = map(decode($_), @fields[1..$#fields]); + if ($#results == 2) + { + $barcode=$results[2]; + } + # end decode my ($iteminformation, $borrower, $messages, $overduecharge) = returnbook(\%env, $barcode); *************** *** 341,349 **** my $overduetext="$duedate"; ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate); ! ($duedate) || ($overduetext="<img src=/images/blackdot.gif>"); my $borrowernumber=$riborrowernumber{$_}; 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"; --- 397,405 ---- my $overduetext="$duedate"; ($overduetext="<font color=red>$duedate</font>") if ($duedate lt $todaysdate); ! ($duedate) || ($overduetext="<img src=/koha/images/blackdot.gif>"); my $borrowernumber=$riborrowernumber{$_}; 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=/koha/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"; *************** *** 399,402 **** --- 455,467 ---- my $day=$query->param('day'); if (my $barcode=$query->param('barcode')) { + # decode cuecat + chomp($barcode); + @fields = split(/\./,$barcode); + @results = map(decode($_), @fields[1..$#fields]); + if ($#results == 2) + { + $barcode=$results[2]; + } + # end decode my $invalidduedate=0; $env{'datedue'}='';

1 0

CVS: koha overdue.pl,NONE,1.1
by Chris Cormack 18 Mar '01

18 Mar '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv29706 Added Files: overdue.pl Log Message: Script to list overdue books under the headings Due-Date Patron Phone Title Author The patron can be email by clicking on the name (if the database contains an email address for them) Courtesy of Glen Stewart --- NEW FILE --- #!/usr/bin/perl use strict; use C4::Output; use CGI; use C4::Database; my $input = new CGI; print $input->header; my $type=$input->param('type'); print startpage(); print startmenu('report'); my $duedate; my $bornum; my $itemnum; my $data1; my $data2; my $data3; my $name; my $phone; my $email; my $biblionumber; my $title; my $author; my @datearr = localtime(time()); my $todaysdate = (1900+$datearr[5]).'-'.sprintf ("%0.2d", ($datearr[4]+1)).'-'.sprintf ("%0.2d", $datearr[3]); print "<FONT SIZE=6><em>Items Overdue as of $todaysdate</em></FONT><br><P>"; print << "EOF"; <TABLE cellspacing=0 cellpadding=5 border=0 align=center> <TR VALIGN=TOP> <TD bgcolor="99cc33" background="/koha/images/background-mem.gif" colspan ><b>Due Date</b></td> <TD bgcolor="99cc33" background="/koha/images/background-mem.gif" colspan ><b>Patron</b></td> <TD bgcolor="99cc33" background="/koha/images/background-mem.gif"><b>Phone</b></td> <TD bgcolor="99cc33" background="/koha/images/background-mem.gif"><b>Title</b></td> <TD bgcolor="99cc33" background="/koha/images/background-mem.gif"><b>Author</b></td> </tr> EOF my $dbh=C4Connect; my $query="select date_due,borrowernumber,itemnumber from issues where isnull(returndate) && date_due<'$todaysdate' order by date_due,borrowernumber"; my $sth=$dbh->prepare($query); $sth->execute; while (my $data=$sth->fetchrow_hashref) { $duedate=$data->{'date_due'}; $bornum=$data->{'borrowernumber'}; $itemnum=$data->{'itemnumber'}; my $query="select concat(firstname,' ',surname),phone,emailaddress from borrowers where borrowernumber='$bornum'"; my $sth1=$dbh->prepare($query); $sth1->execute; $data1=$sth1->fetchrow_hashref; $name=$data1->{'concat(firstname,\' \',surname)'}; $phone=$data1->{'phone'}; $email=$data1->{'emailaddress'}; $sth1->finish; my $query="select biblionumber from items where itemnumber='$itemnum'"; my $sth2=$dbh->prepare($query); $sth2->execute; $data2=$sth2->fetchrow_hashref; $biblionumber=$data2->{'biblionumber'}; $sth2->finish; my $query="select title,author from biblio where biblionumber='$biblionumber'"; my $sth3=$dbh->prepare($query); $sth3->execute; $data3=$sth3->fetchrow_hashref; $title=$data3->{'title'}; $author=$data3->{'author'}; $sth3->finish; if (!$email){ print "<tr><td>$duedate</td><td>$name</td><td>$phone</td><td>$title</td><td>$author</td></tr>"; } else { print "<tr><td>$duedate</td><td><a href=\"mailto:$email?subject=Overdue: $title\">$name</a></td><td>$phone</td><td>$title</td><td>$author</td></tr>"; } } $sth->finish; $dbh->disconnect; print "</table>"; print endmenu('report'); print endpage();

1 0

CVS: koha detail.pl,1.2,1.3 moredetail.pl,1.1.1.1,1.2
by Chris Cormack 15 Mar '01

15 Mar '01

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv7285 Modified Files: detail.pl moredetail.pl Log Message: Added code to allow searches to be used by catalogue maintenance Index: detail.pl =================================================================== RCS file: /cvsroot/koha/koha/detail.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** detail.pl 2001/02/11 22:44:34 1.2 --- detail.pl 2001/03/15 10:17:33 1.3 *************** *** 47,50 **** --- 47,53 ---- } my @temp=split('\t',$items[0]); + if ($type eq 'catmain'){ + print mkheadr(3,"Catalogue Maintenance"); + } if ($dat->{'author'} ne ''){ print mkheadr(3,"$dat->{'title'} ($dat->{'author'}) $temp[4]"); *************** *** 174,212 **** my @results=split('\t',$items[$i]); if ($type ne 'opac'){ ! $results[1]=mklink("/cgi-bin/koha/moredetail.pl?item=$results[5]&bib=$bib&bi=$results[8]",$results[1]); } if ($results[2] eq ''){ $results[2]='Available'; } if ($colour == 1){ if ($type ne 'opac'){ ! # if ($results[6] eq 'PER'){ print mktablerow(7,$secondary,$results[6],$results[4],$results[3],$results[2],$results[7],$results[1],$results[9]); ! # } else { ! # print mktablerow(6,$secondary,$results[6],$results[4],$results[3],$results[2],$results[7],$results[1]); ! # } } else { ! $results[6]=ItemType($results[6]); ! # if ($results[6] =~ /Periodical/){ ! print mktablerow(6,$secondary,$results[6],$results[4],$results[3],$results[2],$results[7],$results[9]); ! # } else { ! # print mktablerow(5,$secondary,$results[6],$results[4],$results[3],$results[2],$results[7]); ! # } } $colour=0; } else{ if ($type ne 'opac'){ ! # if ($results[6] eq 'PER'){ ! print mktablerow(7,'white',$results[6],$results[4],$results[3],$results[2],$results[7],$results[1],$results[9]); ! # }else{ ! # print mktablerow(6,'white',$results[6],$results[4],$results[3],$results[2],$results[7],$results[1]); ! # } } else { $results[6]=ItemType($results[6]); ! # if ($results[6] =~ /Periodical/){ ! print mktablerow(6,'white',$results[6],$results[4],$results[3],$results[2],$results[7],$results[9]); ! # } else { ! # print mktablerow(5,'white',$results[6],$results[4],$results[3],$results[2],$results[7]); ! # } } $colour=1; --- 177,210 ---- my @results=split('\t',$items[$i]); if ($type ne 'opac'){ ! $results[1]=mklink("/cgi-bin/koha/moredetail.pl?item=$results[5]&bib=$bib&bi=$results[8]&type=$type",$results[1]); } if ($results[2] eq ''){ $results[2]='Available'; } + if ($type eq 'catmain'){ + $results[10]=mklink("/cgi-bin/koha/maint/catmaintain.pl?type=fixitemtype&bi=$results[8]&item=$results[6]","Fix Itemtype"); + } if ($colour == 1){ if ($type ne 'opac'){ ! if ($type eq 'catmain'){ ! print mktablerow(8,$secondary,$results[6],$results[4],$results[3],$results[2],$results[7],$results[1],$results[9],$results[10]); ! } else { print mktablerow(7,$secondary,$results[6],$results[4],$results[3],$results[2],$results[7],$results[1],$results[9]); ! } } else { ! $results[6]=ItemType($results[6]); ! print mktablerow(6,$secondary,$results[6],$results[4],$results[3],$results[2],$results[7],$results[9]); } $colour=0; } else{ if ($type ne 'opac'){ ! if ($type eq 'catmain'){ ! print mktablerow(8,'white',$results[6],$results[4],$results[3],$results[2],$results[7],$results[1],$results[9],$results[10]); ! } else { ! print mktablerow(7,'white',$results[6],$results[4],$results[3],$results[2],$results[7],$results[1],$results[9]); ! } } else { $results[6]=ItemType($results[6]); ! print mktablerow(6,'white',$results[6],$results[4],$results[3],$results[2],$results[7],$results[9]); } $colour=1; *************** *** 223,231 **** <TD bgcolor="99cc33" background="/images/background-mem.gif" colspan=2><p><b>HELP</b><br> <b>Update Biblio for all Items:</b> Click on the <b>Modify</b> button [left] to amend the biblio. Any changes you make will update the record for <b>all</b> the items listed above. <p> ! <b>Updating the Biblio for only ONE or SOME Items:</b> If some of the items listed above need a different biblio, or are on the wrong biblio, you must use the <a href="acquisitions/">acquisitions</a> process to fix this. You will need to "re-order" the items, and delete them from this biblio.<p> </TR> printend ; } print mktableft(); --- 221,246 ---- <TD bgcolor="99cc33" background="/images/background-mem.gif" colspan=2><p><b>HELP</b><br> <b>Update Biblio for all Items:</b> Click on the <b>Modify</b> button [left] to amend the biblio. Any changes you make will update the record for <b>all</b> the items listed above. <p> ! <b>Updating the Biblio for only ONE or SOME Items:</b> ! printend ! ; ! if ($type eq 'catmain'){ ! print <<printend ! If some of the items listed above need a different biblio, ! you need to click on the wrong item, then shift the group it belongs to, to the correct biblio. ! You will need to know the correct biblio number ! <p> </TR> printend ; + } else { + print <<printend + If some of the items listed above need a different biblio, or are on the wrong biblio, you must use the <a href="acquisitions/">acquisitions</a> process to fix this. You will need to "re-order" the items, and delete them from this biblio. + <p> + + </TR> + printend + ; + } } print mktableft(); Index: moredetail.pl =================================================================== RCS file: /cvsroot/koha/koha/moredetail.pl,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 *** moredetail.pl 2000/12/19 23:45:52 1.1.1.1 --- moredetail.pl 2001/03/15 10:17:33 1.2 *************** *** 54,57 **** --- 54,63 ---- <br> <a href=/cgi-bin/koha/request.pl?bib=$bib><img src=/images/requests.gif width=120 height=42 border=0 align=right border=0></a> + printend + ; + if ($type eq 'catmain'){ + print "<FONT SIZE=6><em>Catalogue Maintenance</em></FONT><br>"; + } + print <<printend <FONT SIZE=6><em><a href=/cgi-bin/koha/detail.pl?bib=$bib&type=intra>$data->{'title'} ($data->{'author'})</a></em></FONT><P> <p> *************** *** 85,88 **** --- 91,101 ---- <b>Notes:</b> $data->{'notes'}<br> <b>No. of Items:</b> $count + printend + ; + if ($type eq 'catmain'){ + print "<br><a href=/cgi-bin/koha/maint/shiftbib.pl?bi=$data->{'biblioitemnumber'}&bib=$data->{'biblionumber'}>Shift to another biblio</a>"; + + } + print <<printend </font> </TD>

1 0

CVS: koha/maint catmaintain.pl,1.1,1.2
by Chris Cormack 15 Mar '01

15 Mar '01

Update of /cvsroot/koha/koha/maint In directory usw-pr-cvs1:/tmp/cvs-serv6565/maint Modified Files: catmaintain.pl Log Message: Added functionality to allow invalid itemtype to be fixed Index: catmaintain.pl =================================================================== RCS file: /cvsroot/koha/koha/maint/catmaintain.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** catmaintain.pl 2001/03/13 22:41:21 1.1 --- catmaintain.pl 2001/03/15 10:15:51 1.2 *************** *** 58,61 **** --- 58,76 ---- print "Succesfully undeleted"; print "<p><a href=/cgi-bin/koha/maint/catmaintain.pl>Back to Catalogue Maintenance</a>"; + } elsif ($type eq 'fixitemtype'){ + my $bi=$input->param('bi'); + my $item=$input->param('item'); + print "<form method=post action=/cgi-bin/koha/maint/catmaintain.pl>"; + print "<input type=hidden name=bi value=$bi>"; + print "<input type=hidden name=type value=updatetype>"; + print "Itemtype:<input type=text name=itemtype value=$item><br>\n"; + print "<input type=submit value=Change>"; + print "</form>"; + } elsif ($type eq 'updatetype'){ + my $bi=$input->param('bi'); + my $itemtype=$input->param('itemtype'); + updatetype($bi,$itemtype); + print "Updated successfully"; + print "<p><a href=/cgi-bin/koha/maint/catmaintain.pl>Back to Catalogue Maintenance</a>"; } else { print "<B>Subject Maintenance</b><br>";

1 0