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

Diff for /loncom/homework/structuretags.pm between versions 1.332.2.3 and 1.389

version 1.332.2.3, 2006/04/20 19:08:41 version 1.389, 2007/08/14 01:45:20
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 );
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
 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,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style);      if ($target ne 'edit' && $target ne 'modified') {
     if ($target eq 'web' || $target eq 'webgrade') {   my $bodytext=&Apache::lonxml::get_all_text("/web",$parser,$style);
  return $bodytext;   if ($target eq 'web' || $target eq 'webgrade') {
       return $bodytext;
    }
       } elsif ($target eq "edit" ) {
    my $bodytext = 
       &Apache::lonxml::get_all_text_unbalanced("/web",$parser);
    my $result = &Apache::edit::tag_start($target,$token);
    $result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1);
    return $result;
       } elsif ( $target eq "modified" ) {
    return $token->[4].&Apache::edit::modifiedfield("/web",$parser);
     }      }
     return '';      return '';
 }  }
Line 57  sub end_web { Line 71  sub end_web {
 sub start_tex {  sub start_tex {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);      if ($target ne 'edit' && $target ne 'modified') {
     if ($target eq 'tex') {   my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);
  return $bodytext.' ';   if ($target eq 'tex') {
       return $bodytext.' ';
    }
       } elsif ($target eq "edit" ) {
    my $bodytext = 
       &Apache::lonxml::get_all_text_unbalanced("/tex",$parser);
    my $result = &Apache::edit::tag_start($target,$token);
    $result .= &Apache::edit::editfield($token->[1],$bodytext,'',80,1);
    return $result;
       } elsif ( $target eq "modified" ) {
    return $token->[4].&Apache::edit::modifiedfield("/tex",$parser);
     }      }
     return $result;;      return $result;;
 }  }
