Koha-community
/
kumara
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

*** empty log message ***

master
chris 24 years ago
parent
6c9a61269e
commit
920293aaca
10 changed files with 37 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  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
View File

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

10
C4/Circulation/Main.pm
View File

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

2
C4/Database.pm
View File

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

8
C4/Interface/FlagsCDK.pm
View File

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

24
C4/Output.pm
View File

@ -66,17 +66,17 @@ sub gotopage{
sub startmenu{ sub startmenu{
my ($type)=@_; my ($type)=@_;
if ($type eq 'issue') { 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') { } 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') { } 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'){ } 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'){ } 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 { } 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>; my @string=<FILE>;
close FILE; close FILE;
@ -89,17 +89,17 @@ sub startmenu{
sub endmenu{ sub endmenu{
my ($type)=@_; my ($type)=@_;
if ($type eq 'issue'){ 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') { } 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') { } 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') { } 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') { } 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 { } 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>; my @string=<FILE>;
close FILE; close FILE;

2
C4/Print.pm
View File

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

9
borrwraper.pl
View File

@ -7,8 +7,13 @@ use C4::Circulation::Main;
use C4::InterfaceCDK; use C4::InterfaceCDK;
use C4::Circulation::Borrower; use C4::Circulation::Borrower;
# my @args=('issuewrapper.pl',"$env{'branchcode'}","$env{'usercode'}","$env{'telnet'}","$env{'queue'}","$env{'printtype'}");
my ($env) = @_; 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(); startint();
helptext(''); helptext('');
my $done; my $done;

5
issuewrapper.pl
View File

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

2
showbudget.pl
View File

@ -10,7 +10,7 @@ use C4::Acquisitions;
#print $inp->header; #print $inp->header;
my ($count,@results)=bookfunds; 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 print FILE <<printend
<TABLE width="40%" cellspacing=0 cellpadding=5 border=1 > <TABLE width="40%" cellspacing=0 cellpadding=5 border=1 >

4
testissue.pl
View File

@ -27,7 +27,7 @@ my %env = (
); );
$env{'branchcode'} = "C"; $env{'branchcode'} = "C";
$env{'usercode'} = "chris"; $env{'usercode'} = `whoami`;
$env{'telnet'} = "Y"; $env{'telnet'} = "Y";
@ -46,7 +46,7 @@ while ($donext ne 'Quit') {
$data = $donext; $data = $donext;
} }
if ($data eq 'Issues') { 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); system(@args);
} elsif ($data eq 'Returns') { } elsif ($data eq 'Returns') {
$donext=Returns(\%env); #C4::Circulation::Returns $donext=Returns(\%env); #C4::Circulation::Returns

Write Preview
Loading…
Cancel
Save