rat/lonuserstate.pm - diff

Return to lonuserstate.pm CVS log

Up to [LON-CAPA] / rat

Diff for /rat/lonuserstate.pm between versions 1.106 and 1.111

version 1.106, 2006/02/28 20:56:40	version 1.111, 2006/05/12 00:02:22
Line 368 sub traceroute {	Line 368 sub traceroute {
} else {	} else {
$hash{'conditions_'.$rid}=$sofar;	$hash{'conditions_'.$rid}=$sofar;
}	}
$newsofar='_'.$rid;
	# if the expression is just the 0th condition keep it
	# otherwise leave a pointer to this condition expression
	$newsofar = ($sofar eq '0') ? $sofar : '_'.$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=
Line 409 sub accinit {	Line 413 sub accinit {
foreach my $key (keys(%hash)) {	foreach my $key (keys(%hash)) {
if ($key=~/^conditions/) {	if ($key=~/^conditions/) {
my $expr=$hash{$key};	my $expr=$hash{$key};
	# try to find and factor out common sub-expressions
foreach my $sub ($expr=~m/($\([_\.\d]+(?:\&[_\.\d]+)+$(?:\\|$[_\.\d]+(?:\&[_\.\d]+)+$)+\))/g) {	foreach my $sub ($expr=~m/($\([_\.\d]+(?:\&[_\.\d]+)+$(?:\\|$[_\.\d]+(?:\&[_\.\d]+)+$)+\))/g) {
my $orig=$sub;	my $orig=$sub;
$sub=~/$\(([_\.\d]+\&(:?[_\.\d]+\&))(?:[_\.\d]+\&)+$(?:\\|$\1(?:[_\.\d]+\&*)+$)+\)/;
my $factor=$1;	my ($factor) = ($sub=~/$\(([_\.\d]+\&(:?[_\.\d]+\&))(?:[_\.\d]+\&)+$(?:\\|$\1(?:[_\.\d]+\&*)+$)+\)/);
$sub=~s/$factor//g;	next if (!defined($factor));

	$sub=~s/\Q$factor\E//g;
$sub=~s/^\(/\($factor\(/;	$sub=~s/^\(/\($factor\(/;
$sub.=')';	$sub.=')';
$sub=simplify($sub);	$sub=simplify($sub);
$orig=~s/(\W)/\\$1/g;	$expr=~s/\Q$orig\E/$sub/;
$expr=~s/$orig/$sub/;
}	}
$hash{$key}=$expr;	$hash{$key}=$expr;
unless (defined($captured{$expr})) {	unless (defined($captured{$expr})) {
Line 539 sub hiddenurls {	Line 545 sub hiddenurls {
sub readmap {	sub readmap {
my $short=shift;	my $short=shift;
$short=~s/^\///;	$short=~s/^\///;
my %cenv=&Apache::lonnet::coursedescription($short);	my %cenv=&Apache::lonnet::coursedescription($short,{'freshen_cache'=>1});
my $fn=$cenv{'fn'};	my $fn=$cenv{'fn'};
my $uri;	my $uri;
$short=~s/\//\_/g;	$short=~s/\//\_/g;
Line 586 sub readmap {	Line 592 sub readmap {
}	}
# ------------------------------------------------------- Put versions into src	# ------------------------------------------------------- Put versions into src
foreach my $key (keys(%hash)) {	foreach my $key (keys(%hash)) {
if ($key=~/^src\_/) {	if ($key=~/^src_/) {
$hash{$key}=&putinversion($hash{$key});	$hash{$key}=&putinversion($hash{$key});
	} elsif ($key =~ /^(map_(?:start\|finish\|pc)_)(.*)/) {
	my ($type, $url) = ($1,$2);
	my $value = $hash{$key};
	delete($hash{$key});
	$hash{$type.&putinversion($url)}=$value;
}	}
}	}
# ---------------------------------------------------------------- Encrypt URLs	# ---------------------------------------------------------------- Encrypt URLs

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

Removed from v.1.106
changed lines
	Added in v.1.111