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

Diff for /loncom/homework/chemresponse.pm between versions 1.12 and 1.17

version 1.12, 2003/09/08 22:08:37 version 1.17, 2003/10/16 21:52:27
Line 51  SMILESECTION Line 51  SMILESECTION
 JMESECTION  JMESECTION
     }      }
   
     if ($molecule) { $molecule="<param name='jme' value='$molecule' />"; }      if ($molecule) { $molecule='<param name="jme" value="'.$molecule.'" />'; }
     my $body=<<CHEMPAGE;      my $body=<<CHEMPAGE;
 <html>  <html>
 <head>  <head>
Line 113  sub start_organicresponse { Line 113  sub start_organicresponse {
     $molecule=&Apache::lonxml::get_param('molecule',$parstack,      $molecule=&Apache::lonxml::get_param('molecule',$parstack,
  $safeeval);   $safeeval);
  }   }
  my $multipart=&Apache::lonxml::get_param('multipart',$parstack,   my $options=&Apache::lonxml::get_param('options',$parstack,
  $safeeval);         $safeeval);
  if ($multipart eq 'yes') {   $result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);
     $multipart = 'multipart';  
  } else {  
     $multipart ='';  
         }  
  $result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$multipart);  
  $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';   $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);
Line 175  sub end_organicresponse { Line 170  sub end_organicresponse {
  if ( $response =~ /[^\s]/) {   if ( $response =~ /[^\s]/) {
     my $partid = $Apache::inputtags::part;      my $partid = $Apache::inputtags::part;
     my $id = $Apache::inputtags::response['-1'];      my $id = $Apache::inputtags::response['-1'];
     my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);      my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
     my %previous = &Apache::response::check_for_previous($response,$partid,$id);      my %previous = &Apache::response::check_for_previous($response,$partid,$id);
     $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;      $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
     &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");  
     my $ad;      my $ad;
     if ($response eq $answer) {      foreach my $answer (@answers) {
  $ad='EXACT_ANS';   &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
     } else {   if ($response eq $answer) {
  $ad='INCORRECT';      $ad='EXACT_ANS';
       last;
    } else {
       $ad='INCORRECT';
    }
     }      }
     &Apache::response::handle_previous(\%previous,$ad);      &Apache::response::handle_previous(\%previous,$ad);
     $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;      $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
Line 191  sub end_organicresponse { Line 189  sub end_organicresponse {
  }   }
     } elsif ($target eq "edit") {      } elsif ($target eq "edit") {
  $result.= &Apache::edit::tag_end($target,$token,'');   $result.= &Apache::edit::tag_end($target,$token,'');
       } elsif ($target eq 'answer') {
    my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
        $safeeval);
    $result.=&Apache::response::answer_header('organicresponse');
    foreach my $answer (@answers) {
       $result.=&Apache::response::answer_part('organicresponse',$answer);
    }
    $result.=&Apache::response::answer_footer('organicresponse');
     }      }
     &Apache::response::end_response;      &Apache::response::end_response;
     return $result;      return $result;
Line 201  sub start_organicstructure { Line 207  sub start_organicstructure {
     my $result;      my $result;
     if ($target eq 'web') {      if ($target eq 'web') {
  my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);   my $width=&Apache::lonxml::get_param('width',$parstack,$safeeval);
  my $height=&Apache::lonxml::get_param('height',$parstack,$safeeval);  
  my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);   my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
  my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);   my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
  $result=<<CHEMOUTPUT;   my $id=time.'_'.int(rand(1000));
 <applet code="JME.class" archive="/adm/jme/JME.jar" width="$width" height="$height">   $result="<img src='/cgi-bin/convertjme.pl?$id' />";
 <param name="options" value="depict,$options" />   &Apache::lonnet::appenv(
 <param name="jme" value="$molecule" />              'cgi.'.$id.'.JME'   => &Apache::lonnet::escape($molecule),
 </applet>      'cgi.'.$id.'.PNG' => 1,
 CHEMOUTPUT      'cgi.'.$id.'.WIDTH' => $width );
       } elsif ($target eq 'tex') {
    my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,1);
    if (!$texwidth) { $texwidth='90'; }
    my $molecule=&Apache::lonxml::get_param('molecule',$parstack,$safeeval);
    my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
    my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.
       '_'.time.'_'.$$.int(rand(1000)).'_organicstructure';
    my $id=$filename;
    &Apache::lonnet::appenv(
        'cgi.'.$id.'.JME'   => &Apache::lonnet::escape($molecule),
        'cgi.'.$id.'.PS' => 1,
        'cgi.'.$id.'.WIDTH' => $texwidth );
    $id=&Apache::lonnet::escape($id);
    &Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id");
    $result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
  $result .=&Apache::edit::text_arg('Width:','width',$token,5);   $result .=&Apache::edit::text_arg('Width:','width',$token,5);
  $result .=&Apache::edit::text_arg('Height:','height',$token,5);   $result .=&Apache::edit::text_arg('Height:','height',$token,5);
    $result .=&Apache::edit::text_arg('TeXwidth:','texwidth',$token,5);
  $result .='<nobr>';   $result .='<nobr>';
  $result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40);   $result .=&Apache::edit::text_arg('Molecule:','molecule',$token,40);
  my $molecule=&Apache::lonxml::get_param('molecule',$parstack,   my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
Line 238  CHEMOUTPUT Line 259  CHEMOUTPUT
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'molecule',       $safeeval,'molecule',
      'width','height',       'width','height',
      'options');       'texwidth','options');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }      }
     return $result;      return $result;
Line 307  sub end_reactionresponse { Line 328  sub end_reactionresponse {
  if ( $response =~ /[^\s]/) {   if ( $response =~ /[^\s]/) {
     my $partid = $Apache::inputtags::part;      my $partid = $Apache::inputtags::part;
     my $id = $Apache::inputtags::response['-1'];      my $id = $Apache::inputtags::response['-1'];
     my $answer=&Apache::lonxml::get_param('answer',$parstack,$safeeval);      my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
     my %previous = &Apache::response::check_for_previous($response,$partid,$id);      my %previous = &Apache::response::check_for_previous($response,$partid,$id);
     $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;      $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
     &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");  
     my $ad;      my $ad;
     if ($response eq $answer) {      foreach my $answer (@answers) {
  $ad='EXACT_ANS';   &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
     } else {   if ($response eq $answer) {
  $ad='INCORRECT';      $ad='EXACT_ANS';
    } else {
       $ad='INCORRECT';
    }
     }      }
     &Apache::response::handle_previous(\%previous,$ad);      &Apache::response::handle_previous(\%previous,$ad);
     $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;      $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
  }   }
     }  elsif ($target eq "edit") {      }  elsif ($target eq "edit") {
  $result.= &Apache::edit::tag_end($target,$token,'');   $result.= &Apache::edit::tag_end($target,$token,'');
       } elsif ($target eq 'answer') {
    my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
        $safeeval);
    $result.=&Apache::response::answer_header('reactionresponse');
    foreach my $answer (@answers) {
       $result.=&Apache::response::answer_part('reactionresponse',
       $answer);
    }
    $result.=&Apache::response::answer_footer('reactionresponse');
     }      }
     &Apache::response::end_response;      &Apache::response::end_response;
     return $result;      return $result;
Removed from v.1.12  
changed lines
  Added in v.1.17

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