Browse Source

*** empty log message ***

master
chris 22 years ago
parent
commit
920293aaca
  1. 2
      C4/Acquisitions.pm
  2. 10
      C4/Circulation/Main.pm
  3. 2
      C4/Database.pm
  4. 8
      C4/Interface/FlagsCDK.pm
  5. 24
      C4/Output.pm
  6. 2
      C4/Print.pm
  7. 9
      borrwraper.pl
  8. 5
      issuewrapper.pl
  9. 2
      showbudget.pl
  10. 4
      testissue.pl

2
C4/Acquisitions.pm

@ -601,7 +601,7 @@ sub makeitems {
booksellerid,dateaccessioned,homebranch,holdingbranch,price,replacementprice,
replacementpricedate) values
($biblio,$bibitemno,$item,'$barcodes[$i]','$booksellerid',now(),'$branch',
'$branch',$price,$replacement,now())";
'$branch','$price','$replacement',now())";
my $sth=$dbh->prepare($query);
$sth->execute;
$sth->finish;

10
C4/Circulation/Main.pm

@ -147,24 +147,24 @@ sub previousissue {
if ($borrower->{'borrowernumber'} ne ''){
if ($bornum eq $borrower->{'borrowernumber'}){
# no need to issue
my ($renewstatus) = &renewstatus($env,$dbh,$bornum,$itemnum);
my ($renewstatus) = C4::Circulation::Renewals::renewstatus($env,$dbh,$bornum,$itemnum);
my ($resbor,$resrec) = checkreserve($env,$dbh,$itemnum);
if ($renewstatus == "0") {
info_msg($env,"</S>Issued to this borrower - No renewals<!S>");
$canissue = "N";
} elsif ($resbor ne "") {
my $resp = msg_ny($env,"Book is issued to this borrower",
my $resp = C4::InterfaceCDK::msg_ny($env,"Book is issued to this borrower",
"and is reserved - Renew?");
if ($resp eq "Y") {
$newdate = &renewbook($env,$dbh,$bornum,$itemnum);
$newdate = C4::Circulation::Renewals::renewbook($env,$dbh,$bornum,$itemnum);
$canissue = "R";
} else {
$canissue = "N";
}
} else {
my $resp = &msg_yn($env,"Book is issued to this borrower", "Renew?");
my $resp = C4::InterfaceCDK::msg_yn($env,"Book is issued to this borrower", "Renew?");
if ($resp eq "Y") {
$newdate = &renewbook($env,$dbh,$bornum,$itemnum);
$newdate = C4::Circulation::Renewals::renewbook($env,$dbh,$bornum,$itemnum);
$canissue = "R";
} else {
$canissue = "N";

2
C4/Database.pm

@ -53,7 +53,7 @@ my $priv_func = sub {
sub C4Connect {
my $dbname="c4";
# my $dbh = DBI->connect("dbi:Pg:dbname=$dbname", "chris", "");
my $database='c4test';
my $database='koha2';
my $hostname='localhost';
my $user='hdl';
my $pass='testing';

8
C4/Interface/FlagsCDK.pm

@ -74,8 +74,8 @@ sub trapscreen {
sub trapsnotes {
my ($env,$bornum,$borrower,$amount) = @_;
my $titlepanel = titlepanel($env,$env->{'sysarea'},"Borrower Notes");
my $borpanel = borrowerbox($env,$borrower,$amount);
my $titlepanel = C4::InterfaceCDK::titlepanel($env,$env->{'sysarea'},"Borrower Notes");
my $borpanel = C4::InterfaceCDK::borrowerbox($env,$borrower,$amount);
$borpanel->draw();
my $notesbox = new Cdk::Mentry ('Label'=>"Notes: ",
'Width'=>40,'Prows'=>10,'Lrows'=>30,
@ -109,8 +109,8 @@ sub trapsnotes {
sub reservesdisplay {
my ($env,$borrower,$amount,$odues,$items) = @_;
my $titlepanel = titlepanel($env,$env->{'sysarea'},"Reserves Waiting");
my $borpanel = borrowerbox($env,$borrower,$amount);
my $titlepanel = C4::InterfaceCDK::titlepanel($env,$env->{'sysarea'},"Reserves Waiting");
my $borpanel = C4::InterfaceCDK::borrowerbox($env,$borrower,$amount);
$borpanel->draw();
my $x = 0;
my @itemslist;

24
C4/Output.pm

@ -66,17 +66,17 @@ sub gotopage{
sub startmenu{
my ($type)=@_;
if ($type eq 'issue') {
open (FILE,'/usr/local/www/hdl/htdocs/includes/issues-top.inc') || die;
open (FILE,'/usr/local/www/koha/htdocs/includes/issues-top.inc') || die;
} elsif ($type eq 'opac') {
open (FILE,'/usr/local/www/hdl/htdocs/includes/opac-top.inc') || die;
open (FILE,'/usr/local/www/koha/htdocs/includes/opac-top.inc') || die;
} elsif ($type eq 'member') {
open (FILE,'/usr/local/www/hdl/htdocs/includes/members-top.inc') || die;
open (FILE,'/usr/local/www/koha/htdocs/includes/members-top.inc') || die;
} elsif ($type eq 'acquisitions'){
open (FILE,'/usr/local/www/hdl/htdocs/includes/aquisitions-top.inc') || die;
open (FILE,'/usr/local/www/koha/htdocs/includes/aquisitions-top.inc') || die;
} elsif ($type eq 'report'){
open (FILE,'/usr/local/www/hdl/htdocs/includes/reports-top.inc') || die;
open (FILE,'/usr/local/www/koha/htdocs/includes/reports-top.inc') || die;
} else {
open (FILE,'/usr/local/www/hdl/htdocs/includes/cat-top.inc') || die;
open (FILE,'/usr/local/www/koha/htdocs/includes/cat-top.inc') || die;
}
my @string=<FILE>;
close FILE;
@ -89,17 +89,17 @@ sub startmenu{
sub endmenu{
my ($type)=@_;
if ($type eq 'issue'){
open (FILE,'/usr/local/www/hdl/htdocs/includes/issues-bottom.inc') || die;
open (FILE,'/usr/local/www/koha/htdocs/includes/issues-bottom.inc') || die;
} elsif ($type eq 'opac') {
open (FILE,'/usr/local/www/hdl/htdocs/includes/opac-bottom.inc') || die;
open (FILE,'/usr/local/www/koha/htdocs/includes/opac-bottom.inc') || die;
} elsif ($type eq 'member') {
open (FILE,'/usr/local/www/hdl/htdocs/includes/members-bottom.inc') || die;
open (FILE,'/usr/local/www/koha/htdocs/includes/members-bottom.inc') || die;
} elsif ($type eq 'acquisitions') {
open (FILE,'/usr/local/www/hdl/htdocs/includes/aquisitions-bottom.inc') || die;
open (FILE,'/usr/local/www/koha/htdocs/includes/aquisitions-bottom.inc') || die;
} elsif ($type eq 'report') {
open (FILE,'/usr/local/www/hdl/htdocs/includes/reports-bottom.inc') || die;
open (FILE,'/usr/local/www/koha/htdocs/includes/reports-bottom.inc') || die;
} else {
open (FILE,'/usr/local/www/hdl/htdocs/includes/cat-bottom.inc') || die;
open (FILE,'/usr/local/www/koha/htdocs/includes/cat-bottom.inc') || die;
}
my @string=<FILE>;
close FILE;

2
C4/Print.pm

@ -66,7 +66,7 @@ sub remoteprint {
my $i=0;
my $brdata = $env->{'brdata'};
print PRINTER "Horowhenua Library Trust\r\n";
print PRINTER "$brdata->{'branchname'}\r\n";
# print PRINTER "$brdata->{'branchname'}\r\n";
print PRINTER "Phone: 368-1953\r\n";
print PRINTER "Fax: 367-9218\r\n";
print PRINTER "Email: renewals\@library.org.nz\r\n\r\n\r\n";

9
borrwraper.pl

@ -7,8 +7,13 @@ use C4::Circulation::Main;
use C4::InterfaceCDK;
use C4::Circulation::Borrower;
my ($env) = @_;
# my @args=('issuewrapper.pl',"$env{'branchcode'}","$env{'usercode'}","$env{'telnet'}","$env{'queue'}","$env{'printtype'}");
my %env = (
branchcode => $ARGV[0], usercode => $ARGV[1], proccode => "lgon", borrowernumber => "",
logintime => "", lasttime => "", tempuser => "", debug => "9",
telnet => $ARGV[2], queue => $ARGV[3], printtype => $ARGV[4], brdata => $ARGV[5]
);
my ($env) = \%env;
startint();
helptext('');
my $done;

5
issuewrapper.pl

@ -1,10 +1,11 @@
#!/usr/bin/perl
my ($env) = @_;
#my @args=('issuewrapper.pl',"$env{'branchcode'}","$env{'usercode'}","$env{'telnet'}","$env{'queue'}","$env{'printtype'}");
$done = "Issues";
my $i=0;
while ($done eq "Issues") {
my @args='./borrwraper.pl';
my @args=('borrwraper.pl',@ARGV);
eval{system(@args)};
$exit_value = $? >> 8;
if ($exit_value){

2
showbudget.pl

@ -10,7 +10,7 @@ use C4::Acquisitions;
#print $inp->header;
my ($count,@results)=bookfunds;
open (FILE,'>/usr/local/www/hdl/htdocs/includes/budgets.inc') || die "Cant open file";
open (FILE,'>/usr/local/www/koha/htdocs/includes/budgets.inc') || die "Cant open file";
print FILE <<printend
<TABLE width="40%" cellspacing=0 cellpadding=5 border=1 >

4
testissue.pl

@ -27,7 +27,7 @@ my %env = (
);
$env{'branchcode'} = "C";
$env{'usercode'} = "chris";
$env{'usercode'} = `whoami`;
$env{'telnet'} = "Y";
@ -46,7 +46,7 @@ while ($donext ne 'Quit') {
$data = $donext;
}
if ($data eq 'Issues') {
my @args=('./issuewrapper.pl');
my @args=('issuewrapper.pl',"$env{'branchcode'}","$env{'usercode'}","$env{'telnet'}","$env{'queue'}","$env{'printtype'}","$env{'brdata'}");
system(@args);
} elsif ($data eq 'Returns') {
$donext=Returns(\%env); #C4::Circulation::Returns

Loading…
Cancel
Save