Diff for /loncom/homework/lonhomework.pm between versions 1.101 and 1.110

version 1.101, 2002/11/12 05:05:26 version 1.110, 2003/02/25 23:18:22
Line 48  use Apache::optionresponse(); Line 48  use Apache::optionresponse();
 use Apache::imageresponse();  use Apache::imageresponse();
 use Apache::essayresponse();  use Apache::essayresponse();
 use Apache::externalresponse();  use Apache::externalresponse();
   use Apache::rankresponse();
   use Apache::matchresponse();
 use Apache::Constants qw(:common);  use Apache::Constants qw(:common);
 use HTML::Entities();  use HTML::Entities();
 use Apache::loncommon();  use Apache::loncommon();
Line 144  $Apache::lonxml::browse=''; Line 146  $Apache::lonxml::browse='';
 sub check_access {  sub check_access {
   my ($id) = @_;    my ($id) = @_;
   my $date ='';    my $date ='';
   my $status = '';    my $status;
   my $datemsg = '';    my $datemsg = '';
   my $lastdate = '';    my $lastdate = '';
   my $temp;    my $temp;
   my $type;    my $type;
   my $passed;    my $passed;
   
     if ($ENV{'request.state'} eq "construct") {
       &Apache::lonxml::debug("in construction ignoring dates");
       $status='CAN_ANSWER';
       $datemsg='is in under construction';
       return ($status,$datemsg);
     }
   
   &Apache::lonxml::debug("checking for part :$id:");    &Apache::lonxml::debug("checking for part :$id:");
   &Apache::lonxml::debug("time:".time);    &Apache::lonxml::debug("time:".time);
   foreach $temp ("opendate","duedate","answerdate") {    foreach $temp ("opendate","duedate","answerdate") {
     $lastdate = $date;      $lastdate = $date;
     $date = &Apache::lonnet::EXT("resource.$id.$temp");      $date = &Apache::lonnet::EXT("resource.$id.$temp");
     my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");      my $thistype = &Apache::lonnet::EXT("resource.$id.$temp.type");
       if ($thistype =~ /^(con_lost|no_such_host)/ ||
    $date     =~ /^(con_lost|no_such_host)/) {
    $status='UNAVAILABLE';
    $date="may open later.";
    return($status,$date);
       }
     if ($thistype eq 'date_interval') {      if ($thistype eq 'date_interval') {
  if ($temp eq 'opendate') {   if ($temp eq 'opendate') {
            $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date;             $date=&Apache::lonnet::EXT("resource.$id.duedate")-$date;
Line 210  sub check_access { Line 226  sub check_access {
     $status='CAN_ANSWER';      $status='CAN_ANSWER';
     $datemsg='is closed but you are allowed to view it';      $datemsg='is closed but you are allowed to view it';
   }    }
   if ($ENV{'request.state'} eq "construct") {  
     &Apache::lonxml::debug("in construction ignoring dates");  
     $status='CAN_ANSWER';  
     $datemsg='is in under construction';  
   }  
   return ($status,$datemsg);    return ($status,$datemsg);
 }  }
   
Line 224  sub showhash { Line 236  sub showhash {
   return '';    return '';
 }  }
   
   sub showarray {
       my ($array)=@_;
       my $string="(";
       foreach my $elm (@{ $array }) {
    if (ref($elm)) {
       if ($elm =~ /ARRAY/ ) {
    $string.=&showarray($elm);
       }
    } else {
       $string.="$elm,"
    }
       }
       chop($string);
       $string.=")";
       return $string;
   }
   
 sub showhashsubset {  sub showhashsubset {
   my ($hash,$keyre) = @_;    my ($hash,$keyre) = @_;
   my $resultkey;    my $resultkey;
Line 231  sub showhashsubset { Line 260  sub showhashsubset {
     if ($resultkey =~ /$keyre/) {      if ($resultkey =~ /$keyre/) {
       if (ref($$hash{$resultkey})) {        if (ref($$hash{$resultkey})) {
  if ($$hash{$resultkey} =~ /ARRAY/ ) {   if ($$hash{$resultkey} =~ /ARRAY/ ) {
   my $string="$resultkey ---- (";      &Apache::lonxml::debug("$resultkey ---- ".
   foreach my $elm (@{ $$hash{$resultkey} }) {     &showarray($$hash{$resultkey}));
     $string.="$elm,";   } elsif ($$hash{$resultkey} =~ /HASH/ ) {
   }      &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
   chop($string);      &showhashsubset($$hash{$resultkey},'.');
   &Apache::lonxml::debug("$string)");  
  } else {   } else {
   &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");      &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
  }   }
       } else {        } else {
  &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");   &Apache::lonxml::debug("$resultkey ---- $$hash{$resultkey}");
Line 311  sub handle_save_or_undo { Line 339  sub handle_save_or_undo {
   
 sub analyze_header {  sub analyze_header {
     my ($request) = @_;      my ($request) = @_;
     my $result.='<html><body bgcolor="#FFFFFF">      my $result.='<html>
               <head><title>Analyzing a problem</title></head>
               <body bgcolor="#FFFFFF">
             <form name="lonhomework" method="POST" action="'.              <form name="lonhomework" method="POST" action="'.
       $ENV{'request.uri'}.'">        $ENV{'request.uri'}.'">
             <input type="submit" name="problemmode" value="EditXML" />              <input type="submit" name="problemmode" value="EditXML" />
Line 325  sub analyze_header { Line 355  sub analyze_header {
     $request->rflush();      $request->rflush();
 }  }
   
   sub analyze_footer {
       my ($request) = @_;
       my $result='</body></html>';
       $request->print($result);
       $request->rflush();
   }
   
 sub analyze {  sub analyze {
     my ($request,$file) = @_;      my ($request,$file) = @_;
     &Apache::lonxml::debug("Analyze");      &Apache::lonxml::debug("Analyze");
Line 332  sub analyze { Line 369  sub analyze {
     my %overall;      my %overall;
     my %allparts;      my %allparts;
     my $rndseed=$ENV{'form.rndseed'};      my $rndseed=$ENV{'form.rndseed'};
     srand($rndseed);  
     &analyze_header($request);      &analyze_header($request);
     for(my $i;$i<$ENV{'form.numtoanalyze'};$i++) {      for(my $i=1;$i<$ENV{'form.numtoanalyze'}+1;$i++) {
  my $subresult=&Apache::lonnet::ssi($request->uri,   my $subresult=&Apache::lonnet::ssi($request->uri,
    ('grade_target' => 'analyze'),     ('grade_target' => 'analyze'),
    ('rndseed' => rand));     ('rndseed' => $i));
  #&Apache::lonxml::debug(":$subresult:");   &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;
  &Apache::lonhomework::showhash(%analyze);   &Apache::lonhomework::showhash(%analyze);
    $Apache::lonxml::debug=0;
  my @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' ||
    $analyze{$part.'.type'} eq 'stringresponse' ||
    $analyze{$part.'.type'} eq 'formularesponse'   ) {
  push( @{ $overall{$part.'.answer'} },   push( @{ $overall{$part.'.answer'} },
       [@{ $analyze{$part.'.answer'} }]);        [@{ $analyze{$part.'.answer'} }]);
     }      }
  }   }
     }      }
     foreach my $part (keys(%allparts)) {      foreach my $part (keys(%allparts)) {
  $request->print('<table><tr><td>Part '.$part.'</td></tr>');   if (defined(@{ $overall{$part.'.answer'} })) {
  foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {      $request->print('<table><tr><td>Part '.$part.'</td></tr>');
     $request->print('<tr><td>'.join('</td><td>',@{ $answer }).      foreach my $answer (sort {$a->[0] <=> $b->[0]} (@{ $overall{$part.'.answer'} })) {
     '</td></tr>');   $request->print('<tr><td>'.join('</td><td>',@{ $answer }).
    '</td></tr>');
       }
       $request->print('</table>');
    } else {
       $request->print('<p>Part '.$part.
       ' is not analyzabale at this time</p>');
  }   }
     }      }
       &analyze_footer($request);
     &Apache::lonhomework::showhash(%overall);      &Apache::lonhomework::showhash(%overall);
     return $result;      return $result;
 }  }
Line 382  sub editxmlmode { Line 429  sub editxmlmode {
     &renderpage($request,$file);      &renderpage($request,$file);
   } else {    } else {
     my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);      my ($rows,$cols) = &Apache::edit::textarea_sizes(\$problem);
     my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index");      my $xml_help = Apache::loncommon::help_open_topic("Problem_Editor_XML_Index",'Problem Editing Help');
     if ($cols > 80) { $cols = 80; }      if ($cols > 80) { $cols = 80; }
     if ($cols < 70) { $cols = 70; }      if ($cols < 70) { $cols = 70; }
     if ($rows < 20) { $rows = 20; }      if ($rows < 20) { $rows = 20; }
Line 397  sub editxmlmode { Line 444  sub editxmlmode {
             <input type="submit" name="submit" value="Submit Changes and View" />              <input type="submit" name="submit" value="Submit Changes and View" />
             <input type="submit" name="Undo" value="undo" />              <input type="submit" name="Undo" value="undo" />
             <hr />              <hr />
             ' . $xml_help . ' Problem Help<br>              ' . $xml_help . '
             <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.              <textarea rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.
       &HTML::Entities::encode($problem).'</textarea>        &HTML::Entities::encode($problem).'</textarea>
             </form></body></html>';              </form></body></html>';
Line 421  sub renderpage { Line 468  sub renderpage {
   
     my %mystyle;      my %mystyle;
     my $result = '';      my $result = '';
     &Apache::inputtags::initialize_inputtags();      if ($target eq 'analyze') { %Apache::lonhomework::analyze=(); }
     &Apache::outputtags::initialize_outputtags();  
     &Apache::edit::initialize_edit();  
     if ($target eq 'analyze') { %Apache::lonhomework::anaylze=(); }  
     if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }      if ($target eq 'answer') { &showhash(%Apache::lonhomework::history); }
     if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');}      if ($target eq 'web') {&Apache::lonhomework::showhashsubset(\%ENV,'^form');}
   
Line 465  sub get_template_list { Line 509  sub get_template_list {
       $result=$file;        $result=$file;
       last;        last;
     } else {      } else {
       push (@allnames, $name);   if ($name) { push (@allnames, $name); }
     }      }
   }    }
   if (@allnames && !$result) {    if (@allnames && !$result) {
Line 501  sub newproblem { Line 545  sub newproblem {
  my $url=$request->uri;   my $url=$request->uri;
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
  my $instructions;   my $instructions;
  if ($templatelist) { $instructions=", select a template from the pull-down menu below. 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">
 The requested file $url doesn\'t exist. <br />  <h1>Creating a new $extension resource</h1>
 To create a new $extension$instructions click on the Create $extension button.  The requested file <tt>$url</tt> currently does not exist.
 <form action="$url" method="POST">  <p>
   To create a new $extension$instructions click on the "Create $extension" button.
   </p>
   <p><form action="$url" method="POST">
 ENDNEWPROBLEM  ENDNEWPROBLEM
  if (defined($templatelist)) {   if (defined($templatelist)) {
     $request->print("<select name=\"template\">$templatelist</select>");      $request->print("<select name=\"template\">$templatelist</select>");
  }   }
  $request->print("<br /><input type=\"submit\" name=\"newfile\" value=\"Create $extension\" />");   $request->print("<br /><input type=\"submit\" name=\"newfile\" value=\"Create $extension\" />");
  $request->print("</form></body>");   $request->print("</form></p></body>");
     }      }
     return '';      return '';
 }  }

Removed from v.1.101  
changed lines
  Added in v.1.110


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