version 1.30, 2004/11/08 15:14:52
|
version 1.35, 2004/12/28 20:28:47
|
Line 86 sub render_resource {
|
Line 86 sub render_resource {
|
($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|); |
($base,undef) = ($resource->{'src'} =~ m|(.*/)[^/]*$|); |
$base = "http://".$ENV{'SERVER_NAME'}.$base; |
$base = "http://".$ENV{'SERVER_NAME'}.$base; |
my $rendered_problem = |
my $rendered_problem = |
&Apache::lonnet::ssi_body($resource->{'src'}); |
&Apache::lonnet::ssi_body($resource->{'src'}.'?symb='.&Apache::lonnet::escape($resource->{'symb'})); |
$rendered_problem =~ s/<\s*form\s*/<nop /g; |
$rendered_problem =~ s/<\s*form\s*/<nop /g; |
$rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g; |
$rendered_problem =~ s|(<\s*/form\s*>)|<\/nop>|g; |
return '<table bgcolor="ffffff"><tr><td>'. |
return '<table bgcolor="ffffff"><tr><td>'. |
Line 149 sub ProblemSelector {
|
Line 149 sub ProblemSelector {
|
if (scalar(@{$partdata->{'ResponseIds'}}) > 1) { |
if (scalar(@{$partdata->{'ResponseIds'}}) > 1) { |
$seq_str .= &mt('response').' '.$respid; |
$seq_str .= &mt('response').' '.$respid; |
} |
} |
|
my $link = $res->{'src'}.'?symb='. |
|
&Apache::lonnet::escape($res->{'symb'}); |
$seq_str .= (' 'x2). |
$seq_str .= (' 'x2). |
qq{<a target="preview" href="$res->{'src'}">view</a>}; |
qq{<a target="preview" href="$link">view</a>}; |
$seq_str .= "</td></tr>\n"; |
$seq_str .= "</td></tr>\n"; |
$rb_count++; |
$rb_count++; |
} |
} |
Line 280 END
|
Line 282 END
|
return $Str; |
return $Str; |
} |
} |
|
|
sub get_title { |
|
my ($title,$src) = @_; |
|
if ($title eq '') { |
|
($title) = ($src =~ m|/([^/]+)$|); |
|
} else { |
|
$title =~ s/\:/:/g; |
|
} |
|
return $title; |
|
} |
|
|
|
sub new_accumulator { |
sub new_accumulator { |
my ($title,$src,$symb,$seq_id,$inputname) = @_; |
my ($title,$src,$symb,$seq_id,$inputname) = @_; |
my $target; |
my $target; |
Line 308 sub new_accumulator {
|
Line 300 sub new_accumulator {
|
'value="'.&Apache::lonnet::escape($res->symb).'" />'. |
'value="'.&Apache::lonnet::escape($res->symb).'" />'. |
' '.$res->compTitle.'</label>'. |
' '.$res->compTitle.'</label>'. |
(' 'x2).'<a target="preview" '. |
(' 'x2).'<a target="preview" '. |
'href="'.$res->src.'">view</a>'. |
'href="'.$res->src.'?symb='. |
|
&Apache::lonnet::escape($res->{'symb'}).'">view</a>'. |
'</td></tr>'.$/; |
'</td></tr>'.$/; |
} else { |
} else { |
if (defined($target)) { |
if (defined($target)) { |
Line 555 Returns: nothing
|
Line 548 Returns: nothing
|
##################################################### |
##################################################### |
sub GetStudentAnswers { |
sub GetStudentAnswers { |
my ($r,$problem,$Students,$formname,$inputname) = @_; |
my ($r,$problem,$Students,$formname,$inputname) = @_; |
|
my %answers; |
my $status_type; |
my $status_type; |
if (defined($formname)) { |
if (defined($formname)) { |
$status_type = 'inline'; |
$status_type = 'inline'; |
Line 582 sub GetStudentAnswers {
|
Line 576 sub GetStudentAnswers {
|
($resource,$sname,$sdom,$partid,$respid); |
($resource,$sname,$sdom,$partid,$respid); |
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, |
&Apache::lonhtmlcommon::Increment_PrgWin($r,\%prog_state, |
&mt('last student')); |
&mt('last student')); |
|
$answers{$answer}++; |
$student->{'answer'} = $answer; |
$student->{'answer'} = $answer; |
} |
} |
&Apache::lonstathelpers::write_analysis_cache(); |
&Apache::lonstathelpers::write_analysis_cache(); |
Line 589 sub GetStudentAnswers {
|
Line 584 sub GetStudentAnswers {
|
$r->rflush(); |
$r->rflush(); |
# close progress window |
# close progress window |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
&Apache::lonhtmlcommon::Close_PrgWin($r,\%prog_state); |
return; |
return \%answers; |
} |
} |
|
|
##################################################### |
##################################################### |
Line 1130 sub get_problem_data {
|
Line 1125 sub get_problem_data {
|
$Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}= |
$Partdata{$part}->{'_Foils'}->{$foil}->{'_Concept'}= |
$concept; |
$concept; |
} |
} |
} elsif ($key =~ /^(incorrect|answer|ans_low|ans_high|str_type)$/) { |
} elsif ($key =~ /^(unit|incorrect|answer|ans_low|ans_high|str_type)$/) { |
$Partdata{$part}->{$key}=$value; |
$Partdata{$part}->{$key}=$value; |
} |
} |
} else { |
} else { |