[Koha-cvs] koha reports/inventory.pl C4/Circulation/Circ2.pm [rel_2_2]
Ryan Higgins
rch at liblime.com
Sun Jun 24 19:31:30 CEST 2007
CVSROOT: /sources/koha
Module name: koha
Branch: rel_2_2
Changes by: Ryan Higgins <rych> 07/06/24 17:31:29
Modified files:
reports : inventory.pl
C4/Circulation : Circ2.pm
Log message:
bugfix: inventory report - passing lcsort back to tmpl; also sort of sort a poorly formed lccn
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/reports/inventory.pl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.4.6&r2=1.1.4.7
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Circulation/Circ2.pm?cvsroot=koha&only_with_tag=rel_2_2&r1=1.87.2.25&r2=1.87.2.26
Patches:
Index: reports/inventory.pl
===================================================================
RCS file: /sources/koha/koha/reports/inventory.pl,v
retrieving revision 1.1.4.6
retrieving revision 1.1.4.7
diff -u -b -r1.1.4.6 -r1.1.4.7
--- reports/inventory.pl 5 Jun 2007 15:54:43 -0000 1.1.4.6
+++ reports/inventory.pl 24 Jun 2007 17:31:29 -0000 1.1.4.7
@@ -57,6 +57,7 @@
offset => $offset,
pagesize => $pagesize,
datelastseen => $datelastseen,
+ lcsort => $lcsort,
intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"),
intranetstylesheet => C4::Context->preference("intranetstylesheet"),
IntranetNav => C4::Context->preference("IntranetNav"),
Index: C4/Circulation/Circ2.pm
===================================================================
RCS file: /sources/koha/koha/C4/Circulation/Attic/Circ2.pm,v
retrieving revision 1.87.2.25
retrieving revision 1.87.2.26
diff -u -b -r1.87.2.25 -r1.87.2.26
--- C4/Circulation/Circ2.pm 5 Jun 2007 15:54:43 -0000 1.87.2.25
+++ C4/Circulation/Circ2.pm 24 Jun 2007 17:31:29 -0000 1.87.2.26
@@ -3,7 +3,7 @@
package C4::Circulation::Circ2;
-# $Id: Circ2.pm,v 1.87.2.25 2007/06/05 15:54:43 rych Exp $
+# $Id: Circ2.pm,v 1.87.2.26 2007/06/24 17:31:29 rych Exp $
#package to deal with Returns
#written 3/11/99 by olwen at katipo.co.nz
@@ -121,6 +121,8 @@
{
my @a = ($a->{itemcallnumber} =~ /^([A-Z]+)(\d+(?:\.\d+)?)\.?([A-Z]*)(\d*)\.?([A-Z]*)(\d*)(?: (\d{4}))?/);
my @b = ($b->{itemcallnumber} =~ /^([A-Z]+)(\d+(?:\.\d+)?)\.?([A-Z]*)(\d*)\.?([A-Z]*)(\d*)(?: (\d{4}))?/);
+ @a= ($a->{itemcallnumber}) unless (@a);
+ @b= ($b->{itemcallnumber}) unless (@b);
return $a[0] cmp $b[0] ||
$a[1] <=> $b[1] ||
More information about the Koha-cvs
mailing list