Diff for /loncom/homework/structuretags.pm between versions 1.288 and 1.352

version 1.288, 2005/04/18 22:39:35 version 1.352, 2006/04/20 19:07:09
Line 36  use Apache::File(); Line 36  use Apache::File();
 use Apache::lonmenu;  use Apache::lonmenu;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonxml;  use Apache::lonxml;
   use Apache::lonenc();
 use Time::HiRes qw( gettimeofday tv_interval );  use Time::HiRes qw( gettimeofday tv_interval );
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));      &Apache::lonxml::register('Apache::structuretags',('block','languageblock','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startouttext','endouttext','simpleeditbutton','definetag'));
 }  }
   
 sub start_web {  sub start_web {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $bodytext=&Apache::lonxml::get_all_text("/web",$parser);      my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style);
     if ($target eq 'web') {      if ($target eq 'web' || $target eq 'webgrade') {
  return $bodytext;   return $bodytext;
     }      }
     return '';      return '';
Line 55  sub end_web { Line 56  sub end_web {
 }  }
   
 sub start_tex {  sub start_tex {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser);      my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);
     if ($target eq 'tex') {      if ($target eq 'tex') {
  return $bodytext.' ';   return $bodytext.' ';
     }      }
Line 69  sub end_tex { Line 70  sub end_tex {
 }  }
   
 sub page_start {  sub page_start {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name,
    $extra_head)=@_;
     my %found;      my %found;
     foreach my $taginside (@$tagstack) {      foreach my $taginside (@$tagstack) {
  foreach my $taglookedfor ('html','body','form') {   foreach my $taglookedfor ('html','body','form') {
Line 77  sub page_start { Line 79  sub page_start {
  }   }
     }      }
   
     my $result;      if ($target eq 'tex') {
     my $head_tag_start;   return
     if (!defined($found{'html'})) {      &Apache::londefdef::start_html($target,$token,$tagstack,
  $result=&Apache::londefdef::start_html($target,$token,$tagstack,     $parstack,$parser,$safeeval);
        $parstack,$parser,$safeeval);      }
  $head_tag_start='<head>'.&Apache::lonmenu::registerurl(undef,$target).  
     &Apache::lonhtmlcommon::htmlareaheaders().      my %body_args;
     &Apache::lonhtmlcommon::spellheader().      if (defined($found{'html'})) {
     &Apache::lonxml::fontsettings();        $body_args{'skip_phases'}{'head'}=1;
     }      } else {
     my $body_tag_start;  
     if (!defined($found{'body'}) && $env{'request.state'} eq 'construct'   $extra_head .= &Apache::lonhtmlcommon::spellheader();
  && $env{'environment.remote'} eq 'off') {  
  $body_tag_start=&Apache::loncommon::bodytag();   my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');
  $body_tag_start.=&Apache::lonxml::message_location();   if ($css_href =~ /\S/) {
       &Apache::lonxml::extlink($css_href);
       $extra_head .= 
    '<link rel="stylesheet" type="text/css" href="'.$css_href.'" />';
    }
    if ($target eq 'edit') {
       $extra_head.=&Apache::edit::js_change_detection().
    "<script type=\"text/javascript\">\n".
    "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
    &Apache::loncommon::browser_and_searcher_javascript().
                   "\n</script>\n";
    }
       }
   
       if (defined($found{'body'})) {
    $body_args{'skip_phases'}{'body'}=1;
       } elsif (!defined($found{'body'}) 
        && $env{'request.state'} eq 'construct') {
    if ($target eq 'web' || $target eq 'edit') {
       # no extra args to bodytag
    }
     } elsif (!defined($found{'body'})) {      } elsif (!defined($found{'body'})) {
  $body_tag_start='<body onload="'.&Apache::lonmenu::loadevents().'" '.   my %add_entries;
     '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 ($background ne '' ) {
  if ($background) {      $add_entries{'background'} = $background;
     $Apache::lonxml::extlinks[$#Apache::lonxml::extlinks+1]=  
  $background;  
     $body_tag_start.='background="'.$background.'" ';  
  } else {  
     my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,  
    $safeeval);  
     if (($bgcolor) && ($env{'browser.blackwhite'} ne 'on')) {  
  $body_tag_start.='bgcolor="'.$bgcolor.'" ';  
     } else {  
  $body_tag_start.='bgcolor="#ffffff"';  
     }  
  }  
  if ($env{'browser.fontenhance'} eq 'on') {  
     $body_tag_start.=' style="font-size: x-large;" ';  
  }  
  $body_tag_start.='>'.&Apache::lonmenu::menubuttons(undef,$target,1);  
  if ($env{'environment.texengine'} eq 'jsMath') {  
     $body_tag_start.='<script type="text/javascript">  
                      function NoFontMessage () {}  
                    </script>'."\n".  
        '<script src="/adm/jsMath/jsMath.js"></script>'."\n";  
  }   }
  if ($target eq 'web' && $env{'request.state'} ne 'construct') {  
     my ($symb,undef,undef,undef,$publicuser)=   my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
  &Apache::lonxml::whichuser();         $safeeval);
     if ($symb eq '' && !$publicuser) {          if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; }
  my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");  
  $help=&mt("Browsing resource, all submissions are temporary.")."<br />";   $body_args{'bgcolor'}        = $bgcolor;
  $body_tag_start.=$help;   $body_args{'no_title'}       = 1;
     }   $body_args{'force_register'} = 1;
    $body_args{'add_entries'}    = \%add_entries;
       }
   
       my $page_start = &Apache::loncommon::start_page($name,$extra_head,
       \%body_args);
   
       if (!defined($found{'body'}) 
    && $env{'request.state'} ne 'construct'
    && ($target eq 'web' || $target eq 'webgrade')) {
   
    my ($symb,undef,undef,undef,$publicuser)= &Apache::lonxml::whichuser();
    if ($symb eq '' && !$publicuser) {
       my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
       $help=&mt("Browsing resource, all submissions are temporary.")."<br />";
       $page_start .= $help;
  }   }
  $body_tag_start.=&Apache::lonxml::message_location();  
     }      }
   
       if (!defined($found{'body'})) {
    $page_start .= &Apache::lonxml::message_location();
       }
       
     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 = &Apache::lonenc::check_encrypt($env{'request.uri'});
  if ($env{'request.enc'}) { $uri=&Apache::lonenc::encrypted($uri); }   $form_tag_start.=$uri.'" ';
  $form_tag_start.=$uri.'">';   if ($target eq 'edit') {
       $form_tag_start.=&Apache::edit::form_change_detection();
    }
    $form_tag_start.='>';
     }      }
     return ($result,$head_tag_start,$body_tag_start,$form_tag_start);      return ($page_start,$form_tag_start);
 }  }
   
 #use Time::HiRes();  #use Time::HiRes();
