Diff for /loncom/homework/chemresponse.pm between versions 1.3 and 1.30

version 1.3, 2003/05/05 19:27:08 version 1.30, 2004/03/08 17:31:37
Line 32  use Apache::lonxml; Line 32  use Apache::lonxml;
 use Apache::lonnet;  use Apache::lonnet;
   
 BEGIN {  BEGIN {
     &Apache::lonxml::register('Apache::chemresponse',('chemresponse','chemstructure'));      &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse'));
 }  }
   
 sub seperate_jme_window {  sub separate_jme_window {
     my ($smile_input,$jme_input,$molecule)=@_;      my ($smile_input,$jme_input,$molecule,$options)=@_;
     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 51  SMILESECTION Line 52  SMILESECTION
 JMESECTION  JMESECTION
     }      }
   
       if ($molecule) { $molecule='<param name="jme" value="'.$molecule.'" />'; }
     my $body=<<CHEMPAGE;      my $body=<<CHEMPAGE;
 <html>  <html>
 <head>  <head>
 <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 73  function openHelpWindow() { Line 75  function openHelpWindow() {
 </head>  </head>
 <body bgcolor="#ffffff">  <body bgcolor="#ffffff">
 <center>  <center>
 <applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="97%" height="78%">  <applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="440" height="390">
 You have to enable Java and JavaScript on your machine.  You have to enable Java and JavaScript on your machine.
 <param name="jme" value="$molecule" />  $molecule
   <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>
Line 97  CHEMINPUT Line 100  CHEMINPUT
     return $result;      return $result;
 }  }
   
 sub start_chemresponse {  sub start_organicresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     my $partid = $Apache::inputtags::part;      my $partid = $Apache::inputtags::part;
     my $id = &Apache::response::start_response($parstack,$safeeval);      my $id = &Apache::response::start_response($parstack,$safeeval);
     if ($target eq 'meta') {      if ($target eq 'meta') {
    $result=&Apache::response::meta_package_write('organicresponse');
     } elsif ($target eq 'web') {      } elsif ($target eq 'web') {
  my $molecule;   my $molecule;
  if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {   if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {
Line 111  sub start_chemresponse { Line 115  sub start_chemresponse {
     $molecule=&Apache::lonxml::get_param('molecule',$parstack,      $molecule=&Apache::lonxml::get_param('molecule',$parstack,
  $safeeval);   $safeeval);
  }   }
  $result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule);   my $options=&Apache::lonxml::get_param('options',$parstack,
          $safeeval);
    $result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options);
  $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);
  $result .=&Apache::edit::text_arg('Starting Molecule:','molecule',   my $options=&Apache::lonxml::get_param('options',$parstack,
   $token,40);         $safeeval);
    if ($options !~ /multipart/) { $options.=',multipart'; }
    $result .='<nobr>'.
       &Apache::edit::text_arg('Starting Molecule:','molecule',
       $token,40);
  my $molecule=&Apache::lonxml::get_param('molecule',$parstack,   my $molecule=&Apache::lonxml::get_param('molecule',$parstack,
  $safeeval);   $safeeval);
  $result .=&seperate_jme_window(undef,   $result .=&separate_jme_window(undef,
       &Apache::edit::html_element_name('molecule'),        &Apache::edit::html_element_name('molecule'),
       $molecule);        $molecule,$options);
  $result .='<br />';   $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::hidden_arg('jmeanswer',$token);
  my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,   my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
  $safeeval);   $safeeval);
  $result .=&seperate_jme_window(   $result .=&separate_jme_window(
                       &Apache::edit::html_element_name('answer'),                        &Apache::edit::html_element_name('answer'),
                       &Apache::edit::html_element_name('jmeanswer'),                        &Apache::edit::html_element_name('jmeanswer'),
       $jmeanswer);        $jmeanswer,$options);
    $result .='</nobr><br />';
    $result .=&Apache::edit::checked_arg('Options:','options',
       [ ['autoez','Auto E,Z stereochemistry'],
         ['multipart','Multipart Structures'],
         ['nostereo','No stereochemistry'],
         ['reaction','Is a reaction'],
         ['number','Able to number atoms'] ],
        ,$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') {
  my $constructtag=&Apache::edit::get_new_args($token,$parstack,   my $constructtag=&Apache::edit::get_new_args($token,$parstack,
      $safeeval,'molecule',       $safeeval,'molecule',
      'answer','jmeanswer');       'answer','jmeanswer',
        'options');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }      }
     return $result;      return $result;
 }  }
   
 sub end_chemresponse {  sub end_organicresponse {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq 'grade' && defined($ENV{'form.submitted'})) {      if ($target eq 'grade' && defined($ENV{'form.submitted'})) {
Line 151  sub end_chemresponse { Line 170  sub end_chemresponse {
  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 167  sub end_chemresponse { Line 189  sub end_chemresponse {
  }   }
     } 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;
 }  }
   
 sub start_chemstructure {  sub start_organicstructure {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     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);
  $result=<<CHEMOUTPUT;   my $options=&Apache::lonxml::get_param('options',$parstack,$safeeval);
 <applet code="JME.class" archive="/adm/jme/JME.jar" width="$width" height="$height">   my $id=&Apache::loncommon::get_cgi_id();
 <param name="options" value="depict border" />   $result="<img src='/cgi-bin/convertjme.pl?$id'";
 <param name="jme" value="$molecule" />   if ($options =~ /border/) { $result.= ' border="1"'; }
 </applet>   $result.=' />';
 CHEMOUTPUT   &Apache::lonnet::appenv(
               'cgi.'.$id.'.JME'   => &Apache::lonnet::escape($molecule),
       'cgi.'.$id.'.PNG' => 1,
       '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");
    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 (pixels):','width',$token,5);
  $result .=&Apache::edit::text_arg('Height:','height',$token,5);   $result .=&Apache::edit::text_arg('TeXwidth (mm):','texwidth',$token,5);
    $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,
  $safeeval);   $safeeval);
  $result .=&seperate_jme_window(undef,   my $options=&Apache::lonxml::get_param('options',$parstack,
       &Apache::edit::html_element_name('molecule'),         $safeeval);
       $molecule);   if ($options !~ /reaction/) {
  $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();      $options.= ',multipart,number';
    }
      
    $result .=&separate_jme_window(undef,
    &Apache::edit::html_element_name('molecule'),
          $molecule,$options);
    $result.="</nobr><br />";
    $result .=&Apache::edit::checked_arg('Options:','options',
        [ ['reaction','Is a reaction'],
          ['border','Draw a border'] ],
        $token);
    $result .=&Apache::edit::end_row();
     } elsif ($target eq 'modified') {      } elsif ($target eq 'modified') {
  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','texwidth',
        'options');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }      }
     return $result;      return $result;
 }  }
   
 sub end_chemstructure {  sub end_organicstructure {
     my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;      my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
     my $result;      my $result;
     if ($target eq "edit") {      if ($target eq "edit") {
Line 214  sub end_chemstructure { Line 276  sub end_chemstructure {
     return $result;      return $result;
 }  }
   
   sub edit_reaction_button {
       my ($id,$field,$reaction)=@_;
       my $id_es=&Apache::lonnet::escape($id);
       my $field_es=&Apache::lonnet::escape($field);
       my $reaction_es=&Apache::lonnet::escape($reaction);
       my $result=<<EDITREACTION;
   <script type="text/javascript">
       function create_reaction_window_${id}_${field} () {
    editor=window.open('','','width=500,height=270,scrollbars=no,resizable=yes');
    editor.document.open('text/html','replace');
    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" name="viewer" scrolling="no" />  <frame src="/res/adm/pages/reactionresponse/reaction_editor.html?reaction=$reaction_es&id=$id_es&field=$field_es" name="editor" scrolling="no" /> </frameset> </html>');
       }
   </script>
   <input type='button' value='Edit Reaction' onClick="javascript:create_reaction_window_${id}_${field}();void(0);" />
   EDITREACTION
       return $result;
   }
   
   sub start_reactionresponse {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       my $id = &Apache::response::start_response($parstack,$safeeval);
       if ($target eq 'meta') {
    $result=&Apache::response::meta_package_write('reactionresponse');
       } elsif ($target eq 'web') {
    my $partid = $Apache::inputtags::part;
    my $id = $Apache::inputtags::response['-1'];
    my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"};
    $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction);
       } elsif ($target eq "edit") {
    $result .=&Apache::edit::tag_start($target,$token);
    my $answer=&Apache::lonxml::get_param('answer',$parstack,
    $safeeval);
    $result .='<nobr>'.
       &Apache::edit::text_arg('Answer:','answer',$token,40);
    $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'</nobr>';
   
    $result .=&Apache::edit::end_row().&Apache::edit::start_spanning_row();
       }  elsif ($target eq 'modified') {
    my $constructtag=&Apache::edit::get_new_args($token,$parstack,
        $safeeval,'answer');
    if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
       }
       return $result;
   }
   
   sub end_reactionresponse {
       my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style)=@_;
       my $result;
       if ($target eq 'grade' && defined($ENV{'form.submitted'})) {
    &Apache::response::setup_params($$tagstack[-1]);
    my $response = &Apache::response::getresponse();
    if ( $response =~ /[^\s]/) {
       my $partid = $Apache::inputtags::part;
       my $id = $Apache::inputtags::response['-1'];
       my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,$safeeval);
       my %previous = &Apache::response::check_for_previous($response,$partid,$id);
       $Apache::lonhomework::results{"resource.$partid.$id.submission"}=$response;
       my $ad;
       foreach my $answer (@answers) {
    &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
    if ($response eq $answer) {
       $ad='EXACT_ANS';
    } else {
       $ad='INCORRECT';
    }
       }
       &Apache::response::handle_previous(\%previous,$ad);
       $Apache::lonhomework::results{"resource.$partid.$id.awarddetail"}=$ad;
    }
       }  elsif ($target eq "edit") {
    $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;
       return $result;
   }
   
 1;  1;
 __END__  __END__

Removed from v.1.3  
changed lines
  Added in v.1.30


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