--- loncom/interface/loncoursedata.pm 2003/02/14 21:02:05 1.47 +++ loncom/interface/loncoursedata.pm 2003/02/28 23:19:01 1.54 @@ -1,7 +1,6 @@ # The LearningOnline Network with CAPA -# (Publication Handler # -# $Id: loncoursedata.pm,v 1.47 2003/02/14 21:02:05 matthew Exp $ +# $Id: loncoursedata.pm,v 1.54 2003/02/28 23:19:01 bowersj2 Exp $ # # Copyright Michigan State University Board of Trustees # @@ -120,9 +119,10 @@ sub DownloadClasslist { my ($courseDomain,$courseNumber)=split(/\_/,$courseID); my %classlist; - my $modifiedTime = &Apache::lonnet::GetFileTimestamp($courseDomain, $courseNumber, + my $modifiedTime = &Apache::lonnet::GetFileTimestamp($courseDomain, + $courseNumber, 'classlist.db', - $Apache::lonnet::perlvar{'lonUsersDir'}); + $Apache::lonnet::perlvar{'lonUsersDir'}); # Always download the information if lastDownloadTime is set to # Not downloaded, otherwise it is only downloaded if the file @@ -261,7 +261,8 @@ with stopping downloading then can not t # ----- PROCESSING FUNCTIONS --------------------------------------- - +#################################################### +#################################################### =pod @@ -278,19 +279,24 @@ The returned structure is a hash referen symb => 'symb', source => '/s/o/u/r/c/e', type => (container|assessment), - contents => [ {},{},{},{} ], # only for container + num_assess => 2, # only for container parts => [11,13,15], # only for assessment - response_ids => [12,14,16] # only for assessment + response_ids => [12,14,16], # only for assessment + contents => [........] # only for container } $hash->{'contents'} is a reference to an array of hashes of the same structure. +Also returned are array references to the sequences and assessments contained +in the course. + + =cut +#################################################### +#################################################### sub get_sequence_assessment_data { - return undef; my $fn=$ENV{'request.course.fn'}; - &Apache::lonnet::logthis('filename = '.$fn); ## ## use navmaps my $navmap = Apache::lonnavmaps::navmap->new($fn.".db",$fn."_parms.db", @@ -305,32 +311,37 @@ sub get_sequence_assessment_data { ## We are going to loop until we run out of sequences/pages to explore for ## resources. This means we have to start out with something to look ## at. - my $curRes = $iterator->next(); # BEGIN_MAP - $curRes = $iterator->next(); # The sequence itself - # - my $title = $curRes->title(); - my $symb = $curRes->symb(); - my $src = $curRes->src(); + my $title = $ENV{'course.'.$ENV{'request.course.id'}.'.description'}; + my $symb = 'top'; + my $src = 'not applicable'; # + my @Sequences; + my @Assessments; my @Nested_Sequences = (); # Stack of sequences, keeps track of depth my $top = { title => $title, + src => $src, symb => $symb, type => 'container', num_assess => 0, + num_assess_parts => 0, contents => [], }; + push (@Sequences,$top); push (@Nested_Sequences, $top); # # We need to keep track of which sequences contain homework problems # + my $previous; + my $curRes = $iterator->next(); # BEGIN_MAP + $curRes = $iterator->next(); # The first item in the top level map. while (scalar(@Nested_Sequences)) { + $previous = $curRes; $curRes = $iterator->next(); my $currentmap = $Nested_Sequences[-1]; # Last one on the stack if ($curRes == $iterator->BEGIN_MAP()) { # get the map itself, instead of BEGIN_MAP - $curRes = $iterator->next(); - $title = $curRes->title(); - $symb = $curRes->symb(); - $src = $curRes->src(); + $title = $previous->title(); + $symb = $previous->symb(); + $src = $previous->src(); my $newmap = { title => $title, src => $src, symb => $symb, @@ -339,6 +350,7 @@ sub get_sequence_assessment_data { contents => [], }; push (@{$currentmap->{'contents'}},$newmap); # this is permanent + push (@Sequences,$newmap); push (@Nested_Sequences, $newmap); # this is a stack next; } @@ -347,7 +359,7 @@ sub get_sequence_assessment_data { next; } next if (! ref($curRes)); - next if (! $curRes->is_problem() && !$curRes->randomout); + next if (! $curRes->is_problem());# && !$curRes->randomout); # Okay, from here on out we only deal with assessments $title = $curRes->title(); $symb = $curRes->symb(); @@ -357,13 +369,20 @@ sub get_sequence_assessment_data { src => $src, symb => $symb, type => 'assessment', + parts => $parts, + num_parts => scalar(@$parts), }; + push(@Assessments,$assessment); push(@{$currentmap->{'contents'}},$assessment); $currentmap->{'num_assess'}++; + $currentmap->{'num_assess_parts'}+= scalar(@$parts); } - return $top; + return ($top,\@Sequences,\@Assessments); } +################################################# +################################################# + =pod =item &ProcessTopResourceMap() @@ -1611,13 +1630,13 @@ sub get_current_state { my $value = join(':',map { &Apache::lonnet::escape($_); } @Parameters); # Store away the values - $cache{$key.&Apache::lonnet::escape($symb)}=$value; + $cache{$key.&Apache::lonnet::escape($current_symb)}=$value; } $cache{$key.'time'}=$time_of_retrieval; untie(%cache); } } else { -# &Apache::lonnet::logthis('retrieving cached data '); + &Apache::lonnet::logthis('retrieving cached data '); if (tie(%cache,'GDBM_File',$cachefilename,&GDBM_READER(),0640)) { if (defined($symb)) { my $searchkey = $key.&Apache::lonnet::escape($symb); @@ -1628,7 +1647,10 @@ sub get_current_state { my $searchkey = '^'.$key.'(.*)$';#' while (my ($testkey,$params)=each(%cache)) { if ($testkey =~ /$searchkey/) { # \Q \E? May be necc. - $student_data{&Apache::lonnet::unescape($1)} = + my $tmpsymb = $1; + next if ($tmpsymb =~ 'time'); +# &Apache::lonnet::logthis('found '.$tmpsymb.':'); + $student_data{&Apache::lonnet::unescape($tmpsymb)} = &make_into_hash($params); } } @@ -1665,13 +1687,26 @@ $ENV{'course.'.$cid.'.domain'}, and $ENV Returns a reference to a hash which contains: keys '$sname:$sdom' - values [$end,$start,$id,$section,$fullname] + values [$sdom,$sname,$end,$start,$id,$section,$fullname,$status] + +The constant values CL_SDOM, CL_SNAME, CL_END, etc. can be used +as indices into the returned list to future-proof clients against +changes in the list order. =cut ################################################ ################################################ +sub CL_SDOM { return 0; } +sub CL_SNAME { return 1; } +sub CL_END { return 2; } +sub CL_START { return 3; } +sub CL_ID { return 4; } +sub CL_SECTION { return 5; } +sub CL_FULLNAME { return 6; } +sub CL_STATUS { return 7; } + sub get_classlist { my ($cid,$cdom,$cnum) = @_; $cid = $cid || $ENV{'request.course.id'};