[Koha-cvs] koha bookshelves/addbookbybiblionumber.pl catal... [rel_TG]
Tumer Garip
tgarip at neu.edu.tr
Sat May 5 15:00:14 CEST 2007
CVSROOT: /sources/koha
Module name: koha
Branch: rel_TG
Changes by: Tumer Garip <tgarip1957> 07/05/05 13:00:14
Modified files:
bookshelves : addbookbybiblionumber.pl
catalogue : bookcount.pl
cataloguing : addbiblio.pl additem.pl
circ : branchreserves.pl branchtransfers.pl
circulation.pl currenttransfers.pl
renewscript.pl rescirculation.pl resreturns.pl
waitingreservestransfers.pl
members : boraccount.pl mancredit.pl member-picupload.pl
moremember.pl pay.pl payprint.pl
reports : acquisitions_stats.pl bor_issues_top.pl
borrowers_out.pl borrowers_stats.pl
cat_issues_top.pl catalogue_out.pl
catalogue_stats.pl contact_history.pl
issues_avg_stats.pl issues_stats.pl onloan.pl
overdue.pl resonloan.pl sms_history.pl
reserve : modrequest.pl request.pl
serials : subscription-add.pl
sms : sms_listen_windows_start.pl
tools : fines2.pl import.pl
z3950 : search.pl
Log message:
MAJOR changes:1- Database column names changed to comply SQl and mysSQL5. Code changed accordingly.
2-Optimizing addbiblio and marcdetail for speed. Using hidden flag and retrieveing only the neccessary fields from marcgettagslib proides speed gain of 400%
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/bookshelves/addbookbybiblionumber.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.5.2.3&r2=1.5.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/bookcount.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/addbiblio.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.19.2.3&r2=1.19.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/cataloguing/additem.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.12.2.4&r2=1.12.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchreserves.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.3.2.3&r2=1.3.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/circ/branchtransfers.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.26.2.3&r2=1.26.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/circ/circulation.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.99.2.2&r2=1.99.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/circ/currenttransfers.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.3.4.3&r2=1.3.4.4
http://cvs.savannah.gnu.org/viewcvs/koha/circ/renewscript.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/circ/rescirculation.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/circ/resreturns.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.2.2.2&r2=1.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/circ/waitingreservestransfers.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.5.2.3&r2=1.5.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/members/boraccount.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.4.2.3&r2=1.4.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/members/mancredit.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.4.2.3&r2=1.4.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/members/member-picupload.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.4.4&r2=1.1.4.5
http://cvs.savannah.gnu.org/viewcvs/koha/members/moremember.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.29.2.4&r2=1.29.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/members/pay.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.6.2.3&r2=1.6.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/members/payprint.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/acquisitions_stats.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.12.2.3&r2=1.12.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/bor_issues_top.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.9.2.3&r2=1.9.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/borrowers_out.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.7.2.3&r2=1.7.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/borrowers_stats.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.11.2.3&r2=1.11.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/cat_issues_top.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.11.2.3&r2=1.11.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/catalogue_out.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.6.2.3&r2=1.6.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/catalogue_stats.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.18.2.3&r2=1.18.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/contact_history.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/reports/issues_avg_stats.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.6.2.3&r2=1.6.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/issues_stats.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.14.2.3&r2=1.14.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/onloan.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/reports/overdue.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/reports/resonloan.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/reports/sms_history.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.2&r2=1.1.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/modrequest.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.3.2.2&r2=1.3.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/reserve/request.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.7.2.3&r2=1.7.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/serials/subscription-add.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.10.2.3&r2=1.10.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/sms/sms_listen_windows_start.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/tools/fines2.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/tools/import.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.3.2.3&r2=1.3.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/z3950/search.pl?cvsroot=koha&only_with_tag=rel_TG&r1=1.8.2.3&r2=1.8.2.4
Patches:
Index: bookshelves/addbookbybiblionumber.pl
===================================================================
RCS file: /sources/koha/koha/bookshelves/addbookbybiblionumber.pl,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -b -r1.5.2.3 -r1.5.2.4
--- bookshelves/addbookbybiblionumber.pl 11 Apr 2007 11:54:04 -0000 1.5.2.3
+++ bookshelves/addbookbybiblionumber.pl 5 May 2007 13:00:13 -0000 1.5.2.4
@@ -2,7 +2,7 @@
#script to provide bookshelf management
# WARNING: This file uses 4-character tabs!
#
-# $Header: /sources/koha/koha/bookshelves/addbookbybiblionumber.pl,v 1.5.2.3 2007/04/11 11:54:04 tgarip1957 Exp $
+# $Header: /sources/koha/koha/bookshelves/addbookbybiblionumber.pl,v 1.5.2.4 2007/05/05 13:00:13 tgarip1957 Exp $
#
# Copyright 2000-2002 Katipo Communications
#
@@ -84,8 +84,9 @@
output_html_with_http_headers $query, $cookie, $template->output;
}
# $Log: addbookbybiblionumber.pl,v $
-# Revision 1.5.2.3 2007/04/11 11:54:04 tgarip1957
-# small bugfixes and correction of flagsrequired
+# Revision 1.5.2.4 2007/05/05 13:00:13 tgarip1957
+# MAJOR changes:1- Database column names changed to comply SQl and mysSQL5. Code changed accordingly.
+# 2-Optimizing addbiblio and marcdetail for speed. Using hidden flag and retrieveing only the neccessary fields from marcgettagslib proides speed gain of 400%
#
# Revision 1.5 2006/09/27 21:19:21 tgarip1957
# Finalized XML version for intranet
Index: catalogue/bookcount.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/Attic/bookcount.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- catalogue/bookcount.pl 11 Apr 2007 11:54:04 -0000 1.1.2.2
+++ catalogue/bookcount.pl 5 May 2007 13:00:13 -0000 1.1.2.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: bookcount.pl,v 1.1.2.2 2007/04/11 11:54:04 tgarip1957 Exp $
+# $Id: bookcount.pl,v 1.1.2.3 2007/05/05 13:00:13 tgarip1957 Exp $
#written 7/3/2002 by Finlay
#script to display reports
@@ -67,7 +67,7 @@
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {management => 1},
+ flagsrequired => {borrowers => 1},
debug => 1,
});
@@ -119,7 +119,7 @@
sub issuessince {
my ($itemnumber, $date)=@_;
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("Select count(*) from issues where issues.itemnumber=? and issues.timestamp > ?");
+ my $sth=$dbh->prepare("Select count(*) from issues where issues.itemnumber=? and issues.timestamped > ?");
$sth->execute($itemnumber,$date);
my $count=$sth->fetchrow_hashref;
$sth->finish;
@@ -139,7 +139,7 @@
sub lastseenat {
my ($itemnumber, $brc)=@_;
my $dbh = C4::Context->dbh;
- my $sth=$dbh->prepare("Select max(timestamp) from issues where itemnumber=? and branchcode = ?");
+ my $sth=$dbh->prepare("Select max(timestamped) from issues where itemnumber=? and branchcode = ?");
$sth->execute($itemnumber,$brc);
my ($date1)=$sth->fetchrow_array;
$sth->finish;
Index: cataloguing/addbiblio.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/addbiblio.pl,v
retrieving revision 1.19.2.3
retrieving revision 1.19.2.4
diff -u -b -r1.19.2.3 -r1.19.2.4
--- cataloguing/addbiblio.pl 23 Apr 2007 12:32:10 -0000 1.19.2.3
+++ cataloguing/addbiblio.pl 5 May 2007 13:00:13 -0000 1.19.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: addbiblio.pl,v 1.19.2.3 2007/04/23 12:32:10 tgarip1957 Exp $
+# $Id: addbiblio.pl,v 1.19.2.4 2007/05/05 13:00:13 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: cataloguing/additem.pl
===================================================================
RCS file: /sources/koha/koha/cataloguing/additem.pl,v
retrieving revision 1.12.2.4
retrieving revision 1.12.2.5
diff -u -b -r1.12.2.4 -r1.12.2.5
--- cataloguing/additem.pl 23 Apr 2007 12:32:10 -0000 1.12.2.4
+++ cataloguing/additem.pl 5 May 2007 13:00:13 -0000 1.12.2.5
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: additem.pl,v 1.12.2.4 2007/04/23 12:32:10 tgarip1957 Exp $
+# $Id: additem.pl,v 1.12.2.5 2007/05/05 13:00:13 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: circ/branchreserves.pl
===================================================================
RCS file: /sources/koha/koha/circ/Attic/branchreserves.pl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- circ/branchreserves.pl 11 Apr 2007 11:54:04 -0000 1.3.2.3
+++ circ/branchreserves.pl 5 May 2007 13:00:13 -0000 1.3.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: branchreserves.pl,v 1.3.2.3 2007/04/11 11:54:04 tgarip1957 Exp $
+# $Id: branchreserves.pl,v 1.3.2.4 2007/05/05 13:00:13 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: circ/branchtransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -u -b -r1.26.2.3 -r1.26.2.4
--- circ/branchtransfers.pl 11 Apr 2007 11:54:04 -0000 1.26.2.3
+++ circ/branchtransfers.pl 5 May 2007 13:00:13 -0000 1.26.2.4
@@ -46,7 +46,6 @@
my $query=new CGI;
-
my $branch = getbranch($query, $branches);
my $printer = getprinter($query, $printers);
@@ -69,6 +68,7 @@
my $frbranchcd='';
my $dbh=C4::Context->dbh;
############
+my $ignoreRs = 0;
# Deal with the requests....
if ($request eq "KillWaiting") {
my $item = $query->param('itemnumber');
@@ -77,7 +77,7 @@
$reqmessage =1;
}
-my $ignoreRs = 0;
+
if ($request eq "SetWaiting") {
my $item = $query->param('itemnumber');
$tobranchcd = ReserveWaiting($item, $borrnum);
@@ -87,8 +87,8 @@
$reqmessage =1;
}
if ($request eq 'KillReserved'){
- my $biblio = $query->param('biblionumber');
- CancelReserve($biblio, 0, $borrnum);
+ my $item = $query->param('itemnumber');
+ CancelReserve(0, $item, $borrnum);
$cancelled = 1;
$reqmessage =1;
}
@@ -98,7 +98,6 @@
# set up the branchselect options....
my @branchoptionloop;
foreach my $br (keys %$branches) {
- #(next) unless $branches->{$br}->{'CU'}; #FIXME disabled to fix bug 202
my %branch;
$branch{selected}=($br eq $tobranchcd);
$branch{code}=$br;
@@ -122,6 +121,8 @@
= transferbook($tobranchcd, $barcode, $ignoreRs,$user);
$found = $messages->{'ResFound'};
if ($transfered) {
+ my $dbh=C4::Context->dbh;
+ itemseen($dbh,$iteminformation->{'itemnumber'});
my %item;
my $frbranchcd = $iteminformation->{'holdingbranch'};
if (not ($found)) {
@@ -194,7 +195,7 @@
$branchname = $branches->{$res->{'branchcode'}}->{'branchname'};
my ($borr) = getpatroninformation(\%env, $res->{'borrowernumber'}, 0);
$name = name($borr);
- $bornum = $borr->{'borrowernumber'}; #Hopefully, borr->{borrowernumber}=res->{borrowernumber}
+ $bornum = $borr->{'borrowernumber'};
$borcnum = $borr->{'cardnumber'};
$itemnumber = $res->{'itemnumber'};
@@ -208,13 +209,16 @@
}
#####################
-
+my $rname;
+my $rbornum;
+my $rborcnum;
my @errmsgloop;
foreach my $code (keys %$messages) {
my %err;
$err{errbadcode} = ($code eq 'BadBarcode');
if ($code eq 'BadBarcode') {
$err{msg}=$messages->{'BadBarcode'};
+ $reqmessage =1;
}
$err{errispermanent} = ($code eq 'IsPermanent');
@@ -222,15 +226,17 @@
$err{msg} = $branches->{$messages->{'IsPermanent'}}->{'branchname'};
# Here, msg contains the branchname
# Not so satisfied with this... But should work
+ $reqmessage =1;
}
$err{errdesteqholding} = ($code eq 'DestinationEqualsHolding');
-
+ if ($code eq 'DestinationEqualsHolding'){$reqmessage =1;}
$err{errwasreturned} = ($code eq 'WasReturned');
if ($code eq 'WasReturned') {
my ($borrowerinfo) = getpatroninformation(\%env, $messages->{'WasReturned'}, 0);
- $name =name($borrowerinfo);
- $bornum =$borrowerinfo->{'borrowernumber'};
- $borcnum =$borrowerinfo->{'cardnumber'};
+ $rname =name($borrowerinfo);
+ $rbornum =$borrowerinfo->{'borrowernumber'};
+ $rborcnum =$borrowerinfo->{'cardnumber'};
+ $reqmessage =1;
}
if ($code eq 'WasTransfered'){
# Put code here if you want to notify the user that item was transfered...
@@ -258,7 +264,11 @@
name => $name,
bornum => $bornum,
borcnum => $borcnum,
+ rname => $rname,
+ rbornum => $rbornum,
+ rborcnum => $rborcnum,
branchname => $branchname,
+ reqbranchname => $reqbrchname,
itemnumber => $itemnumber,
barcode => $barcode,
biblionumber => $biblionum,
@@ -268,7 +278,8 @@
setwaiting => $setwaiting,
trsfitemloop => \@trsfitemloop,
branchoptionloop => \@branchoptionloop,
- errmsgloop => \@errmsgloop
+ errmsgloop => \@errmsgloop,
+
);
output_html_with_http_headers $query, $cookie, $template->output;
Index: circ/circulation.pl
===================================================================
RCS file: /sources/koha/koha/circ/circulation.pl,v
retrieving revision 1.99.2.2
retrieving revision 1.99.2.3
diff -u -b -r1.99.2.2 -r1.99.2.3
--- circ/circulation.pl 26 Mar 2007 02:19:21 -0000 1.99.2.2
+++ circ/circulation.pl 5 May 2007 13:00:13 -0000 1.99.2.3
@@ -244,7 +244,7 @@
my $i = 0;
my $togglecolor;
# parses today & build Template array
- foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){
+ foreach my $book (sort {$b->{'timestamped'} <=> $a->{'timestamped'}} @todaysissues){
my $dd = $book->{'date_due'};
my $datedue = $book->{'date_due'};
Index: circ/currenttransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/Attic/currenttransfers.pl,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -u -b -r1.3.4.3 -r1.3.4.4
--- circ/currenttransfers.pl 11 Apr 2007 11:54:04 -0000 1.3.4.3
+++ circ/currenttransfers.pl 5 May 2007 13:00:13 -0000 1.3.4.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: currenttransfers.pl,v 1.3.4.3 2007/04/11 11:54:04 tgarip1957 Exp $
+# $Id: currenttransfers.pl,v 1.3.4.4 2007/05/05 13:00:13 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: circ/renewscript.pl
===================================================================
RCS file: /sources/koha/koha/circ/Attic/renewscript.pl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- circ/renewscript.pl 11 Apr 2007 11:54:04 -0000 1.2.2.3
+++ circ/renewscript.pl 5 May 2007 13:00:13 -0000 1.2.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: renewscript.pl,v 1.2.2.3 2007/04/11 11:54:04 tgarip1957 Exp $
+# $Id: renewscript.pl,v 1.2.2.4 2007/05/05 13:00:13 tgarip1957 Exp $
#written 18/1/2000 by chris at katipo.co.nz
#script to renew items from the web
Index: circ/rescirculation.pl
===================================================================
RCS file: /sources/koha/koha/circ/Attic/rescirculation.pl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- circ/rescirculation.pl 26 Mar 2007 02:19:21 -0000 1.3.2.2
+++ circ/rescirculation.pl 5 May 2007 13:00:13 -0000 1.3.2.3
@@ -220,7 +220,7 @@
# split in 2 arrays for today & previous
foreach my $it (keys %$issueslist) {
- my $issuedate = $issueslist->{$it}->{'timestamp'};
+ my $issuedate = $issueslist->{$it}->{'timestamped'};
$issuedate = substr($issuedate, 0, 10);
#warn "$todaysdate,$issuedate";
if ($todaysdate == $issuedate) {
@@ -234,7 +234,7 @@
my $od; # overdues
my $togglecolor;
# parses today & build Template array
- foreach my $book (sort {$b->{'timestamp'} <=> $a->{'timestamp'}} @todaysissues){
+ foreach my $book (sort {$b->{'timestamped'} <=> $a->{'timestamped'}} @todaysissues){
my $dd = $book->{'duetime'};
my $overdue = $book->{'overdue'};
# $dd=format_date($dd);
Index: circ/resreturns.pl
===================================================================
RCS file: /sources/koha/koha/circ/Attic/resreturns.pl,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- circ/resreturns.pl 26 Mar 2007 02:19:21 -0000 1.2.2.2
+++ circ/resreturns.pl 5 May 2007 13:00:13 -0000 1.2.2.3
@@ -26,6 +26,7 @@
use strict;
use CGI;
use C4::Circulation::Circ3;
+use C4::Circulation::Circ2;
use C4::Search;
use C4::Output;
use C4::Print;
@@ -364,8 +365,7 @@
foreach my $item ( sort { $a->{'date_due'} cmp $b->{'date_due'} }
@$items )
{
- my ($iteminformation) =
- getiteminformation( \%env, $item->{'itemnumber'}, 0 );
+ my ($iteminformation) =C4::Circulation::Circ2::getiteminformation( \%env, $item->{'itemnumber'}, 0 );
my %overdueitem;
$overdueitem{duedate} = $item->{'date_due'};
$overdueitem{biblionum} = $iteminformation->{'biblionumber'};
Index: circ/waitingreservestransfers.pl
===================================================================
RCS file: /sources/koha/koha/circ/Attic/waitingreservestransfers.pl,v
retrieving revision 1.5.2.3
retrieving revision 1.5.2.4
diff -u -b -r1.5.2.3 -r1.5.2.4
--- circ/waitingreservestransfers.pl 11 Apr 2007 11:54:04 -0000 1.5.2.3
+++ circ/waitingreservestransfers.pl 5 May 2007 13:00:13 -0000 1.5.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: waitingreservestransfers.pl,v 1.5.2.3 2007/04/11 11:54:04 tgarip1957 Exp $
+# $Id: waitingreservestransfers.pl,v 1.5.2.4 2007/05/05 13:00:13 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: members/boraccount.pl
===================================================================
RCS file: /sources/koha/koha/members/boraccount.pl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -b -r1.4.2.3 -r1.4.2.4
--- members/boraccount.pl 11 Apr 2007 11:54:04 -0000 1.4.2.3
+++ members/boraccount.pl 5 May 2007 13:00:13 -0000 1.4.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: boraccount.pl,v 1.4.2.3 2007/04/11 11:54:04 tgarip1957 Exp $
+# $Id: boraccount.pl,v 1.4.2.4 2007/05/05 13:00:13 tgarip1957 Exp $
#writen 11/1/2000 by chris at katipo.oc.nz
#script to display borrowers account details
@@ -73,7 +73,7 @@
if($accts->[$i]{'amountoutstanding'} <= 0){
$accts->[$i]{'amountoutstandingcredit'} = 1;
}
- my %row = ( 'date' => format_date($accts->[$i]{'date'}),
+ my %row = ( 'dates' => format_date($accts->[$i]{'dates'}),
'accountid' => $accts->[$i]{'accountid'},
'itemnum' => $accts->[$i]{'itemnumber'},
'amountcredit' => $accts->[$i]{'amountcredit'},
Index: members/mancredit.pl
===================================================================
RCS file: /sources/koha/koha/members/mancredit.pl,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -u -b -r1.4.2.3 -r1.4.2.4
--- members/mancredit.pl 11 Apr 2007 11:54:04 -0000 1.4.2.3
+++ members/mancredit.pl 5 May 2007 13:00:13 -0000 1.4.2.4
@@ -47,7 +47,7 @@
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {updatefines => 1},
+ flagsrequired => {updatecharges => 1},
debug => 1,
});
$template->param(user => $user);
@@ -78,7 +78,7 @@
$template->param( accountid => $accountid);
} else {
print $input->redirect("/cgi-bin/koha/members/boraccount.pl?bornum=$bornum");
- exit
+ exit;
}
}
Index: members/member-picupload.pl
===================================================================
RCS file: /sources/koha/koha/members/member-picupload.pl,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -b -r1.1.4.4 -r1.1.4.5
--- members/member-picupload.pl 11 Apr 2007 11:54:04 -0000 1.1.4.4
+++ members/member-picupload.pl 5 May 2007 13:00:13 -0000 1.1.4.5
@@ -1,6 +1,6 @@
#!/usr/bin/perl
- # $Id: member-picupload.pl,v 1.1.4.4 2007/04/11 11:54:04 tgarip1957 Exp $
+ # $Id: member-picupload.pl,v 1.1.4.5 2007/05/05 13:00:13 tgarip1957 Exp $
# script to upload a picture to a borrowerimages directory.
# checks to see if its either displaying the upload form
@@ -69,6 +69,7 @@
}
close UPLOADFILE;
print $input->redirect("/cgi-bin/koha/members/moremember.pl?bornum=$bornum");
+exit;
}
else {
$template->param(
Index: members/moremember.pl
===================================================================
RCS file: /sources/koha/koha/members/moremember.pl,v
retrieving revision 1.29.2.4
retrieving revision 1.29.2.5
diff -u -b -r1.29.2.4 -r1.29.2.5
--- members/moremember.pl 11 Apr 2007 11:54:04 -0000 1.29.2.4
+++ members/moremember.pl 5 May 2007 13:00:13 -0000 1.29.2.5
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: moremember.pl,v 1.29.2.4 2007/04/11 11:54:04 tgarip1957 Exp $
+# $Id: moremember.pl,v 1.29.2.5 2007/05/05 13:00:13 tgarip1957 Exp $
# script to do a borrower enquiry/bring up borrower details etc
# Displays all the details about a borrower
Index: members/pay.pl
===================================================================
RCS file: /sources/koha/koha/members/pay.pl,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -b -r1.6.2.3 -r1.6.2.4
--- members/pay.pl 11 Apr 2007 11:54:04 -0000 1.6.2.3
+++ members/pay.pl 5 May 2007 13:00:13 -0000 1.6.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: pay.pl,v 1.6.2.3 2007/04/11 11:54:04 tgarip1957 Exp $
+# $Id: pay.pl,v 1.6.2.4 2007/05/05 13:00:13 tgarip1957 Exp $
# written 11/1/2000 by chris at katipo.oc.nz
# part of the koha library system, script to facilitate paying off fines
@@ -75,6 +75,7 @@
$check=2;
}
if ($temp eq 'yes' || $temp eq 'wo'){
+
my $desc=$input->param($names[$i+7]);
my $accounttype=$input->param($names[$i+2]);
my $amount=$input->param($names[$i+4]);
@@ -96,9 +97,10 @@
my %env;
-$env{'branchcode'}=$user->{'branchcode'};
+$env{'branchcode'}=$user->{'branch'};
my $total=$input->param('total');
if ($check ==0){
+
if ($total ne ''){
recordpayment(\%env,$bornum,$total);
}
@@ -152,9 +154,10 @@
}
$bornum=$input->param('bornum');
print $input->redirect("/cgi-bin/koha/members/pay.pl?bornum=$bornum");
+exit;
}
-
+1;
# Local Variables:
Index: members/payprint.pl
===================================================================
RCS file: /sources/koha/koha/members/Attic/payprint.pl,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- members/payprint.pl 11 Apr 2007 11:54:04 -0000 1.1.2.3
+++ members/payprint.pl 5 May 2007 13:00:13 -0000 1.1.2.4
@@ -2,7 +2,7 @@
# WARNING: Not enough context to figure out the correct tabstop size
# WARNING: Assume that this file uses 4-character tabs
-# $Id: payprint.pl,v 1.1.2.3 2007/04/11 11:54:04 tgarip1957 Exp $
+# $Id: payprint.pl,v 1.1.2.4 2007/05/05 13:00:13 tgarip1957 Exp $
#written 11/1/2000 by chris at katipo.oc.nz
#part of the koha library system, script to facilitate paying off fines
Index: reports/acquisitions_stats.pl
===================================================================
RCS file: /sources/koha/koha/reports/acquisitions_stats.pl,v
retrieving revision 1.12.2.3
retrieving revision 1.12.2.4
diff -u -b -r1.12.2.3 -r1.12.2.4
--- reports/acquisitions_stats.pl 11 Apr 2007 11:54:05 -0000 1.12.2.3
+++ reports/acquisitions_stats.pl 5 May 2007 13:00:14 -0000 1.12.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: acquisitions_stats.pl,v 1.12.2.3 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: acquisitions_stats.pl,v 1.12.2.4 2007/05/05 13:00:14 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: reports/bor_issues_top.pl
===================================================================
RCS file: /sources/koha/koha/reports/bor_issues_top.pl,v
retrieving revision 1.9.2.3
retrieving revision 1.9.2.4
diff -u -b -r1.9.2.3 -r1.9.2.4
--- reports/bor_issues_top.pl 11 Apr 2007 11:54:05 -0000 1.9.2.3
+++ reports/bor_issues_top.pl 5 May 2007 13:00:14 -0000 1.9.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: bor_issues_top.pl,v 1.9.2.3 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: bor_issues_top.pl,v 1.9.2.4 2007/05/05 13:00:14 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: reports/borrowers_out.pl
===================================================================
RCS file: /sources/koha/koha/reports/borrowers_out.pl,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -b -r1.7.2.3 -r1.7.2.4
--- reports/borrowers_out.pl 11 Apr 2007 11:54:05 -0000 1.7.2.3
+++ reports/borrowers_out.pl 5 May 2007 13:00:14 -0000 1.7.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: borrowers_out.pl,v 1.7.2.3 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: borrowers_out.pl,v 1.7.2.4 2007/05/05 13:00:14 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: reports/borrowers_stats.pl
===================================================================
RCS file: /sources/koha/koha/reports/borrowers_stats.pl,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -b -r1.11.2.3 -r1.11.2.4
--- reports/borrowers_stats.pl 11 Apr 2007 11:54:05 -0000 1.11.2.3
+++ reports/borrowers_stats.pl 5 May 2007 13:00:14 -0000 1.11.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: borrowers_stats.pl,v 1.11.2.3 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: borrowers_stats.pl,v 1.11.2.4 2007/05/05 13:00:14 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: reports/cat_issues_top.pl
===================================================================
RCS file: /sources/koha/koha/reports/cat_issues_top.pl,v
retrieving revision 1.11.2.3
retrieving revision 1.11.2.4
diff -u -b -r1.11.2.3 -r1.11.2.4
--- reports/cat_issues_top.pl 11 Apr 2007 11:54:05 -0000 1.11.2.3
+++ reports/cat_issues_top.pl 5 May 2007 13:00:14 -0000 1.11.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: cat_issues_top.pl,v 1.11.2.3 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: cat_issues_top.pl,v 1.11.2.4 2007/05/05 13:00:14 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: reports/catalogue_out.pl
===================================================================
RCS file: /sources/koha/koha/reports/catalogue_out.pl,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -b -r1.6.2.3 -r1.6.2.4
--- reports/catalogue_out.pl 11 Apr 2007 11:54:05 -0000 1.6.2.3
+++ reports/catalogue_out.pl 5 May 2007 13:00:14 -0000 1.6.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: catalogue_out.pl,v 1.6.2.3 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: catalogue_out.pl,v 1.6.2.4 2007/05/05 13:00:14 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: reports/catalogue_stats.pl
===================================================================
RCS file: /sources/koha/koha/reports/catalogue_stats.pl,v
retrieving revision 1.18.2.3
retrieving revision 1.18.2.4
diff -u -b -r1.18.2.3 -r1.18.2.4
--- reports/catalogue_stats.pl 11 Apr 2007 11:54:05 -0000 1.18.2.3
+++ reports/catalogue_stats.pl 5 May 2007 13:00:14 -0000 1.18.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
## Will not work. Requires a complete re-write for ZEBRA
-# $Id: catalogue_stats.pl,v 1.18.2.3 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: catalogue_stats.pl,v 1.18.2.4 2007/05/05 13:00:14 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: reports/contact_history.pl
===================================================================
RCS file: /sources/koha/koha/reports/Attic/contact_history.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- reports/contact_history.pl 11 Apr 2007 11:54:05 -0000 1.1.2.2
+++ reports/contact_history.pl 5 May 2007 13:00:14 -0000 1.1.2.3
@@ -52,30 +52,30 @@
- $querystring = "SELECT date, method, address, result, message, borrowernumber
+ $querystring = "SELECT dates, method, address, result, message, borrowernumber
from attempted_contacts
where borrowernumber=$bornum
";
-if ($sdate){ $querystring.= " and date >='$sdate'";}
-if ($edate){ $querystring.= " and date <='$edate'";}
+if ($sdate){ $querystring.= " and dates >='$sdate'";}
+if ($edate){ $querystring.= " and dates <='$edate'";}
}else{
- $querystring = " SELECT date, method, address, result, message, borrowernumber
+ $querystring = " SELECT dates, method, address, result, message, borrowernumber
from attempted_contacts
";
-if ($sdate){ $querystring.= " where date >='$sdate'";}
-if ($edate){ $querystring.= " and date <='$edate'";}
+if ($sdate){ $querystring.= " where dates >='$sdate'";}
+if ($edate){ $querystring.= " and dates <='$edate'";}
}
-$querystring.=" order by date DESC";
+$querystring.=" order by dates DESC";
my $dbh = C4::Context->dbh;
my $sth=$dbh->prepare($querystring);
$sth->execute();
my @contacts;
while (my $row=$sth->fetchrow_hashref()) {
my $borrower = BorType($row->{'borrowernumber'});
-$row->{date}=format_date($row->{date});
+$row->{date}=format_date($row->{dates});
$row->{result}="Sent" if $row->{result}==1;
$row->{name}="$borrower->{firstname} $borrower->{surname}";
$row->{categorycode}=$borrower->{categorycode};
Index: reports/issues_avg_stats.pl
===================================================================
RCS file: /sources/koha/koha/reports/issues_avg_stats.pl,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -b -r1.6.2.3 -r1.6.2.4
--- reports/issues_avg_stats.pl 11 Apr 2007 11:54:05 -0000 1.6.2.3
+++ reports/issues_avg_stats.pl 5 May 2007 13:00:14 -0000 1.6.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: issues_avg_stats.pl,v 1.6.2.3 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: issues_avg_stats.pl,v 1.6.2.4 2007/05/05 13:00:14 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: reports/issues_stats.pl
===================================================================
RCS file: /sources/koha/koha/reports/issues_stats.pl,v
retrieving revision 1.14.2.3
retrieving revision 1.14.2.4
diff -u -b -r1.14.2.3 -r1.14.2.4
--- reports/issues_stats.pl 11 Apr 2007 11:54:05 -0000 1.14.2.3
+++ reports/issues_stats.pl 5 May 2007 13:00:14 -0000 1.14.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: issues_stats.pl,v 1.14.2.3 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: issues_stats.pl,v 1.14.2.4 2007/05/05 13:00:14 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: reports/onloan.pl
===================================================================
RCS file: /sources/koha/koha/reports/Attic/onloan.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- reports/onloan.pl 11 Apr 2007 11:54:05 -0000 1.1.2.2
+++ reports/onloan.pl 5 May 2007 13:00:14 -0000 1.1.2.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: onloan.pl,v 1.1.2.2 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: onloan.pl,v 1.1.2.3 2007/05/05 13:00:14 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: reports/overdue.pl
===================================================================
RCS file: /sources/koha/koha/reports/Attic/overdue.pl,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- reports/overdue.pl 11 Apr 2007 11:54:05 -0000 1.2.2.3
+++ reports/overdue.pl 5 May 2007 13:00:14 -0000 1.2.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: overdue.pl,v 1.2.2.3 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: overdue.pl,v 1.2.2.4 2007/05/05 13:00:14 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: reports/resonloan.pl
===================================================================
RCS file: /sources/koha/koha/reports/Attic/resonloan.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- reports/resonloan.pl 11 Apr 2007 11:54:05 -0000 1.1.2.2
+++ reports/resonloan.pl 5 May 2007 13:00:14 -0000 1.1.2.3
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: resonloan.pl,v 1.1.2.2 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: resonloan.pl,v 1.1.2.3 2007/05/05 13:00:14 tgarip1957 Exp $
# Copyright 2000-2002 Katipo Communications
#
Index: reports/sms_history.pl
===================================================================
RCS file: /sources/koha/koha/reports/Attic/sms_history.pl,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -b -r1.1.2.2 -r1.1.2.3
--- reports/sms_history.pl 11 Apr 2007 11:54:05 -0000 1.1.2.2
+++ reports/sms_history.pl 5 May 2007 13:00:14 -0000 1.1.2.3
@@ -44,7 +44,7 @@
query => $input,
type => "intranet",
authnotrequired => 0,
- flagsrequired => {management => 1},
+ flagsrequired => {circulate => 1},
debug => 1,
});
my $querystring;
Index: reserve/modrequest.pl
===================================================================
RCS file: /sources/koha/koha/reserve/modrequest.pl,v
retrieving revision 1.3.2.2
retrieving revision 1.3.2.3
diff -u -b -r1.3.2.2 -r1.3.2.3
--- reserve/modrequest.pl 26 Mar 2007 00:07:53 -0000 1.3.2.2
+++ reserve/modrequest.pl 5 May 2007 13:00:14 -0000 1.3.2.3
@@ -48,3 +48,4 @@
} else {
print $input->redirect("/cgi-bin/koha/reserve/request.pl?biblionumber=$biblionumber[0]");
}
+exit;
Index: reserve/request.pl
===================================================================
RCS file: /sources/koha/koha/reserve/request.pl,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -b -r1.7.2.3 -r1.7.2.4
--- reserve/request.pl 11 Apr 2007 11:54:05 -0000 1.7.2.3
+++ reserve/request.pl 5 May 2007 13:00:14 -0000 1.7.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: request.pl,v 1.7.2.3 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: request.pl,v 1.7.2.4 2007/05/05 13:00:14 tgarip1957 Exp $
#script to place reserves/requests
#writen 2/1/00 by chris at katipo.oc.nz
@@ -167,18 +167,13 @@
my @branches;
my @select_branch;
my %select_branches;
-my $branches=GetBranches;
+my $branches=GetBranches();
#my $count2=scalar(@branches);
foreach my $br (keys %$branches) {
-
+ (next) unless $branches->{$br}->{'IS'};
push @select_branch, $br;
$select_branches{$br}= $branches->{$br}->{'branchname'};
}
-my $CGIbranch=CGI::scrolling_list( -name => 'pickup',
- -values => \@select_branch,
- -labels => \%select_branches,
- -size => 1,
- -multiple => 0 );
#get the time for the form name...
my $time = time();
@@ -191,6 +186,13 @@
authnotrequired => 0,
flagsrequired => {reserveforothers => 1},
});
+my $CGIbranch=CGI::scrolling_list( -name => 'pickup',
+ -values => \@select_branch,
+ -labels => \%select_branches,
+ -default => C4::Context->userenv->{'branch'},
+ -size => 1,
+ -multiple => 0 );
+
$template->param( optionloop =>\@optionloop,
CGIbranch => $CGIbranch,
reserveloop => \@reserveloop,
Index: serials/subscription-add.pl
===================================================================
RCS file: /sources/koha/koha/serials/subscription-add.pl,v
retrieving revision 1.10.2.3
retrieving revision 1.10.2.4
diff -u -b -r1.10.2.3 -r1.10.2.4
--- serials/subscription-add.pl 11 Apr 2007 11:54:05 -0000 1.10.2.3
+++ serials/subscription-add.pl 5 May 2007 13:00:14 -0000 1.10.2.4
@@ -17,7 +17,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: subscription-add.pl,v 1.10.2.3 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: subscription-add.pl,v 1.10.2.4 2007/05/05 13:00:14 tgarip1957 Exp $
=head1 NAME
Index: sms/sms_listen_windows_start.pl
===================================================================
RCS file: /sources/koha/koha/sms/Attic/sms_listen_windows_start.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- sms/sms_listen_windows_start.pl 26 Mar 2007 02:19:26 -0000 1.1.2.1
+++ sms/sms_listen_windows_start.pl 5 May 2007 13:00:14 -0000 1.1.2.2
@@ -11,6 +11,6 @@
my $fileplace=C4::Context->config('intranetdir');
my $fullpath=$fileplace."/cgi-bin/sms";
my $ZebraObj;
- my $pid=Win32::Process::Create($ZebraObj, "C:/usr/bin/perl.exe",'perl sms_listen.pl', 0, DETACHED_PROCESS,$fullpath) ;
+ my $pid=Win32::Process::Create($ZebraObj, "C:/perl/bin/perl.exe",'perl sms_listen.pl', 0, DETACHED_PROCESS,$fullpath) ;
print $input->redirect("/cgi-bin/koha/mainpage.pl?pid=$pid");
Index: tools/fines2.pl
===================================================================
RCS file: /sources/koha/koha/tools/Attic/fines2.pl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- tools/fines2.pl 26 Mar 2007 02:19:27 -0000 1.1.2.1
+++ tools/fines2.pl 5 May 2007 13:00:14 -0000 1.1.2.2
@@ -25,7 +25,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: fines2.pl,v 1.1.2.1 2007/03/26 02:19:27 tgarip1957 Exp $
+# $Id: fines2.pl,v 1.1.2.2 2007/05/05 13:00:14 tgarip1957 Exp $
use C4::Context;
use C4::Search;
@@ -108,7 +108,7 @@
if ($item->{'itemlost'} ne '1' && $item->{'itemoverdue'} ne '1' ){
my $sth=$dbh->prepare("Insert into accountlines
- (borrowernumber,itemnumber,accountno,date,amount,
+ (borrowernumber,itemnumber,accountno,dates,amount,
description,accounttype,amountoutstanding) values
(?,?,?,now(),?,?,'L',?)");
$sth->execute($data->[$i]->{'borrowernumber'},$data->[$i]->{'itemnumber'},
Index: tools/import.pl
===================================================================
RCS file: /sources/koha/koha/tools/import.pl,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -b -r1.3.2.3 -r1.3.2.4
--- tools/import.pl 11 Apr 2007 11:54:05 -0000 1.3.2.3
+++ tools/import.pl 5 May 2007 13:00:14 -0000 1.3.2.4
@@ -1,6 +1,6 @@
#!/usr/bin/perl
-# $Id: import.pl,v 1.3.2.3 2007/04/11 11:54:05 tgarip1957 Exp $
+# $Id: import.pl,v 1.3.2.4 2007/05/05 13:00:14 tgarip1957 Exp $
# Script for handling import of MARC data into Koha db
# and Z39.50 lookups
@@ -95,8 +95,9 @@
#---------------
# log cleared, as marcimport is (almost) rewritten from scratch.
# $Log: import.pl,v $
-# Revision 1.3.2.3 2007/04/11 11:54:05 tgarip1957
-# small bugfixes and correction of flagsrequired
+# Revision 1.3.2.4 2007/05/05 13:00:14 tgarip1957
+# MAJOR changes:1- Database column names changed to comply SQl and mysSQL5. Code changed accordingly.
+# 2-Optimizing addbiblio and marcdetail for speed. Using hidden flag and retrieveing only the neccessary fields from marcgettagslib proides speed gain of 400%
#
# Revision 1.3.2.2 2007/03/26 02:19:27 tgarip1957
# Recommiting everything
Index: z3950/search.pl
===================================================================
RCS file: /sources/koha/koha/z3950/Attic/search.pl,v
retrieving revision 1.8.2.3
retrieving revision 1.8.2.4
diff -u -b -r1.8.2.3 -r1.8.2.4
--- z3950/search.pl 11 Apr 2007 11:54:05 -0000 1.8.2.3
+++ z3950/search.pl 5 May 2007 13:00:14 -0000 1.8.2.4
@@ -172,7 +172,8 @@
for ($i=0; $i<(($numresults<5) ? ($numresults) : (5)) ; $i++) {
my $rec=$oResult[$k]->record($i);
my $marcrecord;
- $marcdata = $rec->raw();
+ eval{$marcdata = $rec->raw();};
+ if ($@){$i--;next;}
$marcrecord = MARC::File::USMARC::decode($marcdata);
my $marcxml=$marcrecord->as_xml_record($marcrecord);
@@ -210,9 +211,9 @@
$template->param(breeding_loop => \@breeding_loop,server=>$serverhost[$k],
numberpending => $numberpending,
);
-output_html_with_http_headers $input, "", $template->output if $firstresult==1;
+output_html_with_http_headers $input, $cookie, $template->output ;
-print $template->output if $firstresult !=1;
+#print $template->output if $firstresult !=1;
$firstresult++;
MAYBE_AGAIN:
More information about the Koha-cvs
mailing list