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

CVS: koha-html/intranet-html/images koha-front-koha.gif,1.1.1.1,1.2
by Chris Cormack 16 Mar '02

16 Mar '02

Update of /cvsroot/koha/koha-html/intranet-html/images In directory usw-pr-cvs1:/tmp/cvs-serv16040/intranet-html/images Modified Files: koha-front-koha.gif Log Message: Generic images for the front page Index: koha-front-koha.gif =================================================================== RCS file: /cvsroot/koha/koha-html/intranet-html/images/koha-front-koha.gif,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -r1.1.1.1 -r1.2 Binary files /tmp/cvsrqGAGK and /tmp/cvsiXdS7k differ

1 0

CVS: koha/misc fines2.pl,1.1,1.2
by Chris Cormack 16 Mar '02

16 Mar '02

Update of /cvsroot/koha/koha/misc In directory usw-pr-cvs1:/tmp/cvs-serv15021/misc Modified Files: fines2.pl Log Message: tidied up, less hlt specific now Index: fines2.pl =================================================================== RCS file: /cvsroot/koha/koha/misc/fines2.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** fines2.pl 26 Jan 2001 00:39:19 -0000 1.1 --- fines2.pl 17 Mar 2002 02:31:02 -0000 1.2 *************** *** 3,7 **** #script to keep total of number of issues; ! use C4::Circulation::Fines; use Date::Manip; --- 3,9 ---- #script to keep total of number of issues; ! use C4::Database; ! use C4::Search; ! use C4::Circulation::Circ2; use C4::Circulation::Fines; use Date::Manip; *************** *** 16,22 **** $year=$year+1900; my $date=Date_DaysSince1BC($mon,$mday,$year); ! #my $date=Date_DaysSince1BC(12,4,2000); my $bornum; ! my $total=0; my $max=5; --- 18,24 ---- $year=$year+1900; my $date=Date_DaysSince1BC($mon,$mday,$year); ! #my $date=Date_DaysSince1BC(1,24,2002); my $bornum; ! #print $date; my $total=0; my $max=5; *************** *** 38,47 **** if ($amount > 0){ UpdateFine($data->[$i]->{'itemnumber'},$data->[$i]->{'borrowernumber'},$amount,$type,$due); ! if ($amount ==5){ # marklost(); ! } ! print "$printout\t$borrower->{'cardnumber'}\t$borrower->{'categorycode'}\t$borrower->{'firstname'}\t$borrower->{'surname'}\t$data->[$i]->{'date_due'}\t$type\t$difference\t$borrower->{'emailaddress'}\t$borrower->{'phone'}\t$borrower->{'streetaddress'}\t$borrower->{'city'}\t$amount\n"; } else { # print "$borrower->{'cardnumber'}\t$borrower->{'categorycode'}\t0 fine\n"; } --- 40,87 ---- if ($amount > 0){ UpdateFine($data->[$i]->{'itemnumber'},$data->[$i]->{'borrowernumber'},$amount,$type,$due); ! # if ($amount ==5){ # marklost(); ! # } ! if ($borrower->{'categorycode'} eq 'C'){ ! my $dbh=C4Connect; ! my $query="Select * from borrowers where borrowernumber='$borrower->{'guarantor'}'"; ! my $sth=$dbh->prepare($query); ! $sth->execute; ! my $tdata=$sth->fetchrow_hashref; ! $sth->finish; ! $dbh->disconnect; ! $borrower->{'phone'}=$tdata->{'phone'}; ! } ! print "$printout\t$borrower->{'cardnumber'}\t$borrower->{'categorycode'}\t$borrower->{'firstname'}\t$borrower->{'surname'}\t$data->[$i]->{'date_due'}\t$type\t$difference\t$borrower->{'emailaddress'}\t$borrower->{'phone'}\t$borrower->{'streetaddress'}\t$borrower->{'city'}\t$amount\n"; } else { # print "$borrower->{'cardnumber'}\t$borrower->{'categorycode'}\t0 fine\n"; + } + if ($difference >= 28){ + my $borrower=BorType($data->[$i]->{'borrowernumber'}); + if ($borrower->{'cardnumber'} ne ''){ + my $cost=ReplacementCost($data->[$i]->{'itemnumber'}); + my $dbh=C4Connect; + my $env; + my $accountno=C4::Circulation::Circ2::getnextacctno($env,$data->[$i]->{'borrowernumber'},$dbh); + my $item=itemnodata($env,$dbh,$data->[$i]->{'itemnumber'}); + if ($item->{'itemlost'} ne '1' && $item->{'itemlost'} ne '2' ){ + $item->{'title'}=~ s/\'/\\'/g; + my $query="Insert into accountlines + (borrowernumber,itemnumber,accountno,date,amount, + description,accounttype,amountoutstanding) values + ($data->[$i]->{'borrowernumber'},$data->[$i]->{'itemnumber'}, + '$accountno',now(),'$cost','Lost item $item->{'title'} $item->{'barcode'}','L','$cost')"; + my $sth=$dbh->prepare($query); + $sth->execute; + $sth->finish; + $query="update items set itemlost=2 where itemnumber='$data->[$i]->{'itemnumber'}'"; + $sth=$dbh->prepare($query); + $sth->execute; + $sth->finish; + } else { + + } + $dbh->disconnect; + } }

