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

Diff for /loncom/homework/chemresponse.pm between versions 1.48 and 1.55

version 1.48, 2005/02/18 23:12:29 version 1.55, 2005/05/26 20:59:47
Line 30  package Apache::chemresponse; Line 30  package Apache::chemresponse;
 use strict;  use strict;
 use Apache::lonxml;  use Apache::lonxml;
 use Apache::lonnet;  use Apache::lonnet;
   use Apache::lonlocal;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));      &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));
Line 63  sub chem_standard_order { Line 64  sub chem_standard_order {
 }  }
   
 sub separate_jme_window {  sub separate_jme_window {
     my ($smile_input,$jme_input,$molecule,$options)=@_;      my ($smile_input,$jme_input,$molecule,$options,$shown_text)=@_;
     my $smilesection;      my $smilesection;
     if (defined($smile_input)) {      if (defined($smile_input)) {
  $smilesection=<<SMILESECTION;   $smilesection=<<SMILESECTION;
Line 85  JMESECTION Line 86  JMESECTION
 <head>  <head>
 <title>Molecule Editor</title>  <title>Molecule Editor</title>
 <script type="text/javascript">  <script type="text/javascript">
 // <!--  
 function submitSmiles() {  function submitSmiles() {
     jmeFile = document.applets.JME.jmeFile();      jmeFile = document.applets.JME.jmeFile();
     if (jmeFile == "") {      if (jmeFile == "") {
Line 99  function submitSmiles() { Line 99  function submitSmiles() {
 function openHelpWindow() {  function openHelpWindow() {
     window.open("/adm/jme/jme_help.html","","scrollbars=yes,resizable=yes,width=500,height=600");      window.open("/adm/jme/jme_help.html","","scrollbars=yes,resizable=yes,width=500,height=600");
 }  }
 // -->  
 </script>  </script>
 </head>  </head>
 <body bgcolor="#ffffff">  <body bgcolor="#ffffff">
Line 109  You have to enable Java and JavaScript o Line 108  You have to enable Java and JavaScript o
 $molecule  $molecule
 <param name="options" value="$options" />  <param name="options" value="$options" />
 </applet><br />  </applet><br />
 <font face="arial,helvetica,sans-serif" size=-1><a href="http://www.molinspiration.com/jme/index.html">JME Editor</a> courtesy of Peter Ertl, Novartis</font>  <font face="arial,helvetica,sans-serif" size="-1"><a href="http://www.molinspiration.com/jme/index.html">JME Editor</a> courtesy of Peter Ertl, Novartis</font>
 <form>  <form>
 <input type="button" name="submit" value="Insert Answer" onclick = "submitSmiles();" />  <input type="button" name="submit" value="Insert Answer" onclick = "submitSmiles();" />
 <br />  <br />
Line 123  $molecule Line 122  $molecule
 CHEMPAGE  CHEMPAGE
     $body=&HTML::Entities::encode($body,'<>&"');      $body=&HTML::Entities::encode($body,'<>&"');
     $body=~s/\n/ /g;      $body=~s/\n/ /g;
       my $nothing=&Apache::lonhtmlcommon::javascript_nothing();
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();      my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
       my $display=&mt('Draw Molecule');
       if (defined($shown_text)) { $display=&mt($shown_text); }
     my $result=<<CHEMINPUT;      my $result=<<CHEMINPUT;
 <input type="button" value="Draw Molecule" onclick="javascript:editor=window.open('','','width=500,height=500,scrollbars=no,resizable=yes');editor.$docopen;editor.document.writeln('$body')" />  <input type="button" value="$display" onclick="javascript:editor=window.open($nothing,'jmeedit','width=500,height=500,menubar=yes,scrollbars=no,resizable=yes');editor.$docopen;editor.document.write('$body');editor.document.close();editor.focus()" />
 CHEMINPUT  CHEMINPUT
     return $result;      return $result;
 }  }
Line 138  sub start_organicresponse { Line 140  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') {
  if (  &Apache::response::show_answer() ) {   my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
     my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,   $safeeval);
      $safeeval);   if (  &Apache::response::show_answer() && $jmeanswer ne '') {
     my $options=&Apache::lonxml::get_param('options',$parstack,      my $options=&Apache::lonxml::get_param('options',$parstack,
    $safeeval);     $safeeval);
     my $width=&Apache::lonxml::get_param('width',$parstack,      my $width=&Apache::lonxml::get_param('width',$parstack,
Line 163  sub start_organicresponse { Line 165  sub start_organicresponse {
     }      }
     my $options=&Apache::lonxml::get_param('options',$parstack,      my $options=&Apache::lonxml::get_param('options',$parstack,
    $safeeval);     $safeeval);
     $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);      my $shown_text;
       if (&Apache::response::show_answer()) {
    $shown_text="Show Your Last Answer";
       }
       $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,
    $options,$shown_text);
     $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';      $result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
  }   }
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
Line 237  sub end_organicresponse { Line 244  sub end_organicresponse {
     }      }
     &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;
     $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$ENV{"form.MOLECULE_$id"};      $Apache::lonhomework::results{"resource.$partid.$id.molecule"}=$env{"form.MOLECULE_$id"};
  }   }
     } elsif ($target eq "edit") {      } elsif ($target eq "edit") {
  $result.= &Apache::edit::tag_end($target,$token,'');   $result.= &Apache::edit::tag_end($target,$token,'');
Line 274  sub start_organicstructure { Line 281  sub start_organicstructure {
  if (!$texwidth) { $texwidth='90'; }   if (!$texwidth) { $texwidth='90'; }
  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);
  my $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.   my $filename = $env{'user.name'}.'_'.$env{'user.domain'}.
     '_'.time.'_'.$$.int(rand(1000)).'_organicstructure';      '_'.time.'_'.$$.int(rand(1000)).'_organicstructure';
  my $id=$filename;   my $id=$filename;
  &Apache::lonnet::appenv(   &Apache::lonnet::appenv(
Line 366  sub start_reactionresponse { Line 373  sub start_reactionresponse {
  }   }
  if (  &Apache::response::show_answer() ) {   if (  &Apache::response::show_answer() ) {
     my $ans=&Apache::lonxml::get_param('answer',$parstack,$safeeval);      my $ans=&Apache::lonxml::get_param('answer',$parstack,$safeeval);
     $ans=~s/(\\|\')/\\$1/g;      if (!$Apache::lonxml::default_homework_loaded) {
     $Apache::inputtags::answertxt{$id}=&Apache::run::run("return &chemparse('$ans');",$safeeval);   &Apache::lonxml::default_homework_load($safeeval);
       }
       @Apache::scripttag::parser_env = @_;
       $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);
Removed from v.1.48  
changed lines
  Added in v.1.55

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