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

Diff for /loncom/homework/chemresponse.pm between versions 1.69 and 1.78

version 1.69, 2006/07/27 20:34:40 version 1.78, 2008/03/12 02:46:52
Line 186  sub jme_img { Line 186  sub jme_img {
     my $result='<img alt="'.$smile.'" src="/cgi-bin/convertjme.pl?'.$id.'"';      my $result='<img alt="'.$smile.'" src="/cgi-bin/convertjme.pl?'.$id.'"';
     if ($options =~ /border/) { $result.= ' border="1"'; }      if ($options =~ /border/) { $result.= ' border="1"'; }
     $result.=' />';      $result.=' />';
     &Apache::lonnet::appenv('cgi.'.$id.'.JME'   =>      &Apache::lonnet::appenv({'cgi.'.$id.'.JME'   =>
     &escape($jme),       &escape($jme),
     'cgi.'.$id.'.PNG'   => 1,       'cgi.'.$id.'.PNG'   => 1,
     'cgi.'.$id.'.WIDTH' => $width);       'cgi.'.$id.'.WIDTH' => $width});
     return $result;      return $result;
 }  }
   
Line 245  sub start_organicresponse { Line 245  sub start_organicresponse {
  $result .='</nobr><br /><nobr>';   $result .='</nobr><br /><nobr>';
  $result .=&Apache::edit::text_arg('Correct Answer:','answer',   $result .=&Apache::edit::text_arg('Correct Answer:','answer',
   $token,40);    $token,40);
    $result .='</nobr><br /><nobr>';
  $result .=&Apache::edit::text_arg('JME string of the answer (automatically updated when using the Draw Molecule button):',   $result .=&Apache::edit::text_arg('JME string of the answer (automatically updated when using the Draw Molecule button):',
   'jmeanswer',$token);    'jmeanswer',$token);
  my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,   my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
Line 326  sub end_organicresponse { Line 327  sub end_organicresponse {
  }   }
  $result.=&Apache::response::answer_footer('organicresponse');   $result.=&Apache::response::answer_footer('organicresponse');
     }      }
       if ($target eq 'web') {
    &Apache::response::setup_prior_tries_hash(\&format_prior_answer_organic,
     ['molecule'])
       }
   
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::increment_counter(&Apache::response::repetition());   &Apache::lonxml::increment_counter(&Apache::response::repetition(), 
      "$partid.$id"); # part.response
    if ($target eq 'analyze') {
               $Apache::lonhomework::analyze{"$partid.$id.type"} = 'organicresponse';
       &Apache::lonhomework::set_bubble_lines();
    }
     }      }
     &Apache::response::end_response();      &Apache::response::end_response();
     return $result;      return $result;
 }  }
   
   sub format_prior_answer_organic {
       my ($mode,$answer,$other_data) = @_;
       my $result=&mt('Smile representation: "[_1]"','<tt>'.$answer.'</tt>');
       my $jme=$other_data->[0];
       $result.=&jme_img($jme,$answer,400);
       return $result;
   }
   
 sub start_organicstructure {  sub start_organicstructure {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
Line 347  sub start_organicstructure { Line 365  sub start_organicstructure {
  if ($options =~ /border/) { $result.= ' border="1"'; }   if ($options =~ /border/) { $result.= ' border="1"'; }
  $result.=' />';   $result.=' />';
  &Apache::lonnet::appenv(   &Apache::lonnet::appenv(
             'cgi.'.$id.'.JME'   => &escape($molecule),              {'cgi.'.$id.'.JME'   => &escape($molecule),
     'cgi.'.$id.'.PNG' => 1,       'cgi.'.$id.'.PNG' => 1,
     'cgi.'.$id.'.WIDTH' => $width );       'cgi.'.$id.'.WIDTH' => $width});
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);   my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
  my $webwidth=&Apache::lonxml::get_param('width', $parstack, $safeeval);   my $webwidth=&Apache::lonxml::get_param('width', $parstack, $safeeval);
Line 363  sub start_organicstructure { Line 381  sub start_organicstructure {
     '_'.time.'_'.$$.int(rand(1000)).'_organicstructure';      '_'.time.'_'.$$.int(rand(1000)).'_organicstructure';
  my $id=$filename;   my $id=$filename;
  &Apache::lonnet::appenv(   &Apache::lonnet::appenv(
      'cgi.'.$id.'.JME'   => &escape($molecule),       {'cgi.'.$id.'.JME'   => &escape($molecule),
      'cgi.'.$id.'.PS' => 1,        'cgi.'.$id.'.PS' => 1,
      'cgi.'.$id.'.WIDTH' => $texwidth );        'cgi.'.$id.'.WIDTH' => $texwidth});
  $id=&escape($id);   $id=&escape($id);
  &Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id");   &Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id");
  if ($options =~ /border/) { $result.= '\fbox{'; }   if ($options =~ /border/) { $result.= '\fbox{'; }
Line 466  sub start_reactionresponse { Line 484  sub start_reactionresponse {
  &Apache::lonxml::default_homework_load($safeeval);   &Apache::lonxml::default_homework_load($safeeval);
     }      }
     @Apache::scripttag::parser_env = @_;      @Apache::scripttag::parser_env = @_;
     $Apache::inputtags::answertxt{$id}=&Apache::run::run("return &chemparse(q\0$ans\0);",$safeeval);      $Apache::inputtags::answertxt{$id}=[&Apache::run::run("return &chemparse(q\0$ans\0);",$safeeval)];
  }   }
     } elsif ($target eq "edit") {      } elsif ($target eq "edit") {
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
Line 541  sub end_reactionresponse { Line 559  sub end_reactionresponse {
  }   }
  $result.=&Apache::response::answer_footer('reactionresponse');   $result.=&Apache::response::answer_footer('reactionresponse');
     }      }
       if ($target eq 'web') {
    &Apache::response::setup_prior_tries_hash(\&format_prior_response_reaction);
       }
   
     if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' ||       if ($target eq 'grade' || $target eq 'web' || $target eq 'answer' || 
  $target eq 'tex' || $target eq 'analyze') {   $target eq 'tex' || $target eq 'analyze') {
  &Apache::lonxml::increment_counter(&Apache::response::repetition());   &Apache::lonxml::increment_counter(&Apache::response::repetition(), "$partid.$id");
           if ($target eq 'analyze') {
               $Apache::lonhomework::analyze{"$partid.$id.type"} = 'reactionresponse';
               &Apache::lonhomework::set_bubble_lines();
           }
     }      }
     &Apache::response::end_response();      &Apache::response::end_response();
     return $result;      return $result;
 }  }
   
   sub format_prior_response_reaction {
       my ($mode,$answer) =@_;
       return '<span class="LC_prior_reaction">'.
       &HTML::Entities::encode($answer,'"<>&').'</span>';
   }
   
 sub start_chem {  sub start_chem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $result = '';      my $result = '';
Removed from v.1.69  
changed lines
  Added in v.1.78

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