Diff for /loncom/homework/structuretags.pm between versions 1.392 and 1.471

version 1.392, 2007/08/31 19:31:16 version 1.471, 2010/07/29 21:16:40
Line 27 Line 27
 #  #
 ###  ###
   
   =pod
   
   =head1 NAME
   
   Apache::structuretags
   
   =head1 SYNOPSIS
   
   
   This is part of the LearningOnline Network with CAPA project
   described at http://www.lon-capa.org.
   
   
   =head1 NOTABLE SUBROUTINES
   
   =over
   
   =item 
   
   =back
   
   =cut
   
   
 package Apache::structuretags;   package Apache::structuretags; 
   
Line 36  use Apache::File(); Line 59  use Apache::File();
 use Apache::lonmenu;  use Apache::lonmenu;
 use Apache::lonlocal;  use Apache::lonlocal;
 use Apache::lonxml;  use Apache::lonxml;
   use Apache::londefdef;
 use Apache::lonenc();  use Apache::lonenc();
 use Time::HiRes qw( gettimeofday tv_interval );  use Time::HiRes qw( gettimeofday tv_interval );
 use lib '/home/httpd/lib/perl/';  use lib '/home/httpd/lib/perl/';
 use LONCAPA;  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','translated','instructorcomment','while','randomlist','problem','library','web','tex','part','preduedate','postanswerdate','solved','notsolved','problemtype','startpartmarker','startouttext','endpartmarker','endouttext','simpleeditbutton','definetag'));
 }  }
   
 sub start_web {  sub start_web {
Line 74  sub start_tex { Line 98  sub start_tex {
     if ($target ne 'edit' && $target ne 'modified') {      if ($target ne 'edit' && $target ne 'modified') {
  my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);   my $bodytext=&Apache::lonxml::get_all_text("/tex",$parser,$style);
  if ($target eq 'tex') {   if ($target eq 'tex') {
     return $bodytext.' ';      
       # If inside a table, occurrences of \\ must be removed;
       # else the table blows up.
   
       if (&Apache::londefdef::is_inside_of($tagstack, "table")) {
    $bodytext =~ s/\\\\//g;
       }
       return $bodytext.'{}';
  }   }
     } elsif ($target eq "edit" ) {      } elsif ($target eq "edit" ) {
  my $bodytext =    my $bodytext = 
Line 92  sub end_tex { Line 123  sub end_tex {
     return '';      return '';
 }  }
   
   sub homework_js {
       return &Apache::loncommon::resize_textarea_js().
              &setmode_javascript().
    <<'JS';
   <script type="text/javascript">
   function setSubmittedPart (part) {
      this.document.lonhomework.submitted.value="part_"+part;
   }
   
   function image_response_click (which, e) {
       init_geometry();
       if (!e) { e = window.event; } //IE
       var input_element = document.lonhomework.elements[which];
       var token_element = document.lonhomework.elements[which+'_token'];
       var token = token_element.value;
       var img_element   = document.getElementById(which+'_imageresponse');
       var x= e.clientX-getX(img_element)+Geometry.getHorizontalScroll();
       var y= e.clientY-getY(img_element)+Geometry.getVerticalScroll();
       var click = x+':'+y;
       input_element.value = click;
       img_element.src = '/adm/randomlabel.png?token='+token+'&clickdata='+click;
   }
   
   </script>
   JS
   }
   
   sub setmode_javascript {
       return <<"ENDSCRIPT";
   <script type="text/javascript">
   function setmode(form,probmode) {
       form.problemmode.value = probmode;
       form.submit();
   }
   </script>
   ENDSCRIPT
   }
   
 sub page_start {  sub page_start {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name,      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$name,
  $extra_head)=@_;   $extra_head)=@_;
Line 108  sub page_start { Line 177  sub page_start {
    $parstack,$parser,$safeeval);     $parstack,$parser,$safeeval);
     }      }
   
     $extra_head.= '      $extra_head .= &homework_js();
 <script type="text/javascript">  
 function setSubmittedPart (part) {      if ($env{'environment.wysiwygeditor'} eq 'on') {
    this.document.lonhomework.submitted.value="part_"+part;   $extra_head .= &Apache::lonhtmlcommon::dragmath_js("FCKEditMathPopup");
 }      } else {
 </script>          $extra_head .= &Apache::lonhtmlcommon::dragmath_js("EditMathPopup");
 ';      }
   
     my %body_args;      my %body_args;
     if (defined($found{'html'})) {      if (defined($found{'html'})) {
Line 134  function setSubmittedPart (part) { Line 203  function setSubmittedPart (part) {
  }   }
     }      }
   
       my $pageheader = '';
     if (defined($found{'body'})) {      if (defined($found{'body'})) {
  $body_args{'skip_phases'}{'body'}=1;   $body_args{'skip_phases'}{'body'}=1;
     } elsif (!defined($found{'body'})       } elsif (!defined($found{'body'}) 
      && $env{'request.state'} eq 'construct') {       && $env{'request.state'} eq 'construct') {
  if ($target eq 'web' || $target eq 'edit') {   if ($target eq 'web' || $target eq 'edit') {
     # no extra args to bodytag          # Breadcrumbs for Construction Space
           &Apache::lonhtmlcommon::clear_breadcrumbs();
           &Apache::lonhtmlcommon::add_breadcrumb({
               'text'  => 'Construction Space',
               'href'  => &Apache::loncommon::authorspace(),
           });
           # breadcrumbs (and tools) will be created 
           # in start_page->bodytag->innerregister
   
   # FIXME Where are we?
   #        &Apache::lonhtmlcommon::add_breadcrumb({
   #            'text'  => 'Problem Editing', # 'Problem Testing'
   #            'href'  => '',
   #        });
           $pageheader =&Apache::loncommon::head_subbox(
                   &Apache::loncommon::CSTR_pageheader());
  }   }
     } elsif (!defined($found{'body'})) {      } elsif (!defined($found{'body'})) {
  my %add_entries;   my %add_entries;
Line 151  function setSubmittedPart (part) { Line 236  function setSubmittedPart (part) {
   
  my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,   my $bgcolor=&Apache::lonxml::get_param('bgcolor',$parstack,
        $safeeval);         $safeeval);
         if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; }          if ($bgcolor eq '' ) { $bgcolor = '#FFFFFF'; }
   
  $body_args{'bgcolor'}        = $bgcolor;          $body_args{'bgcolor'}        = $bgcolor;
  $body_args{'no_title'}       = 1;          # $body_args{'no_title'}       = 1;
  $body_args{'force_register'} = 1;          $body_args{'force_register'} = 1;
  $body_args{'add_entries'}    = \%add_entries;          $body_args{'add_entries'}    = \%add_entries;
  if ($env{'environment.remote'} eq 'off'          if ( $env{'request.state'} eq   'construct') {
     && $env{'request.state'} eq   'construct') {              $body_args{'only_body'}  = 1;
     $body_args{'only_body'}  = 1;          }
  }  
     }      }
     $body_args{'no_auto_mt_title'} = 1;      $body_args{'no_auto_mt_title'} = 1;
     my $page_start = &Apache::loncommon::start_page($name,$extra_head,      my $page_start = &Apache::loncommon::start_page($name,$extra_head,
     \%body_args);      \%body_args);
       $page_start .= $pageheader;
     if (!defined($found{'body'})       if (!defined($found{'body'}) 
  && $env{'request.state'} ne 'construct'   && $env{'request.state'} ne 'construct'
  && ($target eq 'web' || $target eq 'webgrade')) {   && ($target eq 'web' || $target eq 'webgrade')) {
   
  my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();   my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
  if ($symb eq '' && !$publicuser) {          if ($symb eq '' && !$publicuser) {
     my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");              $page_start .= '<p class="LC_info">'
     $help=&mt("Browsing resource, all submissions are temporary.")."<br />";                            .&mt('Browsing resource, all submissions are temporary.')
     $page_start .= $help;                            .'</p>';
  }          }
     }      }
   
     if (!defined($found{'body'})) {      if (!defined($found{'body'}) && $env{'request.state'} ne 'construct') {
  $page_start .= &Apache::lonxml::message_location();   $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 = &Apache::lonenc::check_encrypt($env{'request.uri'});   my $uri = &Apache::loncommon::inhibit_menu_check(
                   &Apache::lonenc::check_encrypt($env{'request.uri'}));
           $uri = &HTML::Entities::encode($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();
Line 278  sub remember_problem_state { Line 364  sub remember_problem_state {
        <input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />';         <input type="hidden" name="problemstatus" value="'.$env{'form.problemstatus'}.'" />';
 }  }
   
   sub problem_edit_buttons {
      return  '
   <div class="LC_edit_problem_discards">
          <input type="button" name="submitmode" accesskey="d" value="'.&mt('Discard Edits and View').'" '.
          ' onclick="javscript:setmode(this.form,'."'discard'".')"  />
          <input '.&Apache::edit::submit_ask_anyway('setmode(this.form,'."'editxml'".')').' type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" />
          <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" />
   </div>
   <div class="LC_edit_problem_saves">
          <input type="submit" name="submitbutton" accesskey="s" value="'.&mt('Save and Edit').'" />
          <input type="submit" name="submitbutton" accesskey="v" value="'.&mt('Save and View').'" />
   </div>';
   }
   
 sub problem_edit_header {  sub problem_edit_header {
     return '<input type="hidden" name="submitted" value="edit" />'.      return '<input type="hidden" name="submitted" value="edit" /><input type="hidden" name="problemmode" value="edit" />'.
  &Apache::structuretags::remember_problem_state().'   &Apache::structuretags::remember_problem_state().'
        <input type="hidden" name="problemmode" value="'.&mt('Edit').'" />  <div class="LC_edit_problem_header">
        <input type="submit" name="problemmode" accesskey="d" value="'.&mt('Discard Edits and View').'" />  <div class="LC_edit_problem_header_title">
        <input '.&Apache::edit::submit_ask_anyway().' type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />  '.&mt('Problem Editing').&Apache::loncommon::help_open_menu('Problem Editing','Problem_Editor_XML_Index',5,'Authoring').'
        <input type="submit" name="Undo" accesskey="u" value="'.&mt('undo').'" /> <hr />  </div>'.
        <input type="submit" name="submit" accesskey="s" value="'.&mt('Submit Changes and Edit').'" />  &problem_edit_buttons().'
        <input type="submit" name="submit" accesskey="v" value="'.&mt('Submit Changes and View').'" /><table><tr><td>'.  <hr style="clear:both;" />
        &Apache::loncommon::help_open_menu('Problem Editing Help','Problem_Editor_XML_Index',5,'Authoring',undef,undef,undef,'Problem Editing Help')  '.&Apache::lonxml::message_location().'
        .'</td></tr></table>'.  </div>
        '<table border="0" width="100%"><tr><td bgcolor="#DDDDDD">';  '.
          '<table border="0" width="100%"><tr><td bgcolor="#F8F8F8">';
 }  }
   
 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 View').'" />'.  <div class="LC_edit_problem_footer">
     <hr />'.
   &problem_edit_buttons().'
     <hr style="clear:both;" />
   </div>
   '.
   
     &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).      &Apache::lonhtmlcommon::htmlareaselectactive(&Apache::lonhtmlcommon::get_htmlareafields()).
     "\n</form>\n".&Apache::loncommon::end_page();      "\n</form>\n".&Apache::loncommon::end_page();
 }  }
Line 311  sub option { Line 418  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 .= '<div class="LC_edit_problem_header">';
     $result .= '<input type="submit" name="problemmode" accesskey="e" value="'.&mt('Edit').'" />';  
     $result .= '<input type="submit" name="problemmode" accesskey="x" value="'.&mt('EditXML').'" />      if (!$Apache::lonhomework::parsing_a_task) {
              <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />   $result .= 
              <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />      '<div class="LC_edit_problem_header_title">'.
              <nobr><input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />      &mt('Problem Testing').
               <input type="text" name="rndseed" size="10" value="'.      &Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area').
        $rndseed.'"      '</div>';
            onchange="javascript:document.lonhomework.changerandseed.click()" /></nobr>      } else {
              <span class="LC_nobreak"><label><input type="checkbox" name="showallfoils" ';   $result .= 
       '<div class="LC_edit_problem_header_title">'.
       &mt('Task Testing').
       '</div>';
       }
       
     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('Show All Instances')
  : &mt('&nbsp;Show&nbsp;All&nbsp;Foils');   : &mt('Show All Foils');
   
     if (defined($env{'form.showallfoils'})) { $result.='checked="on"'; }      my $show_all= '<span class="LC_nobreak"><label for="showallfoils">'
     $result.= ' />'.$show_all_foils_text.'</label></span>'.                   .'<input type="checkbox" name="showallfoils"';
  &Apache::loncommon::help_open_topic('Problem_Editor_Testing_Area','Testing Problems').      if (defined($env{'form.showallfoils'})) { $show_all.=' checked="checked"'; }
  '<hr />';      $show_all.= ' /> '.$show_all_foils_text
     $result.=&mt('Apply style file: ').'                 .'</label></span>';
 <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 />';  
   
   
   
       $result .= '<div class="LC_edit_problem_header_status_row">';
     if (!$Apache::lonhomework::parsing_a_task) {      if (!$Apache::lonhomework::parsing_a_task) {
  $result.="   $result.="
 <nobr>  <div class='LC_edit_problem_header_row1'>
 Problem Status:  <span class=\"LC_nobreak\">
   ".&mt("Problem Status:")."
 <select name='problemstate'>  <select name='problemstate'>
   <option value=''></option>    <option value=''></option>
   ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>    ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
Line 348  Problem Status: Line 460  Problem Status:
   ".&option('CANNOT_ANSWER_correct','problemstate').&mt("Open and correct")."</option>    ".&option('CANNOT_ANSWER_correct','problemstate').&mt("Open and correct")."</option>
   ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Answer")."</option>    ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Answer")."</option>
 </select>  </select>
 </nobr>  </span>
 <nobr>  <span class=\"LC_nobreak\">
 Problem Type:  ".&mt("Problem Type:")."
 <select name='problemtype'>  <select name='problemtype'>
   <option value=''></option>    <option value=''></option>
   ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>    ".&option('exam'   ,'problemtype').&mt("Exam Problem")."</option>
   ".&option('problem','problemtype').&mt("Homework problem")."</option>    ".&option('problem','problemtype').&mt("Homework Problem")."</option>
   ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>    ".&option('survey' ,'problemtype').&mt("Survey Question")."</option>
     ".&option('surveycred' ,'problemtype').&mt("Survey Question (with credit)")."</option>
     ".&option('anonsurvey' ,'problemtype').&mt("Anonymous Survey Question")."</option>
     ".&option('anonsurveycred' ,'problemtype').&mt("Anonymous Survey Question (with credit)")."</option>
     ".&option('practice' ,'problemtype').&mt("Practice Problem")."</option>
 </select>  </select>
 </nobr>  </span>
 <nobr>  $show_all
 Feedback Mode:  </div>
   <div class='LC_edit_problem_header_row2'>
   <span class=\"LC_nobreak\">
   ".&mt("Feedback Mode:")."
 <select name='problemstatus'>  <select name='problemstatus'>
   <option value=''></option>    <option value=''></option>
   ".&option('yes','problemstatus').&mt("Show Feedback")."</option>    ".&option('yes','problemstatus').&mt("Show Feedback")."</option>
   ".&option('no', 'problemstatus').&mt("Don't Show Feedback")."</option>    ".&option('no', 'problemstatus').&mt("Don't Show Incorect/Correct Feedback")."</option>
     ".&option('no_feedback_ever', 'problemstatus').&mt("Don't Show Any Feedback")."</option>
 </select>  </select>
 </nobr>  </span>
 <input type='submit' name='changeproblemmode' value='".&mt("Change")."' />  ";
 <hr />";  
  my $numtoanalyze=$env{'form.numtoanalyze'};  
  if (!$numtoanalyze) { $numtoanalyze=20; }  
  $result.= '<input type="submit" name="problemmode" value='.  
     &mt('"Calculate answers').'" /> for  
              <input type="text" name="numtoanalyze" value="'.  
      $numtoanalyze.'" size="5" /> '.&mt('versions of this problem').  
      '.'.&Apache::loncommon::help_open_topic("Analyze_Problem",  
      '',undef,undef,300).  
      '<hr />';  
     } elsif ($Apache::lonhomework::parsing_a_task) {      } elsif ($Apache::lonhomework::parsing_a_task) {
  $result.="   $result.="
 <nobr>  <div class='LC_edit_problem_header_row1'>
 Problem Status:  <span class=\"LC_nobreak\">
   ".&mt("Problem Status:")."
 <select name='problemstate'>  <select name='problemstate'>
   <option value=''></option>    <option value=''></option>
   ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>    ".&option('CLOSED'               ,'problemstate').&mt("Closed")."</option>
Line 388  Problem Status: Line 500  Problem Status:
   ".&option('WEB_GRADE'            ,'problemstate').&mt("Criteria Grading")."</option>    ".&option('WEB_GRADE'            ,'problemstate').&mt("Criteria Grading")."</option>
   ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Feedback")."</option>    ".&option('SHOW_ANSWER'          ,'problemstate').&mt("Show Feedback")."</option>
 </select>  </select>
 </nobr>  </span>
 <input type='submit' name='changeproblemmode' value='".&mt("Change")."' />  $show_all
 <hr />";  ";
     }      }
       $result.='
          <span class="LC_nobreak">
          '.&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>
          </span>
        </div>
        <div class="LC_edit_problem_header_row1">'.
          &Apache::lonxml::renderingoptions().'
        </div>
        <input type="submit" name="changeproblemmode" value="'.&mt("Change View").'" />
        <input type="submit" name="clear_style_file" accesskey="d" value="'.&mt('Show Default View').'" />
        <input type="submit" name="resetdata" accesskey="r" value="'.&mt('Reset Submissions').'" />
      </div>
      <hr />
      <div class="LC_edit_problem_header_randomize_row">
        <input type="submit" name="newrandomization" accesskey="a" value="'.&mt('New Randomization').'" />
        <input type="submit" name="changerandseed" value="'.&mt('Change Random Seed To:').'" />
        <input type="text" name="rndseed" size="10" value="'.
          $rndseed.'"
                onchange="javascript:document.lonhomework.changerandseed.click()" />';
   
       if (!$Apache::lonhomework::parsing_a_task) {
    my $numtoanalyze=$env{'form.numtoanalyze'};
    if (!$numtoanalyze) { $numtoanalyze=20; }
    $result .= '<span class="LC_nobreak">'.
       &mt('[_1] for [_2] versions.',
    '<input type="button" name="submitmode" value="'.&mt('Calculate answers').'" '.
                   'onclick="javascript:setmode(this.form,'."'calcanswers'".')" />'
                  ,'<input type="text" name="numtoanalyze" value="'.
    $numtoanalyze.'" size="5" />').
    &Apache::loncommon::help_open_topic("Analyze_Problem",'',undef,undef,300).
    '</span>';
       
       }
   
       $result.='
      </div>
      <hr />
      <div>';
       $result.='<input type="hidden" name="problemmode" value="view" />';
       $result .= '<input type="button" name="submitmode" accesskey="e" value="'.&mt('Edit').'" '.
                  'onclick="javascript:setmode(this.form,'."'edit'".')" />';
       $result .= '<input type="button" name="submitmode" accesskey="x" value="'.&mt('EditXML').'" '.
                  'onclick="javascript:setmode(this.form,'."'editxml'".')" />';
       $result.='
      </div>
      <hr />
      '.&Apache::lonxml::message_location().'
   </div>';
     return $result;      return $result;
 }  }
   
Line 434  sub initialize_storage { Line 596  sub initialize_storage {
     if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }      if ($temp =~ m/^error:.*/) { %Apache::lonhomework::history=(); }
 }  }
   
 # -------------------------------------------------------------finalize_storage  =pod
 # Stores away the result has to a student's environment  
 # checks form.grade_ for specific values, other wises stores  =item finalize_storage()
 # to the running users environment  
 # Will increment totals for attempts, students, and corrects   Stores away the result has to a student's environment
 # if running user has student role.     checks form.grade_ for specific values, other wises stores
    to the running users environment
    Will increment totals for attempts, students, and corrects
    if running user has student role.
   
   =cut
   
   
 sub finalize_storage {  sub finalize_storage {
     my ($given_symb) = @_;      my ($given_symb) = @_;
     my $result;      my $result;
Line 460  sub finalize_storage { Line 629  sub finalize_storage {
     $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,      $result=&Apache::lonnet::cstore(\%Apache::lonhomework::results,
     $symb,$courseid,$domain,$name);      $symb,$courseid,$domain,$name);
     &Apache::lonxml::debug('Store return message:'.$result);      &Apache::lonxml::debug('Store return message:'.$result);
             if ($env{'request.role'} =~/^st/) {              &store_aggregates($symb,$courseid);
                 &store_aggregates($symb,$courseid);  
             }  
  }   }
     } else {      } else {
  &Apache::lonxml::debug('Nothing to store');   &Apache::lonxml::debug('Nothing to store');
Line 470  sub finalize_storage { Line 637  sub finalize_storage {
     return $result;      return $result;
 }  }
   
 # -------------------------------------------------------------store_aggregates  =pod
 # Sends hash of values to be incremented in nohist_resourcetracker.db  
 # for the course. Increments total number of attempts, unique students   item store_aggregates()
 # and corrects for each part for an instance of a problem, as appropriate.  
    Sends hash of values to be incremented in nohist_resourcetracker.db
    for the course. Increments total number of attempts, unique students 
    and corrects for each part for an instance of a problem, as appropriate.
   
   =cut
   
 sub store_aggregates {  sub store_aggregates {
     my ($symb,$courseid) = @_;      my ($symb,$courseid) = @_;
     my %aggregate;      my %aggregate;
Line 486  sub store_aggregates { Line 659  sub store_aggregates {
         }          }
     }      }
     foreach my $part (@parts) {      foreach my $part (@parts) {
         if ($Apache::lonhomework::results{'resource.'.$part.'.award'}          if ($env{'request.role'} =~/^st/) {
     eq 'APPROX_ANS' ||              if ($Apache::lonhomework::results{'resource.'.$part.'.award'}
     $Apache::lonhomework::results{'resource.'.$part.'.award'}          eq 'APPROX_ANS' ||
     eq 'EXACT_ANS') {          $Apache::lonhomework::results{'resource.'.$part.'.award'}
             $aggregate{$symb."\0".$part."\0correct"} = 1;          eq 'EXACT_ANS') {
                   $aggregate{$symb."\0".$part."\0correct"} = 1;
               }
               if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 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;
         }          }
         if ($Apache::lonhomework::results{'resource.'.$part.'.tries'} == 1) {          if (($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurvey') || 
             $aggregate{$symb."\0".$part."\0users"} = 1;              ($Apache::lonhomework::results{'resource.'.$part.'.type'} eq 'anonsurveycred')) {
         } else {              $aggregate{$symb."\0".$part."\0anonymous"} = 1;
             my (undef,$last_reset) = &Apache::grades::get_last_resets($symb,$env{'request.course.id'},[$part]);               my $needsrelease = $Apache::lonnet::needsrelease{'parameter:type:'.$Apache::lonhomework::results{'resource.'.$part.'.type'}};
             if ($last_reset) {              if ($needsrelease) {   
                 if (&Apache::grades::get_num_tries(\%Apache::lonhomework::history,$last_reset,$part) == 0) {                  my $curr_required = $env{'course.'.$env{'request.course.id'}.'.internal.releaserequired'};
                     $aggregate{$symb."\0".$part."\0users"} = 1;                  if ($curr_required eq '') {
                       &Apache::lonnet::update_released_required($needsrelease);
                   } else {
                       my ($currmajor,$currminor) = split(/\./,$curr_required);
                       my ($needsmajor,$needsminor) = split(/\./,$needsrelease);
                       if (($currmajor < $needsmajor) || ($currmajor == $needsmajor && $currminor < $needsminor)) {
                           &Apache::lonnet::update_released_required($needsrelease);
                       }
                 }                  }
             }              }
         }          }
         $aggregate{$symb."\0".$part."\0attempts"} = 1;  
     }      }
     if (keys (%aggregate) > 0) {      if (keys (%aggregate) > 0) {
  &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,   &Apache::lonnet::cinc('nohist_resourcetracker',\%aggregate,
Line 521  sub checkout_msg { Line 713  sub checkout_msg {
     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">  <p class="LC_warning">$lt{'warning'}</p>
 <p>$lt{'warning'}</p>  <form name="checkout" method="post" action="$uri">
 </font>  
 <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 533  ENDCHECKOUT Line 723  ENDCHECKOUT
   
 sub firstaccess_msg {  sub firstaccess_msg {
     my ($time,$symb)=@_;      my ($time,$symb)=@_;
     my ($map)=&Apache::lonnet::decode_symb($symb);      my $result;
     my $foldertitle=&Apache::lonnet::gettitle($map);      my @interval=&Apache::lonnet::EXT("resource.0.interval");
     &Apache::lonxml::debug("map is $map title is $foldertitle");      if ($interval[1] eq 'map') {
    my ($map)=&Apache::lonnet::decode_symb($symb);
    my $foldertitle=&Apache::lonnet::gettitle($map);
       
    &Apache::lonxml::debug("map is $map title is $foldertitle");
    $result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.'
                                .' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
                                ,$foldertitle,$time)."</h2>";
       } elsif ($interval[1] eq 'course') {
    my $course = $env{'course.'.$env{'request.course.id'}.'.description'};
           $result .= "<h2>".&mt('The resources in "[_1]" are open for a limited time.'
                                .' Once you click the "Show Resource" button below you have [_2] to complete all resources "[_1]".'
                                ,$course,$time)."</h2>";
       } else {
    my $title=&Apache::lonnet::gettitle($symb);
           $result .= "<h2>".&mt('This resource "[_1]" is open for a limited time.'
                                .' Once you click the "Show Resource" button below you have [_2] to complete this resource "[_1]".'
                                ,$title,$time)."</h2>";
       }
     my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});      my $uri = &Apache::lonenc::check_encrypt($env{'request.uri'});
     return (<<ENDCHECKOUT);      my $buttontext = &mt('Show Resource');
 <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>      my $timertext = &mt('Start Timer?');
 <form name="markaccess" method="POST" action="$uri">      $result .= (<<ENDCHECKOUT);
   <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="$buttontext" onClick="javascript:if (confirm('$timertext')) { document.markaccess.submit(); }" />
 </form>  </form>
 ENDCHECKOUT  ENDCHECKOUT
       return $result;
 }  }
   
 sub init_problem_globals {  sub init_problem_globals {
Line 555  sub init_problem_globals { Line 765  sub init_problem_globals {
     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::set_show_problem_status(&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::reset_show_problem_status();
  $Apache::lonhomework::ignore_response_errors=1;   $Apache::lonhomework::ignore_response_errors=1;
   
     } elsif ($type eq 'Task') {      } elsif ($type eq 'Task') {
  $Apache::inputtags::part='0';   $Apache::inputtags::part='0';
  @Apache::inputtags::partlist=('0');   @Apache::inputtags::partlist=('0');
  $Apache::lonhomework::problemstatus='';   &Apache::lonhomework::reset_show_problem_status();
  $Apache::lonhomework::ignore_response_errors=1;   $Apache::lonhomework::ignore_response_errors=1;
     }      }
     @Apache::inputtags::responselist = ();      @Apache::inputtags::responselist = ();
Line 596  sub reset_problem_globals { Line 806  sub reset_problem_globals {
     undef($Apache::lonhomework::default_type);      undef($Apache::lonhomework::default_type);
     undef($Apache::lonhomework::type);      undef($Apache::lonhomework::type);
     undef($Apache::lonhomework::scantronmode);      undef($Apache::lonhomework::scantronmode);
     undef($Apache::lonhomework::problemstatus);  
     undef($Apache::lonhomework::ignore_response_errors);      undef($Apache::lonhomework::ignore_response_errors);
       &Apache::lonhomework::reset_show_problem_status();
 }  }
   
 sub set_problem_state {  sub set_problem_state {
Line 648  sub start_problem { Line 858  sub start_problem {
     }      }
   
     if ($target ne 'analyze') {      if ($target ne 'analyze') {
  $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');          my $type = &Apache::lonnet::EXT('resource.0.type');
    $Apache::lonhomework::type=$type;
  if (($env{'request.state'} eq 'construct') &&   if (($env{'request.state'} eq 'construct') &&
     defined($env{'form.problemtype'})) {      $env{'form.problemtype'} =~ /\S/) {
     $Apache::lonhomework::type=$env{'form.problemtype'};      $Apache::lonhomework::type=$env{'form.problemtype'};
  }   }
  &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");   &Apache::lonxml::debug("Found this to be of type :$Apache::lonhomework::type:");
Line 699  sub start_problem { Line 910  sub start_problem {
     if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }      if ($target eq 'analyze') { my $rndseed=&setup_rndseed($safeeval); }
     if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||      if ($target eq 'web' || $target eq 'grade' || $target eq 'answer' ||
  $target eq 'tex') {   $target eq 'tex') {
  #handle exam checkout  
  if ($Apache::lonhomework::type eq 'exam') {  
     my $token=  
  $Apache::lonhomework::history{"resource.0.outtoken"};  
     if (($env{'form.doescheckout'}) && (!$token)) {  
  $token=&Apache::lonxml::maketoken();  
  $Apache::lonhomework::history{"resource.0.outtoken"}=  
     $token;  
     }  
     $result.=&Apache::lonxml::printtokenheader($target,$token);  
  }  
  if ($env{'form.markaccess'}) {   if ($env{'form.markaccess'}) {
     &Apache::lonnet::set_first_access('map');      my @interval=&Apache::lonnet::EXT("resource.0.interval");
       &Apache::lonnet::set_first_access($interval[1]);
  }   }
  #handle rand seed in construction space   #handle rand seed in construction space
  my $rndseed=&setup_rndseed($safeeval);   my $rndseed=&setup_rndseed($safeeval);
Line 728  sub start_problem { Line 929  sub start_problem {
                              value="'.$env{'form.username'}.'" />';                               value="'.$env{'form.username'}.'" />';
     }      }
     if ($env{'request.role.adv'}) {      if ($env{'request.role.adv'}) {
  $form_tag_start.=   $form_tag_start.= ' <label class="LC_nobreak">'
     ' <label><input type="checkbox" name="showallfoils" ';                           .'<input type="checkbox" name="showallfoils"';
  if (defined($env{'form.showallfoils'})) {   if (defined($env{'form.showallfoils'})) {
     $form_tag_start.='checked="on"';      $form_tag_start.=' checked="checked"';
  }   }
  $form_tag_start.= ' />'.&mt('&nbsp;Show&nbsp;All&nbsp;Foils').                  $form_tag_start.= ' /> '
     '</label>';                                   .&mt('Show All Foils')
                                    .'</label>';
     }      }
               if ($Apache::lonhomework::type eq 'practice') {
                   $form_tag_start.=&practice_problem_header();
               }
     $form_tag_start.='<hr />';      $form_tag_start.='<hr />';
  }   }
   
Line 761  sub start_problem { Line 966  sub start_problem {
  my $msg;   my $msg;
  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 eq 'NOT_IN_A_SLOT') {
                       $msg.='<h1>'.&mt('You are not currently signed up to work at this time and/or place.').'</h1>';
  } elsif ($status ne 'NOT_YET_VIEWED') {   } elsif ($status ne 'NOT_YET_VIEWED') {
     $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';      $msg.='<h1>'.&mt('Not open to be viewed').'</h1>';
  }   }
  if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {   if ($status eq 'CLOSED' || $status eq 'INVALID_ACCESS') {
     $msg.='The problem '.$accessmsg;      $msg.=&mt('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') {
     $msg.=&Apache::bridgetask::add_request_another_attempt_button("Sign up for time to work.");      $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') {
  my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''   my $startminipage = ($env{'form.problem_split'}=~/yes/i)? ''
                     : '\begin{minipage}{\textwidth}';                      : '\begin{minipage}{\textwidth}';
  $result.='\begin{document}\noindent \vskip 1 mm '.   $result.='\noindent \vskip 1 mm '.
     $startminipage.'\vskip 0 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 ';
Line 808  sub start_problem { Line 1015  sub start_problem {
     # create a page header and exit      # create a page header and exit
     if ($env{'request.state'} eq "construct") {      if ($env{'request.state'} eq "construct") {
  $result.= &problem_web_to_edit_header($env{'form.rndseed'});   $result.= &problem_web_to_edit_header($env{'form.rndseed'});
                   if ($Apache::lonhomework::type eq 'practice') {
                       $result.= '<input type="submit" name="resetdata" '.
                                 'value="'.&mt('New Problem Variation').'" />'.
                                 &practice_problem_header().'<hr />';
                   }
     }      }
     # if we are viewing someone else preserve that info      # if we are viewing someone else preserve that info
     if (defined $env{'form.grade_symb'}) {      if (defined $env{'form.grade_symb'}) {
Line 873  sub end_problem { Line 1085  sub end_problem {
     $allow_print_points=0;      $allow_print_points=0;
  }   }
  my $name_of_resourse= &Apache::lonxml::latex_special_symbols(&get_resource_name($parstack,$safeeval),'header');   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 $begin_doc=' \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.   my $toc_line='\vskip 1 mm\noindent '.$startminipage.
     '\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';      '\addcontentsline{toc}{subsection}{'.$name_of_resourse.'}';
   
Line 883  sub end_problem { Line 1095  sub end_problem {
   
  my $duetime = &Apache::lonnet::EXT("resource.$id.duedate");    my $duetime = &Apache::lonnet::EXT("resource.$id.duedate"); 
  my $duedate = POSIX::strftime("%c",localtime($duetime));   my $duedate = POSIX::strftime("%c",localtime($duetime));
           my $duedate_text = &mt('Due date: [_1]'
                                 ,&Apache::lonlocal::locallocaltime($duetime));
  my $temp_file;   my $temp_file;
  my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";   my $filename = "/home/httpd/prtspool/$env{'user.name'}_$env{'user.domain'}_printout.due";
   
Line 914  sub end_problem { Line 1128  sub end_problem {
     if (not $env{'request.symb'} =~ m/\.page_/) {      if (not $env{'request.symb'} =~ m/\.page_/) {
  if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {   if(not $duedate=~m/1969/ and $Apache::lonhomework::type ne 'exam') {
     $frontmatter .= $begin_doc.      $frontmatter .= $begin_doc.
  '\textit{Due date: '.$duedate.'} '.$toc_line;   '\textit{'.$duedate_text.'} '.$toc_line;
  } else {   } else {
     $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\textit{Due date: '.$duedate.'} \\\\\\\\'.$startminipage;   $frontmatter .= '\vskip 1mm\textit{'.$duedate_text.'} \\\\\\\\'.$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 \\\\\\\\'.$startminipage;   $frontmatter .= '\vskip 1mm \\\\\\\\'.$startminipage;
     }      }
Line 1043  sub start_library { Line 1261  sub start_library {
  $result.=" \n $form_tag_start".   $result.=" \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);
           if ($Apache::lonhomework::type eq 'practice') {
               $result.= '<input type="submit" name="resetdata" '.
                         'value="'.&mt('New Problem Variation').'" />'.
                         &practice_problem_header().'<hr />';
           }
     }      }
     return $result;      return $result;
 }  }
Line 1070  sub start_definetag { Line 1293  sub start_definetag {
   
     my $name = $token->[2]->{'name'};      my $name = $token->[2]->{'name'};
     my $skip=&Apache::lonxml::get_all_text("/definetag",$parser,$style);      my $skip=&Apache::lonxml::get_all_text("/definetag",$parser,$style);
     if ($name=~/^\//) {      if ($target eq 'web') {
  $result=   if ($name=~/^\//) {
  '<br /><table bgcolor="#FFBBBB"><tr><th>END <tt>'.$name.'</tt></th></tr>';      $result=
     } else {   '<br /><table class="LC_sty_end"><tr><th>'.
  $result=   &mt('END [_1]'.'<tt>'.$name.'</tt>').'</th></tr>';
  '<br /><table bgcolor="#BBFFBB"><tr><th>BEGIN <tt>'.$name.'</tt></th></tr>';   } else {
       $result=
    '<br /><table class="LC_sty_begin"><tr><th>'.
    &mt('BEGIN [_1]'.'<tt>'.$name.'</tt>').'</th></tr>';
    }
    $skip = &HTML::Entities::encode($skip, '<>&"');
    $result.='<tr><td><pre>'.$skip.'</pre></td></tr></table>';
     }      }
     $skip=~s/\</\&lt\;/gs;  
     $skip=~s/\>/\&gt\;/gs;  
     $result.='<tr><td><pre>'.$skip.'</pre></td></tr></table>';  
     return $result;      return $result;
 }  }
   
Line 1140  sub start_languageblock { Line 1366  sub start_languageblock {
  $target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {   $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 @preferred_languages=&Apache::lonlocal::preferred_languages();
         $result='1';  # This should not even happen, since we should at least have the server language
  if ($include) {          if (!$preferred_languages[0]) { $preferred_languages[0]='en'; }
             $result='';  # Now loop over all languages in order of preference
             foreach (split(/\,/,$include)) {          foreach my $preferred_language (@preferred_languages) {
                 if ($languages{$_}) { $result='1'; }  # If the languageblock has no arguments, show the contents
             }             $result=1;
  }             my $found=0;
         if ($exclude) {  # Do we have an include argument?
             foreach (split(/\,/,$exclude)) {     if ($include) {
                 if ($languages{$_}) { $result='0'; }  # If include is specified, by default, don't render the block
             }                $result=0;
  }                foreach my $included_language (split(/\,/,$include)) {
   # ... but if my preferred language is included, render it
                    if ($included_language eq $preferred_language) {
                       $result=1; 
                       $found=1; 
                    }
                 }
      }
   # Do we have an exclude argument?
              if ($exclude) {
                 $result=1;
                 foreach my $excluded_language (split(/\,/,$exclude)) {
                    if ($excluded_language eq $preferred_language) {
                       $result=0;
                       $found=1;
                    }
                 }
      }
              if ($found) { last; }
           }
  if ( ! $result ) {   if ( ! $result ) {
     my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser,      my $skip=&Apache::lonxml::get_all_text("/languageblock",$parser,
    $style);     $style);
Line 1184  sub end_languageblock { Line 1429  sub end_languageblock {
     return $result;      return $result;
 }  }
   
   {
       my %available_texts;
       sub start_translated {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
    &Apache::lonxml::register('Apache::structuretags',('lang'));
    undef(%available_texts);
       }
       
       sub end_translated {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
    my $result;
    #show the translation on viewable targets
    if ($target eq 'web'     || $target eq 'tex' || $target eq 'webgrade'||
       # or non-viewable targets, if it's embedded in something that
       # wants the output
       (($target eq 'answer' || $target eq 'analyze'|| $target eq 'grade')
        && &Apache::lonxml::in_redirection() ) ) {
       my @possibilities = keys(%available_texts);
       my $which = 
    &Apache::loncommon::languages(\@possibilities) || 'default';
       $result = $available_texts{$which};
    }
    undef(%available_texts);
    &Apache::lonxml::deregister('Apache::structuretags',('lang'));
    return $result;
       }
   
   
       sub start_lang {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
       $target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
       &Apache::lonxml::startredirection();
    }
    return '';
       }
   
       sub end_lang {
    my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
    if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
       $target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
       my $result = &Apache::lonxml::endredirection();
       my $which = &Apache::lonxml::get_param('which',$parstack,
      $safeeval);
               if ($which=~/\w/) {
                   $available_texts{$which} = $result;
               }
               my $otherlangs = &Apache::lonxml::get_param('other',$parstack,
                                                           $safeeval);
               foreach my $language (split(/\s*\,\s*/,$otherlangs)) {
                   if ($language=~/\w/) {
                       $available_texts{$language} = $result;
                   }
               }
   
    }
    return '';
       }
   }
   
 sub start_instructorcomment {  sub start_instructorcomment {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
   
Line 1191  sub start_instructorcomment { Line 1496  sub start_instructorcomment {
   
     if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||      if ($target eq 'web' || $target eq 'grade'   || $target eq 'answer' ||
  $target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {   $target eq 'tex' || $target eq 'analyze' || $target eq 'webgrade') {
         $result=($env{'request.role'}=~/^(in|cc|au|ca|li)/);          $result=($env{'request.role'}=~/^(in|cc|co|au|ca|li)/);
  if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) {   if ( (! $result) or ($env{'form.instructor_comments'} eq 'hide')) {
     my $skip=&Apache::lonxml::get_all_text("/instructorcomment",      my $skip=&Apache::lonxml::get_all_text("/instructorcomment",
    $parser,$style);     $parser,$style);
Line 1275  sub end_while { Line 1580  sub end_while {
     $return = &Apache::run::run($code,$safeeval);      $return = &Apache::run::run($code,$safeeval);
  }   }
  if ($error) {   if ($error) {
     &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occured while running &lt;while&gt; on line').' '.$line.'</pre>');      &Apache::lonxml::error('<pre>'.&mt('Code ran too long. It ran for more than').' '.$Apache::lonnet::perlvar{'lonScriptTimeout'}.' '.&mt('seconds occurred while running &lt;while&gt; on line').' '.$line.'</pre>');
  }   }
     } elsif ($target eq "edit") {      } elsif ($target eq "edit") {
  $result.= &Apache::edit::tag_end($target,$token,'');   $result.= &Apache::edit::tag_end($target,$token,'');
Line 1329  sub start_randomlist { Line 1634  sub start_randomlist {
     my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);      my $showarg=&Apache::lonxml::get_param('show',$parstack,$safeeval);
     $showarg--;      $showarg--;
     if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }      if ( ($showarg >= 0) && ($showarg < $show) ) { $show = $showarg; }
               if (($target eq 'analyze') && ($env{'form.check_parts_withrandomlist'})) {
                   my @currlist;
                   my $part = $Apache::inputtags::part;
                   if ($part ne '') {
                       if (ref($Apache::lonhomework::analyze{'parts_withrandomlist'}) eq 'ARRAY') {
                           my @currlist = @{$Apache::lonhomework::analyze{'parts_withrandomlist'}};
                           if (!(grep(/^\Q$part\E$/,@currlist))) {
                               push(@{$Apache::lonhomework::analyze{'parts_withrandomlist'}},$part);
                           }
                       } else {
                           push(@{$Apache::lonhomework::analyze{'parts_withrandomlist'}},$part);
                       }
                   }
               }
     for(0 .. $show) {      for(0 .. $show) {
  $bodytext .= "$randomlist[ $idx_arr[$_] ]";   $bodytext .= "$randomlist[ $idx_arr[$_] ]";
     }      }
Line 1382  sub ordered_show_check { Line 1701  sub ordered_show_check {
     return $in_order_show;      return $in_order_show;
 }  }
   
   
   sub start_startpartmarker {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result='';
       if ($target eq 'edit') {
           $result=&Apache::edit::tag_start($target,$token);
           $result.=&mt('Marker for the start of a part. Place end marker below to wrap in-between tags into a new part.').'</td></tr>';
           $result.=&Apache::edit::end_table();
   
       } 
       return $result;
   }
   
   sub end_startpartmarker {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my @result;
       if ($target eq 'edit') { $result[1]='no'; }
       return @result;
   }
   
   sub start_endpartmarker {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my $result='';
       if ($target eq 'edit') {
           $result=&Apache::edit::tag_start($target,$token);
           $result.=&mt('Marker for the end of a part. Place start marker above to wrap in-between tags into a new part.').'</td></tr>';
           $result.=&Apache::edit::end_table();
   
       }
       return $result;
   }
   
   sub end_endpartmarker {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
       my @result;
       if ($target eq 'edit') { $result[1]='no'; }
       return @result;
   }
   
   
   
   
   
 sub start_part {  sub start_part {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     if (!$Apache::lonxml::metamode) {      if (!$Apache::lonxml::metamode) {
Line 1395  sub start_part { Line 1757  sub start_part {
     @Apache::inputtags::response=();      @Apache::inputtags::response=();
     @Apache::inputtags::previous=();      @Apache::inputtags::previous=();
     @Apache::inputtags::previous_version=();      @Apache::inputtags::previous_version=();
     $Apache::lonhomework::problemstatus=&get_problem_status($id);      &Apache::lonhomework::set_show_problem_status(&get_problem_status($id));
       &Apache::response::reset_params();
   
     my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);      my $hidden=&Apache::loncommon::check_if_partid_hidden($Apache::inputtags::part);
     my $newtype=&Apache::lonnet::EXT("resource.$id.type");      my $newtype=&Apache::lonnet::EXT("resource.$id.type");
     if ($newtype) { $Apache::lonhomework::type=$newtype; }      if ($newtype) { $Apache::lonhomework::type=$newtype; }
Line 1464  sub start_part { Line 1828  sub start_part {
     '.disableexampointprint'}) eq 'yes') {      '.disableexampointprint'}) eq 'yes') {
  $allow_print_points=0;   $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 .= '\vskip 10mm\fbox{\textit{'.$weight.' pt}}';
   
       }
  } elsif ($target eq 'web') {   } elsif ($target eq 'web') {
     $result.='<a name="'.&escape($Apache::inputtags::part).'" />';      $result.='<a name="'.&escape($Apache::inputtags::part).'" />';
  }   }
Line 1633  sub start_problemtype { Line 2000  sub start_problemtype {
  $result .=&Apache::edit::checked_arg('When used as type(s):','for',   $result .=&Apache::edit::checked_arg('When used as type(s):','for',
      [ ['exam','Exam/Quiz Problem'],       [ ['exam','Exam/Quiz Problem'],
        ['survey','Survey'],         ['survey','Survey'],
        ['problem','Homework Problem'] ]                                                 ['surveycred','Survey (with credit)'],
                                                  ['anonsurvey','Anonymous Survey'],
                                                  ['anonsurveycred','Anonymous Survey (with credit)'],
          ['problem','Homework Problem'],
                                                  ['practice','Practice Problem'] ]
      ,$token);       ,$token);
  $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
Line 1652  sub start_startouttext { Line 2023  sub start_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval)=@_;
     my @result=(''.'');      my @result=(''.'');
     if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); }      if ($target eq 'edit' || $target eq 'modified' ) { @result=('','no'); }
       
       my $nesting = 
    &Apache::lonxml::set_state('outtext',
      &Apache::lonxml::get_state('outtext')+1);
       if ($nesting > 1 && $env{'request.state'} eq 'construct') {
    &Apache::lonxml::error("Nesting of &lt;startouttext /&gt; not allowed, on line ".$token->[5]);
       }
     return (@result);      return (@result);
 }  }
   
Line 1659  sub end_startouttext { Line 2037  sub end_startouttext {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result='';      my $result='';
     my $text='';      my $text='';
   
     if ($target eq 'edit') {      if ($target eq 'edit') {
    my $areaid = 'homework_edit_'.$Apache::lonxml::curdepth;
  $text=&Apache::lonxml::get_all_text("endouttext",$parser,$style);   $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><span class="LC_nobreak">'.&mt('Delete?').' '
                  &Apache::edit::deletelist($target,$token)                   .&Apache::edit::deletelist($target,$token)
  ."</td>                   .'</span></td>';
 <td>".          unless ($env{'environment.wysiwygeditor'} eq 'on') {
                  &Apache::edit::insertlist($target,$token).      $result .= '<td align="left">'
  '</td><td align="right" valign="top">' .   .&Apache::lonhtmlcommon::dragmath_button($areaid,1)
  &Apache::loncommon::helpLatexCheatsheet().   .'</td>'
    .'<td>'
    .&Apache::edit::insertlist($target,$token)
    .'</td>';
    }
    $result.='<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::edit::editfield($token->[1],$text,"",80,8,1);   &Apache::edit::editfield($token->[1],$text,"",80,8,1);
Line 1691  sub start_endouttext { Line 2075  sub start_endouttext {
  $result='<endouttext />'.   $result='<endouttext />'.
     &Apache::edit::handle_insertafter('startouttext');      &Apache::edit::handle_insertafter('startouttext');
     }      }
   
       my $nesting = 
    &Apache::lonxml::set_state('outtext',
      &Apache::lonxml::get_state('outtext')-1);
       if ($nesting < 0 && $env{'request.state'} eq 'construct') {
    &Apache::lonxml::error(" Extraneous &lt;endouttext /&gt; not allowed on line ".$token->[5]);
    &Apache::lonxml::set_state('outtext', 0);
       }
     return $result;      return $result;
 }  }
   
Line 1724  sub start_simpleeditbutton { Line 2116  sub start_simpleeditbutton {
         my $url=$env{'request.noversionuri'};          my $url=$env{'request.noversionuri'};
         $url=~s/\?.*$//;          $url=~s/\?.*$//;
  my ($symb) = &Apache::lonnet::whichuser();   my ($symb) = &Apache::lonnet::whichuser();
  $result='<table width="100%" bgcolor="#FFFFAA" border="2"><tr><td>'.  #       Warning makes more sense and is more important on edit screen
                 '<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.').  #       $result='<p class="LC_warning">'
 &Apache::loncommon::help_open_topic('Caching').'</td></tr></table><br />';  #              .&mt('Note: it can take up to 10 minutes for changes to take effect for all users.')
   #              .&Apache::loncommon::help_open_topic('Caching')
   #              .'</p>';
           $result.=&Apache::lonhtmlcommon::start_funclist()
                   .&Apache::lonhtmlcommon::add_item_funclist(
                        '<a href="'.$url.'/smpedit?symb='.&escape($symb).'">'
                       .&mt('Edit').'</a>')
                   .&Apache::lonhtmlcommon::end_funclist();
   
     }      }
     return $result;      return $result;
 }  }
Line 1735  sub end_simpleeditbutton { Line 2135  sub end_simpleeditbutton {
     return '';      return '';
 }  }
   
   sub practice_problem_header {
       return '<span class="LC_info"><h3>'.&mt('Practice Problem').'</h3></span>'.
              '<span class="LC_info">'.&mt('Submissions are not permanently recorded').
              '</span>';
   }
   
 1;  1;
 __END__  __END__
   
   =pod
   
   =back
   
   =cut

Removed from v.1.392  
changed lines
  Added in v.1.471


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