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

Diff for /loncom/homework/structuretags.pm between versions 1.283 and 1.284

version 1.283, 2005/04/01 18:08:14 version 1.284, 2005/04/07 06:56:22
Line 88  sub page_start { Line 88  sub page_start {
     &Apache::lonxml::fontsettings();           &Apache::lonxml::fontsettings();     
     }      }
     my $body_tag_start;      my $body_tag_start;
     if (!defined($found{'body'}) && $ENV{'request.state'} eq 'construct'      if (!defined($found{'body'}) && $env{'request.state'} eq 'construct'
  && $ENV{'environment.remote'} eq 'off') {   && $env{'environment.remote'} eq 'off') {
  $body_tag_start=&Apache::loncommon::bodytag();   $body_tag_start=&Apache::loncommon::bodytag();
  $body_tag_start.=&Apache::lonxml::message_location();   $body_tag_start.=&Apache::lonxml::message_location();
     } elsif (!defined($found{'body'})) {      } elsif (!defined($found{'body'})) {
Line 97  sub page_start { Line 97  sub page_start {
     'onunload="'.&Apache::lonmenu::unloadevents().'" ';      'onunload="'.&Apache::lonmenu::unloadevents().'" ';
  my $background=&Apache::lonxml::get_param('background',$parstack,   my $background=&Apache::lonxml::get_param('background',$parstack,
   $safeeval);    $safeeval);
  if ($ENV{'browser.imagesuppress'} eq 'on') { $background=''; }   if ($env{'browser.imagesuppress'} eq 'on') { $background=''; }
  if ($background) {   if ($background) {
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=      $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=
  $background;   $background;
Line 105  sub page_start { Line 105  sub page_start {
  } else {   } else {
     my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,      my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
    $safeeval);     $safeeval);
     if (($bgcolor) && ($ENV{'browser.blackwhite'} ne 'on')) {      if (($bgcolor) && ($env{'browser.blackwhite'} ne 'on')) {
  $body_tag_start.='bgcolor="'.$bgcolor.'" ';   $body_tag_start.='bgcolor="'.$bgcolor.'" ';
     } else {      } else {
  $body_tag_start.='bgcolor="#ffffff"';   $body_tag_start.='bgcolor="#ffffff"';
     }      }
  }   }
  if ($ENV{'browser.fontenhance'} eq 'on') {   if ($env{'browser.fontenhance'} eq 'on') {
     $body_tag_start.=' style="font-size: x-large;" ';      $body_tag_start.=' style="font-size: x-large;" ';
  }   }
  $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);   $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);
  if ($ENV{'environment.texengine'} eq 'jsMath') {   if ($env{'environment.texengine'} eq 'jsMath') {
     $body_tag_start.='<script type="text/javascript">      $body_tag_start.='<script type="text/javascript">
                      function NoFontMessage () {}                       function NoFontMessage () {}
                    </script>'."\n".                     </script>'."\n".
        '<script src="/adm/jsMath/jsMath.js"></script>'."\n";         '<script src="/adm/jsMath/jsMath.js"></script>'."\n";
  }   }
  if ($target eq 'web' && $ENV{'request.state'} ne 'construct') {   if ($target eq 'web' && $env{'request.state'} ne 'construct') {
     my ($symb,undef,undef,undef,$publicuser)=      my ($symb,undef,undef,undef,$publicuser)=
  &Apache::lonxml::whichuser();   &Apache::lonxml::whichuser();
     if ($symb eq '' && !$publicuser) {      if ($symb eq '' && !$publicuser) {
Line 135  sub page_start { Line 135  sub page_start {
     my $form_tag_start;      my $form_tag_start;
     if (!defined($found{'form'})) {      if (!defined($found{'form'})) {
  $form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="POST" action="';   $form_tag_start='<form name="lonhomework" enctype="multipart/form-data" method="POST" action="';
  my $uri=$ENV{'request.uri'};   my $uri=$env{'request.uri'};
  if ($ENV{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }   if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }
  $form_tag_start.=$uri.'">';   $form_tag_start.=$uri.'">';
     }      }
     return ($result,$head_tag_start,$body_tag_start,$form_tag_start);      return ($result,$head_tag_start,$body_tag_start,$form_tag_start);
Line 155  sub get_resource_name { Line 155  sub get_resource_name {
  if ($name eq 'con_lost') { $name = ''; }   if ($name eq 'con_lost') { $name = ''; }
     }      }
     if ($name!~/\S+/) {      if ($name!~/\S+/) {
  $name=$ENV{'request.uri'};   $name=$env{'request.uri'};
  $name=~s-.*/([^/]+)$-$1-;   $name=~s-.*/([^/]+)$-$1-;
     }      }
     $Apache::lonhomework::name=$name;      $Apache::lonhomework::name=$name;
Line 166  sub setup_rndseed { Line 166  sub setup_rndseed {
     my ($safeeval)=@_;      my ($safeeval)=@_;
     my $rndseed;      my $rndseed;
     my ($symb)=&Apache::lonxml::whichuser();      my ($symb)=&Apache::lonxml::whichuser();
     if ($ENV{'request.state'} eq "construct" || $symb eq '' ||      if ($env{'request.state'} eq "construct" || $symb eq '' ||
           $Apache::lonhomework::history{'resource.CODE'}) {            $Apache::lonhomework::history{'resource.CODE'}) {
  $rndseed=$ENV{'form.rndseed'};   $rndseed=$env{'form.rndseed'};
  if (!$rndseed) {   if (!$rndseed) {
     $rndseed=$Apache::lonhomework::history{'rndseed'};      $rndseed=$Apache::lonhomework::history{'rndseed'};
     if (!$rndseed) {      if (!$rndseed) {
  $rndseed=time;   $rndseed=time;
     }      }
     $ENV{'form.rndseed'}=$rndseed;      $env{'form.rndseed'}=$rndseed;
  }   }
  if ($ENV{'form.resetdata'} eq &mt('New Problem Variation') ||   if ($env{'form.resetdata'} eq &mt('New Problem Variation') ||
     $ENV{'form.newrandomization'} eq &mt('New Randomization')) {      $env{'form.newrandomization'} eq &mt('New Randomization')) {
     srand(time);      srand(time);
     $rndseed=int(rand(2100000000));      $rndseed=int(rand(2100000000));
     $ENV{'form.rndseed'}=$rndseed;      $env{'form.rndseed'}=$rndseed;
     delete($ENV{'form.resetdata'});      delete($env{'form.resetdata'});
     delete($ENV{'form.newrandomization'});      delete($env{'form.newrandomization'});
  }   }
  if (defined($rndseed) && $rndseed ne int($rndseed)) {   if (defined($rndseed) && $rndseed ne int($rndseed)) {
    $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));     $rndseed=join(',',&Math::Random::random_seed_from_phrase($rndseed));
Line 200  sub setup_rndseed { Line 200  sub setup_rndseed {
   
 sub remember_problem_state {  sub remember_problem_state {
     return '      return '
        <input type="hidden" name="problemstate" value="'.$ENV{'form.problemstate'}.'" />         <input type="hidden" name="problemstate" value="'.$env{'form.problemstate'}.'" />
        <input type="hidden" name="problemtype" value="'.$ENV{'form.problemtype'}.'" />         <input type="hidden" name="problemtype" value="'.$env{'form.problemtype'}.'" />
        <input type="hidden" name="problemstatus" value="'.$ENV{'form.problemstatus'}.'" />';         <input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />';
 }  }
   
 sub problem_edit_header {  sub problem_edit_header {
Line 229  sub problem_edit_footer { Line 229  sub problem_edit_footer {
 sub option {  sub option {
     my ($value,$name) = @_;      my ($value,$name) = @_;
     my $result ="<option value='".$value."' ";      my $result ="<option value='".$value."' ";
     if ($ENV{'form.'.$name} eq $value) {      if ($env{'form.'.$name} eq $value) {
  $result.=" selected='on' ";   $result.=" selected='on' ";
     }      }
     $result.='>';      $result.='>';
Line 248  sub problem_web_to_edit_header { Line 248  sub problem_web_to_edit_header {
        $rndseed.'"         $rndseed.'"
            onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr>             onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr>
              <label><input type="checkbox" name="showallfoils" ';               <label><input type="checkbox" name="showallfoils" ';
     if (defined($ENV{'form.showallfoils'})) { $result.='checked="on"'; }      if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }
     $result.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').      $result.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').
  &Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').   &Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
  '</label><hr />';   '</label><hr />';
Line 283  Feedback Mode: Line 283  Feedback Mode:
 </nobr>  </nobr>
 <input type='submit' name='changeproblemmode' value='".&mt("Change")."' />  <input type='submit' name='changeproblemmode' value='".&mt("Change")."' />
 <hr />";  <hr />";
     my $numtoanalyze=$ENV{'form.numtoanalyze'};      my $numtoanalyze=$env{'form.numtoanalyze'};
     if (!$numtoanalyze) { $numtoanalyze=20; }      if (!$numtoanalyze) { $numtoanalyze=20; }
     $result.= '<input type="submit" name="problemmode" value='.      $result.= '<input type="submit" name="problemmode" value='.
  &mt('"Calculate answers').'" /> for   &mt('"Calculate answers').'" /> for
Line 299  sub initialize_storage { Line 299  sub initialize_storage {
     %Apache::lonhomework::results=();      %Apache::lonhomework::results=();
     %Apache::lonhomework::history=();      %Apache::lonhomework::history=();
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();      my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
     if ($ENV{'request.state'} eq 'construct' || $symb eq '') {      if ($env{'request.state'} eq 'construct' || $symb eq '') {
  %Apache::lonhomework::history=   %Apache::lonhomework::history=
     &Apache::lonnet::tmprestore($ENV{'request.uri'},'',$domain,$name);      &Apache::lonnet::tmprestore($env{'request.uri'},'',$domain,$name);
  my ($temp)=keys %Apache::lonhomework::history ;   my ($temp)=keys %Apache::lonhomework::history ;
  &Apache::lonxml::debug("Return message of $temp");   &Apache::lonxml::debug("Return message of $temp");
     } else {      } else {
Line 322  sub finalize_storage { Line 322  sub finalize_storage {
     my ($temp) = keys %Apache::lonhomework::results;      my ($temp) = keys %Apache::lonhomework::results;
     if ( $temp ne '' ) {      if ( $temp ne '' ) {
  my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();   my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();
  if ($ENV{'request.state'} eq 'construct' || $symb eq '') {   if ($env{'request.state'} eq 'construct' || $symb eq '') {
     $Apache::lonhomework::results{'rndseed'}=$ENV{'form.rndseed'};      $Apache::lonhomework::results{'rndseed'}=$env{'form.rndseed'};
     $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,      $result=&Apache::lonnet::tmpstore(\%Apache::lonhomework::results,
  $ENV{'request.uri'},'',$domain,$name);   $env{'request.uri'},'',$domain,$name);
     &Apache::lonxml::debug('Construct Store return message:'.$result);      &Apache::lonxml::debug('Construct Store return message:'.$result);
  } else {   } else {
     $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,      $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
Line 349  sub checkout_msg { Line 349  sub checkout_msg {
 <font color="red">  <font color="red">
 <p>$lt{'warning'}</p>  <p>$lt{'warning'}</p>
 </font>  </font>
 <form name="checkout" method="POST" action="$ENV{'request.uri'}">  <form name="checkout" method="POST" action="$env{'request.uri'}">
 <input type="hidden" name="doescheckout" value="yes" />  <input type="hidden" name="doescheckout" value="yes" />
 <input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />  <input type="button" name="checkoutbutton" value="$lt{'checkout'}" onClick="javascript:if (confirm('$lt{'checkout?'}')) { document.checkout.submit(); }" />
 </form>  </form>
Line 363  sub firstaccess_msg { Line 363  sub firstaccess_msg {
     &Apache::lonxml::debug("map is $map title is $foldertitle");      &Apache::lonxml::debug("map is $map title is $foldertitle");
     return (<<ENDCHECKOUT);      return (<<ENDCHECKOUT);
 <h2>The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".</h2>  <h2>The resources in "$foldertitle" are open for a limited time. Once you click the 'Show Resource' button below you have $time to complete all resources "$foldertitle".</h2>
 <form name="markaccess" method="POST" action="$ENV{'request.uri'}">  <form name="markaccess" method="POST" action="$env{'request.uri'}">
 <input type="hidden" name="markaccess" value="yes" />  <input type="hidden" name="markaccess" value="yes" />
 <input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" />  <input type="button" name="accessbutton" value="Show Resource" onClick="javascript:if (confirm('Start Timer?')) { document.markaccess.submit(); }" />
 </form>  </form>
Line 410  sub reset_problem_globals { Line 410  sub reset_problem_globals {
   
 sub set_problem_state {  sub set_problem_state {
     my ($part)=@_;      my ($part)=@_;
     if ($ENV{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {      if ($env{'form.problemstate'} eq 'CANNOT_ANSWER_correct') {
  $Apache::lonhomework::history{"resource.$part.solved"}=   $Apache::lonhomework::history{"resource.$part.solved"}=
     'correct_by_student';      'correct_by_student';
     }      }
Line 419  sub set_problem_state { Line 419  sub set_problem_state {
 sub get_problem_status {  sub get_problem_status {
     my ($part)=@_;      my ($part)=@_;
     my $problem_status;      my $problem_status;
     if ($ENV{'request.state'} eq 'construct' &&      if ($env{'request.state'} eq 'construct' &&
  defined($ENV{'form.problemstatus'})) {   defined($env{'form.problemstatus'})) {
  $problem_status=$ENV{'form.problemstatus'};   $problem_status=$env{'form.problemstatus'};
     } else {      } else {
  $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");   $problem_status=&Apache::lonnet::EXT("resource.$part.problemstatus");
  &Apache::lonxml::debug("problem status for $part is $problem_status");   &Apache::lonxml::debug("problem status for $part is $problem_status");
  &Apache::lonxml::debug("env probstat is ".$ENV{'form.problemstatus'});   &Apache::lonxml::debug("env probstat is ".$env{'form.problemstatus'});
     }      }
     return $problem_status;      return $problem_status;
 }  }
Line 443  sub start_problem { Line 443  sub start_problem {
     $Apache::lonhomework::parsing_a_problem=1;      $Apache::lonhomework::parsing_a_problem=1;
     &init_problem_globals('problem');      &init_problem_globals('problem');
   
     if (defined($ENV{'scantron.maxquest'})) {      if (defined($env{'scantron.maxquest'})) {
  $Apache::lonhomework::scantronmode=1;   $Apache::lonhomework::scantronmode=1;
     }      }
   
Line 452  sub start_problem { Line 452  sub start_problem {
  if ($target eq 'web') {   if ($target eq 'web') {
     &Apache::lonhomework::showhash(%Apache::lonhomework::history);      &Apache::lonhomework::showhash(%Apache::lonhomework::history);
  }   }
         if ($ENV{'request.state'} eq 'construct') { &set_problem_state('0'); }          if ($env{'request.state'} eq 'construct') { &set_problem_state('0'); }
  $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');   $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
  if (($ENV{'request.state'} eq 'construct') &&   if (($env{'request.state'} eq 'construct') &&
     defined($ENV{'form.problemtype'})) {      defined($env{'form.problemtype'})) {
     $Apache::lonhomework::type=$ENV{'form.problemtype'};      $Apache::lonhomework::type=$env{'form.problemtype'};
  }   }
  &Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");   &Apache::lonxml::debug("Found this to be of type :$Apache::ltonhomework::type:");
     }      }
     if ($Apache::lonhomework::type eq '' ) {      if ($Apache::lonhomework::type eq '' ) {
  my $uri=$ENV{'request.uri'};   my $uri=$env{'request.uri'};
  if ($uri=~/\.(\w+)$/) {   if ($uri=~/\.(\w+)$/) {
     $Apache::lonhomework::type=$1;      $Apache::lonhomework::type=$1;
     &Apache::lonxml::debug("Using type of $1");      &Apache::lonxml::debug("Using type of $1");
Line 481  sub start_problem { Line 481  sub start_problem {
     #should get back a <html> or the neccesary stuff to start XML/MathML      #should get back a <html> or the neccesary stuff to start XML/MathML
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=      my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
  &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);   &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
     if ($target eq 'tex' and $ENV{'request.symb'} =~ m/\.page_/) {$result='';}      if ($target eq 'tex' and $env{'request.symb'} =~ m/\.page_/) {$result='';}
   
     if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }      if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
Line 490  sub start_problem { Line 490  sub start_problem {
  if ($Apache::lonhomework::type eq 'exam') {   if ($Apache::lonhomework::type eq 'exam') {
     my $token=      my $token=
  $Apache::lonhomework::history{"resource.0.outtoken"};   $Apache::lonhomework::history{"resource.0.outtoken"};
     if (($ENV{'form.doescheckout'}) && (!$token)) {      if (($env{'form.doescheckout'}) && (!$token)) {
  $token=&Apache::lonxml::maketoken();   $token=&Apache::lonxml::maketoken();
  $Apache::lonhomework::history{"resource.0.outtoken"}=   $Apache::lonhomework::history{"resource.0.outtoken"}=
     $token;      $token;
     }      }
     $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);      $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);
  }   }
  if ($ENV{'form.markaccess'}) {   if ($env{'form.markaccess'}) {
     &Apache::lonnet::set_first_access('map');      &Apache::lonnet::set_first_access('map');
  }   }
  #handle rand seed in construction space   #handle rand seed in construction space
  my $rndseed=&setup_rndseed($safeeval);   my $rndseed=&setup_rndseed($safeeval);
  my ($symb)=&Apache::lonxml::whichuser();   my ($symb)=&Apache::lonxml::whichuser();
  if ($ENV{'request.state'} ne "construct" && $symb eq '') {   if ($env{'request.state'} ne "construct" && $symb eq '') {
     $form_tag_start.='<input type="hidden" name="rndseed" value="'.      $form_tag_start.='<input type="hidden" name="rndseed" value="'.
  $rndseed.'" />'.   $rndseed.'" />'.
     '<input type="submit" name="resetdata"      '<input type="submit" name="resetdata"
                              value="'.&mt('New Problem Variation').'" />'.                               value="'.&mt('New Problem Variation').'" />'.
     '<input type="hidden" name="username"      '<input type="hidden" name="username"
                              value="'.$ENV{'form.username'}.'" />';                               value="'.$env{'form.username'}.'" />';
     if ($ENV{'user.adv'}) {      if ($env{'user.adv'}) {
  $form_tag_start.=   $form_tag_start.=
     ' <input type="checkbox" name="showallfoils" ';      ' <input type="checkbox" name="showallfoils" ';
  if (defined($ENV{'form.showallfoils'})) {   if (defined($env{'form.showallfoils'})) {
     $form_tag_start.='checked="on"';      $form_tag_start.='checked="on"';
  }   }
  $form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils');   $form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils');
Line 563  sub start_problem { Line 563  sub start_problem {
               $body_tag_start \n $form_tag_start".                $body_tag_start \n $form_tag_start".
       '<input type="hidden" name="submitted" value="yes" />';        '<input type="hidden" name="submitted" value="yes" />';
     # create a page header and exit      # create a page header and exit
     if ($ENV{'request.state'} eq "construct") {      if ($env{'request.state'} eq "construct") {
  $result.= &problem_web_to_edit_header($ENV{'form.rndseed'});   $result.= &problem_web_to_edit_header($env{'form.rndseed'});
     }      }
     # if we are viewing someone else preserve that info      # if we are viewing someone else preserve that info
     if (defined $ENV{'form.grade_symb'}) {      if (defined $env{'form.grade_symb'}) {
  foreach my $field ('symb','courseid','domain','username') {   foreach my $field ('symb','courseid','domain','username') {
     $result .= '<input type="hidden" name="grade_'.$field.      $result .= '<input type="hidden" name="grade_'.$field.
  '" value="'.$ENV{"form.grade_$field"}.'" />'."\n";   '" value="'.$env{"form.grade_$field"}.'" />'."\n";
  }   }
     }      }
  } elsif ($target eq 'tex') {   } elsif ($target eq 'tex') {
     my $startminipage = '';      my $startminipage = '';
     if (not $ENV{'form.problem_split'}=~/yes/) {      if (not $env{'form.problem_split'}=~/yes/) {
  $startminipage = '\begin{minipage}{\textwidth}';   $startminipage = '\begin{minipage}{\textwidth}';
     }      }
     my $id = $Apache::inputtags::part;      my $id = $Apache::inputtags::part;
     my $weight = &Apache::lonnet::EXT("resource.$id.weight");      my $weight = &Apache::lonnet::EXT("resource.$id.weight");
     my $packages=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');      my $packages=&Apache::lonnet::metadata($env{'request.uri'},'packages');
     my @packages = split /,/,$packages;      my @packages = split /,/,$packages;
     my $allow_print_points = 0;      my $allow_print_points = 0;
     foreach my $partial_key (@packages) {      foreach my $partial_key (@packages) {
Line 593  sub start_problem { Line 593  sub start_problem {
     my $duedate = &Apache::lonnet::EXT("resource.$id.duedate");       my $duedate = &Apache::lonnet::EXT("resource.$id.duedate"); 
     $duedate = POSIX::strftime("%c",localtime($duedate));      $duedate = POSIX::strftime("%c",localtime($duedate));
     my $temp_file;      my $temp_file;
     my $filename = "/home/httpd/prtspool/$ENV{'user.name'}_$ENV{'user.domain'}_printout.due";      my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
     if (-e $filename) {      if (-e $filename) {
  $temp_file = Apache::File->new($filename);   $temp_file = Apache::File->new($filename);
     } else {      } else {
Line 606  sub start_problem { Line 606  sub start_problem {
     if ($due_file_content ne $duedate) {      if ($due_file_content ne $duedate) {
  $temp_file = Apache::File->new('>'.$filename);   $temp_file = Apache::File->new('>'.$filename);
  print $temp_file "$duedate\n";   print $temp_file "$duedate\n";
  if (not $ENV{'request.symb'} =~ m/\.page_/) {   if (not $env{'request.symb'} =~ m/\.page_/) {
     if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {      if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
  $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';   $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent\textit{Due date: '.$duedate.'} \vskip 1 mm\noindent '.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
     } else {      } else {
  $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';   $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm \noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
  if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}   if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
     }      }
  } else {   } else {
     $result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';      $result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
  }   }
     } else {      } else {
  if (not $ENV{'request.symb'} =~ m/\.page_/) {   if (not $env{'request.symb'} =~ m/\.page_/) {
     $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$ENV{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';      $result .= '\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent \vskip 1 mm\noindent'.$startminipage.'\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
     if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}      if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
  } else {   } else {
     $result .= '\vskip 1mm \\\\\\\\';      $result .= '\vskip 1mm \\\\\\\\';
Line 665  sub end_problem { Line 665  sub end_problem {
     $result.= $gradestatus;      $result.= $gradestatus;
  }   }
  if (   if (
     (($target eq 'web') && ($ENV{'request.state'} ne 'construct')) ||      (($target eq 'web') && ($env{'request.state'} ne 'construct')) ||
     ($target eq 'answer') || ($target eq 'tex')      ($target eq 'answer') || ($target eq 'tex')
    ) {     ) {
     if ($target ne 'tex' &&      if ($target ne 'tex' &&
  $ENV{'form.answer_output_mode'} ne 'tex') {   $env{'form.answer_output_mode'} ne 'tex') {
  $result.="</form>";   $result.="</form>";
  $result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);   $result.=&Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields);
     }      }
Line 677  sub end_problem { Line 677  sub end_problem {
  $result.=&Apache::lonxml::xmlend().'</html>';   $result.=&Apache::lonxml::xmlend().'</html>';
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $endminipage = '';   my $endminipage = '';
  if (not $ENV{'form.problem_split'}=~/yes/) {   if (not $env{'form.problem_split'}=~/yes/) {
     $endminipage = '\end{minipage}';      $endminipage = '\end{minipage}';
  }   }
                 if ($ENV{'form.print_discussions'} eq 'yes') {                  if ($env{'form.print_discussions'} eq 'yes') {
     $result.=&Apache::lonxml::xmlend($target,$parser);      $result.=&Apache::lonxml::xmlend($target,$parser);
     $result=~s/<\/html>//;      $result=~s/<\/html>//;
  } else {   } else {
     $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';      $result .= '\keephidden{ENDOFPROBLEM}\vskip 0.5mm\noindent\makebox[\textwidth/$number_of_columns][b]{\hrulefill}';
     if (not $ENV{'request.symb'} =~ m/\.page_/) {      if (not $env{'request.symb'} =~ m/\.page_/) {
  $result .= $endminipage.'\end{document} ';   $result .= $endminipage.'\end{document} ';
     } else {      } else {
  $result .= '';   $result .= '';
Line 697  sub end_problem { Line 697  sub end_problem {
     &Apache::lonhomework::showhash(%Apache::lonhomework::results);      &Apache::lonhomework::showhash(%Apache::lonhomework::results);
     &finalize_storage();      &finalize_storage();
  }   }
  if ($target eq 'answer' && ($ENV{'request.state'} eq 'construct')   if ($target eq 'answer' && ($env{'request.state'} eq 'construct')
     && $ENV{'form.answer_output_mode'} ne 'tex') {      && $env{'form.answer_output_mode'} ne 'tex') {
     $result.='</html>'; # normally we get it from xmlend, but in CSTR      $result.='</html>'; # normally we get it from xmlend, but in CSTR
                         # we always show answer mode too.                          # we always show answer mode too.
  }   }
Line 714  sub end_problem { Line 714  sub end_problem {
  $result = &problem_edit_footer();   $result = &problem_edit_footer();
     }      }
   
     if ($ENV{'request.state'} eq 'construct' && $target eq 'web') {      if ($env{'request.state'} eq 'construct' && $target eq 'web') {
  &Apache::inputtags::check_for_duplicate_ids();   &Apache::inputtags::check_for_duplicate_ids();
     }      }
   
Line 742  sub start_library { Line 742  sub start_library {
  $result=$token->[4];   $result=$token->[4];
  $result.=&Apache::edit::handle_insert();   $result.=&Apache::edit::handle_insert();
     } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&      } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
      $ENV{'request.state'} eq "construct" ) {       $env{'request.state'} eq "construct" ) {
  ($result,$head_tag_start,$body_tag_start,$form_tag_start)=   ($result,$head_tag_start,$body_tag_start,$form_tag_start)=
     &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);      &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);
  my $name=&get_resource_name($parstack,$safeeval);   my $name=&get_resource_name($parstack,$safeeval);
Line 761  sub end_library { Line 761  sub end_library {
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $result=&problem_edit_footer();   $result=&problem_edit_footer();
     } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&      } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&
      $ENV{'request.state'} eq "construct") {       $env{'request.state'} eq "construct") {
  $result.='</form>'.&Apache::loncommon::endbodytag().   $result.='</form>'.&Apache::loncommon::endbodytag().
     &Apache::lonxml::xmlend();      &Apache::lonxml::xmlend();
     }      }
Line 897  sub start_instructorcomment { Line 897  sub start_instructorcomment {
   
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
         $result=($ENV{'request.role'}=~/^(in|cc|au|ca|li)/);          $result=($env{'request.role'}=~/^(in|cc|au|ca|li)/);
  if ( (! $result) or ($ENV{'form.instructor_comments'} eq 'hide')) {   if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) {
     my $skip=&Apache::lonxml::get_all_text("/instructorcomment",      my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
    $parser,$style);     $parser,$style);
     &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");      &Apache::lonxml::debug("skipping ahead :$skip: $$parser[-1]");
Line 1110  sub start_part { Line 1110  sub start_part {
     my $expression='$external::datestatus="'.$status.'";';      my $expression='$external::datestatus="'.$status.'";';
     $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';      $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.$id.solved"}.'";';
     &Apache::run::run($expression,$safeeval);      &Apache::run::run($expression,$safeeval);
     if ($ENV{'request.state'} eq 'construct') {      if ($env{'request.state'} eq 'construct') {
  &set_problem_state($Apache::inputtags::part);    &set_problem_state($Apache::inputtags::part); 
     }      }
     if (( $status eq 'CLOSED' ) ||      if (( $status eq 'CLOSED' ) ||
Line 1123  sub start_part { Line 1123  sub start_part {
  if ( $target eq "web" ) {   if ( $target eq "web" ) {
     $result="<br />".&mt('Part is not open to be viewed. It')." $accessmsg<br />";      $result="<br />".&mt('Part is not open to be viewed. It')." $accessmsg<br />";
  } elsif ( $target eq 'tex' ) {   } elsif ( $target eq 'tex' ) {
     if (not $ENV{'form.problem_split'}=~/yes/) {      if (not $env{'form.problem_split'}=~/yes/) {
  $result="\\end{minipage}\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\\\begin{minipage}{\\textwidth}";   $result="\\end{minipage}\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\\\begin{minipage}{\\textwidth}";
     } else {      } else {
  $result="\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\";   $result="\\vskip 0 mm ".&mt('Part is not open to be viewed. It')." $accessmsg \\\\";
Line 1131  sub start_part { Line 1131  sub start_part {
  }   }
     } else {      } else {
  if ($target eq 'tex') {   if ($target eq 'tex') {
     if (not $ENV{'form.problem_split'}=~/yes/) {      if (not $env{'form.problem_split'}=~/yes/) {
  if ($$tagstack[-2] eq 'td') {   if ($$tagstack[-2] eq 'td') {
     $result.='\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';      $result.='\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
  } else {   } else {
Line 1139  sub start_part { Line 1139  sub start_part {
  }   }
     }      }
     my $weight = &Apache::lonnet::EXT("resource.$id.weight");      my $weight = &Apache::lonnet::EXT("resource.$id.weight");
     my $allkeys=&Apache::lonnet::metadata($ENV{'request.uri'},'packages');      my $allkeys=&Apache::lonnet::metadata($env{'request.uri'},'packages');
     my @allkeys = split /,/,$allkeys;      my @allkeys = split /,/,$allkeys;
     my $allow_print_points = 0;      my $allow_print_points = 0;
     foreach my $partial_key (@allkeys) {      foreach my $partial_key (@allkeys) {
Line 1390  sub delete_startouttext { Line 1390  sub delete_startouttext {
 sub start_simpleeditbutton {  sub start_simpleeditbutton {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';      my $result='';
     if (($ENV{'form.simple_edit_button'} ne 'off') &&      if (($env{'form.simple_edit_button'} ne 'off') &&
  ($target eq 'web') &&   ($target eq 'web') &&
         (&Apache::lonnet::allowed('srm',$ENV{'request.course.id'}))) {          (&Apache::lonnet::allowed('srm',$env{'request.course.id'}))) {
         my $url=$ENV{'request.noversionuri'};          my $url=$env{'request.noversionuri'};
         $url=~s/\?.*$//;          $url=~s/\?.*$//;
  my ($symb) = &Apache::lonxml::whichuser();   my ($symb) = &Apache::lonxml::whichuser();
  $result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.   $result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
Removed from v.1.283  
changed lines
  Added in v.1.284

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