Line 68  sub end_tex { Line 92  sub end_tex {
     return '';      return '';
 }  }
   
 sub body_tag_start {  
     my ($target,$background,$bgcolor)=@_;  
     my $body_tag_start='<body onload="'.&Apache::lonmenu::loadevents().'" '.  
  'onunload="'.&Apache::lonmenu::unloadevents().'" ';  
     if ($env{'browser.imagesuppress'} eq 'on') { $background=''; }  
     if ($background) {  
  &Apache::lonxml::extlink($background);  
  $body_tag_start.='background="'.$background.'" ';  
     } else {  
  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);  
       
     &Apache::lontexconvert::jsMath_reset();  
     if ($env{'environment.texengine'} eq 'jsMath') {  
  $body_tag_start.=&Apache::lontexconvert::jsMath_header();  
     }  
     return $body_tag_start;  
 }  
   
 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 104  sub page_start { Line 102  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().      $extra_head.= '
     &Apache::lonhtmlcommon::spellheader().  <script type="text/javascript">
     &Apache::lonxml::fontsettings();       function setSubmittedPart (part) {
  my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');     this.document.lonhomework.submitted.value="part_"+part;
  if ($css_href =~ /\S/) {  }
     &Apache::lonxml::extlink($css_href);  </script>
     $head_tag_start =   ';
  '<link rel="stylesheet" type="text/css" href="'.$css_href.'" />';  
  }      my %body_args;
  if ($target eq 'edit') {      if (defined($found{'html'})) {
     $head_tag_start.=&Apache::edit::js_change_detection();   $body_args{'skip_phases'}{'head'}=1;
       } else {
   
    $extra_head .= &Apache::lonhtmlcommon::spellheader();
   
    $extra_head .= &Apache::londefdef::generate_css_links();
   
    if ($env{'request.state'} eq 'construct') {
       $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";
  }   }
     }      }
     my $body_tag_start;  
     if (!defined($found{'body'}) && $env{'request.state'} eq 'construct') {      if (defined($found{'body'})) {
  if ($env{'environment.remote'} eq 'off') {   $body_args{'skip_phases'}{'body'}=1;
     if ($target eq 'web' || $target eq 'edit') {      } elsif (!defined($found{'body'}) 
  $body_tag_start=&Apache::loncommon::bodytag();       && $env{'request.state'} eq 'construct') {
  $body_tag_start.=&Apache::lonxml::message_location();   if ($target eq 'web' || $target eq 'edit') {
     }      # no extra args to bodytag
  } else {  
     if ($target eq 'web' || $target eq 'edit') {  
  $body_tag_start=&Apache::loncommon::bodytag(undef,undef,undef,1);  
  $body_tag_start.=&Apache::lonxml::message_location();  
     }  
  }   }
     } elsif (!defined($found{'body'})) {      } elsif (!defined($found{'body'})) {
    my %add_entries;
  my $background=&Apache::lonxml::get_param('background',$parstack,   my $background=&Apache::lonxml::get_param('background',$parstack,
   $safeeval);    $safeeval);
    if ($background ne '' ) {
       $add_entries{'background'} = $background;
    }
   
  my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,   my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
        $safeeval);         $safeeval);
  $body_tag_start=&body_tag_start($target,$background,$bgcolor);          if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; }
  if ( ($target eq 'web' || $target eq 'webgrade')  
      && $env{'request.state'} ne 'construct') {   $body_args{'bgcolor'}        = $bgcolor;
     my ($symb,undef,undef,undef,$publicuser)=   $body_args{'no_title'}       = 1;
  &Apache::lonxml::whichuser();   $body_args{'force_register'} = 1;
     if ($symb eq '' && !$publicuser) {   $body_args{'add_entries'}    = \%add_entries;
  my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");      }
  $help=&mt("Browsing resource, all submissions are temporary.")."<br />";      $body_args{'no_auto_mt_title'} = 1;
  $body_tag_start.=$help;      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::lonnet::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') {   if ($target eq 'edit') {
     $form_tag_start.=&Apache::edit::form_change_detection();      $form_tag_start.=&Apache::edit::form_change_detection();
  }   }
  $form_tag_start.='>';   $form_tag_start.='>'."\n";
   
    my $symb=&Apache::lonnet::symbread();
    if ($symb =~ /\S/) {
       $symb=
    &HTML::Entities::encode(&Apache::lonenc::check_encrypt($symb));
       $form_tag_start.=
    "\t".'<input type="hidden" name="symb" value="'.$symb.'" />'."\n";
    }
     }      }
     return ($result,$head_tag_start,$body_tag_start,$form_tag_start);      return ($page_start,$form_tag_start);
 }  }
   
 #use Time::HiRes();  #use Time::HiRes();
 sub get_resource_name {  sub get_resource_name {
     my ($parstack,$safeeval)=@_;      my ($parstack,$safeeval)=@_;
       my $name;
     if (defined($Apache::lonhomework::name)) {      if (defined($Apache::lonhomework::name)) {
  return $Apache::lonhomework::name;   $name = $Apache::lonhomework::name;
     }      } else {
     my ($symb)=&Apache::lonxml::whichuser();   my ($symb)=&Apache::lonnet::whichuser();
     my $name=&Apache::lonnet::gettitle($symb);   my $name=&Apache::lonnet::gettitle($symb);
     if ($name eq '') {   if ($name eq '') {
  $name=&Apache::lonnet::EXT('resource.title');      $name=&Apache::lonnet::EXT('resource.title');
  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-;
    }
    # The name has had html tags escaped:
          
    $name=~s/&lt;/</gs;
    $name=~s/&gt;/>/gs;
   
    $Apache::lonhomework::name=$name;
     }      }
     $Apache::lonhomework::name=$name;  
     return $name;      return $name;
 }  }
   
 sub setup_rndseed {  sub setup_rndseed {
     my ($safeeval)=@_;      my ($safeeval)=@_;
     my $rndseed;      my $rndseed;
     my ($symb)=&Apache::lonxml::whichuser();      my ($symb)=&Apache::lonnet::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'},   &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},
  ['rndseed']);   ['rndseed']);
  $rndseed=$env{'form.rndseed'};   $rndseed=$env{'form.rndseed'};
