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

Diff for /loncom/homework/structuretags.pm between versions 1.375 and 1.394

version 1.375, 2007/04/06 21:22:24 version 1.394, 2007/09/10 16:25:38
Line 47  BEGIN { Line 47  BEGIN {
   
 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 61  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 103  function setSubmittedPart (part) { Line 123  function setSubmittedPart (part) {
   
  $extra_head .= &Apache::lonhtmlcommon::spellheader();   $extra_head .= &Apache::lonhtmlcommon::spellheader();
   
  my $css_href = &Apache::lonnet::EXT('resource.0.cssfile');   $extra_head .= &Apache::londefdef::generate_css_links();
  if ($css_href =~ /\S/) {  
     &Apache::lonxml::extlink($css_href);   if ($env{'request.state'} eq 'construct') {
     $extra_head .=   
  '<link rel="stylesheet" type="text/css" href="'.$css_href.'" />';  
  }  
  if ($target eq 'edit') {  
     $extra_head.=&Apache::edit::js_change_detection().      $extra_head.=&Apache::edit::js_change_detection().
  "<script type=\"text/javascript\">\n".   "<script type=\"text/javascript\">\n".
  "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".   "if (typeof swmenu != 'undefined') {swmenu.currentURL=null;}\n".
Line 141  function setSubmittedPart (part) { Line 157  function setSubmittedPart (part) {
  $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'
       && $env{'request.state'} eq   'construct') {
       $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,
Line 186  function setSubmittedPart (part) { Line 206  function setSubmittedPart (part) {
 #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::lonnet::whichuser();   my ($symb)=&Apache::lonnet::whichuser();
     my $name=&Apache::lonnet::gettitle($symb);   $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;
 }  }
   
Line 293  sub problem_web_to_edit_header { Line 320  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.'</label>'.      $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').
  '<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 344  Feedback Mode: Line 377  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;
 }  }
Line 422  sub finalize_storage { Line 469  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 602  sub start_problem { Line 648  sub start_problem {
     }      }
   
     if ($target ne 'analyze') {      if ($target ne 'analyze') {
         if ($env{'request.state'} eq 'construct') { &set_problem_state('0'); }  
  $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');   $Apache::lonhomework::type=&Apache::lonnet::EXT('resource.0.type');
  if (($env{'request.state'} eq 'construct') &&   if (($env{'request.state'} eq 'construct') &&
     defined($env{'form.problemtype'})) {      defined($env{'form.problemtype'})) {
Line 623  sub start_problem { Line 668  sub start_problem {
     $Apache::lonhomework::default_type = $Apache::lonhomework::type;      $Apache::lonhomework::default_type = $Apache::lonhomework::type;
   
     &initialize_storage();      &initialize_storage();
       if ($target ne 'analyze'
           && $env{'request.state'} eq 'construct') {
    &set_problem_state('0');
       }
   
     if ($target eq 'web') {      if ($target eq 'web') {
  &Apache::lonxml::debug(" grading history ");   &Apache::lonxml::debug(" grading history ");
  &Apache::lonhomework::showhash(%Apache::lonhomework::history);   &Apache::lonhomework::showhash(%Apache::lonhomework::history);
Line 715  sub start_problem { Line 765  sub start_problem {
     $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') {
Line 778  sub start_problem { Line 828  sub start_problem {
  $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 871  sub end_problem { Line 920  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 928  sub end_problem { Line 977  sub end_problem {
     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 955  sub end_problem { Line 1004  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 984  sub start_library { Line 1032  sub start_library {
  $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' || $target eq 'webgrade')
      && ($#$tagstack eq 0 && $$tagstack[0] eq 'library')       && ($#$tagstack eq 0 && $$tagstack[0] eq 'library')
      && $env{'request.state'} eq "construct" ) {       && $env{'request.state'} eq "construct" ) {
Line 1048  sub start_block { Line 1095  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 1093  sub start_languageblock { Line 1140  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_language=(&Apache::loncommon::preferred_languages)[0];
   # This should not even happen, since we should at least have the server language
           unless ($preferred_language) { $preferred_language='en'; }
   # If the languageblock has no arguments, show the contents
         $result='1';          $result='1';
   # Do we have an include argument?
  if ($include) {   if ($include) {
   # If include is specified, by default, don't render the block
             $result='';              $result='';
             foreach (split(/\,/,$include)) {              foreach my $included_language (split(/\,/,$include)) {
                 if ($languages{$_}) { $result='1'; }  # ... but if my preferred language is included, render it
                   if ($included_language eq $preferred_language) { $result='1'; }
             }              }
  }   }
   # Do we have an exclude argument?
         if ($exclude) {          if ($exclude) {
             foreach (split(/\,/,$exclude)) {              $result='1';
                 if ($languages{$_}) { $result='0'; }              foreach my $excluded_language (split(/\,/,$exclude)) {
                   if ($excluded_language eq $preferred_language) { $result='0'; }
             }              }
  }   }
  if ( ! $result ) {   if ( ! $result ) {
Line 1215  sub end_while { Line 1270  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 1335  sub start_part { Line 1397  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 1389  sub start_part { Line 1450  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 1431  sub start_part { Line 1492  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 1469  sub end_part { Line 1529  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 1638  sub start_endouttext { Line 1697  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;
 }  }
   
Removed from v.1.375  
changed lines
  Added in v.1.394

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