oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove WebGUI::Utility::isBetween

Browse source
This commit is contained in:
Graham Knop 2010-08-20 12:29:08 -05:00
parent a34f51a903
commit 631c4fe38c
3 changed files with 4 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/AssetLineage.pm
View file

@ -1013,7 +1013,9 @@ sub setRank {
next; next;
} }
last unless $sibling; last unless $sibling;
if (isBetween($sibling->getRank, $newRank, $currentRank)) { my $rank = $sibling->getRank;
if ($rank >= $newRank && $rank <= $currentRank
|| $rank >= $currentRank && $rank <= $newRank) {
$outputSub->('moving %s', $sibling->getTitle); $outputSub->('moving %s', $sibling->getTitle);
$sibling->cascadeLineage($previous); $sibling->cascadeLineage($previous);
$previous = $sibling->lineage; $previous = $sibling->lineage;

36
lib/WebGUI/Utility.pm
View file

@ -22,7 +22,7 @@ use Tie::IxHash;
use Net::CIDR::Lite; use Net::CIDR::Lite;
our @ISA = qw(Exporter); our @ISA = qw(Exporter);
our @EXPORT = qw(&isBetween &makeTabSafe &makeArrayTabSafe &randomizeHash &randomizeArray &isInSubnet our @EXPORT = qw(&makeTabSafe &makeArrayTabSafe &randomizeHash &randomizeArray &isInSubnet
&sortHashDescending &sortHash &isIn &makeCommaSafe &makeArrayCommaSafe &randint &round &scalarEquals &sortHashDescending &sortHash &isIn &makeCommaSafe &makeArrayCommaSafe &randint &round &scalarEquals
); );
@ -38,7 +38,6 @@ This package provides miscellaneous but useful utilities to the WebGUI programme
=head1 SYNOPSIS =head1 SYNOPSIS
use WebGUI::Utility; use WebGUI::Utility;
$boolean = isBetween($value, $first, $second);
$boolean = isIn($value, @array); $boolean = isIn($value, @array);
$boolean = isInSubnet($ip, \@subnets); $boolean = isInSubnet($ip, \@subnets);
makeArrayCommaSafe(\@array); makeArrayCommaSafe(\@array);
@ -59,39 +58,6 @@ These subroutines are available from this package:
#------------------------------------------------------------------- #-------------------------------------------------------------------
=head2 isBetween ( value, first, second )
Returns true if value is between two other values (inclusive). Otherwise returns false.
=head3 value
An integer to compare against first and second.
=head3 first
An integer to compare value against.
=head3 second
Another integer to compare value against.
=cut
sub isBetween {
my $value = shift;
my $first = shift;
my $second = shift;
if ($first > $second) {
($first,$second) = ($second,$first);
}
if ($value >= $first && $value <= $second) {
return 1;
}
return 0;
}
#-------------------------------------------------------------------
=head2 isIn ( value, list ) =head2 isIn ( value, list )
Returns a boolean value as to whether the value is in the array. Returns a boolean value as to whether the value is in the array.

8
t/Utility.t
View file

@ -22,14 +22,6 @@ use Test::Deep;
my $session = WebGUI::Test->session; my $session = WebGUI::Test->session;
# isBetween
ok(WebGUI::Utility::isBetween(0,-1,1), 'isBetween() - negative and positive range');
ok(WebGUI::Utility::isBetween(0,1,-1), 'isBetween() - negative and positive range, reversed');
ok(WebGUI::Utility::isBetween(11,1,15), 'isBetween() - positive range');
ok(WebGUI::Utility::isBetween(-5,-10,-2), 'isBetween() - negative range');
ok(!WebGUI::Utility::isBetween(+5,-10,-2), 'isBetween() - not in range on high side');
ok(!WebGUI::Utility::isBetween(-15,-10,-2), 'isBetween() - not in range on low side');
# isIn # isIn
ok(WebGUI::Utility::isIn("webgui", qw(cars trucks webgui trains)), 'isIn()'); ok(WebGUI::Utility::isIn("webgui", qw(cars trucks webgui trains)), 'isIn()');