Diff for /loncom/homework/chemresponse.pm between versions 1.43 and 1.44

version 1.43, 2005/01/08 03:54:32 version 1.44, 2005/01/21 22:10:59
Line 136  sub start_organicresponse { Line 136  sub start_organicresponse {
     if ($target eq 'meta') {      if ($target eq 'meta') {
  $result=&Apache::response::meta_package_write('organicresponse');   $result=&Apache::response::meta_package_write('organicresponse');
     } elsif ($target eq 'web') {      } elsif ($target eq 'web') {
  my $molecule;   if (  &Apache::response::show_answer() ) {
  if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {      my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
     $molecule=$Apache::lonhomework::history{"resource.$partid.$id.molecule"};       $safeeval);
       my $options=&Apache::lonxml::get_param('options',$parstack,
      $safeeval);
       my $width=&Apache::lonxml::get_param('width',$parstack,
      $safeeval);
       my $id=&Apache::loncommon::get_cgi_id();
       $result="<img src='/cgi-bin/convertjme.pl?$id'";
       if ($options =~ /border/) { $result.= ' border="1"'; }
       $result.=' />';
       &Apache::lonnet::appenv('cgi.'.$id.'.JME'   =>
              &Apache::lonnet::escape($jmeanswer),
       'cgi.'.$id.'.PNG'   => 1,
       'cgi.'.$id.'.WIDTH' => $width);
  } else {   } else {
     $molecule=&Apache::lonxml::get_param('molecule',$parstack,      my $molecule;
  $safeeval);      if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {
    $molecule=$Apache::lonhomework::history{"resource.$partid.$id.molecule"};
       } else {
    $molecule=&Apache::lonxml::get_param('molecule',$parstack,
        $safeeval);
       }
       my $options=&Apache::lonxml::get_param('options',$parstack,
      $safeeval);
       $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);
       $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
  }   }
  my $options=&Apache::lonxml::get_param('options',$parstack,  
        $safeeval);  
  $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);  
  $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';  
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
  my $options=&Apache::lonxml::get_param('options',$parstack,   my $options=&Apache::lonxml::get_param('options',$parstack,
Line 178  sub start_organicresponse { Line 195  sub start_organicresponse {
       ['reaction','Is a reaction'],        ['reaction','Is a reaction'],
       ['number','Able to number atoms'] ],        ['number','Able to number atoms'] ],
      ,$token);       ,$token);
    $result .=&Apache::edit::text_arg('Width of correct answer image:',
     'width',$token,10);
  $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') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'molecule',       $safeeval,'molecule',
      'answer','jmeanswer',       'answer','jmeanswer',
      'options');       'options','width');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }      }
     return $result;      return $result;

Removed from v.1.43  
changed lines
  Added in v.1.44


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