Line 204  sub setup_rndseed { Line 244  sub setup_rndseed {
     }      }
     $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.submitted'} eq 'yes')  ||
     $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));
Line 242  sub problem_edit_header { Line 283  sub problem_edit_header {
        <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>'.
        &Apache::loncommon::help_open_menu('','Problem Editing Help','Problem_Editor_XML_Index','',5,'Authoring',undef,undef,undef,'Problem Editing Help')         &Apache::loncommon::help_open_menu('Problem Editing Help','Problem_Editor_XML_Index',5,'Authoring',undef,undef,undef,'Problem Editing Help')
        .'</td></tr></table>'.         .'</td></tr></table>'.
        '<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">';         '<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">';
 }  }
Line 250  sub problem_edit_header { Line 291  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 267  sub option { Line 308  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').'" />';
     if (!$Apache::lonhomework::parsing_a_task) {      $result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />';
  $result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />';  
     }  
     $result .= '<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />      $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').'" />
Line 277  sub problem_web_to_edit_header { Line 316  sub problem_web_to_edit_header {
               <input type="text" name="rndseed" size="10" value="'.                <input type="text" name="rndseed" size="10" value="'.
        $rndseed.'"         $rndseed.'"
            onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr>             onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr>
              <label><input type="checkbox" name="showallfoils" ';               <span class="LC_nobreak"><label><input type="checkbox" name="showallfoils" ';
     my $show_all_foils_text =       my $show_all_foils_text = 
  ($Apache::lonhomework::parsing_a_task) ?   ($Apache::lonhomework::parsing_a_task) ?
  &mt('&nbsp;Show&nbsp;All&nbsp;Instances')   &mt('&nbsp;Show&nbsp;All&nbsp;Instances')
  : &mt('&nbsp;Show&nbsp;All&nbsp;Foils');   : &mt('&nbsp;Show&nbsp;All&nbsp;Foils');
   
     if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }      if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }
     $result.= ' />'.$show_all_foils_text.      $result.= ' />'.$show_all_foils_text.'</label></span>'.
  &Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').   &Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').
  '</label><hr />';   '<hr />';
       $result.=&mt('Apply style file: ').'
   <input type="text" name="style_file" value="'.&HTML::Entities::encode($env{'construct.style'},'"<>&').'" />
    <a href="javascript:openbrowser(\'lonhomework\',\'style_file\',\'sty\')">'.&mt('Select').'</a>
   <input type="submit" name="clear_style_file" value="'.&mt('Clear').'" />
   <br />';
   
     if (!$Apache::lonhomework::parsing_a_task) {      if (!$Apache::lonhomework::parsing_a_task) {
  $result.="   $result.="
 <nobr>  <nobr>
Line 328  Feedback Mode: Line 373  Feedback Mode:
      '.'.&Apache::loncommon::help_open_topic("Analyze_Problem",       '.'.&Apache::loncommon::help_open_topic("Analyze_Problem",
      '',undef,undef,300).       '',undef,undef,300).
      '<hr />';       '<hr />';
       } elsif ($Apache::lonhomework::parsing_a_task) {
    $result.="
   <nobr>
   Problem Status:
   <select name='problemstate'>
     <option value=''></option>
     ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
     ".&option('CAN_ANSWER'           ,'problemstate').&mt("Answerable")."</option>
     ".&option('WEB_GRADE'            ,'problemstate').&mt("Criteria Grading")."</option>
     ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Feedback")."</option>
   </select>
   </nobr>
   <input type='submit' name='changeproblemmode' value='".&mt("Change")."' />
   <hr />";
     }      }
     return $result;      return $result;
 }  }
   
 sub initialize_storage {  sub initialize_storage {
     %Apache::lonhomework::results=();      my ($given_symb) = @_;
     %Apache::lonhomework::history=();      undef(%Apache::lonhomework::results);
     my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();      undef(%Apache::lonhomework::history);
     if ($env{'request.state'} eq 'construct' || $symb eq '') {      my ($symb,$courseid,$domain,$name) = 
    &Apache::lonnet::whichuser($given_symb);
       
       # anonymous users (CODEd exams) have no data
       if ($name eq 'anonymous' 
    && !defined($domain)) {
    return;
       }
   
       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.submitted'} eq 'yes') ||
       $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 {
  %Apache::lonhomework::history=   %Apache::lonhomework::history=
     &Apache::lonnet::restore($symb,$courseid,$domain,$name);      &Apache::lonnet::restore($symb,$courseid,$domain,$name);
     }      }
   
     #ignore error conditions      #ignore error conditions
     my ($temp)=keys %Apache::lonhomework::history ;      my ($temp)=keys %Apache::lonhomework::history ;
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }      if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
Line 357  sub initialize_storage { Line 437  sub initialize_storage {
 # Will increment totals for attempts, students, and corrects  # Will increment totals for attempts, students, and corrects
 # if running user has student role.    # if running user has student role.  
 sub finalize_storage {  sub finalize_storage {
       my ($given_symb) = @_;
     my $result;      my $result;
     if (%Apache::lonhomework::results) {      if (%Apache::lonhomework::results) {
  my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results));   my @remove = grep(/^INTERNAL_/,keys(%Apache::lonhomework::results));
  delete(@Apache::lonhomework::results{@remove});   delete(@Apache::lonhomework::results{@remove});
  my ($symb,$courseid,$domain,$name) = &Apache::lonxml::whichuser();   my ($symb,$courseid,$domain,$name) = 
  if ($env{'request.state'} eq 'construct' || $symb eq '') {      &Apache::lonnet::whichuser($given_symb);
    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 380  sub finalize_storage { Line 465  sub finalize_storage {
     }      }
     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 492  sub init_problem_globals { Line 576  sub init_problem_globals {
     @Apache::structuretags::whileline=();      @Apache::structuretags::whileline=();
     $Apache::lonhomework::scantronmode=0;      $Apache::lonhomework::scantronmode=0;
     undef($Apache::lonhomework::name);      undef($Apache::lonhomework::name);
       undef($Apache::lonhomework::default_type);
       undef($Apache::lonhomework::type);
 }  }
   
 sub reset_problem_globals {  sub reset_problem_globals {
Line 504  sub reset_problem_globals { Line 589  sub reset_problem_globals {
 #detect if we try to do 2 problems in one file  #detect if we try to do 2 problems in one file
 #   undef($Apache::lonhomework::parsing_a_problem);  #   undef($Apache::lonhomework::parsing_a_problem);
     undef($Apache::lonhomework::name);      undef($Apache::lonhomework::name);
       undef($Apache::lonhomework::default_type);
       undef($Apache::lonhomework::type);
       undef($Apache::lonhomework::scantronmode);
       undef($Apache::lonhomework::problemstatus);
       undef($Apache::lonhomework::ignore_response_errors);
 }  }
   
 sub set_problem_state {  sub set_problem_state {
Line 553  sub start_problem { Line 643  sub start_problem {
  $Apache::lonhomework::scantronmode=1;   $Apache::lonhomework::scantronmode=1;
     }      }
   
     &initialize_storage();  
     if ($target ne 'analyze') {      if ($target ne 'analyze') {
  if ($target eq 'web') {  
     &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') &&
Line 578  sub start_problem { Line 664  sub start_problem {
     }      }
     $Apache::lonhomework::default_type = $Apache::lonhomework::type;      $Apache::lonhomework::default_type = $Apache::lonhomework::type;
   
       &initialize_storage();
       if ($target ne 'analyze'
           && $env{'request.state'} eq 'construct') {
    &set_problem_state('0');
       }
   
       if ($target eq 'web') {
    &Apache::lonxml::debug(" grading history ");
    &Apache::lonhomework::showhash(%Apache::lonhomework::history);
       }
   
     #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.'\';';
     $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';      $expression.='$external::type=\''.$Apache::lonhomework::type.'\';';
Line 585  sub start_problem { Line 682  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'
    || $target eq 'edit') {
    ($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 602  sub start_problem { Line 705  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');
  }   }
  #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::lonnet::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.=
     ' <label><input type="checkbox" name="showallfoils" ';      ' <label><input type="checkbox" name="showallfoils" ';
  if (defined($env{'form.showallfoils'})) {   if (defined($env{'form.showallfoils'})) {
Line 648  sub start_problem { Line 755  sub start_problem {
     my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,      my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
        $style);         $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 658  sub start_problem { Line 764  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') {   } elsif ($status eq 'NOT_IN_A_SLOT') {
Line 680  sub start_problem { Line 786  sub start_problem {
     my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,      my $bodytext=&Apache::lonxml::get_all_text("/problem",$parser,
        $style);         $style);
     if ($target eq 'web') {      if ($target eq 'web') {
  $result .= $head_tag_start.'</head>';   $result .= 
  $result .= $body_tag_start;      &Apache::bridgetask::proctor_validation_screen($slot);
  $result .= &Apache::bridgetask::proctor_validation_screen();  
     } elsif ($target eq 'grade') {      } elsif ($target eq 'grade') {
  &Apache::bridgetask::proctor_check_auth($slot_name,$slot,   &Apache::bridgetask::proctor_check_auth($slot_name,$slot,
  'problem');   'problem');
     }      }
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
     my $name= &get_resource_name($parstack,$safeeval);      if ($status eq 'CAN_ANSWER' 
     $result.="$head_tag_start<title>$name</title></head>   && $slot_name ne ''
               $body_tag_start \n $form_tag_start".   && $Apache::lonhomework::history{'resource.0.checkedin'} eq '') {
    # unproctored slot access, self checkin
    &Apache::bridgetask::check_in('problem',undef,undef,
         $slot_name);
       }
       $result.="\n $form_tag_start \t".
       '<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 708  sub start_problem { Line 818  sub start_problem {
   
  }   }
     } 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);
  $result.=$temp;   $result.=$temp;
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $result=$token->[4];   $result=$token->[4];
  $result.=&Apache::edit::handle_insert();  
     } else {      } else {
  # page_start returned a starting result, delete it if we don't need it   # page_start returned a starting result, delete it if we don't need it
  $result = '';   $result = '';
Line 734  sub end_problem { Line 842  sub end_problem {
     }      }
   
     if ($target eq 'tex') {      if ($target eq 'tex') {
   
  # Figure out the front matter and replace the   # Figure out the front matter and replace the
  # INSERTTEXFRONTMATTERHERE in result with it.  note that we do   # INSERTTEXFRONTMATTERHERE in result with it.  note that we do
  # this in end_problem because whether or not we display due   # this in end_problem because whether or not we display due
Line 810  sub end_problem { Line 917  sub end_problem {
     if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}      if ($Apache::lonhomework::type eq 'exam' and $allow_print_points==1) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
  }   }
     } else {      } else {
  $frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\';   $frontmatter .= '\vskip 1mm\textit{Due date: '.$duedate.'} \\\\\\\\'.$startminipage;
     }      }
  } else {   } else {
     if (not $env{'request.symb'} =~ m/\.page_/) {      if (not $env{'request.symb'} =~ m/\.page_/) {
  $frontmatter .= $begin_doc.$toc_line;   $frontmatter .= $begin_doc.$toc_line;
  if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}   if (($Apache::lonhomework::type eq 'exam') and ($allow_print_points==1)) { $frontmatter .= '\fbox{\textit{'.$weight.' pt}}';}
     } else {      } else {
  $frontmatter .= '\vskip 1mm \\\\\\\\';   $frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;
     }      }
  }   }
  $result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/;   $result =~ s/INSERTTEXFRONTMATTERHERE/$frontmatter/;
Line 851  sub end_problem { Line 958  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 862  sub end_problem { Line 969  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_/) {
  $result .= $endminipage.'\end{document} ';   $result .= $endminipage.'\end{document} ';
     } else {      } else {
  $result .= '';   $result .= $endminipage;
     }      }
  }   }
     }      }
Line 879  sub end_problem { Line 985  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.=&Apache::lonxml::xmlend().'</html>';      $result.=&Apache::loncommon::end_page({'discussion' => 1});
                         # normally we get it from above, but in CSTR                          # normally we get it from above, but in CSTR
                         # we always show answer mode too.                          # we always show answer mode too.
  }   }
Line 895  sub end_problem { Line 1001  sub end_problem {
  $result .= &problem_edit_footer();   $result .= &problem_edit_footer();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $result .= $token->[2];   $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 910  sub end_problem { Line 1015  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 eq 0 && $$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();      } elsif (($target eq 'web' || $target eq 'webgrade')
     } elsif ($target eq 'web' && $$tagstack[0] ne 'problem' &&       && ($#$tagstack eq 0 && $$tagstack[0] eq 'library')
      $env{'request.state'} eq "construct" ) {       && $env{'request.state'} eq "construct" ) {
  ($result,$head_tag_start,$body_tag_start,$form_tag_start)=  
     &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 944  sub end_library { Line 1049  sub end_library {
     my $result='';      my $result='';
     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' 
      $env{'request.state'} eq "construct") {       && ($#$tagstack eq 0 && $$tagstack[0] eq 'library') 
  $result.='</form>'.&Apache::loncommon::endbodytag().       && $env{'request.state'} eq "construct") {
     &Apache::lonxml::xmlend();   $result.='</form>'.&Apache::loncommon::end_page({'discussion' => 1});
       }
       if ( $#$tagstack eq 0 && $$tagstack[0] eq 'library') {
    &reset_problem_globals('library');
     }      }
     if ($$tagstack[0] eq 'library') { &reset_problem_globals('library') };  
     return $result;      return $result;
 }  }
   
Line 985  sub start_block { Line 1092  sub start_block {
     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 'webgrade') {   $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) && $code ne '') {
     if (!$Apache::lonxml::default_homework_loaded) {      if (!$Apache::lonxml::default_homework_loaded) {
  &Apache::lonxml::default_homework_load($safeeval);   &Apache::lonxml::default_homework_load($safeeval);
     }      }
Line 1152  sub end_while { Line 1259  sub end_while {
  while ($return) {   while ($return) {
     if (time-$starttime >      if (time-$starttime >
  $Apache::lonnet::perlvar{'lonScriptTimeout'}) {   $Apache::lonnet::perlvar{'lonScriptTimeout'}) {
  #$return = 0; $error=1; next;   $return = 0; $error=1; next;
     }      }
     $result.=&Apache::scripttag::xmlparse($bodytext);      $result.=&Apache::scripttag::xmlparse($bodytext);
       if ($target eq 'grade' || $target eq 'answer' ||
    $target eq 'analyze') {
    # grade/answer/analyze should produce no output but if we
    # are redirecting, the redirecter should know what to do
    # with the output
    if (!$Apache::lonxml::redirection) { undef($result); }
       }
     $return = &Apache::run::run($code,$safeeval);      $return = &Apache::run::run($code,$safeeval);
  }   }
  if ($error) {   if ($error) {
Line 1272  sub start_part { Line 1386  sub start_part {
                                      # duedates.                                       # duedates.
     }      }
     my $result='';      my $result='';
     my $id= &Apache::lonxml::get_param('id',$parstack,$safeeval);      my $id= &Apache::lonxml::get_id($parstack,$safeeval);
     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 1326  sub start_part { Line 1439  sub start_part {
  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.='\noindent \begin{minipage}{\textwidth}\noindent';
  } else {   } else {
     $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';      $result.='\noindent \end{minipage}\vskip 0 mm \noindent \begin{minipage}{\textwidth}\noindent';
  }   }
Line 1350  sub start_part { Line 1463  sub start_part {
     }      }
     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="'.&escape($Apache::inputtags::part).'" />';
  }   }
     }      }
  }   }
Line 1368  sub start_part { Line 1481  sub start_part {
     #limiting ids to only letters numbers, and space      #limiting ids to only letters numbers, and space
     $token->[2]->{'id'}=~s/[^A-Za-z0-9 ]//gs;      $token->[2]->{'id'}=~s/[^A-Za-z0-9 ]//gs;
     $result = &Apache::edit::rebuild_tag($token);      $result = &Apache::edit::rebuild_tag($token);
     $result.=&Apache::edit::handle_insert();  
  }   }
     }      }
     return $result;      return $result;
Line 1406  sub end_part { Line 1518  sub end_part {
  $result.=&Apache::edit::end_table();   $result.=&Apache::edit::end_table();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  $result .= $token->[2];   $result .= $token->[2];
  $result.=&Apache::edit::handle_insertafter($token->[1]);  
     }      }
     pop @Apache::inputtags::status;      pop @Apache::inputtags::status;
     $Apache::inputtags::part='';      $Apache::inputtags::part='';
Line 1433  sub end_preduedate { Line 1544  sub end_preduedate {
     return '';      return '';
 }  }
   
   # In all the modes where <postanswerdate> text is 
   # displayable,  all we do is eat up the text between the start/stop
   # tags if the conditions are not right to display it.
 sub start_postanswerdate {  sub start_postanswerdate {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade') {      my $pav = &Apache::lonnet::allowed('pav', $env{'request.course.id'}) ||
    &Apache::lonnet::allowed('pav',
      $env{'request.course.id'}.'/'.$env{'request.course.sec'});
       if ($target eq 'web' || $target eq 'grade' || $target eq 'webgrade' ||
    $target eq 'tex' ) {
  if ($Apache::lonhomework::scantronmode ||   if ($Apache::lonhomework::scantronmode ||
     $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER') {      $Apache::inputtags::status['-1'] ne 'SHOW_ANSWER' ||
       (($target eq 'tex') && !$pav)) {
     &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);      &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);
  }   }
     } elsif ($target eq 'tex') {  
  &Apache::lonxml::get_all_text("/postanswerdate",$parser,$style);  
     }      }
     return '';      return '';
 }  }
Line 1548  sub end_startouttext { Line 1665  sub end_startouttext {
  ."</td>   ."</td>
 <td>".  <td>".
                  &Apache::edit::insertlist($target,$token).                   &Apache::edit::insertlist($target,$token).
    '</td><td align="right" valign="top">' .
    &Apache::loncommon::helpLatexCheatsheet().
  &Apache::edit::end_row().   &Apache::edit::end_row().
                  &Apache::edit::start_spanning_row()."\n"                   &Apache::edit::start_spanning_row()."\n".
  . &Apache::loncommon::helpLatexCheatsheet () .  
  &Apache::edit::editfield($token->[1],$text,"",80,8,1);   &Apache::edit::editfield($token->[1],$text,"",80,8,1);
     }      }
     if ($target eq 'modified') {      if ($target eq 'modified') {
Line 1568  sub start_endouttext { Line 1686  sub start_endouttext {
     if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; }      if ($target eq "edit" ) { $result="</td></tr>".&Apache::edit::end_table()."\n"; }
     if ($target eq "modified") {      if ($target eq "modified") {
  $result='<endouttext />'.   $result='<endouttext />'.
     &Apache::edit::handle_insertafter('startouttext'); }      &Apache::edit::handle_insertafter('startouttext');
       }
     return $result;      return $result;
 }  }
   
Line 1601  sub start_simpleeditbutton { Line 1720  sub start_simpleeditbutton {
         (&Apache::lonnet::allowed('mdc',$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::lonnet::whichuser();
  $result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.   $result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.
                 '<a href="'.$url.'/smpedit?symb='.&Apache::lonnet::escape($symb).'">'.&mt('Edit').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').                  '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'.&mt('Edit').'</a> - '.&mt('Note: it can take up to 10 minutes for changes to take effect for all users.').
 &Apache::loncommon::help_open_topic('Caching').'</td></tr></table><br />';  &Apache::loncommon::help_open_topic('Caching').'</td></tr></table><br />';
     }      }
     return $result;      return $result;
Removed from v.1.332.2.3  
changed lines
  Added in v.1.389

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