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

Diff for /loncom/homework/structuretags.pm between versions 1.384 and 1.391

version 1.384, 2007/07/23 23:30:47 version 1.391, 2007/08/18 00:31:35
Line 157  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 202  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);   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;
 }  }
   
Line 319  sub problem_web_to_edit_header { Line 330  sub problem_web_to_edit_header {
     $result.= ' />'.$show_all_foils_text.'</label></span>'.      $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').'      $result.=&mt('Apply style file: ').'
 <input type="text" name="style_file" value="'.&HTML::Entities::encode($env{'construct.style'},'"<>&').'" />  <input type="text" name="style_file" value="'.&HTML::Entities::encode($env{'construct.style'},'"<>&').'" />
  <a href="javascript:openbrowser(\'lonhomework\',\'style_file\',\'sty\')">'.&mt('Select').'</a>   <a href="javascript:openbrowser(\'lonhomework\',\'style_file\',\'sty\')">'.&mt('Select').'</a>
 <input type="submit" name="clear_style_file" value="'.&mt('Clear').'" />  <input type="submit" name="clear_style_file" value="'.&mt('Clear').'" />
Line 458  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 638  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 659  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 1081  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 1375  sub start_part { Line 1389  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 1429  sub start_part { Line 1442  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';
  }   }
Removed from v.1.384  
changed lines
  Added in v.1.391

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