[interchange-cvs] interchange - jon modified lib/Vend/Interpolate.pm
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Thu Apr 24 12:07:05 2003
User: jon
Date: 2003-04-24 16:06:35 GMT
Modified: lib/Vend Interpolate.pm
Log:
Don't my $b, which interferes with sort { $a <=> $b } etc.
Also remove unneeded my @b and @e. Lightly tested. Hopefully I didn't
miss anything.
Revision Changes Path
2.158 +15 -15 interchange/lib/Vend/Interpolate.pm
rev 2.158, prev_rev 2.157
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.157
retrieving revision 2.158
diff -u -u -r2.157 -r2.158
--- Interpolate.pm 7 Apr 2003 12:13:43 -0000 2.157
+++ Interpolate.pm 24 Apr 2003 16:06:35 -0000 2.158
@@ -1,6 +1,6 @@
# Vend::Interpolate - Interpret Interchange tags
#
-# $Id: Interpolate.pm,v 2.157 2003/04/07 12:13:43 mheins Exp $
+# $Id: Interpolate.pm,v 2.158 2003/04/24 16:06:35 jon Exp $
#
# Copyright (C) 1996-2002 Red Hat, Inc. <interchange@redhat.com>
#
@@ -27,7 +27,7 @@
require Exporter;
@ISA = qw(Exporter);
-$VERSION = substr(q$Revision: 2.157 $, 10);
+$VERSION = substr(q$Revision: 2.158 $, 10);
@EXPORT = qw (
@@ -3571,32 +3571,32 @@
$decade_div = $q->{mv_more_decade} > 1 ? $q->{mv_more_decade} : 10;
}
- my ($b, $e, @b, @e);
+ my ($begin, $end);
if(defined $decade_div and $pages > $decade_div) {
if($current > $decade_div) {
- $b = ( int ($current / $decade_div) * $decade_div ) + 1;
+ $begin = ( int ($current / $decade_div) * $decade_div ) + 1;
$list .= " ";
- $list .= more_link($b - $decade_div, $decade_prev);
+ $list .= more_link($begin - $decade_div, $decade_prev);
}
else {
- $b = 1;
+ $begin = 1;
}
- if($b + $decade_div <= $pages) {
- $e = $b + $decade_div;
- $decade_next = more_link($e, $decade_next);
- $e--;
+ if($begin + $decade_div <= $pages) {
+ $end = $begin + $decade_div;
+ $decade_next = more_link($end, $decade_next);
+ $end--;
}
else {
- $e = $pages;
+ $end = $pages;
undef $decade_next;
}
-#::logDebug("more_list: decade found pages=$pages current=$current b=$b e=$e next=$next last=$last decade_div=$decade_div");
+#::logDebug("more_list: decade found pages=$pages current=$current begin=$begin end=$end next=$next last=$last decade_div=$decade_div");
}
else {
- ($b, $e) = (1, $pages);
+ ($begin, $end) = (1, $pages);
undef $decade_next;
}
-#::logDebug("more_list: pages=$pages current=$current b=$b e=$e next=$next last=$last decade_div=$decade_div");
+#::logDebug("more_list: pages=$pages current=$current begin=$begin end=$end next=$next last=$last decade_div=$decade_div");
if ($q->{mv_alpha_list}) {
for my $record (@{$q->{mv_alpha_list}}) {
@@ -3605,7 +3605,7 @@
$list .= more_link_template($letters, $arg, $form_arg) . ' ';
}
} else {
- foreach $inc ($b .. $e) {
+ foreach $inc ($begin .. $end) {
last if $page_anchor eq 'none';
$list .= more_link($inc, $page_anchor);
}