--- loncom/homework/lonhomework.pm 2006/06/30 17:42:38 1.256 +++ loncom/homework/lonhomework.pm 2007/03/06 19:05:58 1.265 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # The LON-CAPA Homework handler # -# $Id: lonhomework.pm,v 1.256 2006/06/30 17:42:38 albertel Exp $ +# $Id: lonhomework.pm,v 1.265 2007/03/06 19:05:58 albertel Exp $ # # Copyright Michigan State University Board of Trustees # @@ -96,7 +96,6 @@ sub get_target { return ('grade','webgrade'); } if ( defined($env{'form.submitted'}) && - ( !defined($env{'form.resetdata'})) && ( !defined($env{'form.newrandomization'}))) { return ('grade', 'web'); } else { @@ -393,7 +392,7 @@ sub check_access { &Apache::lonxml::debug("checking for part :$id:"); &Apache::lonxml::debug("time:".time); - my ($symb)=&Apache::lonxml::whichuser(); + my ($symb)=&Apache::lonnet::whichuser(); &Apache::lonxml::debug("symb:".$symb); #if ($env{'request.state'} ne "construct" && $symb ne '') { if ($env{'request.state'} ne "construct") { @@ -514,8 +513,9 @@ sub due_date { my $due_date= &Apache::lonnet::EXT("resource.$part_id.duedate",$symb, $udom,$uname); &Apache::lonxml::debug("looking for due_date $part_id $symb $due_date"); - if (defined($interval)) { + if ($interval =~ /\d+/) { my $first_access=&Apache::lonnet::get_first_access('map',$symb); + &Apache::lonxml::debug("looking for first_access $first_access"); if (defined($first_access)) { $interval = $first_access+$interval; $date = ($interval < $due_date)? $interval : $due_date; @@ -603,7 +603,7 @@ sub setuppermissions { if ($Apache::lonhomework::browse eq 'F' && $env{'form.devalidatecourseresdata'} eq 'on') { - my (undef,$courseid) = &Apache::lonxml::whichuser(); + my (undef,$courseid) = &Apache::lonnet::whichuser(); &Apache::lonnet::devalidatecourseresdata($env{"course.$courseid.num"}, $env{"course.$courseid.domain"}); } @@ -656,9 +656,6 @@ sub handle_save_or_undo { my $filebak =$file.".bak"; my $filetmp =$file.".tmp"; my $error=0; - - &Apache::lonnet::correct_line_ends($result); - if ($env{'form.Undo'} eq &mt('undo')) { my $error=0; if (!copy($file,$filetmp)) { $error=1; } @@ -671,6 +668,7 @@ sub handle_save_or_undo { $error=1; } } else { + &Apache::lonnet::correct_line_ends($result); my $fs=Apache::File->new(">$filebak"); if (defined($fs)) { print $fs $$problem; @@ -754,13 +752,20 @@ sub analyze { if ($analyze{$part.'.type'} eq 'numericalresponse' || $analyze{$part.'.type'} eq 'stringresponse' || $analyze{$part.'.type'} eq 'formularesponse' ) { - my $concatanswer=join("\0",@{ $analyze{$part.'.answer'} }); - if (($concatanswer eq '') || ($concatanswer=~/^\@/)) { - @{$analyze{$part.'.answer'}}=(''.&mt('Error').''); + foreach my $name (keys(%{ $analyze{$part.'.answer'} })) { + my $i=0; + foreach my $answer_part (@{ $analyze{$part.'.answer'}{$name} }) { + push( @{ $overall{$part.'.answer'}[$i] }, + $answer_part); + my $concatanswer= join("\0",@{ $answer_part }); + if (($concatanswer eq '') || ($concatanswer=~/^\@/)) { + $answer_part = [''.&mt('Error').'']; + } + $seedexample{join("\0",$part,$i,@{$answer_part})}= + $thisseed; + $i++; + } } - push( @{ $overall{$part.'.answer'} }, - [@{ $analyze{$part.'.answer'} }]); - $seedexample{join("\0",@{ $analyze{$part.'.answer'}})}=$thisseed; } } } @@ -769,21 +774,27 @@ sub analyze { $request->print('
'.&mt('List of possible answers').': '); foreach my $part (sort(keys(%allparts))) { if (defined(@{ $overall{$part.'.answer'} })) { - my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] }); - $request->print(''); - my %frequency; - foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) { - $frequency{join("\0",@{ $answer })}++; - } - $request->print(''); - foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) { - $request->print(''); + for (my $i=0;$iprint('
'.&mt('Part').' '.$part.'
'.&mt('Answer').''.&mt('Frequency').'
(' - .&mt('click for example').')
'. - join('',split("\0",$answer)). - ''.$frequency{$answer}. - '
'); + my %frequency; + foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'}[$i] })) { + $frequency{join("\0",@{ $answer })}++; + } + $request->print(''); + foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) { + $request->print(''); + } + $request->print('
'.&mt('Part').' '.$part); + if (scalar(@{ $overall{$part.'.answer'} }) > 1) { + $request->print(&mt(' Answer [_1]',$i+1)); + } + $request->print('
'.&mt('Answer').''.&mt('Frequency').'
(' + .&mt('click for example').')
'. + join('',split("\0",$answer)). + ''.$frequency{$answer}. + '
'); } - $request->print(''); } else { $request->print('

'.&mt('Response').' '.$part.' '. &mt('is not analyzable at this time').'

'); @@ -829,8 +840,9 @@ sub editxmlmode { if ($cols < 70) { $cols = 70; } if ($rows < 20) { $rows = 20; } my $start_page = - &Apache::loncommon::start_page("EditXML $file", - &Apache::edit::js_change_detection()); + &Apache::loncommon::start_page(&mt("EditXML [_1]",$file), + &Apache::edit::js_change_detection(), + {'no_auto_mt_title' => 1,}); $result.=$start_page. &renderpage($request,$file,['no_output_web'],1). @@ -884,9 +896,16 @@ sub renderpage { my $problem=&Apache::lonnet::getfile($file); my $result; if ($problem eq -1) { - my $filename=(split('/',$file))[-1]; - $result.=" ".&mt('Unable to find')." $filename"; $problem=''; + my $filename=(split('/',$file))[-1]; + my $error = + " ".&mt('Unable to find [_1]', + ' '.$filename.'') + .""; + $result.= + &Apache::loncommon::simple_error_page($request,'Not available', + $error); + return; } my %mystyle; @@ -968,7 +987,7 @@ sub newproblem { # I don't like hard-coded filenames but for now, this will work. use File::Copy; my $templatefilename = - $request->dir_config('lonIncludes').'/templates/blank.problem'; + $request->dir_config('lonIncludes').'/templates/blank.'.$extension; &Apache::lonxml::debug("$templatefilename"); my $dest = &Apache::lonnet::filelocation("",$request->uri); copy($templatefilename,$dest); @@ -985,25 +1004,18 @@ sub newproblem { my $instructions; my $start_page = &Apache::loncommon::start_page("Create New $extension"); - if ($templatelist) { $instructions=&mt(", select a template from the pull-down menu below.").'
'.&mt("Then");} - my %lt=&Apache::lonlocal::texthash( 'create' => 'Creating a new', - 'resource' => 'resource', - 'requested' => 'The requested file', - 'not exist' => 'currently does not exist', - 'createnew' => 'To create a new', - 'click' => 'click on the', - 'Create' => 'Create', - 'button' => 'button'); - $request->print(<print(" $start_page -

$lt{'create'} $extension $lt{'resource'}

+

".&mt("Creating a new $extension resource.")."

$errormsg -$lt{'requested'} $shownurl $lt{'not exist'}. +".&mt("The requested file [_1] currently does not exist.", + "$shownurl")."

-$lt{'createnew'} $extension$instructions $lt{'click'} "$lt{'Create'} $extension" $lt{'button'}. -

-

-ENDNEWPROBLEM + +".&mt("To create a new $extension, select a template from the". + "pull-down menu below. Then click on the \"Create $extension\" button.")." +

"); + if (defined($templatelist)) { $request->print(""); } @@ -1047,7 +1059,7 @@ sub handler { } &Apache::lonxml::debug("Permissions:$Apache::lonhomework::browse:$Apache::lonhomework::viewgrades:$Apache::lonhomework::modifygrades:$Apache::lonhomework::queuegrade"); &Apache::lonxml::debug("Problem Mode ".$env{'form.problemmode'}); - my ($symb) = &Apache::lonxml::whichuser(); + my ($symb) = &Apache::lonnet::whichuser(); &Apache::lonxml::debug('symb is '.$symb); if ($env{'request.state'} eq "construct") { if ( -e $file ) {