Diff for /loncom/homework/chemresponse.pm between versions 1.64 and 1.67

version 1.64, 2006/03/09 01:12:05 version 1.67, 2006/06/27 14:15:26
Line 31  use strict; Line 31  use strict;
 use Apache::lonxml;  use Apache::lonxml;
 use Apache::lonnet;  use Apache::lonnet;
 use Apache::lonlocal;  use Apache::lonlocal;
   use lib '/home/httpd/lib/perl/';
   use LONCAPA;
    
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));      &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));
Line 87  JMESECTION Line 90  JMESECTION
     '<input type="button" name="submit" value="Insert Answer" onclick="javascript:submitSmiles();" />';      '<input type="button" name="submit" value="Insert Answer" onclick="javascript:submitSmiles();" />';
     }      }
   
     my $body=<<CHEMPAGE;      my $js = <<CHEMJS;
 <html>  
 <head>  
 <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();
Line 107  function openHelpWindow() { Line 107  function openHelpWindow() {
 }  }
 function substituent(r) {document.applets.JME.setSubstituent(r);}  function substituent(r) {document.applets.JME.setSubstituent(r);}
 </script>  </script>
 </head>  CHEMJS
 <body bgcolor="#ffffff">  
       my $start_page = 
           &Apache::loncommon::start_page('Molecule Editor',$js,
          {'only_body' => 1,
    'bgcolor'   => '#FFFFFF',});
       my $end_page = 
    &Apache::loncommon::end_page();
   
       my $body=<<CHEMPAGE;
   $start_page
 <center>  <center>
 <form>  <form>
   <table width="440"><tr>    <table width="440"><tr>
Line 146  $insert_answer Line 155  $insert_answer
 <input type="button" value="  Help  " onclick = "javascript:openHelpWindow()" />  <input type="button" value="  Help  " onclick = "javascript:openHelpWindow()" />
 </form>  </form>
 </center>  </center>
 </body>  $end_page
 </html>  
 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 $nothing=&Apache::lonhtmlcommon::javascript_nothing();
Line 168  sub jme_img { Line 177  sub jme_img {
     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'   =>
     &Apache::lonnet::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 226  sub start_organicresponse { Line 235  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 .=&Apache::edit::hidden_arg('jmeanswer',$token);   $result .=&Apache::edit::text_arg('JME string of the answer (automatically updated when using the Draw Molecule button):',
     'jmeanswer',$token);
  my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,   my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
  $safeeval);   $safeeval);
  $result .=&separate_jme_window(   $result .=&separate_jme_window(
Line 327  sub start_organicstructure { Line 337  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'   => &Apache::lonnet::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') {
Line 343  sub start_organicstructure { Line 353  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'   => &Apache::lonnet::escape($molecule),       'cgi.'.$id.'.JME'   => &escape($molecule),
      'cgi.'.$id.'.PS' => 1,       'cgi.'.$id.'.PS' => 1,
      'cgi.'.$id.'.WIDTH' => $texwidth );       'cgi.'.$id.'.WIDTH' => $texwidth );
  $id=&Apache::lonnet::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{'; }
  $result .= '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';   $result .= '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';
Line 395  sub end_organicstructure { Line 405  sub end_organicstructure {
   
 sub edit_reaction_button {  sub edit_reaction_button {
     my ($id,$field,$reaction)=@_;      my ($id,$field,$reaction)=@_;
     my $id_es=&Apache::lonnet::escape($id);      my $id_es=&escape($id);
     my $field_es=&Apache::lonnet::escape($field);      my $field_es=&escape($field);
     my $reaction_es=&Apache::lonnet::escape($reaction);      my $reaction_es=&escape($reaction);
     my $docopen=&Apache::lonhtmlcommon::javascript_docopen();      my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
       my $start_page = 
    &Apache::loncommon::start_page('LON-CAPA Reaction Editor',undef,
          {'frameset'    => 1,
    'js_ready'    => 1,
    'add_entries' => {
       'rows'   => "30%",
       'border' => "0",}},);
       my $end_page = 
    &Apache::loncommon::end_page({'frameset' => 1,
         'js_ready' => 1});
     my $result=<<EDITREACTION;      my $result=<<EDITREACTION;
 <script type="text/javascript">  <script type="text/javascript">
 // <!--  // <!--
     function create_reaction_window_${id}_${field} () {      function create_reaction_window_${id}_${field} () {
  editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');   editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
  editor.$docopen;   editor.$docopen;
  editor.document.writeln('<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"><html> <head><title>LON-CAPA Reaction Editor</title></head><frameset rows="30%,*" border="0">  <frame src="/res/adm/pages/reactionresponse/reaction_viewer.html?inhibitmenu=yes" name="viewer" scrolling="no" />  <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?inhibitmenu=yes&reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');   editor.document.writeln('$start_page <frame src="/res/adm/pages/reactionresponse/reaction_viewer.html?inhibitmenu=yes" name="viewer" scrolling="no" />  <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?inhibitmenu=yes&reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> $end_page');
     }      }
 // -->  // -->
 </script>  </script>

Removed from v.1.64  
changed lines
  Added in v.1.67


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