1 0

Quick Check
by Nicholas Rosasco 15 Mar '02

15 Mar '02

Hey All -- I'm doing quick-fixes to the FAQ I find a few things needing work. --Contributors list: [If you are a contributor, PLEASE drop me a note! Everyone else, please check spelling of your names, etc.] http://www.koha.org/faq.html#OTHERWISE need to be added... Paul Poulain -- French Language Port, DB schema Finlay Thompson -- Circulation, etc coding --http://www.koha.org/faq.html#SUPPORT France needs to be added to the nationalities list. :) Anything else that is quick? Also, I've gone and rounded up a few more notes from the devel list, just on principle, and fed it to the wishlist tracker on sourceforge. Any other document type stuff need to be done? Thanks, Nick

1 0

CVS: koha/circ branchtransfers.pl,1.2,1.3
by Finlay Thompson 13 Mar '02

13 Mar '02

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv19617/circ Modified Files: branchtransfers.pl Log Message: Changed heading to look like the rest of Koha Index: branchtransfers.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -r1.2 -r1.3 *** branchtransfers.pl 13 Mar 2002 21:07:41 -0000 1.2 --- branchtransfers.pl 14 Mar 2002 01:51:16 -0000 1.3 *************** *** 93,103 **** my $entrytext= << "EOF"; <form method=post action=/cgi-bin/koha/circ/branchtransfers.pl> ! <table border=0 cellpadding=5 cellspacing=0 bgcolor='#dddddd' > ! <tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage> <font color=black><b>Select Branch</b></font></td></tr> <tr><td>Destination Branch:</td> <td><select name=tobranchcd> $tobranchoptions </select></td></tr></table> ! <table border=0 cellpadding=5 cellspacing=0 bgcolor='#dddddd' ><tr> ! <td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage> <font color=black><b>Enter Book Barcode</b></font></td></tr> <tr><td>Item Barcode:</td><td><input name=barcode size=10></td></tr> --- 93,106 ---- my $entrytext= << "EOF"; <form method=post action=/cgi-bin/koha/circ/branchtransfers.pl> ! <table border=1 cellpadding=5 cellspacing=0 align=left> ! <tr><td colspan=2 align=center background=$backgroundimage> <font color=black><b>Select Branch</b></font></td></tr> <tr><td>Destination Branch:</td> <td><select name=tobranchcd> $tobranchoptions </select></td></tr></table> ! ! <img src="/images/holder.gif" width=24 height=50 align=left> ! ! <table border=1 cellpadding=5 cellspacing=0 ><tr> ! <td colspan=2 align=center background=$backgroundimage> <font color=black><b>Enter Book Barcode</b></font></td></tr> <tr><td>Item Barcode:</td><td><input name=barcode size=10></td></tr> *************** *** 126,130 **** print startpage; print startmenu('circulation'); ! print "<h3>Branch Transfers</h3>"; --- 129,133 ---- print startpage; print startmenu('circulation'); ! print "<FONT SIZE=6><em>Circulation: Transfers</em></FONT><br>"; *************** *** 137,141 **** print << "EOF"; <p> ! <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd> <tr><th colspan=6 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Transfered Items</font></th></tr> <tr><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr> --- 140,144 ---- print << "EOF"; <p> ! <table border=1 cellpadding=5 cellspacing=0 bgcolor=#dddddd> <tr><th colspan=6 bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black>Transfered Items</font></th></tr> <tr><th>Bar Code</th><th>Title</th><th>Author</th><th>Type</th><th>From</th><th>To</th></tr>

