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

Diff for /loncom/homework/chemresponse.pm between versions 1.47 and 1.53

version 1.47, 2005/02/18 05:37:42 version 1.53, 2005/05/25 21:45:07
Line 85  JMESECTION Line 85  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 98  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 107  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 121  $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 $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="Draw Molecule" 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 237  sub end_organicresponse { Line 236  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 273  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 365  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);
Line 438  sub end_reactionresponse { Line 440  sub end_reactionresponse {
 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 = '';
       my $inside = &Apache::lonxml::get_all_text_unbalanced("/chem",$parser);
     if ($target eq 'tex' || $target eq 'web') {      if ($target eq 'tex' || $target eq 'web') {
  &Apache::lonxml::startredirection();   $inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
    if (!$Apache::lonxml::default_homework_loaded) {
       &Apache::lonxml::default_homework_load($safeeval);
    }
    @Apache::scripttag::parser_env = @_;
    $result=&Apache::run::run("return &chemparse(q\0$inside\0);",$safeeval);
     }          }    
     return $result;      return $result;
 }  }
Line 447  sub start_chem { Line 455  sub start_chem {
 sub end_chem {  sub end_chem {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
     my $result = '';      my $result = '';
     if ($target eq 'tex' || $target eq 'web') {  
  @Apache::scripttag::parser_env = @_;  
  if (!$Apache::lonxml::default_homework_loaded) {  
     &Apache::lonxml::default_homework_load($safeeval);  
  }  
  my $innards=&Apache::lonxml::endredirection();  
  $result=&Apache::run::run("return &chemparse(q\0$innards\0);",$safeeval);  
     }  
     return $result;      return $result;
 }  }
   
Removed from v.1.47  
changed lines
  Added in v.1.53

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