[BACK]Return to lonhomework.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/lonhomework.pm between versions 1.111 and 1.132

version 1.111, 2003/02/26 17:52:14 version 1.132, 2003/05/23 06:45:45
Line 50  use Apache::essayresponse(); Line 50  use Apache::essayresponse();
 use Apache::externalresponse();  use Apache::externalresponse();
 use Apache::rankresponse();  use Apache::rankresponse();
 use Apache::matchresponse();  use Apache::matchresponse();
   #use Apache::chemresponse();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use HTML::Entities();  use HTML::Entities();
 use Apache::loncommon();  use Apache::loncommon();
Line 60  BEGIN { Line 61  BEGIN {
 }  }
   
 sub get_target {  sub get_target {
   if ( $ENV{'request.state'} eq "published") {    if (($ENV{'request.state'} eq "published") ||
         ($ENV{'request.state'} eq "uploaded")) {
     if ( defined($ENV{'form.grade_target'}  )       if ( defined($ENV{'form.grade_target'}  ) 
  && ($ENV{'form.grade_target'} eq 'tex')) {   && ($ENV{'form.grade_target'} eq 'tex')) {
       return ($ENV{'form.grade_target'});        return ($ENV{'form.grade_target'});
     } elsif ( defined($ENV{'form.grade_target'}  )       } elsif ( defined($ENV{'form.grade_target'}  ) 
  && ($Apache::lonhomework::viewgrades == 'F' )) {   && ($Apache::lonhomework::viewgrades eq 'F' )) {
       return ($ENV{'form.grade_target'});        return ($ENV{'form.grade_target'});
     }      }
     
     if ( defined($ENV{'form.submitted'})) {      if ( defined($ENV{'form.submitted'}) &&
    ( !defined($ENV{'form.resetdata'}))) {
       return ('grade', 'web');        return ('grade', 'web');
     } else {      } else {
       return ('web');        return ('web');
Line 206  sub check_access { Line 209  sub check_access {
     $datemsg = "was due on $lastdate, and answers will be available on $date";      $datemsg = "was due on $lastdate, and answers will be available on $date";
   }    }
   if ($status eq 'CAN_ANSWER') {    if ($status eq 'CAN_ANSWER') {
     #check #tries      #check #tries, and if correct.
     my $tries = $Apache::lonhomework::history{"resource.$id.tries"};      my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
     my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");      my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
     if ( $tries eq '' ) { $tries = '0'; }      if ( $tries eq '' ) { $tries = '0'; }
     if ( $maxtries eq '' ) { $maxtries = '2'; }       if ( $maxtries eq '' ) { $maxtries = '2'; } 
     if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }       if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; }
       # if (correct and show prob status) or excused then CANNOT_ANSWER
       if(($Apache::lonhomework::history{"resource.$id.solved"}=~/^correct/
    &&
    lc($Apache::lonhomework::problemstatus) ne 'no')
          ||
          $Apache::lonhomework::history{"resource.$id.solved"}=~/^excused/) {
    $status = 'CANNOT_ANSWER';
       }
   }    }
   
   if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&    if (($status ne 'CLOSED') && ($Apache::lonhomework::type eq 'exam') &&
Line 279  sub showhashsubset { Line 290  sub showhashsubset {
   
 sub setuppermissions {  sub setuppermissions {
   $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});    $Apache::lonhomework::browse= &Apache::lonnet::allowed('bre',$ENV{'request.filename'});
   $Apache::lonhomework::viewgrades=&Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});    my $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'});
     if (! $viewgrades && 
         exists($ENV{'request.course.sec'}) && 
         $ENV{'request.course.sec'} !~ /^\s*$/) {
         $viewgrades = &Apache::lonnet::allowed('vgr',$ENV{'request.course.id'}.
                                                  '/'.$ENV{'request.course.sec'});
     }
     $Apache::lonhomework::viewgrades = $viewgrades;
   return ''    return ''
 }  }
   
 sub setupheader {  sub setupheader {
   my $request=$_[0];      my $request=$_[0];
   if ($ENV{'browser.mathml'}) {      if ($ENV{'browser.mathml'}) {
     $request->content_type('text/xml');   $request->content_type('text/xml');
   } else {      } else {
     $request->content_type('text/html');   $request->content_type('text/html');
   }      }
   if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {      $request->content_encoding('UTF-8');
     &Apache::loncommon::no_cache($request);      if (!$Apache::lonxml::debug && ($ENV{'REQUEST_METHOD'} eq 'GET')) {
   }   &Apache::loncommon::no_cache($request);
   $request->send_http_header;      }
   return OK if $request->header_only;      $request->send_http_header;
   return ''      return OK if $request->header_only;
       return ''
 }  }
   
 sub handle_save_or_undo {  sub handle_save_or_undo {
Line 370  sub analyze { Line 389  sub analyze {
     my %allparts;      my %allparts;
     my $rndseed=$ENV{'form.rndseed'};      my $rndseed=$ENV{'form.rndseed'};
     &analyze_header($request);      &analyze_header($request);
       my %prog_state=
    &Apache::lonhtmlcommon::Create_PrgWin($request,'Analyze Progress',
         'Getting Problem Variants',
         $ENV{'form.numtoanalyze'});
     for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) {      for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) {
    &Apache::lonhtmlcommon::Increment_PrgWin($request,\%prog_state,
    'last problem');
  my $subresult=&Apache::lonnet::ssi($request->uri,   my $subresult=&Apache::lonnet::ssi($request->uri,
    ('grade_target' => 'analyze'),     ('grade_target' => 'analyze'),
    ('rndseed' => $i));     ('rndseed' => $i+$rndseed));
  &Apache::lonxml::debug(":$subresult:");  
  (my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2);   (my $garbage,$subresult)=split(/_HASH_REF__/,$subresult,2);
  my %analyze=&Apache::lonnet::str2hash($subresult);   my %analyze=&Apache::lonnet::str2hash($subresult);
  $Apache::lonxml::debug=1;   my @parts;
  &Apache::lonhomework::showhash(%analyze);   if (defined(@{ $analyze{'parts'} })) {
  $Apache::lonxml::debug=0;      @parts=@{ $analyze{'parts'} };
  my @parts = @{ $analyze{'parts'} };   }
  foreach my $part (@parts) {   foreach my $part (@parts) {
     if (!exists($allparts{$part})) {$allparts{$part}=1;};      if (!exists($allparts{$part})) {$allparts{$part}=1;};
     if ($analyze{$part.'.type'} eq 'numericalresponse' ||      if ($analyze{$part.'.type'} eq 'numericalresponse' ||
Line 391  sub analyze { Line 415  sub analyze {
     }      }
  }   }
     }      }
       &Apache::lonhtmlcommon::Update_PrgWin($request,\%prog_state,
     'Analyzing Results');
     foreach my $part (keys(%allparts)) {      foreach my $part (keys(%allparts)) {
  if (defined(@{ $overall{$part.'.answer'} })) {   if (defined(@{ $overall{$part.'.answer'} })) {
     $request->print('<table><tr><td>Part '.$part.'</td></tr>');      my $num_cols=scalar(@{ $overall{$part.'.answer'}->[0] });
       $request->print('<table><tr><td colspan="'.($num_cols+1).'">Part '.$part.'</td></tr>');
       my %frequency;
     foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {      foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
  $request->print('<tr><td>'.join('</td><td>',@{ $answer }).   $frequency{join("\0",@{ $answer })}++;
  '</td></tr>');      }
       $request->print('<tr><td colspan="'.($num_cols).'">Answer</td><td>Frequency</td></tr>');
       foreach my $answer (sort {(split("\0",$a))[0] <=> (split("\0",$b))[0]} (keys(%frequency))) {
    $request->print('<tr><td align="right">'.
    join('</td><td align="right">',split("\0",$answer)).
    '</td><td>('.$frequency{$answer}.
    ')</td></tr>');
     }      }
     $request->print('</table>');      $request->print('</table>');
  } else {   } else {
     $request->print('<p>Part '.$part.      $request->print('<p>Part '.$part.
     ' is not analyzabale at this time</p>');      ' is not analyzable at this time</p>');
  }   }
     }      }
       if (scalar(keys(%allparts)) == 0 ) {
    $request->print('<p>Found no analyzable parts in this problem,
                            currently only Numerical, Formula and String response
                            styles are supported.</p>');
       }
       &Apache::lonhtmlcommon::Close_PrgWin($request,\%prog_state);
     &analyze_footer($request);      &analyze_footer($request);
     &Apache::lonhomework::showhash(%overall);      &Apache::lonhomework::showhash(%overall);
     return $result;      return $result;
Line 413  sub editxmlmode { Line 453  sub editxmlmode {
   my ($request,$file) = @_;    my ($request,$file) = @_;
   my $result;    my $result;
   my $problem=&Apache::lonnet::getfile($file);    my $problem=&Apache::lonnet::getfile($file);
   if ($problem == -1) {    if ($problem eq -1) {
     &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");      &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
     $problem='';      $problem='';
   }    }
Line 469  sub renderpage { Line 509  sub renderpage {
   foreach my $target (@targets) {    foreach my $target (@targets) {
     #my $t0 = [&gettimeofday()];      #my $t0 = [&gettimeofday()];
     my $problem=&Apache::lonnet::getfile($file);      my $problem=&Apache::lonnet::getfile($file);
     if ($problem == -1) {      if ($problem eq -1) {
       &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");        &Apache::lonxml::error("<b> Unable to find <i>$file</i></b>");
       $problem='';        $problem='';
     }      }
Line 483  sub renderpage { Line 523  sub renderpage {
     &Apache::lonxml::debug("Should be parsing now");      &Apache::lonxml::debug("Should be parsing now");
     $result = &Apache::lonxml::xmlparse($request, $target, $problem,      $result = &Apache::lonxml::xmlparse($request, $target, $problem,
  &setup_vars($target),%mystyle);   &setup_vars($target),%mystyle);
       undef($Apache::lonhomework::parsing_a_problem);
     #$request->print("Result follows:");      #$request->print("Result follows:");
     if ($target eq 'modified') {      if ($target eq 'modified') {
       &handle_save_or_undo($request,\$problem,\$result);        &handle_save_or_undo($request,\$problem,\$result);
Line 498  sub renderpage { Line 538  sub renderpage {
  #$result.="<br />Spent $td seconds processing target $target\n</body>";   #$result.="<br />Spent $td seconds processing target $target\n</body>";
       #}        #}
       $request->print($result);        $request->print($result);
         $request->rflush();
     }      }
     #$request->print(":Result ends");      #$request->print(":Result ends");
     #my $td=&tv_interval($t0);      #my $td=&tv_interval($t0);
Line 521  sub get_template_list { Line 562  sub get_template_list {
     }      }
   }    }
   if (@allnames && !$result) {    if (@allnames && !$result) {
     $result="<option>Select a $extension type</option>\n<option>".      $result="<option>Select a $extension template</option>\n<option>".
       join('</option><option>',sort(@allnames)).'</option>';   join('</option><option>',sort(@allnames)).'</option>';
   }    }
   return $result;    return $result;
 }  }
Line 532  sub newproblem { Line 573  sub newproblem {
     my $extension=$request->uri;      my $extension=$request->uri;
     $extension=~s:^.*\.([\w]+)$:$1:;      $extension=~s:^.*\.([\w]+)$:$1:;
     &Apache::lonxml::debug("Looking for :$extension:");      &Apache::lonxml::debug("Looking for :$extension:");
       my $templatelist=&get_template_list('',$extension);
     if ($ENV{'form.template'} &&      if ($ENV{'form.template'} &&
  $ENV{'form.template'} ne "Select a $extension type") {   $ENV{'form.template'} ne "Select a $extension template") {
  use File::Copy;   use File::Copy;
  my $file = &get_template_list($ENV{'form.template'},$extension);   my $file = &get_template_list($ENV{'form.template'},$extension);
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
  copy($file,$dest);   copy($file,$dest);
  &renderpage($request,$dest);   &renderpage($request,$dest);
     } elsif($ENV{'form.newfile'}) {      } elsif($ENV{'form.newfile'} && !$templatelist) {
  # I don't like hard-coded filenames but for now, this will work.   # I don't like hard-coded filenames but for now, this will work.
  use File::Copy;   use File::Copy;
  my $templatefilename =    my $templatefilename =
     $request->dir_config('lonIncludes').'/templates/blank.problem';      $request->dir_config('lonIncludes').'/templates/blank.problem';
  &Apache::lonxml::debug("$templatefilename");   &Apache::lonxml::debug("$templatefilename");
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
  copy($templatefilename,$dest);   copy($templatefilename,$dest);
  &renderpage($request,$dest);   &renderpage($request,$dest);
     } else {      } else {
  my $templatelist=&get_template_list('',$extension);  
  my $url=$request->uri;   my $url=$request->uri;
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
    my $errormsg;
    if ($ENV{'form.newfile'}) {
       $errormsg='<p><font color="red">You did not select a template.</font></p>'."\n";
    }
  my $instructions;   my $instructions;
  if ($templatelist) { $instructions=", select a template from the pull-down menu below.<br />Then";}   if ($templatelist) { $instructions=", select a template from the pull-down menu below.<br />Then";}
  $request->print(<<ENDNEWPROBLEM);   $request->print(<<ENDNEWPROBLEM);
 <body bgcolor="#FFFFFF">  <body bgcolor="#FFFFFF">
 <h1>Creating a new $extension resource</h1>  <h1>Creating a new $extension resource</h1>
   $errormsg
 The requested file <tt>$url</tt> currently does not exist.  The requested file <tt>$url</tt> currently does not exist.
 <p>  <p>
 To create a new $extension$instructions click on the "Create $extension" button.  <b>To create a new $extension$instructions click on the "Create $extension" button.</b>
 </p>  </p>
 <p><form action="$url" method="POST">  <p><form action="$url" method="POST">
 ENDNEWPROBLEM  ENDNEWPROBLEM
Line 589  sub handler { Line 635  sub handler {
   #my $t0 = [&gettimeofday()];    #my $t0 = [&gettimeofday()];
   my $request=$_[0];    my $request=$_[0];
   
 #  if ( $ENV{'user.name'} eq 'albertel' ) {$Apache::lonxml::debug=1;}  
   $Apache::lonxml::debug=$ENV{'user.debug'};    $Apache::lonxml::debug=$ENV{'user.debug'};
   
   if (&setupheader($request)) { return OK; }    if (&setupheader($request)) { return OK; }
Line 621  sub handler { Line 666  sub handler {
     }      }
   }    }
   
     my ($symb) = &Apache::lonxml::whichuser();
     &Apache::lonxml::debug('symb is '.$symb);
     if ($ENV{'request.state'} eq "construct" || $symb eq '') {
         if ($ENV{'form.resetdata'} eq 'Reset Submissions' ||
     $ENV{'form.resetdata'} eq 'New Problem Variation' ) {
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
     &Apache::lonnet::tmpreset($symb,'',$domain,$name);
         }
     }
   if ($ENV{'request.state'} eq "construct") {    if ($ENV{'request.state'} eq "construct") {
     if ($ENV{'form.resetdata'} eq 'Reset Submissions') {  
       my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();  
       &Apache::lonnet::tmpreset($symb,'',$domain,$name);  
     }  
     if ( -e $file ) {      if ( -e $file ) {
       if (!(defined $ENV{'form.problemmode'})) {        if (!(defined $ENV{'form.problemmode'})) {
  #first visit to problem in construction space   #first visit to problem in construction space
Line 634  sub handler { Line 684  sub handler {
  &renderpage($request,$file);   &renderpage($request,$file);
       } elsif ($ENV{'form.problemmode'} eq 'EditXML') {        } elsif ($ENV{'form.problemmode'} eq 'EditXML') {
  &editxmlmode($request,$file);   &editxmlmode($request,$file);
       } elsif ($ENV{'form.problemmode'} eq 'Answer Distribution') {        } elsif ($ENV{'form.problemmode'} eq 'Calculate answers') {
  &analyze($request,$file);   &analyze($request,$file);
       } else {        } else {
  &renderpage($request,$file);   &renderpage($request,$file);
Removed from v.1.111  
changed lines
  Added in v.1.132

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>