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

version 1.101, 2002/11/12 05:05:26 version 1.105, 2002/12/11 15:33:55
Line 144  $Apache::lonxml::browse=''; Line 144  $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;
Line 156  sub check_access { Line 156  sub check_access {
     $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 332  sub analyze { Line 338  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::lonhomework::showhash(%analyze);   &Apache::lonhomework::showhash(%analyze);
Line 465  sub get_template_list { Line 470  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 506  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.105


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