rat/lonuserstate.pm - diff

Return to lonuserstate.pm CVS log

Up to [LON-CAPA] / rat

Diff for /rat/lonuserstate.pm between versions 1.100 and 1.102

version 1.100, 2006/02/10 22:33:42	version 1.102, 2006/02/22 22:36:34
Line 318 sub loadmap {	Line 318 sub loadmap {

sub simplify {	sub simplify {
my $expression=shift;	my $expression=shift;
	# (0&1) = 1
	$expression=~s/$0\&(\d+)$/$1/g;
# (8)=8	# (8)=8
$expression=~s/$(\d+)$/$1/g;	$expression=~s/$(\d+)$/$1/g;
# 8&8=8	# 8&8=8
Line 327 sub simplify {	Line 329 sub simplify {
# (5&3)&4=5&3&4	# (5&3)&4=5&3&4
$expression=~s/$(\d+)((?:\&\d+)+)$\&(\d+\D)/$1$2\&$3/g;	$expression=~s/$(\d+)((?:\&\d+)+)$\&(\d+\D)/$1$2\&$3/g;
# (((5&3)\|(4&6)))=((5&3)\|(4&6))	# (((5&3)\|(4&6)))=((5&3)\|(4&6))
$expression=~	# $expression=~
s/$(\(\(\d+(?:\&\d+)$(?:\\|$\d+(?:\&\d+)$)+\))\)/$1/g;	# s/$(\(\(\d+(?:\&\d+)$(?:\\|$\d+(?:\&\d+)$)+\))\)/$1/g;
# ((5&3)\|(4&6))\|(1&2)=(5&3)\|(4&6)\|(1&2)	# ((5&3)\|(4&6))\|(1&2)=(5&3)\|(4&6)\|(1&2)
$expression=~	$expression=~
s/$(\(\d+(?:\&\d+)$)((?:\\|$\d+(?:\&\d+)$)+)\)\\|($\d+(?:\&\d+)*$)/$$1$2\\|$3$/g;	s/$(\(\d+(?:\&\d+)$)((?:\\|$\d+(?:\&\d+)$)+)\)\\|($\d+(?:\&\d+)*$)/$$1$2\\|$3$/g;
Line 362 sub traceroute {	Line 364 sub traceroute {
}	}
if (defined($hash{'conditions_'.$rid})) {	if (defined($hash{'conditions_'.$rid})) {
$hash{'conditions_'.$rid}=simplify(	$hash{'conditions_'.$rid}=simplify(
'('.$hash{'conditions_'.$rid}.')\|('.$sofar.')');	'('.'conditions_'.$rid.')\|('.$sofar.')');
} else {	} else {
$hash{'conditions_'.$rid}=$sofar;	$hash{'conditions_'.$rid}=$sofar;
}	}
$newsofar=$hash{'conditions_'.$rid};	$newsofar='conditions_'.$rid;
if (defined($hash{'is_map_'.$rid})) {	if (defined($hash{'is_map_'.$rid})) {
if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) {	if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) {
$sofar=$newsofar=	$sofar=$newsofar=

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.100
changed lines
	Added in v.1.102