1 0

CVS: koha/circ circulation.pl,1.22,1.23
by Finlay Thompson 13 Mar '02

13 Mar '02

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv19352/circ Modified Files: circulation.pl Log Message: Added a heading to be consistent with rest of Koha Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -r1.22 -r1.23 *** circulation.pl 14 Mar 2002 01:04:00 -0000 1.22 --- circulation.pl 14 Mar 2002 01:50:17 -0000 1.23 *************** *** 193,199 **** sub returns { my %returneditems; ! print << "EOF"; ! <table border=0 cellpadding=10 cellspacing=0 cellpadding=5><tr><th background=$backgroundimage>Circulation - Returns</th></tr><tr><td bgcolor=$circbackgroundcolor align=center> ! EOF foreach ($query->param) { (next) unless (/ri-(\d*)/); --- 193,197 ---- sub returns { my %returneditems; ! print "<FONT SIZE=6><em>Circulation: Returns</em></FONT><br>"; foreach ($query->param) { (next) unless (/ri-(\d*)/); *************** *** 421,424 **** --- 419,423 ---- sub issues { + my ($noheader) = shift; my $print=$query->param('print'); *************** *** 468,474 **** <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> || ! <a href=branchtransfers.pl>Transfer Book</a></font><p> </p> EOF } --- 467,474 ---- <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> || ! <a href=branchtransfers.pl>Transfers</a></font><p> </p> + <FONT SIZE=6><em>Circulation: Issues</em></FONT><br> EOF }

1 0

CVS: koha/circ circulation2.pl,NONE,1.1 circulation.pl,1.21,1.22
by Finlay Thompson 13 Mar '02

13 Mar '02

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv10323 Modified Files: circulation.pl Added Files: circulation2.pl Log Message: This is the begining of a process of dividing up circulation.pl This script deals with the branch and printer selection stuff --- NEW FILE --- #!/usr/bin/perl use strict; use CGI qw/:standard/; use C4::Circulation::Circ2; use C4::Output; use C4::Print; use DBI; # this is a reorganisation of circulation.pl # dividing it up into three scripts...... # this will be the first one that chooses branch and printer settings.... my %env; my $headerbackgroundcolor='#99cc33'; 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); my $printers=getprinters(\%env); my $branch=$query->param('branch'); my $printer=$query->param('printer'); ($branch) || ($branch=$query->cookie('branch')); ($printer) || ($printer=$query->cookie('printer')); my $oldbranch; my $oldprinter; if ($query->param('selectnewbranchprinter')) { $oldbranch=$branch; $oldprinter=$printer; $branch=''; $printer=''; } $env{'branchcode'}=$branch; $env{'printer'}=$printer; $env{'queue'}=$printer; # set up select options.... my $branchcount=0; my $printercount=0; my $branchoptions; my $printeroptions; foreach (keys %$branches) { (next) unless ($_); (next) if (/^TR$/); $branchcount++; my $selected=''; ($selected='selected') if ($_ eq $oldbranch); $branchoptions.="<option value=$_ $selected>$branches->{$_}->{'branchname'}\n"; } foreach (keys %$printers) { (next) unless ($_); $printercount++; my $selected=''; ($selected='selected') if ($_ eq $oldprinter); $printeroptions.="<option value=$_ $selected>$printers->{$_}->{'printername'}\n"; } # if there is only one.... if ($printercount==1) { ($printer)=keys %$printers; } if ($branchcount==1) { ($branch)=keys %$branches; } my $branchcookie=$query->cookie(-name=>'branch', -value=>"$branch", -expires=>'+1y'); my $printercookie=$query->cookie(-name=>'printer', -value=>"$printer", -expires=>'+1y'); my ($printerform, $branchform); if ($printercount>1) { $printerform=<<"EOF"; <table border=0 cellpadding=5 cellspacing=0 bgcolor='#dddddd' > <tr><td><select name=printer> $printeroptions </select></td></tr> </table> <input type=hidden name=branch value=$printer> EOF } else { my ($printer) = keys %$printers; $printerform=<<"EOF"; <input type=hidden name=printer value=$printer> EOF } if ($branchcount>1) { $branchform=<<"EOF"; <table border=0 cellpadding=5 cellspacing=0 bgcolor='#dddddd' > <tr><td> <select name=branch> $branchoptions </select> </td></tr> </table> <input type=hidden name=branch value=$branch> EOF } else { my ($branch) = keys %$branches; $branchform=<<"EOF"; <input type=hidden name=printer value=$printer> EOF } # set header with cookie.... print $query->header(-type=>'text/html',-expires=>'now', -cookie=>[$branchcookie,$printercookie]); print startpage(); print startmenu('circulation'); if ($branch and $printer) { print << "EOF"; <p align=right> <FONT SIZE=2 face="arial, helvetica"> <a href=circulation.pl?module=issues&branch=$branch&printer=$printer&print>Next Borrower</a> || <a href=circulation.pl?module=returns&branch=$branch&printer=$printer>Returns</a> || <a href=branchtransfers.pl>Transfer Book</a></font> <input type=hidden name=module value=issues> <input type=hidden name=branch value=$branch> <input type=hidden name=printer value=$printer> <input type=hidden name=barcode value=" "> </p> <table align=left border=0 cellpadding=5 cellspacing=0 > <tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage> <font color=black><b>Branch and Printer Settings<b></font> </td></tr> <tr><td> <b>Branch:</b> $branches->{$branch}->{'branchname'} </td><td><b>Printer:</b>$printers->{$printer}->{'printername'} </td></tr> <tr><td colspace=2> <a href=circulation2.pl?selectnewbranchprinter=1>Select new branch and printer</a> </td></tr> </table> <img src="/images/holder.gif" width=24 height=50 align=left> <table border=0 cellpadding=5 cellspacing=0 bgcolor='#dddddd' align=right> <form method=get> <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage><font color=black> <b>Enter borrower card number<br> or partial last name</b></font> </td></tr> <tr><td><input name=findborrower></td></tr> </form> </table> EOF } else { print << "EOF"; <form method=post action=/cgi-bin/koha/circ/circulation2.pl> <table border=0 cellpadding=5 cellspacing=0> <tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage> <font color=black><b>Please Set Branch and Printer</b></font></td></tr> <tr><td> $branchform </td> <td> $printerform </td></tr> </table> <input type="submit" value="Change Settings" type="changesettings"> </form> EOF } print endmenu('circulation'); print endpage(); Index: circulation.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/circulation.pl,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -r1.21 -r1.22 *** circulation.pl 12 Mar 2002 21:04:32 -0000 1.21 --- circulation.pl 14 Mar 2002 01:04:00 -0000 1.22 *************** *** 154,157 **** --- 154,158 ---- print endmenu('circulation'); print endpage(); + sub default { print << "EOF";

1 0

CVS: koha/C4/Circulation Circ2.pm,1.20,1.21
by Finlay Thompson 13 Mar '02

13 Mar '02

Update of /cvsroot/koha/koha/C4/Circulation In directory usw-pr-cvs1:/tmp/cvs-serv19044/C4/Circulation Modified Files: Circ2.pm Log Message: Added a transferbook subroutine that is called from /circ/branchtransfers.pl It writes a new line in the branchtransfers table and changes the currentbranch field in items. Index: Circ2.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** Circ2.pm 25 Nov 2001 20:17:53 -0000 1.20 --- Circ2.pm 13 Mar 2002 21:13:42 -0000 1.21 *************** *** 25,29 **** @ISA = qw(Exporter); @EXPORT = qw(&getbranches &getprinters &getpatroninformation &currentissues &getiteminformation &findborrower &issuebook &returnbook ! &find_reserves); %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], --- 25,29 ---- @ISA = qw(Exporter); @EXPORT = qw(&getbranches &getprinters &getpatroninformation &currentissues &getiteminformation &findborrower &issuebook &returnbook ! &find_reserves &transferbook); %EXPORT_TAGS = ( ); # eg: TAG => [ qw!name1 name2! ], *************** *** 184,187 **** --- 184,205 ---- $dbh->disconnect; return(\@borrowers); + } + + + sub transferbook { + my ($env, $iteminformation, $barcode) = @_; + my $messages; + my $dbh=&C4Connect; + #new entry in branchtransfers.... + my $sth = $dbh->prepare("insert into branchtransfers (itemnumber, frombranch, datearrived, tobranch) values($iteminformation->{'itemnumber'}, '$env->{'frbranchcd'}', now(), '$env->{'tobranchcd'}')"); + $sth->execute || return (0,"database error: $sth->errstr"); + $sth->finish; + #update holdingbranch in items ..... + $sth = $dbh->prepare("update items set holdingbranch='$env->{'tobranchcd'}' where items.itemnumber=$iteminformation->{'itemnumber'}"); + $sth->execute || return (0,"database error: $sth->errstr"); + $sth->execute; + $sth->finish; + $dbh->disconnect; + return (1, $messages); }

1 0

CVS: koha/circ branchtransfers.pl,1.1,1.2
by Finlay Thompson 13 Mar '02

13 Mar '02

Update of /cvsroot/koha/koha/circ In directory usw-pr-cvs1:/tmp/cvs-serv17154/circ Modified Files: branchtransfers.pl Log Message: Fixed a small problem in the <form>, not hidden inputs are getting passed correctly. Index: branchtransfers.pl =================================================================== RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** branchtransfers.pl 12 Mar 2002 21:04:32 -0000 1.1 --- branchtransfers.pl 13 Mar 2002 21:07:41 -0000 1.2 *************** *** 38,41 **** --- 38,42 ---- # collect the stack of books already transfered so they can printed... + my @messages; my %transfereditems; my $ritext = ''; *************** *** 45,49 **** (next) unless (/bc-(\d*)/); my $counter=$1; - (next) if ($counter>20); my $barcode=$query->param("bc-$counter"); my $frbcd=$query->param("fb-$counter"); --- 46,49 ---- *************** *** 60,64 **** #if the barcode has been entered action that and write a message and onto the top of the stack... my $iteminformation; ! my @messages; my $todaysdate; if (my $barcode=$query->param('barcode')) { --- 60,64 ---- #if the barcode has been entered action that and write a message and onto the top of the stack... my $iteminformation; ! my $todaysdate; if (my $barcode=$query->param('barcode')) { *************** *** 93,111 **** my $entrytext= << "EOF"; <form method=post action=/cgi-bin/koha/circ/branchtransfers.pl> ! <table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd > <tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage> <font color=black><b>Select Branch</b></font></td></tr> ! <tr><td>Destination Branch:</td><td> ! <select name=tobranchcd> $tobranchoptions </select> ! </td></tr> ! ! </table><table border=0 cellpadding=5 cellspacing=0 bgcolor=#dddddd > ! <tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage> <font color=black><b>Enter Book Barcode</b></font></td></tr> <tr><td>Item Barcode:</td><td><input name=barcode size=10></td></tr> </table> - <input type=hidden name=tobranchcd value=$tobranchcd> $ritext EOF --- 93,109 ---- my $entrytext= << "EOF"; <form method=post action=/cgi-bin/koha/circ/branchtransfers.pl> ! <table border=0 cellpadding=5 cellspacing=0 bgcolor='#dddddd' > <tr><td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage> <font color=black><b>Select Branch</b></font></td></tr> ! <tr><td>Destination Branch:</td> ! <td><select name=tobranchcd> $tobranchoptions </select></td></tr></table> ! <table border=0 cellpadding=5 cellspacing=0 bgcolor='#dddddd' ><tr> ! <td colspan=2 bgcolor=$headerbackgroundcolor align=center background=$backgroundimage> <font color=black><b>Enter Book Barcode</b></font></td></tr> <tr><td>Item Barcode:</td><td><input name=barcode size=10></td></tr> </table> <input type=hidden name=tobranchcd value=$tobranchcd> $ritext + </form> EOF *************** *** 167,196 **** print endmenu('circulation'); print endpage; - - - ############################################################################ - # - # this is the database query that will go into C4::Circuation::Circ2 - # - - use DBI; - use C4::Database; - - sub transferbook { - my ($env, $iteminformation, $barcode) = @_; - my $messages; - my $dbh=&C4Connect; - #new entry in branchtransfers.... - my $sth = $dbh->prepare("insert into branchtransfers (itemnumber, frombranch, datearrived, tobranch) values($iteminformation->{'itemnumber'}, '$env->{'frbranchcd'}', now(), '$env->{'tobranchcd'}')"); - $sth->execute || return (0,"database error: $sth->errstr"); - $sth->finish; - #update holdingbranch in items ..... - $sth = $dbh->prepare("update items set holdingbranch='$env->{'tobranchcd'}' where items.itemnumber=$iteminformation->{'itemnumber'}"); - $sth->execute || return (0,"database error: $sth->errstr"); - $sth->execute; - $sth->finish; - $dbh->disconnect; - return (1, $messages); - } - --- 165,167 ----

1 0

CVS: koha search.pl,1.4,1.5
by Chris Cormack 12 Mar '02

12 Mar '02

Update of /cvsroot/koha/koha In directory usw-pr-cvs1:/tmp/cvs-serv31173 Modified Files: search.pl Log Message: Removing reference to the FrontSearch subroutine as its never called Index: search.pl =================================================================== RCS file: /cvsroot/koha/koha/search.pl,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** search.pl 5 Oct 2001 20:13:20 -0000 1.4 --- search.pl 13 Mar 2002 07:46:43 -0000 1.5 *************** *** 1,8 **** #!/usr/bin/perl #script to provide intranet (librarian) advanced search facility - #modified 9/11/1999 by chris(a)katipo.co.nz - #adding an extra comment to play with CVS (Si, 19/11/99) - #modified 29/12/99 by chris(a)katipo.co.nz to be usavle by opac as well - #modified by chris 10/11/00 to fix dewey search use strict; --- 1,4 ---- *************** *** 32,36 **** } ! #print $input->dump; my $blah; my %search; --- 28,32 ---- } ! #print $input->Dump; my $blah; my %search; *************** *** 58,61 **** --- 54,59 ---- my $dewey=validate($input->param('dewey')); $search{'dewey'}=$dewey; + my $branch=validate($input->param('branch')); + $search{'branch'}=$branch; my @results; my $offset=$input->param('offset'); *************** *** 69,75 **** print startpage(); print startmenu($type); #print $search{'ttype'}; ! if ($type ne 'opac'){ print mkheadr(1,'Catalogue Search Results'); } else { print mkheadr(1,'Opac Search Results'); --- 67,76 ---- print startpage(); print startmenu($type); + #print $type; #print $search{'ttype'}; ! if ($type eq 'intra'){ print mkheadr(1,'Catalogue Search Results'); + } elsif ($type eq 'catmain'){ + print mkheadr(1,'Catalogue Maintenance'); } else { print mkheadr(1,'Opac Search Results'); *************** *** 85,96 **** } else { if ($keyword ne ''){ - # print "hey"; ($count,@results)=&KeywordSearch(\$blah,'intra',\%search,$num,$offset); - } elsif ($search{'front'} ne '') { - ($count,@results)&FrontSearch(\$blah,'intra',\%search,$num,$offset); - # print "hey"; }elsif ($title ne '' || $author ne '' || $illustrator ne '' || $dewey ne '' || $class ne '') { ($count,@results)=&CatSearch(\$blah,'loose',\%search,$num,$offset); - # print "hey"; } } --- 86,92 ----

1 0

CVS: koha/C4 Search.pm,1.15,1.16
by Chris Cormack 12 Mar '02

12 Mar '02

Update of /cvsroot/koha/koha/C4 In directory usw-pr-cvs1:/tmp/cvs-serv30271/C4 Modified Files: Search.pm Log Message: Tidy up, removing deprecated routines Index: Search.pm =================================================================== RCS file: /cvsroot/koha/koha/C4/Search.pm,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -r1.15 -r1.16 *** Search.pm 13 Mar 2002 03:26:43 -0000 1.15 --- Search.pm 13 Mar 2002 07:36:49 -0000 1.16 *************** *** 18,24 **** @ISA = qw(Exporter); @EXPORT = qw(&CatSearch &BornameSearch &ItemInfo &KeywordSearch &subsearch ! &itemdata &bibdata &GetItems &borrdata &getacctlist &itemnodata &itemcount ! &OpacSearch &borrdata2 &NewBorrowerNumber &bibitemdata &borrissues ! &getboracctrecord &ItemType &itemissues &FrontSearch &subject &subtitle &addauthor &bibitems &barcodes &findguarantees &allissues &systemprefs &findguarantor); --- 18,24 ---- @ISA = qw(Exporter); @EXPORT = qw(&CatSearch &BornameSearch &ItemInfo &KeywordSearch &subsearch ! &itemdata &bibdata &GetItems &borrdata &itemnodata &itemcount ! &borrdata2 &NewBorrowerNumber &bibitemdata &borrissues ! &getboracctrecord &ItemType &itemissues &subject &subtitle &addauthor &bibitems &barcodes &findguarantees &allissues &systemprefs &findguarantor); *************** *** 117,255 **** } - sub OpacSearch { - my ($env,$type,$search,$num,$offset)=@_; - my $dbh = &C4Connect; - $search->{'keyword'}=~ s/'/\\'/g; - my @key=split(' ',$search->{'keyword'}); - my $count=@key; - my $i=1; - my @results; - my $query ="Select count(*) from biblio where - ((title like '$key[0]%' or title like '% $key[0]%')"; - while ($i < $count){ - $query=$query." and (title like '$key[$i]%' or title like '% $key[$i]%')"; - $i++; - } - $query=$query.") or ((author like '$key[0]%' or author like '% $key[0]%')"; - $i=1; - while ($i < $count){ - $query=$query." and (author like '$key[$i]%' or author like '% $key[$i]%')"; - $i++; - } - $query.=") or ((seriestitle like '$key[0]%' or seriestitle like '% $key[0]%')"; - for ($i=1;$i<$count;$i++){ - $query.=" and (seriestitle like '$key[$i]%' or seriestitle like '% $key[$i]%')"; - } - $query.= ") or ((notes like '$key[0]%' or notes like '% $key[0]%')"; - for ($i=1;$i<$count;$i++){ - $query.=" and (notes like '$key[$i]%' or notes like '% $key[$i]%')"; - } - $query=$query.") order by title"; - my $sth=$dbh->prepare($query); - $sth->execute; - my $data=$sth->fetchrow_hashref; - my $count=$data->{'count(*)'}; - $sth->finish; - $query=~ s/count$\*$/\*/; - $query= $query." limit $offset,$num"; - $sth=$dbh->prepare($query); - # print $query; - $sth->execute; - $i=0; - while (my $data=$sth->fetchrow_hashref){ - my $sti=$dbh->prepare("select dewey,subclass from biblioitems where biblionumber=$data->{'biblionumber'}"); - $sti->execute; - my ($dewey, $subclass) = $sti->fetchrow; - $dewey=~s/0*$//; - ($dewey == 0) && ($dewey=''); - ($dewey) && ($dewey.=" $subclass"); - $sti->finish; - $results[$i]="$data->{'author'}\t$data->{'title'}\t$data->{'biblionumber'}\t$dewey"; - $i++; - } - $sth->finish; - $dbh->disconnect; - return($count,@results); - } - - - - sub FrontSearch { - my ($env,$type,$search,$num,$offset)=@_; - my $dbh = &C4Connect; - $search->{'front'}=~ s/ +$//; - $search->{'front'}=~ s/'/\\'/; - my @key=split(' ',$search->{'front'}); - my $count=@key; - my $i=1; - my @results; - my $query ="Select * from biblio,bibliosubtitle where - biblio.biblionumber=bibliosubtitle.biblionumber and - ((title like '$key[0]%' or title like '% $key[0]%' - or subtitle like '$key[0]%' or subtitle like '% $key[0]%' - or author like '$key[0]%' or author like '% $key[0]%')"; - while ($i < $count){ - $query=$query." and (title like '%$key[$i]%' or subtitle like '%$key[$i]%')"; - $i++; - } - $query=$query.") group by biblio.biblionumber order by author,title"; - print $query; - my $sth=$dbh->prepare($query); - $sth->execute; - $i=0; - while (my $data=$sth->fetchrow_hashref){ - my $sti=$dbh->prepare("select dewey,subclass from biblioitems where biblionumber=$data->{'biblionumber'}"); - $sti->execute; - my ($dewey, $subclass) = $sti->fetchrow; - $dewey=~s/\.*0*$//; - ($dewey == 0) && ($dewey=''); - ($dewey) && ($dewey.=" $subclass"); - $sti->finish; - $results[$i]="$data->{'author'}\t$data->{'title'}\t$data->{'biblionumber'}\t$data->{'copyrightdate'}\t$dewey"; - # print $results[$i]; - $i++; - } - $sth->finish; - $sth=$dbh->prepare("Select biblionumber from bibliosubject where subject - like '%$search->{'keyword'}%'"); - $sth->execute; - while (my $data=$sth->fetchrow_hashref){ - my $sth2=$dbh->prepare("Select * from biblio where - biblionumber=$data->{'biblionumber'}"); - $sth2->execute; - while (my $data2=$sth2->fetchrow_hashref){ - - $results[$i]="$data2->{'author'}\t$data2->{'title'}\t$data2->{'biblionumber'}\t$data->{'copyrightdate'}"; - # print $results[$i]; - $i++; - } - $sth2->finish; - } - my $i2=1; - @results=sort @results; - my @res; - my $count=@results; - $i=1; - $res[0]=$results[0]; - while ($i2 < $count){ - if ($results[$i2] ne $res[$i-1]){ - $res[$i]=$results[$i2]; - $i++; - } - $i2++; - } - $i2=0; - my @res2; - $count=@res; - while ($i2 < $num && $i2 < $count){ - $res2[$i2]=$res[$i2+$offset]; - # print $res2[$i2]; - $i2++; - } - $sth->finish; - $dbh->disconnect; - return($i,@res2); - } - sub KeywordSearch { --- 117,120 ---- *************** *** 797,801 **** } } ! print $query; if ($type ne 'precise' && $type ne 'subject'){ if ($search->{'author'} ne ''){ --- 662,666 ---- } } ! #print $query; if ($type ne 'precise' && $type ne 'subject'){ if ($search->{'author'} ne ''){ *************** *** 1276,1308 **** return($data2->{'count(*)'},$data->{'count(*)'},$data3->{'sum(amountoutstanding)'}); } ! ! sub getacctlist { ! my ($env,$params) = @_; ! my $dbh=C4Connect; ! my @acctlines; ! my $numlines; ! my $query = "Select borrowernumber, accountno, date, amount, description, ! dispute, accounttype, amountoutstanding, barcode, title ! from accountlines,items,biblio ! where borrowernumber = $params->{'borrowernumber'} "; ! if ($params->{'acctno'} ne "") { ! my $query = $query." and accountlines.accountno = $params->{'acctno'} "; ! } ! my $query = $query." and accountlines.itemnumber = items.itemnumber ! and items.biblionumber = biblio.biblionumber ! and accountlines.amountoutstanding<>0 order by date"; ! my $sth=$dbh->prepare($query); ! # print $query; ! $sth->execute; ! my $total=0; ! while (my $data=$sth->fetchrow_hashref){ ! $acctlines[$numlines] = $data; ! $numlines++; ! $total = $total+ $data->{'amountoutstanding'}; ! } ! return ($numlines,\@acctlines,$total); ! $sth->finish; ! $dbh->disconnect; ! } sub getboracctrecord { --- 1141,1145 ---- return($data2->{'count(*)'},$data->{'count(*)'},$data3->{'sum(amountoutstanding)'}); } ! sub getboracctrecord {

1 0