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

Diff for /loncom/homework/lonhomework.pm between versions 1.263 and 1.274

version 1.263, 2006/12/13 22:48:07 version 1.274, 2007/09/10 13:31:39
Line 96  sub get_target { Line 96  sub get_target {
     return ('grade','webgrade');      return ('grade','webgrade');
  }   }
  if ( defined($env{'form.submitted'}) &&   if ( defined($env{'form.submitted'}) &&
      ( !defined($env{'form.resetdata'})) &&  
      ( !defined($env{'form.newrandomization'}))) {       ( !defined($env{'form.newrandomization'}))) {
     return ('grade', 'web');      return ('grade', 'web');
  } else {   } else {
Line 113  sub get_target { Line 112  sub get_target {
  return ('web');   return ('web');
     }      }
  } else {   } else {
     if ( $env{'form.problemmode'} eq &mt('View') ||      if ($env{'form.problemstate'} eq 'WEB_GRADE') {
    #$env{'form.webgrade'} = 'yes';
    return ('grade','webgrade','answer');
       } elsif ( $env{'form.problemmode'} eq &mt('View') ||
  $env{'form.problemmode'} eq &mt('Discard Edits and View')) {   $env{'form.problemmode'} eq &mt('Discard Edits and View')) {
  if ( defined($env{'form.submitted'}) &&   if ( defined($env{'form.submitted'}) &&
      (!defined($env{'form.resetdata'})) &&       (!defined($env{'form.resetdata'})) &&
Line 186  sub proctor_checked_in { Line 188  sub proctor_checked_in {
     return 0;      return 0;
 }  }
   
 $Apache::lonxml::browse='';  
 sub check_ip_acc {  sub check_ip_acc {
     my ($acc)=@_;      my ($acc)=@_;
     &Apache::lonxml::debug("acc is $acc");      &Apache::lonxml::debug("acc is $acc");
Line 194  sub check_ip_acc { Line 195  sub check_ip_acc {
  return 1;   return 1;
     }      }
     my $allowed=0;      my $allowed=0;
     my $ip=$ENV{'REMOTE_ADDR'};      my $ip=$env{'request.host'} || $ENV{'REMOTE_ADDR'};
   
     my $name;      my $name;
     foreach my $pattern (split(',',$acc)) {      foreach my $pattern (split(',',$acc)) {
  $pattern =~ s/^\s*//;   $pattern =~ s/^\s*//;
Line 434  sub check_access { Line 436  sub check_access {
  $date = &mt("an indeterminate date"); $passed = 0;   $date = &mt("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 = &Apache::lonlocal::locallocaltime($date);
     }      }
     if (!$passed) { $type=$temp; last; }      if (!$passed) { $type=$temp; last; }
  }   }
Line 663  sub handle_save_or_undo { Line 665  sub handle_save_or_undo {
  if ((!$error) && (!copy($filebak,$file))) { $error=1; }   if ((!$error) && (!copy($filebak,$file))) { $error=1; }
  if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }   if ((!$error) && (!move($filetmp,$filebak))) { $error=1; }
  if (!$error) {   if (!$error) {
     &Apache::lonxml::info("<p><b>".&mt("Undid changes, Switched")." $filebak ".&mt("and")." $file</b></p>");      &Apache::lonxml::info("<p><b>".
     &mt("Undid changes, Switched [_1] and [_2]",
         '<span class="LC_filename">'.$filebak.
         '</span>',
         '<span class="LC_filename">'.$file.
         '</span>')."</b></p>");
  } else {   } else {
     &Apache::lonxml::info("<p><font color=\"red\" size=\"+1\"><b>".&mt("Unable to undo, unable to switch")." $filebak ".&mt("and")." $file</b></font></p>");      &Apache::lonxml::info("<p><span class=\"LC_error\">".
     &mt("Unable to undo, unable to switch [_1] and [_2]",
         '<span class="LC_filename">'.
         $filebak.'</span>',
         '<span class="LC_filename">'.
         $file.'</span>')."</span></p>");
     $error=1;      $error=1;
  }   }
     } else {      } else {
Line 673  sub handle_save_or_undo { Line 685  sub handle_save_or_undo {
  my $fs=Apache::File->new(">$filebak");   my $fs=Apache::File->new(">$filebak");
  if (defined($fs)) {   if (defined($fs)) {
     print $fs $$problem;      print $fs $$problem;
     &Apache::lonxml::info("<b>".&mt("Making Backup to").      &Apache::lonxml::info("<b>".&mt("Making Backup to [_1]",
   " $filebak</b>");      '<span class="LC_filename">'.
       $filebak.'</span>').
     "</b>");
  } else {   } else {
     &Apache::lonxml::info("<font color=\"red\" size=\"+1\"><b>".&mt("Unable to make backup")." $filebak</b></font>");      &Apache::lonxml::info("<span class=\"LC_error\">".
     &mt("Unable to make backup [_1]",
         '<span class="LC_filename">'.
         $filebak.'</span>')."</span>");
     $error=2;      $error=2;
  }   }
  my $fh=Apache::File->new(">$file");   my $fh=Apache::File->new(">$file");
  if (defined($fh)) {   if (defined($fh)) {
     print $fh $$result;      print $fh $$result;
     &Apache::lonxml::info("<b>".&mt("Saving Modifications to").      &Apache::lonxml::info("<b>".&mt("Saving Modifications to [_1]",
   " $file</b>");     '<span class="LC_filename">'.
       $file.'</span>' )."</b>");
  } else {   } else {
     &Apache::lonxml::info("<font color=\"red\" size=\"+1\"><b>".      &Apache::lonxml::info('<span class="LC_error">'.
   &mt("Unable to write to")." $file</b></font>");    &mt("Unable to write to [_1]",
         '<span class="LC_filename">'.
         $file.'</span>').
     '</span>');
     $error|=4;      $error|=4;
  }   }
     }      }
Line 760  sub analyze { Line 781  sub analyze {
       $answer_part);        $answer_part);
  my $concatanswer= join("\0",@{ $answer_part });   my $concatanswer= join("\0",@{ $answer_part });
  if (($concatanswer eq '') || ($concatanswer=~/^\@/)) {   if (($concatanswer eq '') || ($concatanswer=~/^\@/)) {
     $answer_part = ['<font color="red">'.&mt('Error').'</font>'];      $answer_part = ['<span class="LC_error">'.&mt('Error').'</span>'];
  }   }
  $seedexample{join("\0",$part,$i,@{$answer_part})}=   $seedexample{join("\0",$part,$i,@{$answer_part})}=
     $thisseed;      $thisseed;
Line 840  sub editxmlmode { Line 861  sub editxmlmode {
  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; }
    my $js =
       &Apache::edit::js_change_detection(). 
       &Apache::loncommon::resize_textarea_js();
    my $only_body =  ($env{'environment.remote'} eq 'off')? 0 : 1;
  my $start_page =    my $start_page = 
     &Apache::loncommon::start_page("EditXML $file",      &Apache::loncommon::start_page(&mt("EditXML [_1]",$file),$js,
    &Apache::edit::js_change_detection());     {'no_auto_mt_title' => 1,
       'only_body'        => $only_body,
       'add_entries'      => {
    'onresize' => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
    'onload'   => q[resize_textarea('LC_editxmltext','LC_aftertextarea')],
       }});
   
  $result.=$start_page.   $result.=$start_page.
     &renderpage($request,$file,['no_output_web'],1).      &renderpage($request,$file,['no_output_web'],1).
Line 859  sub editxmlmode { Line 889  sub editxmlmode {
             <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />              <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
             <hr />              <hr />
             ' . $xml_help . '              ' . $xml_help . '
             <textarea '.&Apache::edit::element_change_detection().' style="width:100%" rows="'.$rows.'" cols="'.$cols.'" name="editxmltext">'.              <textarea '.&Apache::edit::element_change_detection().
     &HTML::Entities::encode($problem,'<>&"').'</textarea><br />                ' rows="'.$rows.'" cols="'.$cols.'" style="width:100%" '.
             <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />        ' name="editxmltext" id="LC_editxmltext">'.
             <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />        &HTML::Entities::encode($problem,'<>&"').'</textarea>
               <div id="LC_aftertextarea">
                   <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes').'" />
                   <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" />
               </div>
             </form>'.&Apache::loncommon::end_page();              </form>'.&Apache::loncommon::end_page();
  &Apache::lonxml::add_messages(\$result);   &Apache::lonxml::add_messages(\$result);
  $request->print($result);   $request->print($result);
Line 879  sub renderpage { Line 913  sub renderpage {
     my @targets = @{$targets || [&get_target()]};      my @targets = @{$targets || [&get_target()]};
     &Apache::lonhomework::showhashsubset(\%env,'form.');      &Apache::lonhomework::showhashsubset(\%env,'form.');
     &Apache::lonxml::debug("Running targets ".join(':',@targets));      &Apache::lonxml::debug("Running targets ".join(':',@targets));
   
     my $overall_result;      my $overall_result;
     foreach my $target (@targets) {      foreach my $target (@targets) {
  # FIXME need to do something intelligent when a problem goes   # FIXME need to do something intelligent when a problem goes
Line 916  sub renderpage { Line 951  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);   &finished_parsing();
  if (!$output) { $result = ''; }   if (!$output) { $result = ''; }
  #$request->print("Result follows:");   #$request->print("Result follows:");
  if ($target eq 'modified') {   if ($target eq 'modified') {
Line 947  sub renderpage { Line 982  sub renderpage {
     }      }
 }  }
   
   sub finished_parsing {
       undef($Apache::lonhomework::parsing_a_problem);
       undef($Apache::lonhomework::parsing_a_task);
   }
   
 # with no arg it returns a HTML <option> list of the template titles  # with no arg it returns a HTML <option> list of the template titles
 # with one arg it returns the filename associated with the arg passed  # with one arg it returns the filename associated with the arg passed
 sub get_template_list {  sub get_template_list {
Line 955  sub get_template_list { Line 995  sub get_template_list {
     my @allnames;      my @allnames;
     &Apache::lonxml::debug("Looking for :$extension:");      &Apache::lonxml::debug("Looking for :$extension:");
     foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {      foreach my $file (</home/httpd/html/res/adm/includes/templates/*.$extension>) {
    &Apache::lonxml::debug("Looking at $file");
  my $name=&Apache::lonnet::metadata($file,'title');   my $name=&Apache::lonnet::metadata($file,'title');
    &Apache::lonxml::debug("Got a name $name");
  if ($namewanted && ($name eq $namewanted)) {   if ($namewanted && ($name eq $namewanted)) {
     $result=$file;      $result=$file;
     last;      last;
Line 999  sub newproblem { Line 1041  sub newproblem {
  my $dest = &Apache::lonnet::filelocation("",$request->uri);   my $dest = &Apache::lonnet::filelocation("",$request->uri);
  my $errormsg;   my $errormsg;
  if ($env{'form.newfile'}) {   if ($env{'form.newfile'}) {
     $errormsg='<p><font color="red">'.&mt('You did not select a template.').'</font></p>'."\n";      $errormsg='<p><span class="LC_error">'.&mt('You did not select a template.').'</span></p>'."\n";
  }   }
  my $instructions;   my $instructions;
  my $start_page =    my $start_page = 
Line 1025  $errormsg Line 1067  $errormsg
     return '';      return '';
 }  }
   
   sub update_construct_style {
       if ($env{'request.state'} eq "construct"
    && $env{'form.problemmode'} eq &mt('View') 
    &&  defined($env{'form.submitted'})
    && !defined($env{'form.resetdata'})
    && !defined($env{'form.newrandomization'})) {
    if ((!$env{'form.style_file'} && $env{'construct.style'})
       ||$env{'form.clear_style_file'}) {
       &Apache::lonnet::delenv('construct\\.style');
    } elsif ($env{'form.style_file'} 
       && $env{'construct.style'} ne $env{'form.style_file'}) {
       &Apache::lonnet::appenv('construct.style' => 
           $env{'form.style_file'});
    }
       }
   }
   
   
 sub handler {  sub handler {
     #my $t0 = [&gettimeofday()];      #my $t0 = [&gettimeofday()];
     my $request=$_[0];      my $request=$_[0];
Line 1075  sub handler { Line 1135  sub handler {
     } elsif ($env{'form.problemmode'} eq &mt('Calculate answers')) {      } elsif ($env{'form.problemmode'} eq &mt('Calculate answers')) {
  &analyze($request,$file);   &analyze($request,$file);
     } else {      } else {
    &update_construct_style();
  &renderpage($request,$file);   &renderpage($request,$file);
     }      }
  } else {   } else {
Removed from v.1.263  
changed lines
  Added in v.1.274

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