--- loncom/interface/Attic/lonchart.pm 2002/03/02 01:44:00 1.36 +++ loncom/interface/Attic/lonchart.pm 2002/05/09 17:06:09 1.38 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # (Publication Handler # -# $Id: lonchart.pm,v 1.36 2002/03/02 01:44:00 minaeibi Exp $ +# $Id: lonchart.pm,v 1.38 2002/05/09 17:06:09 www Exp $ # # Copyright Michigan State University Board of Trustees # @@ -120,9 +120,10 @@ sub ExtractStudentData { } } - my $Prob = &Apache::lonnet::declutter( $hash{'map_id_'.$1} ). + my $Prob = &Apache::lonnet::symbclean( + &Apache::lonnet::declutter( $hash{'map_id_'.$1} ). '___'.$2.'___'. - &Apache::lonnet::declutter( $hash{'src_'.$ResId} ); + &Apache::lonnet::declutter( $hash{'src_'.$ResId} )); $Code=' '; $Tries = 0; $LatestVersion = $result{"version:$Prob"}; @@ -148,7 +149,11 @@ sub ExtractStudentData { $TempHash{"$Part.Code"} = $Code; } } - } + } +# Actually append problem to output (all parts) + $Str.=''; for ( my $n = 0; $n < $PartNo; $n++ ) { my $part = $TempHash{$n}; my $Code = $TempHash{"$part.Code"}; @@ -163,6 +168,7 @@ sub ExtractStudentData { $Str .= $TempHash{"$part.Code"}; if ( $Code ne 'x' ) {$ProbTotal++;} } + $Str.=''; } else { for(my $n=0; $n<$PartNo; $n++) { @@ -223,35 +229,6 @@ sub tracetable { } } - -sub usection2 { - my ($udom,$unam,$courseid,$ActiveFlag)=@_; - $courseid=~s/\_/\//g; - $courseid=~s/^(\w)/\/$1/; - foreach my $elem(split(/\&/,&Apache::lonnet::reply('dump:'.$udom.':'.$unam.':roles', - &Apache::lonnet::homeserver($unam,$udom)))) { - my ($key,$value)=split(/\=/,$elem); - $key=&Apache::lonnet::unescape($key); - if ($key=~/^$courseid(?:\/)*(\w+)*\_st$/) { - my $section=$1; - if ($key eq $courseid.'_st') { $section=''; } - my ($dummy,$end,$start)=split(/\_/,&Apache::lonnet::unescape($value)); - my $now=time; - my $notactive=0; - if ($start) { - if ($now<$start) { $notactive=1; } - } - if ($end) { - if ($now>$end) { $notactive=1; } - } - if ($ActiveFlag == 1) { $notactive=0; } - unless ($notactive) { return $section; } - } - } - return '-1'; -} - - sub usection { my ($udom,$unam,$courseid,$ActiveFlag)=@_; $courseid=~s/\_/\//g;