Line 166  sub setup_rndseed { Line 188  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" 
           $Apache::lonhomework::history{'resource.CODE'}) {   || $symb eq '' 
    || $Apache::lonhomework::type eq 'practice'
    || $Apache::lonhomework::history{'resource.CODE'}) {
    &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
    ['rndseed']);
  $rndseed=$env{'form.rndseed'};   $rndseed=$env{'form.rndseed'};
  if (!$rndseed) {   if (!$rndseed) {
     $rndseed=$Apache::lonhomework::history{'rndseed'};      $rndseed=$Apache::lonhomework::history{'rndseed'};
Line 185  sub setup_rndseed { Line 211  sub setup_rndseed {
     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(':',&Apache::lonnet::digest($rndseed));
         }          }
         if ($Apache::lonhomework::history{'resource.CODE'}) {          if ($Apache::lonhomework::history{'resource.CODE'}) {
    $rndseed=&Apache::lonnet::rndseed();     $rndseed=&Apache::lonnet::rndseed();
Line 210  sub problem_edit_header { Line 236  sub problem_edit_header {
  &Apache::structuretags::remember_problem_state().'   &Apache::structuretags::remember_problem_state().'
        <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />         <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />
        <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />         <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />
        <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />         <input '.&Apache::edit::submit_ask_anyway().' type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
        <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr />         <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr />
        <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" />         <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" />
        <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.         <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.
Line 222  sub problem_edit_header { Line 248  sub problem_edit_header {
 sub problem_edit_footer {  sub problem_edit_footer {
     return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />      return '</td></tr></table><br /><input type="submit" name="submit" value="'.&mt('Submit Changes and Edit').'" />
     <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'.      <input type="submit" name="submit" value="'.&mt('Submit Changes and View').'" />'.
     &Apache::lonhtmlcommon::htmlareaselectactive(@Apache::lonxml::htmlareafields).      &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
     "\n</form>\n".&Apache::loncommon::endbodytag()."\n</html>";      "\n</form>\n".&Apache::loncommon::end_page();
 }  }
   
 sub option {  sub option {
Line 238  sub option { Line 264  sub option {
   
 sub problem_web_to_edit_header {  sub problem_web_to_edit_header {
     my ($rndseed)=@_;      my ($rndseed)=@_;
     my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />      my $result.='<input type="hidden" name="problemmode" value="'.&mt('View').'" />';
              <input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />      if (!$Apache::lonhomework::parsing_a_task) {
              <input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />   $result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />';
       }
       $result .= '<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />
              <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />               <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
              <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />               <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
              <nobr><input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />               <nobr><input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
Line 248  sub problem_web_to_edit_header { Line 276  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" ';
       my $show_all_foils_text = 
    ($Apache::lonhomework::parsing_a_task) ?
    &mt('&nbsp;Show&nbsp;All&nbsp;Instances')
    : &mt('&nbsp;Show&nbsp;All&nbsp;Foils');
   
     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.= ' />'.$show_all_foils_text.
  &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 />';
     $result.="      if (!$Apache::lonhomework::parsing_a_task) {
    $result.="
 <nobr>  <nobr>
 Problem Status:  Problem Status:
 <select name='problemstate'>  <select name='problemstate'>
Line 283  Feedback Mode: Line 317  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
              <input type="text" name="numtoanalyze" value="'.               <input type="text" name="numtoanalyze" value="'.
      $numtoanalyze.'" size="5" /> '.&mt('versions of this problem').       $numtoanalyze.'" size="5" /> '.&mt('versions of this problem').
      '.'.&Apache::loncommon::help_open_topic("Analyze_Problem",       '.'.&Apache::loncommon::help_open_topic("Analyze_Problem",
      '',undef,undef,300).       '',undef,undef,300).
      '<hr />';       '<hr />';
       }
     return $result;      return $result;
 }  }
   
Line 299  sub initialize_storage { Line 334  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::type eq 'practice') {
   
    my $namespace = $symb || $env{'request.uri'};
    if ($env{'form.resetdata'} eq &mt('Reset Submissions') ||
       $env{'form.resetdata'} eq &mt('New Problem Variation') ||
       $env{'form.newrandomization'} eq &mt('New Randomization')) {
       &Apache::lonnet::tmpreset($namespace,'',$domain,$name);
       &Apache::lonxml::debug("Attempt reset");
    }
  %Apache::lonhomework::history=   %Apache::lonhomework::history=
     &Apache::lonnet::tmprestore($env{'request.uri'},'',$domain,$name);      &Apache::lonnet::tmprestore($namespace,'',$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 321  sub initialize_storage { Line 366  sub initialize_storage {
 # if running user has student role.    # if running user has student role.  
 sub finalize_storage {  sub finalize_storage {
     my $result;      my $result;
     my ($temp) = keys %Apache::lonhomework::results;      if (%Apache::lonhomework::results) {
     if ( $temp ne '' ) {   my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results));
    delete(@Apache::lonhomework::results{@remove});
  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::type eq 'practice') {
       my $namespace = $symb || $env{'request.uri'};
     $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);        $namespace,'',$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 337  sub finalize_storage { Line 386  sub finalize_storage {
                 &store_aggregates($symb,$courseid);                  &store_aggregates($symb,$courseid);
             }              }
  }   }
       } else {
    &Apache::lonxml::debug('Nothing to store');
     }      }
     return $result;      return $result;
 }  }
   use Data::Dumper;
   
 # -------------------------------------------------------------store_aggregates  # -------------------------------------------------------------store_aggregates
 # Sends hash of values to be incremented in nohist_resourcetracker.db  # Sends hash of values to be incremented in nohist_resourcetracker.db
Line 365  sub store_aggregates { Line 417  sub store_aggregates {
         }          }
         if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {          if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {
             $aggregate{$symb."\0".$part."\0users"} = 1;              $aggregate{$symb."\0".$part."\0users"} = 1;
           } else {
               my (undef,$last_reset) = &Apache::grades::get_last_resets($symb,$env{'request.course.id'},[$part]); 
               if ($last_reset) {
                   if (&Apache::grades::get_num_tries(\%Apache::lonhomework::history,$last_reset,$part) == 0) {
                       $aggregate{$symb."\0".$part."\0users"} = 1;
                   }
               }
         }          }
         $aggregate{$symb."\0".$part."\0attempts"} = 1;          $aggregate{$symb."\0".$part."\0attempts"} = 1;
     }      }
     &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,      if (keys (%aggregate) > 0) {
   $cdomain,$cname);    &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
                               $cdomain,$cname);
       }
 }  }
   
 sub checkout_msg {  sub checkout_msg {
Line 379  sub checkout_msg { Line 440  sub checkout_msg {
                 'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',                  'warning'=>'Checking out resources is subject to course policies, and may exclude future credit even if done erroneously.',
                 'checkout'=>'Check out Exam for Viewing',                  'checkout'=>'Check out Exam for Viewing',
  'checkout?'=>'Check out Exam?');   'checkout?'=>'Check out Exam?');
       my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);      return (<<ENDCHECKOUT);
 <h2>$lt{'resource'}</h2>  <h2>$lt{'resource'}</h2>
     <p>$lt{'id_expln'}</p>      <p>$lt{'id_expln'}</p>
 <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="$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 397  sub firstaccess_msg { Line 459  sub firstaccess_msg {
     my ($map)=&Apache::lonnet::decode_symb($symb);      my ($map)=&Apache::lonnet::decode_symb($symb);
     my $foldertitle=&Apache::lonnet::gettitle($map);      my $foldertitle=&Apache::lonnet::gettitle($map);
     &Apache::lonxml::debug("map is $map title is $foldertitle");      &Apache::lonxml::debug("map is $map title is $foldertitle");
       my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     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="$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 409  ENDCHECKOUT Line 472  ENDCHECKOUT
 sub init_problem_globals {  sub init_problem_globals {
     my ($type)=@_;      my ($type)=@_;
     #initialize globals      #initialize globals
       #   For problems, we start out in part 0 (outside a <part> tag).
       #   and part 0 is used to describe the main body of the <problem>
       #
     if ($type eq 'problem') {      if ($type eq 'problem') {
  $Apache::inputtags::part='0';   $Apache::inputtags::part='0';
  @Apache::inputtags::partlist=('0');   @Apache::inputtags::partlist=('0');
  $Apache::lonhomework::problemstatus=&get_problem_status('0');   $Apache::lonhomework::problemstatus=&get_problem_status('0');
  $Apache::lonhomework::ignore_response_errors=0;   $Apache::lonhomework::ignore_response_errors=0;
   
     } elsif ($type eq 'library') {      } elsif ($type eq 'library') {
  $Apache::inputtags::part='';   $Apache::inputtags::part='';
  @Apache::inputtags::partlist=();   @Apache::inputtags::partlist=();
  $Apache::lonhomework::problemstatus='';   $Apache::lonhomework::problemstatus='';
  $Apache::lonhomework::ignore_response_errors=1;   $Apache::lonhomework::ignore_response_errors=1;
   
       } elsif ($type eq 'Task') {
    $Apache::inputtags::part='0';
    @Apache::inputtags::partlist=('0');
    $Apache::lonhomework::problemstatus='';
    $Apache::lonhomework::ignore_response_errors=1;
     }      }
     @Apache::inputtags::responselist = ();      @Apache::inputtags::responselist = ();
     @Apache::inputtags::importlist = ();      @Apache::inputtags::importlist = ();
Line 467  sub get_problem_status { Line 540  sub get_problem_status {
 }  }
   
 sub start_problem {  sub start_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
       # We'll use the redirection to fix up printing of duedates.
       if (!$Apache::lonxml::metamode) {
    &Apache::lonxml::startredirection();
       }
   
       # Problems don't nest and we don't allow more than one <problem> in
       # a .problem file.
       #
     if ( $Apache::inputtags::part ne '' ||      if ( $Apache::inputtags::part ne '' ||
  $Apache::lonhomework::parsing_a_problem) {   $Apache::lonhomework::parsing_a_problem) {
  &Apache::lonxml::error('Only one &lt;problem&gt; allowed in a .problem file');   &Apache::lonxml::error('Only one &lt;problem&gt; allowed in a .problem file');
  #my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);   #my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,$style);
  return '';   return '';
     }      }
   
Line 494  sub start_problem { Line 575  sub start_problem {
     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::lonhomework::type:");
     }      }
     if ($Apache::lonhomework::type eq '' ) {      if ($Apache::lonhomework::type eq '' ) {
  my $uri=$env{'request.uri'};   my $uri=$env{'request.uri'};
Line 506  sub start_problem { Line 587  sub start_problem {
     &Apache::lonxml::debug("Using default type, problem, :$uri:");      &Apache::lonxml::debug("Using default type, problem, :$uri:");
  }   }
     }      }
       $Apache::lonhomework::default_type = $Apache::lonhomework::type;
   
     #added vars to the scripting enviroment      #added vars to the scripting enviroment
     my $expression='$external::part=\''.$Apache::inputtags::part.'\';';      my $expression='$external::part=\''.$Apache::inputtags::part.'\';';
Line 514  sub start_problem { Line 596  sub start_problem {
     my $status;      my $status;
     my $accessmsg;      my $accessmsg;
   
     #should get back a <html> or the neccesary stuff to start XML/MathML      my $name= &get_resource_name($parstack,$safeeval);
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start)=      my ($result,$form_tag_start);
  &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);      if ($target eq 'web' || $target eq 'webgrade' || $target eq 'tex') {
    ($result,$form_tag_start) =
       &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
    $name);
       }
   
     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); }
Line 531  sub start_problem { Line 618  sub start_problem {
  $Apache::lonhomework::history{"resource.0.outtoken"}=   $Apache::lonhomework::history{"resource.0.outtoken"}=
     $token;      $token;
     }      }
     $body_tag_start.=&Apache::lonxml::printtokenheader($target,$token);      $result.=&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');
Line 539  sub start_problem { Line 626  sub start_problem {
  #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 '' || $Apache::lonhomework::type eq 'practice')) {
     $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').'" />';
       if (exists($env{'form.username'})) {
    $form_tag_start.=
     '<input type="hidden" name="username"      '<input type="hidden" name="username"
                              value="'.$env{'form.username'}.'" />';                               value="'.$env{'form.username'}.'" />';
     if ($env{'user.adv'}) {      }
       if ($env{'request.role.adv'}) {
  $form_tag_start.=   $form_tag_start.=
     ' <input type="checkbox" name="showallfoils" ';      ' <label><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').
       '</label>';
     }      }
     $form_tag_start.='<hr />';      $form_tag_start.='<hr />';
  }   }
  ($status,$accessmsg) = &Apache::lonhomework::check_access('0');  
    ($status,$accessmsg,my $slot_name,my $slot) = 
       &Apache::lonhomework::check_slot_access('0','problem');
  push (@Apache::inputtags::status,$status);   push (@Apache::inputtags::status,$status);
   
  my $expression='$external::datestatus="'.$status.'";';   my $expression='$external::datestatus="'.$status.'";';
  $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';   $expression.='$external::gradestatus="'.$Apache::lonhomework::history{"resource.0.solved"}.'";';
  &Apache::run::run($expression,$safeeval);   &Apache::run::run($expression,$safeeval);
  &Apache::lonxml::debug("Got $status");   &Apache::lonxml::debug("Got $status");
   
  if (( $status eq 'CLOSED' ) ||   if (( $status eq 'CLOSED' ) ||
     ( $status eq 'UNCHECKEDOUT') ||      ( $status eq 'UNCHECKEDOUT') ||
     ( $status eq 'NOT_YET_VIEWED') ||      ( $status eq 'NOT_YET_VIEWED') ||
     ( $status eq 'BANNED') ||      ( $status eq 'BANNED') ||
     ( $status eq 'UNAVAILABLE') ||      ( $status eq 'UNAVAILABLE') ||
       ( $status eq 'NOT_IN_A_SLOT') ||
     ( $status eq 'INVALID_ACCESS')) {      ( $status eq 'INVALID_ACCESS')) {
     my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser);      my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
          $style);
     if ( $target eq "web" ) {      if ( $target eq "web" ) {
  $result.= $head_tag_start.'</head>';   my $msg;
  my $msg=$body_tag_start;  
  if ($status eq 'UNAVAILABLE') {   if ($status eq 'UNAVAILABLE') {
     $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';      $msg.='<h1>'.&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'</h1>';
  } elsif ($status ne 'NOT_YET_VIEWED') {   } elsif ($status ne 'NOT_YET_VIEWED') {
Line 580  sub start_problem { Line 677  sub start_problem {
  if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {   if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
     $msg.='The problem '.$accessmsg;      $msg.='The problem '.$accessmsg;
  } elsif ($status eq 'UNCHECKEDOUT') {   } elsif ($status eq 'UNCHECKEDOUT') {
     $msg.=&checkout_msg;      $msg.=&checkout_msg();
  } elsif ($status eq 'NOT_YET_VIEWED') {   } elsif ($status eq 'NOT_YET_VIEWED') {
     $msg.=&firstaccess_msg($accessmsg,$symb);      $msg.=&firstaccess_msg($accessmsg,$symb);
    } elsif ($status eq 'NOT_IN_A_SLOT') {
       $msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work.");
  }   }
  $result.=$msg.'<br />';   $result.=$msg.'<br />';
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  $result.='\begin{document}\noindent \vskip 1 mm  \begin{minipage}{\textwidth}\vskip 0 mm';   my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''
                       : '\begin{minipage}{\textwidth}';
    $result.='\begin{document}\noindent \vskip 1 mm '.
       $startminipage.'\vskip 0 mm';
  if ($status eq 'UNAVAILABLE') {   if ($status eq 'UNAVAILABLE') {
     $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';      $result.=&mt('Unable to determine if this resource is open due to network problems. Please try again later.').'\vskip 0 mm ';
  } else {   } else {
     $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";      $result.=&mt('Problem is not open to be viewed. It')." $accessmsg \\vskip 0 mm ";
  }   }
     }      }
    } elsif ($status eq 'NEEDS_CHECKIN') {
       my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
          $style);
       if ($target eq 'web') {
    $result .= &Apache::bridgetask::proctor_validation_screen();
       } elsif ($target eq 'grade') {
    &Apache::bridgetask::proctor_check_auth($slot_name,$slot,
    'problem');
       }
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
     my $name= &get_resource_name($parstack,$safeeval);      $result.="\n $form_tag_start".
     $result.="$head_tag_start<title>$name</title></head>  
               $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") {
Line 610  sub start_problem { Line 719  sub start_problem {
  }   }
     }      }
  } elsif ($target eq 'tex') {   } elsif ($target eq 'tex') {
     my $startminipage = '';      $result .= 'INSERTTEXFRONTMATTERHERE';
     if (not $env{'form.problem_split'}=~/yes/) {  
  $startminipage = '\begin{minipage}{\textwidth}';  
     }  
     my $id = $Apache::inputtags::part;  
     my $weight = &Apache::lonnet::EXT("resource.$id.weight");  
     my $packages=&Apache::lonnet::metadata($env{'request.uri'},'packages');  
     my @packages = split /,/,$packages;  
     my $allow_print_points = 0;  
     foreach my $partial_key (@packages) {  
  if ($partial_key=~m/^part_0$/) {  
     $allow_print_points=1;  
  }  
     }  
     my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");  
     if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; }  
     my $duedate = &Apache::lonnet::EXT("resource.$id.duedate");   
     $duedate = POSIX::strftime("%c",localtime($duedate));  
     my $temp_file;  
     my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";  
     if (-e $filename) {  
  $temp_file = Apache::File->new($filename);  
     } else {  
  $temp_file = Apache::File->new('>>'.$filename);  
     }  
     my @due_file_content = <$temp_file>;  
     my $due_file_content = $due_file_content[$#due_file_content];  
     chomp $due_file_content;  
     my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');  
     if ($due_file_content ne $duedate) {  
  $temp_file = Apache::File->new('>'.$filename);  
  print $temp_file "$duedate\n";  
  if (not $env{'request.symb'} =~ m/\.page_/) {  
     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.'}';  
     } 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.'}';  
  if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $result .= '\fbox{\textit{'.$weight.' pt}}';}  
     }  
  } else {  
     $result .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';  
  }  
     } else {  
  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.'}';  
     if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}  
  } else {  
     $result .= '\vskip 1mm \\\\\\\\';  
  }  
     }  
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.   $result .= $form_tag_start.&problem_edit_header();
     &problem_edit_header();  
  $Apache::lonxml::warnings_error_header=   $Apache::lonxml::warnings_error_header=
     &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />";      &mt("Editor Errors - these errors might not effect the running of the problem, but they will likely cause problems with further use of the Edit mode. Please use the EditXML mode to fix these errors.")."<br />";
  my $temp=&Apache::edit::insertlist($target,$token);   my $temp=&Apache::edit::insertlist($target,$token);
