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

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

version 1.17, 2003/10/16 21:52:27 version 1.21, 2003/10/21 20:49:06
Line 40  sub seperate_jme_window { Line 40  sub seperate_jme_window {
     my $smilesection;      my $smilesection;
     if (defined($smile_input)) {      if (defined($smile_input)) {
  $smilesection=<<SMILESECTION;   $smilesection=<<SMILESECTION;
           smiles = document.applets.JME.smiles();
  opener.document.lonhomework.$smile_input.value = smiles;   opener.document.lonhomework.$smile_input.value = smiles;
 SMILESECTION  SMILESECTION
     }      }
Line 58  JMESECTION Line 59  JMESECTION
 <title>Molecule Editor</title>  <title>Molecule Editor</title>
 <script language="JavaScript">  <script language="JavaScript">
 function submitSmiles() {  function submitSmiles() {
     smiles = document.applets.JME.smiles();      jmeFile = document.applets.JME.jmeFile();
     if (smiles == "") {      if (jmeFile == "") {
  alert("Nothing to submit");   alert("Nothing to submit");
     } else {      } else {
         $smilesection  
         $jmesection          $jmesection
           $smilesection
  window.close();   window.close();
     }      }
 }  }
Line 143  sub start_organicresponse { Line 144  sub start_organicresponse {
  $result .='</nobr><br />';   $result .='</nobr><br />';
  $result .=&Apache::edit::checked_arg('Options:','options',   $result .=&Apache::edit::checked_arg('Options:','options',
     [ ['autoez','Auto E,Z sterochemistry'],      [ ['autoez','Auto E,Z sterochemistry'],
       ['multipart','MultiPart Structures'],        ['multipart','Multipart Structures'],
       ['hydrogens','Show Hydrogens'],  
       ['nostereo','No stereochemistry'],        ['nostereo','No stereochemistry'],
       ['reaction','Is a reaction'],        ['reaction','Is a reaction'],
       ['number','Able to number atoms'],        ['number','Able to number atoms'] ],
       ['border','Draw a border'] ],  
      ,$token);       ,$token);
  $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') {
Line 210  sub start_organicstructure { Line 209  sub start_organicstructure {
  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 $id=time.'_'.int(rand(1000));   my $id=time.'_'.int(rand(1000));
  $result="<img src='/cgi-bin/convertjme.pl?$id' />";   $result="<img src='/cgi-bin/convertjme.pl?$id'";
    if ($options =~ /border/) { $result.= ' border="1"'; }
    $result.=' />';
  &Apache::lonnet::appenv(   &Apache::lonnet::appenv(
             'cgi.'.$id.'.JME'   => &Apache::lonnet::escape($molecule),              'cgi.'.$id.'.JME'   => &Apache::lonnet::escape($molecule),
     'cgi.'.$id.'.PNG' => 1,      'cgi.'.$id.'.PNG' => 1,
Line 229  sub start_organicstructure { Line 230  sub start_organicstructure {
      'cgi.'.$id.'.WIDTH' => $texwidth );       'cgi.'.$id.'.WIDTH' => $texwidth );
  $id=&Apache::lonnet::escape($id);   $id=&Apache::lonnet::escape($id);
  &Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id");   &Apache::lonxml::register_ssi("/cgi-bin/convertjme.pl?$id");
  $result = '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';   if ($options =~ /border/) { $result.= '\fbox{'; }
    $result .= '\graphicspath{{/home/httpd/perl/tmp/}}\includegraphics[width='.$texwidth.' mm]{'.$filename.'.eps}';
    if ($options =~ /border/) { $result.= '} '; }
     } 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);
Line 250  sub start_organicstructure { Line 253  sub start_organicstructure {
        $molecule,$options);         $molecule,$options);
  $result.="</nobr><br />";   $result.="</nobr><br />";
  $result .=&Apache::edit::checked_arg('Options:','options',   $result .=&Apache::edit::checked_arg('Options:','options',
      [ ['hydrogens','Show Hydrogens'],       [ ['reaction','Is a reaction'],
        ['reaction','Is a reaction'],  
        ['border','Draw a border'] ],         ['border','Draw a border'] ],
      $token);       $token);
  $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();   $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
Removed from v.1.17  
changed lines
  Added in v.1.21

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