version 1.3, 2011/10/06 10:56:49
|
version 1.4, 2011/10/07 12:01:51
|
Line 95 my %cenv; # Course environment.
|
Line 95 my %cenv; # Course environment.
|
|
|
sub simplify { |
sub simplify { |
my $expression=shift; |
my $expression=shift; |
my $prior = ''; # This is safe as a null expression is pretty optimal. |
|
|
|
while ($prior ne $expression) { |
|
$prior = $expression; # Stop when the substitutions below do nothing. |
|
# (0&1) = 1 |
# (0&1) = 1 |
$expression=~s/\(0\&([_\.\d]+)\)/$1/g; |
$expression=~s/\(0\&([_\.\d]+)\)/$1/g; |
# (8)=8 |
# (8)=8 |
Line 115 sub simplify {
|
Line 112 sub simplify {
|
# ((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; |
} |
|
|
|
return $expression; |
return $expression; |
} |
} |
|
|
Line 1387 sub loadmap {
|
Line 1385 sub loadmap {
|
%encurl = (); |
%encurl = (); |
%hiddenurl = (); |
%hiddenurl = (); |
%parmhash = (); |
%parmhash = (); |
@cond = (); |
@cond = ('true:normal'); # Initial value for cond 0. |
$retfrid = ''; |
$retfrid = ''; |
$username = ''; |
$username = ''; |
$userdomain = ''; |
$userdomain = ''; |
Line 1417 sub loadmap {
|
Line 1415 sub loadmap {
|
&Apache::lonnet::logthis("lonmap::loadmap failed: $cnum/$cdom - did not get url"); |
&Apache::lonnet::logthis("lonmap::loadmap failed: $cnum/$cdom - did not get url"); |
return; |
return; |
} |
} |
&Apache::lonnet::logthis("Course environment: \n" . Dumper(\%cenv)); |
|
|
|
$course_id = $cdom . '_' . $cnum; # Long course id. |
$course_id = $cdom . '_' . $cnum; # Long course id. |
|
|