--- rat/lonuserstate.pm 2007/08/28 01:09:14 1.121 +++ rat/lonuserstate.pm 2008/12/19 03:58:24 1.130 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Construct and maintain state and binary representation of course for user # -# $Id: lonuserstate.pm,v 1.121 2007/08/28 01:09:14 albertel Exp $ +# $Id: lonuserstate.pm,v 1.130 2008/12/19 03:58:24 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -56,6 +56,7 @@ my $retfrid; # variable with the very fi my $retfurl; # first URL my %randompick; # randomly picked resources my %randompickseed; # optional seed for randomly picking resources +my %randomorder; # maps to order contents randomly my %encurl; # URLs in this folder are supposed to be encrypted my %hiddenurl; # this URL (or complete folder) is supposed to be hidden @@ -106,7 +107,7 @@ sub processversionfile { # --------------------------------------------------------- Loads map from disk sub loadmap { - my $uri=shift; + my ($uri,$parent_rid)=@_; if ($hash{'map_pc_'.$uri}) { $errtext.='
'.
&mt('Multiple use of sequence/page [_1]! The course will not function properly.',''.$uri.'').
@@ -131,194 +132,85 @@ sub loadmap {
my $instr=&Apache::lonnet::getfile($fn);
- unless ($instr eq -1) {
+ if ($instr eq -1) {
+ $errtext.=&mt('
Map not loaded: The file [_1] does not exist.',$fn);
+ return;
+ }
# Successfully got file, parse it
- my $parser = HTML::TokeParser->new(\$instr);
- $parser->attr_encoded(1);
- my $token;
-
- my $linkpc=0;
-
- $fn=~/\.(\w+)$/;
-
- $hash{'map_type_'.$lpc}=$1;
-
- while ($token = $parser->get_token) {
- if ($token->[0] eq 'S') {
- if ($token->[1] eq 'resource') {
-# -------------------------------------------------------------------- Resource
- if ($token->[2]->{'type'} eq 'zombie') { next; }
- my $rid=$lpc.'.'.$token->[2]->{'id'};
-
- $hash{'kind_'.$rid}='res';
- $hash{'title_'.$rid}=$token->[2]->{'title'};
- my $turi=&versiontrack($token->[2]->{'src'});
- if ($token->[2]->{'version'}) {
- unless ($hash{'version_'.$turi}) {
- $hash{'version_'.$turi}=$1;
- }
- }
- my $title=$token->[2]->{'title'};
- $title=~s/\&colon\;/\:/gs;
-# my $symb=&Apache::lonnet::encode_symb($uri,
-# $token->[2]->{'id'},
-# $turi);
-# &Apache::lonnet::do_cache_new('title',$symb,$title);
- unless ($ispage) {
- $turi=~/\.(\w+)$/;
- my $embstyle=&Apache::loncommon::fileembstyle($1);
- if ($token->[2]->{'external'} eq 'true') { # external
- $turi=~s/^http\:\/\//\/adm\/wrapper\/ext\//;
- } elsif ($turi=~/^\/*uploaded\//) { # uploaded
- if (($embstyle eq 'img')
- || ($embstyle eq 'emb')
- || ($embstyle eq 'wrp')) {
- $turi='/adm/wrapper'.$turi;
- } elsif ($embstyle eq 'ssi') {
- #do nothing with these
- } elsif ($turi!~/\.(sequence|page)$/) {
- $turi='/adm/coursedocs/showdoc'.$turi;
- }
- } elsif ($turi=~/\S/) { # normal non-empty internal resource
- my $mapdir=$uri;
- $mapdir=~s/[^\/]+$//;
- $turi=&Apache::lonnet::hreflocation($mapdir,$turi);
- if (($embstyle eq 'img')
- || ($embstyle eq 'emb')
- || ($embstyle eq 'wrp')) {
- $turi='/adm/wrapper'.$turi;
- }
- }
- }
-# Store reverse lookup, remove query string
- my $idsuri=$turi;
- $idsuri=~s/\?.+$//;
- if (defined($hash{'ids_'.$idsuri})) {
- $hash{'ids_'.$idsuri}.=','.$rid;
- } else {
- $hash{'ids_'.$idsuri}=''.$rid;
- }
-
- if ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard)$/) {
- $turi.='?register=1';
- }
+ my $parser = HTML::TokeParser->new(\$instr);
+ $parser->attr_encoded(1);
+ # first get all parameters
+ while (my $token = $parser->get_token) {
+ next if ($token->[0] ne 'S');
+ if ($token->[1] eq 'param') {
+ &parse_param($token,$lpc);
+ }
+ }
+ #reset parser
+ $parser = HTML::TokeParser->new(\$instr);
+ $parser->attr_encoded(1);
- $hash{'src_'.$rid}=$turi;
+ my $linkpc=0;
- if ($token->[2]->{'external'} eq 'true') {
- $hash{'ext_'.$rid}='true:';
- } else {
- $hash{'ext_'.$rid}='false:';
- }
- if ($token->[2]->{'type'}) {
- $hash{'type_'.$rid}=$token->[2]->{'type'};
- if ($token->[2]->{'type'} eq 'start') {
- $hash{'map_start_'.$uri}="$rid";
- }
- if ($token->[2]->{'type'} eq 'finish') {
- $hash{'map_finish_'.$uri}="$rid";
- }
- } else {
- $hash{'type_'.$rid}='normal';
- }
-
- if (($turi=~/\.sequence$/) ||
- ($turi=~/\.page$/)) {
- $hash{'is_map_'.$rid}=1;
- &loadmap($turi);
- }
-
- } elsif ($token->[1] eq 'condition') {
-# ------------------------------------------------------------------- Condition
+ $fn=~/\.(\w+)$/;
- my $rid=$lpc.'.'.$token->[2]->{'id'};
+ $hash{'map_type_'.$lpc}=$1;
- $hash{'kind_'.$rid}='cond';
- $cond[$#cond+1]=$token->[2]->{'value'};
- $hash{'condid_'.$rid}=$#cond;
- if ($token->[2]->{'type'}) {
- $cond[$#cond].=':'.$token->[2]->{'type'};
- } else {
- $cond[$#cond].=':normal';
- }
+ my $randomize = ($randomorder{$parent_rid} =~ /^yes$/i);
- } elsif ($token->[1] eq 'link') {
+ my @map_ids;
+ while (my $token = $parser->get_token) {
+ next if ($token->[0] ne 'S');
+ if ($token->[1] eq 'resource') {
+ push(@map_ids,&parse_resource($token,$lpc,$ispage,$uri));
+ } elsif ($token->[1] eq 'link' && !$randomize) {
# ----------------------------------------------------------------------- Links
+ &make_link(++$linkpc,$lpc,$token->[2]->{'to'},
+ $token->[2]->{'from'},
+ $token->[2]->{'condition'});
+ } elsif ($token->[1] eq 'condition' && !$randomize) {
+ &parse_condition($token,$lpc);
+ }
+ }
- $linkpc++;
- my $linkid=$lpc.'.'.$linkpc;
-
- my $goesto=$lpc.'.'.$token->[2]->{'to'};
- my $comesfrom=$lpc.'.'.$token->[2]->{'from'};
- my $undercond=0;
-
- if ($token->[2]->{'condition'}) {
- $undercond=$lpc.'.'.$token->[2]->{'condition'};
- }
-
- $hash{'goesto_'.$linkid}=$goesto;
- $hash{'comesfrom_'.$linkid}=$comesfrom;
- $hash{'undercond_'.$linkid}=$undercond;
-
- if (defined($hash{'to_'.$comesfrom})) {
- $hash{'to_'.$comesfrom}.=','.$linkid;
- } else {
- $hash{'to_'.$comesfrom}=''.$linkid;
- }
- if (defined($hash{'from_'.$goesto})) {
- $hash{'from_'.$goesto}.=','.$linkid;
- } else {
- $hash{'from_'.$goesto}=''.$linkid;
- }
- } elsif ($token->[1] eq 'param') {
-# ------------------------------------------------------------------- Parameter
-
- my $referid=$lpc.'.'.$token->[2]->{'to'};
- my $name=$token->[2]->{'name'};
- my $part;
- if ($name=~/^parameter_(.*)_/) {
- $part=$1;
- } else {
- $part=0;
- }
- $name=~s/^.*_([^_]*)$/$1/;
- my $newparam=
- &escape($token->[2]->{'type'}).':'.
- &escape($part.'.'.$name).'='.
- &escape($token->[2]->{'value'});
- if (defined($hash{'param_'.$referid})) {
- $hash{'param_'.$referid}.='&'.$newparam;
- } else {
- $hash{'param_'.$referid}=''.$newparam;
- }
- if ($token->[2]->{'name'}=~/^parameter_(0_)*randompick$/) {
- $randompick{$referid}=$token->[2]->{'value'};
- }
- if ($token->[2]->{'name'}=~/^parameter_(0_)*randompickseed$/) {
- $randompickseed{$referid}=$token->[2]->{'value'};
- }
- if ($token->[2]->{'name'}=~/^parameter_(0_)*encrypturl$/) {
- if ($token->[2]->{'value'}=~/^yes$/i) {
- $encurl{$referid}=1;
- }
- }
- if ($token->[2]->{'name'}=~/^parameter_(0_)*hiddenresource$/) {
- if ($token->[2]->{'value'}=~/^yes$/i) {
- $hiddenurl{$referid}=1;
- }
- }
- }
+ if ($randomize) {
+ if (!$env{'request.role.adv'}) {
+ my $seed;
+ if (defined($randompickseed{$parent_rid})) {
+ $seed = $randompickseed{$parent_rid};
+ } else {
+ my ($mapid,$resid)=split(/\./,$parent_rid);
+ my $symb=
+ &Apache::lonnet::encode_symb($hash{'map_id_'.$mapid},
+ $resid,$hash{'src_'.$parent_rid});
- }
- }
+ $seed = $symb;
+ }
+
+ my $rndseed=&Apache::lonnet::rndseed($seed);
+ &Apache::lonnet::setup_random_from_rndseed($rndseed);
+ @map_ids=&Math::Random::random_permutation(@map_ids);
+ }
+ my $from = shift(@map_ids);
+ my $from_rid = $lpc.'.'.$from;
+ $hash{'map_start_'.$uri} = $from_rid;
+ $hash{'type_'.$from_rid}='start';
- } else {
- $errtext.=&mt('
Map not loaded: The file [_1] does not exist.',$fn);
+ while (my $to = shift(@map_ids)) {
+ &make_link(++$linkpc,$lpc,$to,$from);
+ my $to_rid = $lpc.'.'.$to;
+ $hash{'type_'.$to_rid}='normal';
+ $from = $to;
+ $from_rid = $to_rid;
+ }
+
+ $hash{'map_finish_'.$uri}= $from_rid;
+ $hash{'type_'.$from_rid}='finish';
}
- my $parser = HTML::TokeParser->new(\$instr);
+ $parser = HTML::TokeParser->new(\$instr);
$parser->attr_encoded(1);
# last parse out the mapalias params so as to ignore anything
# refering to non-existant resources
@@ -330,12 +222,189 @@ sub loadmap {
}
}
+
+# -------------------------------------------------------------------- Resource
+sub parse_resource {
+ my ($token,$lpc,$ispage,$uri) = @_;
+ if ($token->[2]->{'type'} eq 'zombie') { next; }
+ my $rid=$lpc.'.'.$token->[2]->{'id'};
+
+ $hash{'kind_'.$rid}='res';
+ $hash{'title_'.$rid}=$token->[2]->{'title'};
+ my $turi=&versiontrack($token->[2]->{'src'});
+ if ($token->[2]->{'version'}) {
+ unless ($hash{'version_'.$turi}) {
+ $hash{'version_'.$turi}=$1;
+ }
+ }
+ my $title=$token->[2]->{'title'};
+ $title=~s/\&colon\;/\:/gs;
+# my $symb=&Apache::lonnet::encode_symb($uri,
+# $token->[2]->{'id'},
+# $turi);
+# &Apache::lonnet::do_cache_new('title',$symb,$title);
+ unless ($ispage) {
+ $turi=~/\.(\w+)$/;
+ my $embstyle=&Apache::loncommon::fileembstyle($1);
+ if ($token->[2]->{'external'} eq 'true') { # external
+ $turi=~s/^https?\:\/\//\/adm\/wrapper\/ext\//;
+ } elsif ($turi=~/^\/*uploaded\//) { # uploaded
+ if (($embstyle eq 'img')
+ || ($embstyle eq 'emb')
+ || ($embstyle eq 'wrp')) {
+ $turi='/adm/wrapper'.$turi;
+ } elsif ($embstyle eq 'ssi') {
+ #do nothing with these
+ } elsif ($turi!~/\.(sequence|page)$/) {
+ $turi='/adm/coursedocs/showdoc'.$turi;
+ }
+ } elsif ($turi=~/\S/) { # normal non-empty internal resource
+ my $mapdir=$uri;
+ $mapdir=~s/[^\/]+$//;
+ $turi=&Apache::lonnet::hreflocation($mapdir,$turi);
+ if (($embstyle eq 'img')
+ || ($embstyle eq 'emb')
+ || ($embstyle eq 'wrp')) {
+ $turi='/adm/wrapper'.$turi;
+ }
+ }
+ }
+# Store reverse lookup, remove query string
+ my $idsuri=$turi;
+ $idsuri=~s/\?.+$//;
+ if (defined($hash{'ids_'.$idsuri})) {
+ $hash{'ids_'.$idsuri}.=','.$rid;
+ } else {
+ $hash{'ids_'.$idsuri}=''.$rid;
+ }
+
+ if ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard)$/) {
+ $turi.='?register=1';
+ }
+
+ $hash{'src_'.$rid}=$turi;
+
+ if ($token->[2]->{'external'} eq 'true') {
+ $hash{'ext_'.$rid}='true:';
+ } else {
+ $hash{'ext_'.$rid}='false:';
+ }
+ if ($token->[2]->{'type'}) {
+ $hash{'type_'.$rid}=$token->[2]->{'type'};
+ if ($token->[2]->{'type'} eq 'start') {
+ $hash{'map_start_'.$uri}="$rid";
+ }
+ if ($token->[2]->{'type'} eq 'finish') {
+ $hash{'map_finish_'.$uri}="$rid";
+ }
+ } else {
+ $hash{'type_'.$rid}='normal';
+ }
+
+ if (($turi=~/\.sequence$/) ||
+ ($turi=~/\.page$/)) {
+ $hash{'is_map_'.$rid}=1;
+ &loadmap($turi,$rid);
+ }
+ return $token->[2]->{'id'};
+}
+
+sub make_link {
+ my ($linkpc,$lpc,$to,$from,$condition) = @_;
+
+ my $linkid=$lpc.'.'.$linkpc;
+ my $goesto=$lpc.'.'.$to;
+ my $comesfrom=$lpc.'.'.$from;
+ my $undercond=0;
+
+ if ($condition) {
+ $undercond=$lpc.'.'.$condition;
+ }
+
+ $hash{'goesto_'.$linkid}=$goesto;
+ $hash{'comesfrom_'.$linkid}=$comesfrom;
+ $hash{'undercond_'.$linkid}=$undercond;
+
+ if (defined($hash{'to_'.$comesfrom})) {
+ $hash{'to_'.$comesfrom}.=','.$linkid;
+ } else {
+ $hash{'to_'.$comesfrom}=''.$linkid;
+ }
+ if (defined($hash{'from_'.$goesto})) {
+ $hash{'from_'.$goesto}.=','.$linkid;
+ } else {
+ $hash{'from_'.$goesto}=''.$linkid;
+ }
+}
+
+# ------------------------------------------------------------------- Condition
+sub parse_condition {
+ my ($token,$lpc) = @_;
+ my $rid=$lpc.'.'.$token->[2]->{'id'};
+
+ $hash{'kind_'.$rid}='cond';
+
+ my $condition = $token->[2]->{'value'};
+ $condition =~ s/[\n\r]+/ /gs;
+ push(@cond, $condition);
+ $hash{'condid_'.$rid}=$#cond;
+ if ($token->[2]->{'type'}) {
+ $cond[$#cond].=':'.$token->[2]->{'type'};
+ } else {
+ $cond[$#cond].=':normal';
+ }
+}
+
+# ------------------------------------------------------------------- Parameter
+
+sub parse_param {
+ my ($token,$lpc) = @_;
+ my $referid=$lpc.'.'.$token->[2]->{'to'};
+ my $name=$token->[2]->{'name'};
+ my $part;
+ if ($name=~/^parameter_(.*)_/) {
+ $part=$1;
+ } else {
+ $part=0;
+ }
+ $name=~s/^.*_([^_]*)$/$1/;
+ my $newparam=
+ &escape($token->[2]->{'type'}).':'.
+ &escape($part.'.'.$name).'='.
+ &escape($token->[2]->{'value'});
+ if (defined($hash{'param_'.$referid})) {
+ $hash{'param_'.$referid}.='&'.$newparam;
+ } else {
+ $hash{'param_'.$referid}=''.$newparam;
+ }
+ if ($token->[2]->{'name'}=~/^parameter_(0_)*randompick$/) {
+ $randompick{$referid}=$token->[2]->{'value'};
+ }
+ if ($token->[2]->{'name'}=~/^parameter_(0_)*randompickseed$/) {
+ $randompickseed{$referid}=$token->[2]->{'value'};
+ }
+ if ($token->[2]->{'name'}=~/^parameter_(0_)*randomorder$/) {
+ $randomorder{$referid}=$token->[2]->{'value'};
+ }
+ if ($token->[2]->{'name'}=~/^parameter_(0_)*encrypturl$/) {
+ if ($token->[2]->{'value'}=~/^yes$/i) {
+ $encurl{$referid}=1;
+ }
+ }
+ if ($token->[2]->{'name'}=~/^parameter_(0_)*hiddenresource$/) {
+ if ($token->[2]->{'value'}=~/^yes$/i) {
+ $hiddenurl{$referid}=1;
+ }
+ }
+}
+
sub parse_mapalias_param {
my ($token,$lpc) = @_;
my $referid=$lpc.'.'.$token->[2]->{'to'};
return if (!exists($hash{'src_'.$referid}));
if ($token->[2]->{'name'}=~/^parameter_(0_)*mapalias$/) {
+ &count_mapalias($token->[2]->{'value'},$referid);
$hash{'mapalias_'.$token->[2]->{'value'}}=$referid;
}
}
@@ -402,7 +471,8 @@ sub traceroute {
if (defined($hash{'map_start_'.$hash{'src_'.$rid}})) {
$sofar=$newsofar=
&traceroute($sofar,
- $hash{'map_start_'.$hash{'src_'.$rid}},'&',
+ $hash{'map_start_'.$hash{'src_'.$rid}},
+ $beenhere,
$encflag || $encurl{$rid},
$hdnflag || $hiddenurl{$rid});
}
@@ -504,7 +574,7 @@ sub accinit {
my $courseuri=$uri;
$courseuri=~s/^\/res\///;
&Apache::lonnet::delenv('(acc\.|httpref\.)');
- &Apache::lonnet::appenv(%acchash);
+ &Apache::lonnet::appenv(\%acchash);
}
# ---------------- Selectively delete from randompick maps and hidden url parms
@@ -560,7 +630,7 @@ sub hiddenurls {
}
# --------------------------------------- append randomout entry to environment
if ($randomoutentry) {
- &Apache::lonnet::appenv('acc.randomout' => $randomoutentry);
+ &Apache::lonnet::appenv({'acc.randomout' => $randomoutentry});
}
}
@@ -599,22 +669,24 @@ sub readmap {
%parmhash=();
$errtext='';
$pc=0;
+ &clear_mapalias_count();
&processversionfile(%cenv);
my $furi=&Apache::lonnet::clutter($uri);
$hash{'src_0.0'}=&versiontrack($furi);
$hash{'title_0.0'}=&Apache::lonnet::metadata($uri,'title');
$hash{'ids_'.$furi}='0.0';
$hash{'is_map_0.0'}=1;
- loadmap($uri);
+ loadmap($uri,'0.0');
if (defined($hash{'map_start_'.$uri})) {
- &Apache::lonnet::appenv("request.course.id" => $short,
- "request.course.fn" => $fn,
- "request.course.uri" => $uri);
+ &Apache::lonnet::appenv({"request.course.id" => $short,
+ "request.course.fn" => $fn,
+ "request.course.uri" => $uri});
$env{'request.course.id'}=$short;
&traceroute('0',$hash{'map_start_'.$uri},'&');
&accinit($uri,$short,$fn);
&hiddenurls();
}
+ $errtext .= &get_mapalias_errors();
# ------------------------------------------------------- Put versions into src
foreach my $key (keys(%hash)) {
if ($key=~/^src_/) {
@@ -679,9 +751,9 @@ sub readmap {
(tie(%hash,'GDBM_File',"$fn.db",&GDBM_READER(),0640))) {
if (tie(%parmhash,'GDBM_File',$fn.'_parms.db',&GDBM_READER(),0640)) {
$retfurl='/adm/navmaps';
- &Apache::lonnet::appenv("request.course.id" => $short,
- "request.course.fn" => $fn,
- "request.course.uri" => $uri);
+ &Apache::lonnet::appenv({"request.course.id" => $short,
+ "request.course.fn" => $fn,
+ "request.course.uri" => $uri});
untie(%hash);
untie(%parmhash);
last;
@@ -742,10 +814,47 @@ sub evalstate {
}
}
}
- &Apache::lonnet::appenv('user.state.'.$env{'request.course.id'} => $state);
+ &Apache::lonnet::appenv({'user.state.'.$env{'request.course.id'} => $state});
return $state;
}
+{
+ my %mapalias_cache;
+ sub count_mapalias {
+ my ($value,$resid) = @_;
+ push(@{ $mapalias_cache{$value} }, $resid);
+ }
+
+ sub get_mapalias_errors {
+ my $error_text;
+ foreach my $mapalias (sort(keys(%mapalias_cache))) {
+ next if (scalar(@{ $mapalias_cache{$mapalias} } ) == 1);
+ my $count;
+ my $which =
+ join('