Diff for /loncom/homework/lonhomework.pm between versions 1.26 and 1.32

version 1.26, 2001/01/06 16:23:45 version 1.32, 2001/01/11 15:25:46
Line 12  use Apache::inputtags; Line 12  use Apache::inputtags;
 use Apache::structuretags;  use Apache::structuretags;
 use Apache::response;  use Apache::response;
 use Apache::hint;  use Apache::hint;
   use Apache::outputtags;
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
   
 sub get_target {  sub get_target {
Line 29  sub get_target { Line 30  sub get_target {
  return ('web');   return ('web');
       }        }
     } else {      } else {
       return ('edit');        #return ('edit');
         #edit is currently broken
         return ('web');
     }      }
   }    }
   return ();    return ();
Line 72  sub check_date { Line 75  sub check_date {
     &Apache::lonxml::debug("found :$date: for :$temp:");      &Apache::lonxml::debug("found :$date: for :$temp:");
     if ($date eq '') {      if ($date eq '') {
       $date = "an unknown date"; $passed = 0;        $date = "an unknown date"; $passed = 0;
       } elsif ($date eq 'con_lost') {
         $date = "an indeterminate date"; $passed = 0;
     } else {      } else {
       if (time < $date) { $passed = 0; } else { $passed = 1; }        if (time < $date) { $passed = 0; } else { $passed = 1; }
       $date = localtime $date;        $date = localtime $date;
Line 90  sub check_date { Line 95  sub check_date {
     $datemsg = "is due at $date";      $datemsg = "is due at $date";
   } elsif ($type eq 'answerdate') {    } elsif ($type eq 'answerdate') {
     $status='CLOSED';      $status='CLOSED';
     $datemsg = "was due as $lastdate, and answers will be available at $date";      $datemsg = "was due on $lastdate, and answers will be available on $date";
     }
     if ($status eq 'CAN_ANSWER') {
       #check #tries
       my $tries = $Apache::lonhomework::history{"resource.$id.tries"};
       my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
       if ( $tries eq '' ) { $tries = '0'; }
       if ( $maxtries eq '' ) { $maxtries = '2'; } 
       if ($tries >= $maxtries) { $status = 'CANNOT_ANSWER'; } 
   }    }
   &Apache::lonxml::debug("sending back :$status:$datemsg:");    &Apache::lonxml::debug("sending back :$status:$datemsg:");
   if ($ENV{'request.state'} eq "construct") {    if ($ENV{'request.state'} eq "construct") {
Line 151  sub handler { Line 164  sub handler {
       &Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>");        &Apache::lonxml::error("<b>Unable to find <i>default_homework.lcpm</i></b>");
       $default='';        $default='';
     }      }
     if ( $target eq 'grade') {   
       $Apache::lonxml::textredirection = 0;   
     } else {  
       $Apache::lonxml::textredirection = 1;   
     }  
     $result = &Apache::lonxml::xmlparse($target, $problem,      $result = &Apache::lonxml::xmlparse($target, $problem,
  $default.&setup_vars($target),%mystyle);   $default.&setup_vars($target),%mystyle);
   
Line 163  sub handler { Line 171  sub handler {
     $request->print($result);      $request->print($result);
     #$request->print(":Result ends");      #$request->print(":Result ends");
     if ($target eq 'grade') {      if ($target eq 'grade') {
   
       my $resultkey;        my $resultkey;
       foreach $resultkey (sort keys %Apache::lonhomework::results) {        foreach $resultkey (sort keys %Apache::lonhomework::results) {
  &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}");   &Apache::lonxml::debug("$resultkey ---- $Apache::lonhomework::results{$resultkey}");

Removed from v.1.26  
changed lines
  Added in v.1.32


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