Line 680  sub start_problem { Line 740  sub start_problem {
   
 sub end_problem {  sub end_problem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result='';      my $result;
   
       if (!$Apache::lonxml::metamode) {
    $result = &Apache::lonxml::endredirection(); #started in &start_problem
    $Apache::lonxml::post_evaluate=0;
       }
   
       if ($target eq 'tex') {
   
    # Figure out the front matter and replace the
    # INSERTTEXFRONTMATTERHERE in result with it.  note that we do
    # this in end_problem because whether or not we display due
    # dates depends on whether due dates have already been
    # displayed in the problem parts.
   
    my $frontmatter   = '';
    my $startminipage = '';
    if (not $env{'form.problem_split'}=~/yes/) {
       $startminipage = '\begin{minipage}{\textwidth}';
    }
    my $id = $Apache::inputtags::part;
    my $weight = &Apache::lonnet::EXT("resource.$id.weight");
    my $packages=&Apache::lonnet::metadata($env{'request.uri'},'packages');
    my @packages = split /,/,$packages;
    my $allow_print_points = 0;
    foreach my $partial_key (@packages) {
       if ($partial_key=~m/^part_0$/) {
    $allow_print_points=1;
       }
    }
    my $maxtries = &Apache::lonnet::EXT("resource.$id.maxtries");
    if (defined($maxtries) && $maxtries < 0) { $allow_print_points=0; }
    if (lc($env{'course.'.$env{'request.course.id'}.
    '.disableexampointprint'}) eq 'yes') {
       $allow_print_points=0;
    }
    my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');
    my $begin_doc='\begin{document} \typeout{STAMPOFPASSEDRESOURCESTART Resource <h2>"'.$name_of_resourse.'"</h2> located in <br /><small><b>'.$env{'request.uri'}.'</b></small><br /> STAMPOFPASSEDRESOURCEEND} \noindent ';
    my $toc_line='\vskip 1 mm\noindent '.$startminipage.
       '\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
   
    #  Figure out what the due date is and if we need to print
    #  it in the problem header.  We have been logging the
    #  last due date written to file. 
   
    my $duetime = &Apache::lonnet::EXT("resource.$id.duedate"); 
    my $duedate = POSIX::strftime("%c",localtime($duetime));
    my $temp_file;
    my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
   
    # Figure out what the last printed due date is or set it
    # to the epoch if no duedates have been printed.
   
    my $due_file_content = 0;      #   If the file does not yet exist, time is the epoch.
    if (-e $filename) {
       $temp_file = Apache::File->new($filename);
       my @due_file      = <$temp_file>;
       $due_file_content = $due_file[$#due_file];
       chomp $due_file_content;
    } 
   
    # We display the due date iff it is not the same as the last
    # duedate in problem header ($due_file_content), and
    # none of our parts displayed a duedate.
    #
    my $parts_with_displayduedate;
    if (defined $Apache::outputtags::showonce{'displayduedate'}) {
       $parts_with_displayduedate = 
    scalar(@{$Apache::outputtags::showonce{'displayduedate'}});
    } else {
       $parts_with_displayduedate = 0;
    }
    if (($due_file_content != $duetime) && ($parts_with_displayduedate == 0) ) {
       $temp_file = Apache::File->new('>'.$filename);
       print $temp_file "$duetime\n";
       if (not $env{'request.symb'} =~ m/\.page_/) {
    if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
       $frontmatter .= $begin_doc.
    '\textit{Due date: '.$duedate.'} '.$toc_line;
    } else {
       $frontmatter.= $begin_doc.$toc_line;
       if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
    }
       } else {
    $frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';
       }
    } else {
       if (not $env{'request.symb'} =~ m/\.page_/) {
    $frontmatter .= $begin_doc.$toc_line;
    if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
       } else {
    $frontmatter .= '\vskip 1mm \\\\\\\\';
       }
    }
    $result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/;
       }
   
     my $status=$Apache::inputtags::status['-1'];      my $status=$Apache::inputtags::status['-1'];
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||      if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||
  $target eq 'tex') {   $target eq 'tex') {
Line 688  sub end_problem { Line 844  sub end_problem {
     # if part is zero, no <part>s existed, so we need to the grading      # if part is zero, no <part>s existed, so we need to the grading
     if ($status eq 'CAN_ANSWER' ||$Apache::lonhomework::scantronmode) {      if ($status eq 'CAN_ANSWER' ||$Apache::lonhomework::scantronmode) {
  &Apache::inputtags::grade;   &Apache::inputtags::grade;
       } elsif ($status eq 'NEEDS_CHECKIN') {
    # no need to grade, and don't want to hide data
     } else {      } else {
  # move any submission data to .hidden   # move any submission data to .hidden
  &Apache::inputtags::hidealldata($Apache::inputtags::part);   &Apache::inputtags::hidealldata($Apache::inputtags::part);
Line 707  sub end_problem { Line 865  sub end_problem {
     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::lonhtmlcommon::get_htmlareafields());
     }      }
     if ($target eq 'web') {      if ($target eq 'web') {
  $result.=&Apache::lonxml::xmlend().'</html>';   $result.= &Apache::loncommon::end_page({'discussion' => 1});
     } 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/) {
Line 718  sub end_problem { Line 876  sub end_problem {
  }   }
                 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>//;  
  } 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_/) {
Line 735  sub end_problem { Line 892  sub end_problem {
  }   }
  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.=&Apache::loncommon::end_page({'discussion' => 1});
                           # normally we get it from above, but in CSTR
                         # we always show answer mode too.                          # we always show answer mode too.
  }   }
     } elsif ($target eq 'meta') {      } elsif ($target eq 'meta') {
Line 747  sub end_problem { Line 905  sub end_problem {
  $result.=&Apache::response::meta_response_order();   $result.=&Apache::response::meta_response_order();
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  &Apache::lonxml::debug("in end_problem with $target, edit");   &Apache::lonxml::debug("in end_problem with $target, edit");
  $result = &problem_edit_footer();   $result .= &problem_edit_footer();
       } elsif ($target eq 'modified') {
    $result .= $token->[2];
    $result.=&Apache::edit::handle_insertafter($token->[1]);
     }      }
   
     if ($env{'request.state'} eq 'construct' && $target eq 'web') {      if ($env{'request.state'} eq 'construct' && $target eq 'web') {
Line 762  sub end_problem { Line 923  sub end_problem {
   
 sub start_library {  sub start_library {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my ($result,$head_tag_start,$body_tag_start,$form_tag_start);      my ($result,$form_tag_start);
     if ($$tagstack[0] eq 'library') {      if ($$tagstack[0] eq 'library') {
  &init_problem_globals('library');   &init_problem_globals('library');
  $Apache::lonhomework::type='problem';   $Apache::lonhomework::type='problem';
     }      }
     if ($target eq 'edit') {      if ($target eq 'edit') {
  ($result,$head_tag_start,$body_tag_start,$form_tag_start)=   ($result,$form_tag_start)=
     &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);      &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
  $result.=$head_tag_start."</head>".$body_tag_start.$form_tag_start.   'Edit');
     &problem_edit_header();   $result.=$form_tag_start.&problem_edit_header();
  my $temp=&Apache::edit::insertlist($target,$token);   my $temp=&Apache::edit::insertlist($target,$token);
  $result.=$temp;   $result.=$temp;
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $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' || $target eq 'webgrade')
      $env{'request.state'} eq "construct" ) {       && $$tagstack[0] eq 'library' 
  ($result,$head_tag_start,$body_tag_start,$form_tag_start)=       && $env{'request.state'} eq "construct" ) {
     &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval);  
  my $name=&get_resource_name($parstack,$safeeval);   my $name=&get_resource_name($parstack,$safeeval);
    ($result,$form_tag_start)=
       &page_start($target,$token,$tagstack,$parstack,$parser,$safeeval,
    $name);
  my $rndseed=&setup_rndseed($safeeval);   my $rndseed=&setup_rndseed($safeeval);
  $result.="$head_tag_start<title>$name</title></head>   $result.=" \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" />';
  $result.=&problem_web_to_edit_header($rndseed);   $result.=&problem_web_to_edit_header($rndseed);
     }      }
Line 798  sub end_library { Line 960  sub end_library {
  $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::end_page({'discussion' => 1});
     &Apache::lonxml::xmlend();  
     }      }
     if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };      if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };
     return $result;      return $result;
 }  }
   
 sub start_definetag {  sub start_definetag {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
     my $result;      my $result;
   
     my $name = $token->[2]->{'name'};      my $name = $token->[2]->{'name'};
     my $skip=&Apache::lonxml::get_all_text("/definetag",$parser);      my $skip=&Apache::lonxml::get_all_text("/definetag",$parser,$style);
     if ($name=~/^\//) {      if ($name=~/^\//) {
  $result=   $result=
  '<br /><table bgcolor="#FFBBBB"><tr><th>END <tt>'.$name.'</tt></th></tr>';   '<br /><table bgcolor="#FFBBBB"><tr><th>END <tt>'.$name.'</tt></th></tr>';
Line 834  sub start_block { Line 995  sub start_block {
   
     my $result;      my $result;
   
     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' || $target eq 'webgrade') {
  my $code = $token->[2]->{'condition'};   my $code = $token->[2]->{'condition'};
  if (defined($code)) {   if (defined($code)) {
     if (!$Apache::lonxml::default_homework_loaded) {      if (!$Apache::lonxml::default_homework_loaded) {
Line 878  sub start_languageblock { Line 1039  sub start_languageblock {
   
     my $result;      my $result;
   
     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' || $target eq 'webgrade') {
  my $include = $token->[2]->{'include'};   my $include = $token->[2]->{'include'};
  my $exclude = $token->[2]->{'exclude'};   my $exclude = $token->[2]->{'exclude'};
         my %languages=&Apache::loncommon::display_languages();          my %languages=&Apache::loncommon::display_languages();
Line 931  sub start_instructorcomment { Line 1092  sub start_instructorcomment {
   
     my $result;      my $result;
   
     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' || $target eq 'webgrade') {
         $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",
Line 957  sub end_instructorcomment { Line 1118  sub end_instructorcomment {
 }  }
   
 sub start_while {  sub start_while {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
     my $result;      my $result;
     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' || $target eq 'webgrade') {
  my $code = $token->[2]->{'condition'};   my $code = $token->[2]->{'condition'};
   
  push( @Apache::structuretags::whileconds, $code);   push( @Apache::structuretags::whileconds, $code);
Line 969  sub start_while { Line 1130  sub start_while {
     &Apache::lonxml::default_homework_load($safeeval);      &Apache::lonxml::default_homework_load($safeeval);
  }   }
  my $result = &Apache::run::run($code,$safeeval);   my $result = &Apache::run::run($code,$safeeval);
  my $bodytext=&Apache::lonxml::get_all_text("/while",$parser);   my $bodytext=&Apache::lonxml::get_all_text("/while",$parser,$style);
  push( @Apache::structuretags::whilebody, $bodytext);   push( @Apache::structuretags::whilebody, $bodytext);
  push( @Apache::structuretags::whileline, $token->[5]);   push( @Apache::structuretags::whileline, $token->[5]);
  &Apache::lonxml::debug("s code $code got -$result-");   &Apache::lonxml::debug("s code $code got -$result-");
Line 993  sub end_while { Line 1154  sub end_while {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my $result;      my $result;
   
     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' || $target eq 'webgrade') {
  my $code = pop(@Apache::structuretags::whileconds);   my $code = pop(@Apache::structuretags::whileconds);
  my $bodytext = pop(@Apache::structuretags::whilebody);   my $bodytext = pop(@Apache::structuretags::whilebody);
  my $line = pop(@Apache::structuretags::whileline);   my $line = pop(@Apache::structuretags::whileline);
Line 1025  sub end_while { Line 1186  sub end_while {
 #  ...  #  ...
 # </randomlist>  # </randomlist>
 sub start_randomlist {  sub start_randomlist {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'answer' || $target eq 'grade' || $target eq 'web' ||      if ($target eq 'answer' || $target eq 'grade'   || $target eq 'web' ||
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex'    || $target eq 'analyze' || $target eq 'webgrade') {
  my $body= &Apache::lonxml::get_all_text("/randomlist",$parser);   my $body= &Apache::lonxml::get_all_text("/randomlist",$parser);
  my $b_parser= HTML::TokeParser->new(\$body);   my $b_parser= HTML::LCParser->new(\$body);
    $b_parser->xml_mode(1);
    $b_parser->marked_sections(1);
  my $b_tok;   my $b_tok;
  my @randomlist;   my @randomlist;
  my $list_item;   my $list_item;
Line 1054  sub start_randomlist { Line 1217  sub start_randomlist {
     #  print "<b>END-TAG $b_tok->[1]</b><br />";      #  print "<b>END-TAG $b_tok->[1]</b><br />";
     # }      # }
  }   }
  my @idx_arr = (0 .. $#randomlist);   if (@randomlist) {
  &Apache::structuretags::shuffle(\@idx_arr);      my @idx_arr = (0 .. $#randomlist);
  my $bodytext = '';      &Apache::structuretags::shuffle(\@idx_arr);
  my $show=$#randomlist;      my $bodytext = '';
  my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);      my $show=$#randomlist;
  $showarg--;      my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
  if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }      $showarg--;
  for(0 .. $show) {      if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }
     $bodytext .= "$randomlist[ $idx_arr[$_] ]";      for(0 .. $show) {
    $bodytext .= "$randomlist[ $idx_arr[$_] ]";
       }
       &Apache::lonxml::newparser($parser,\$bodytext);
  }   }
  &Apache::lonxml::newparser($parser,\$bodytext);  
     } elsif ($target eq 'edit' ) {      } elsif ($target eq 'edit' ) {
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
  $result .=&Apache::edit::text_arg('Maximum Tags to Show:','show',   $result .=&Apache::edit::text_arg('Maximum Tags to Show:','show',
Line 1081  sub start_randomlist { Line 1246  sub start_randomlist {
 sub shuffle {  sub shuffle {
     my $a=shift;      my $a=shift;
     my $i;      my $i;
     if (defined(@$a)) {      if (ref($a) eq 'ARRAY' && @$a) {
  &Apache::response::pushrandomnumber();   &Apache::response::pushrandomnumber();
  for($i=@$a;--$i;) {   for($i=@$a;--$i;) {
     my $j=int(&Math::Random::random_uniform() * ($i+1));      my $j=int(&Math::Random::random_uniform() * ($i+1));
Line 1114  sub ordered_show_check { Line 1279  sub ordered_show_check {
 }  }
   
 sub start_part {  sub start_part {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       if (!$Apache::lonxml::metamode) {
    &Apache::lonxml::startredirection(); # we'll use redirection to fix up 
                                        # duedates.
       }
     my $result='';      my $result='';
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);      my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);
     if ($id eq '') { $id = $Apache::lonxml::curdepth; }      if ($id =~ /^\s*$/) { $id = $Apache::lonxml::curdepth; }
     $Apache::inputtags::part=$id;      $Apache::inputtags::part=$id;
     push(@Apache::inputtags::partlist,$id);      push(@Apache::inputtags::partlist,$id);
     @Apache::inputtags::response=();      @Apache::inputtags::response=();
Line 1139  sub start_part { Line 1308  sub start_part {
     } elsif ($target eq 'web' || $target eq 'grade' ||      } elsif ($target eq 'web' || $target eq 'grade' ||
      $target eq 'answer' || $target eq 'tex') {       $target eq 'answer' || $target eq 'tex') {
  if ($hidden || !$in_order_show) {   if ($hidden || !$in_order_show) {
     my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);      my $bodytext=&Apache::lonxml::get_all_text("/part",$parser,$style);
  } else {   } else {
     my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);      my ($status,$accessmsg) = &Apache::lonhomework::check_access($id);
     push (@Apache::inputtags::status,$status);      push (@Apache::inputtags::status,$status);
Line 1155  sub start_part { Line 1324  sub start_part {
  ( $status eq 'BANNED') ||   ( $status eq 'BANNED') ||
  ( $status eq 'UNAVAILABLE') ||   ( $status eq 'UNAVAILABLE') ||
  ( $status eq 'INVALID_ACCESS')) {   ( $status eq 'INVALID_ACCESS')) {
  my $bodytext=&Apache::lonxml::get_all_text("/part",$parser);   my $bodytext=&Apache::lonxml::get_all_text("/part",$parser,
      $style);
  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' ) {
Line 1187  sub start_part { Line 1357  sub start_part {
     if (defined($maxtries) && $maxtries < 0) {      if (defined($maxtries) && $maxtries < 0) {
  $allow_print_points=0;   $allow_print_points=0;
     }      }
       if (lc($env{'course.'.$env{'request.course.id'}.
       '.disableexampointprint'}) eq 'yes') {
    $allow_print_points=0;
       }
     if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}      if (($Apache::lonhomework::type eq 'exam') && ($allow_print_points)) { $result .= '\fbox{\textit{'.$weight.' pt}}';}
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
     $result.='<a name="'.&Apache::lonnet::escape($Apache::inputtags::part).'" />';      $result.='<a name="'.&Apache::lonnet::escape($Apache::inputtags::part).'" />';
Line 1219  sub end_part { Line 1393  sub end_part {
     my $status=$Apache::inputtags::status['-1'];      my $status=$Apache::inputtags::status['-1'];
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);      my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
     my $in_order_show=&ordered_show_check();      my $in_order_show=&ordered_show_check();
     my $result='';      my $result;
     if ( $target eq 'meta' ) {      if (!$Apache::lonxml::metamode) {
  $result='';   $result = &Apache::lonxml::endredirection(); # started in &start_part
     } elsif ($target eq 'grade') {   $Apache::lonxml::post_evaluate=0;
       }
       if ($target eq 'grade') {
  if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&   if (($status eq 'CAN_ANSWER' || $Apache::lonhomework::scantronmode) &&
     !$hidden && $in_order_show) {      !$hidden && $in_order_show) {
     $result=&Apache::inputtags::grade;      $result.=&Apache::inputtags::grade;
  } else {   } else {
     # move any submission data to .hidden      # move any submission data to .hidden
     &Apache::inputtags::hidealldata($Apache::inputtags::part);      &Apache::inputtags::hidealldata($Apache::inputtags::part);
Line 1237  sub end_part { Line 1413  sub end_part {
  if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {   if ($Apache::lonhomework::type eq 'exam' && $target eq 'tex') {
     $gradestatus='';      $gradestatus='';
  }   }
  $result=$gradestatus;   $result.=$gradestatus;
  if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';}    if ($$tagstack[-2] eq 'td' and $target eq 'tex') {$result.='\end{minipage}';} 
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result=&Apache::edit::end_table();   $result.=&Apache::edit::end_table();
       } elsif ($target eq 'modified') {
    $result .= $token->[2];
    $result.=&Apache::edit::handle_insertafter($token->[1]);
     }      }
     pop @Apache::inputtags::status;      pop @Apache::inputtags::status;
     $Apache::inputtags::part='';      $Apache::inputtags::part='';
       $Apache::lonhomework::type = $Apache::lonhomework::default_type;
     return $result;      return $result;
 }  }
   
 sub start_preduedate {  sub start_preduedate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' || $target eq 'tex') {      if ($target eq 'web' || $target eq 'grade'    || $target eq 'answer' ||
    $target eq 'tex' || $target eq 'webgrade') {
  &Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']);   &Apache::lonxml::debug("State in preduedate is ". $Apache::inputtags::status['-1']);
  if ($Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&   if (!$Apache::lonhomework::scantronmode &&
       $Apache::inputtags::status['-1'] ne 'CAN_ANSWER' &&
     $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {      $Apache::inputtags::status['-1'] ne 'CANNOT_ANSWER') {
     &Apache::lonxml::debug("Wha? ". ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER'));      &Apache::lonxml::debug("Wha? ". ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER'));
     &Apache::lonxml::get_all_text("/preduedate",$parser);      &Apache::lonxml::get_all_text("/preduedate",$parser,$style);
  }   }
     }      }
     return '';      return '';
Line 1265  sub end_preduedate { Line 1447  sub end_preduedate {
 }  }
   
 sub start_postanswerdate {  sub start_postanswerdate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if ($target eq 'web' || $target eq 'grade') {      if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade') {
  if ($Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {   if ($Apache::lonhomework::scantronmode ||
     &Apache::lonxml::get_all_text("/postanswerdate",$parser);      $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {
       &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
  }   }
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  &Apache::lonxml::get_all_text("/postanswerdate",$parser);   &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
     }      }
     return '';      return '';
 }  }
Line 1281  sub end_postanswerdate { Line 1464  sub end_postanswerdate {
 }  }
   
 sub start_notsolved {  sub start_notsolved {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     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 'tex' || $target eq 'webgrade') {
  my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};   my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
  &Apache::lonxml::debug("not solved has :$gradestatus:");   &Apache::lonxml::debug("not solved has :$gradestatus:");
  if ($gradestatus =~ /^correct/ &&   if ($gradestatus =~ /^correct/ &&
     &Apache::response::show_answer()) {      &Apache::response::show_answer()) {
     &Apache::lonxml::debug("skipping");      &Apache::lonxml::debug("skipping");
     &Apache::lonxml::get_all_text("/notsolved",$parser);      &Apache::lonxml::get_all_text("/notsolved",$parser,$style);
  }   }
     }      }
     return '';      return '';
Line 1300  sub end_notsolved { Line 1483  sub end_notsolved {
 }  }
   
 sub start_solved {  sub start_solved {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     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 'tex') {
  my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};   my $gradestatus=$Apache::lonhomework::history{"resource.$Apache::inputtags::part.solved"};
  if ($gradestatus !~ /^correct/ ||   if ($gradestatus !~ /^correct/ ||
     !&Apache::response::show_answer()) {      !&Apache::response::show_answer()) {
     &Apache::lonxml::get_all_text("/solved",$parser);      &Apache::lonxml::get_all_text("/solved",$parser,$style);
  }   }
     }      }
     return '';      return '';
Line 1317  sub end_solved { Line 1500  sub end_solved {
 }  }
   
 sub start_problemtype {  sub start_problemtype {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     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' || $target eq 'webgrade') {
  my $mode=lc(&Apache::lonxml::get_param('mode',$parstack,$safeeval));   my $mode=lc(&Apache::lonxml::get_param('mode',$parstack,$safeeval));
  if (!defined($mode)) { $mode='show'; }   if (!defined($mode)) { $mode='show'; }
  my $for=&Apache::lonxml::get_param('for',$parstack,$safeeval);   my $for=&Apache::lonxml::get_param('for',$parstack,$safeeval);
Line 1329  sub start_problemtype { Line 1512  sub start_problemtype {
     if ($Apache::lonhomework::type eq lc($type)) { $found=1; }      if ($Apache::lonhomework::type eq lc($type)) { $found=1; }
  }   }
  if ($mode eq 'show' && !$found) {   if ($mode eq 'show' && !$found) {
     &Apache::lonxml::get_all_text("/problemtype",$parser);      &Apache::lonxml::get_all_text("/problemtype",$parser,$style);
  }   }
  if ($mode eq 'hide' && $found) {   if ($mode eq 'hide' && $found) {
     &Apache::lonxml::get_all_text("/problemtype",$parser);      &Apache::lonxml::get_all_text("/problemtype",$parser,$style);
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
Line 1366  sub start_startouttext { Line 1549  sub start_startouttext {
 }  }
   
 sub end_startouttext {  sub end_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     my $text='';      my $text='';
   
     if ($target eq 'edit') {      if ($target eq 'edit') {
  $text=&Apache::lonxml::get_all_text("endouttext",$parser);   $text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
  $result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>   $result.=&Apache::edit::start_table($token)."<tr><td>".&mt('Text Block')."</td>
 <td>".&mt('Delete:').  <td>".&mt('Delete:').
                  &Apache::edit::deletelist($target,$token)                   &Apache::edit::deletelist($target,$token)
Line 1410  sub end_endouttext { Line 1593  sub end_endouttext {
 }  }
   
 sub delete_startouttext {  sub delete_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     #  my $text=&Apache::lonxml::get_all_text("endouttext",$parser);      #  my $text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);
     my $text=$$parser['-1']->get_text("/endouttext");      my $text=$$parser['-1']->get_text("/endouttext");
     my $ntoken=$$parser['-1']->get_token();      my $ntoken=$$parser['-1']->get_token();
     &Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext");      &Apache::lonxml::debug("Deleting :$text: and :$ntoken->[0]:$ntoken->[1]:$ntoken->[2]: for startouttext");
Line 1428  sub start_simpleeditbutton { Line 1611  sub start_simpleeditbutton {
     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('mdc',$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();

Removed from v.1.288  
changed lines
  Added in v.1.352


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