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

Diff for /loncom/homework/chemresponse.pm between versions 1.33 and 1.45

version 1.33, 2004/06/07 21:17:42 version 1.45, 2005/01/31 22:00:40
Line 35  BEGIN { Line 35  BEGIN {
     &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse'));      &Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse'));
 }  }
   
   sub chem_standard_order {
       my ($reaction) = @_;
       my ($re,$pr) = split(/->|<=>/,$reaction);
       my @reactants = split(/\s\+/,$re);
       my @products =  split(/\s\+/,$pr);
       foreach my $substance (@reactants,@products) {
    $substance =~ s/(\^\d*)\s+/$1_/g;         # protect superscript space
    $substance =~ s/\s*//g;                   # strip whitespace
    $substance =~ s/_/ /g;                    # restore superscript space
       }
       @reactants = sort @reactants;
       @products = sort @products;
       my $standard = '';
       foreach my $substance (@reactants) {
    $standard .= $substance;
    $standard .= ' + ';
       }
       $standard =~ s/ \+ $//;              # get rid of trailing plus sign
       $standard .= ' -> ';
       foreach my $substance (@products) {
    $standard .= $substance;
    $standard .= ' + ';
       }
       $standard =~ s/ \+ $//;              # get rid of trailing plus sign
       return $standard;
   }
   
 sub separate_jme_window {  sub separate_jme_window {
     my ($smile_input,$jme_input,$molecule,$options)=@_;      my ($smile_input,$jme_input,$molecule,$options)=@_;
     my $smilesection;      my $smilesection;
Line 94  $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 $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.document.open('text/html','replace');editor.document.writeln('$body')" />  <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')" />
 CHEMINPUT  CHEMINPUT
     return $result;      return $result;
 }  }
Line 108  sub start_organicresponse { Line 136  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') {
  my $molecule;   if (  &Apache::response::show_answer() ) {
  if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {      my $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
     $molecule=$Apache::lonhomework::history{"resource.$partid.$id.molecule"};       $safeeval);
       my $options=&Apache::lonxml::get_param('options',$parstack,
      $safeeval);
       my $width=&Apache::lonxml::get_param('width',$parstack,
      $safeeval);
       my $id=&Apache::loncommon::get_cgi_id();
       $result="<img src='/cgi-bin/convertjme.pl?$id'";
       if ($options =~ /border/) { $result.= ' border="1"'; }
       $result.=' />';
       &Apache::lonnet::appenv('cgi.'.$id.'.JME'   =>
              &Apache::lonnet::escape($jmeanswer),
       'cgi.'.$id.'.PNG'   => 1,
       'cgi.'.$id.'.WIDTH' => $width);
  } else {   } else {
     $molecule=&Apache::lonxml::get_param('molecule',$parstack,      my $molecule;
  $safeeval);      if (defined($Apache::lonhomework::history{"resource.$partid.$id.molecule"})) {
    $molecule=$Apache::lonhomework::history{"resource.$partid.$id.molecule"};
       } else {
    $molecule=&Apache::lonxml::get_param('molecule',$parstack,
        $safeeval);
       }
       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="" />';
  }   }
  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="" />';  
     } elsif ($target eq 'edit') {      } elsif ($target eq 'edit') {
  $result .=&Apache::edit::tag_start($target,$token);   $result .=&Apache::edit::tag_start($target,$token);
  my $options=&Apache::lonxml::get_param('options',$parstack,   my $options=&Apache::lonxml::get_param('options',$parstack,
Line 150  sub start_organicresponse { Line 195  sub start_organicresponse {
       ['reaction','Is a reaction'],        ['reaction','Is a reaction'],
       ['number','Able to number atoms'] ],        ['number','Able to number atoms'] ],
      ,$token);       ,$token);
    $result .=&Apache::edit::text_arg('Width of correct answer image:',
     'width',$token,10);
  $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');       'options','width');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }      }
     return $result;      return $result;
Line 164  sub start_organicresponse { Line 211  sub start_organicresponse {
 sub end_organicresponse {  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' && &Apache::response::submitted()) {
  &Apache::response::setup_params($$tagstack[-1],$safeeval);   &Apache::response::setup_params($$tagstack[-1],$safeeval);
  my $response = &Apache::response::getresponse();   my $response = &Apache::response::getresponse();
  if ( $response =~ /[^\s]/) {   if ( $response =~ /[^\s]/) {
Line 183  sub end_organicresponse { Line 230  sub end_organicresponse {
     $ad='INCORRECT';      $ad='INCORRECT';
  }   }
     }      }
       if ($ad && $Apache::lonhomework::type eq 'survey') {
    $ad='SUBMITTED';
       }
     &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"};
Line 218  sub start_organicstructure { Line 268  sub start_organicstructure {
     'cgi.'.$id.'.PNG' => 1,      'cgi.'.$id.'.PNG' => 1,
     'cgi.'.$id.'.WIDTH' => $width );      'cgi.'.$id.'.WIDTH' => $width );
     } elsif ($target eq 'tex') {      } elsif ($target eq 'tex') {
  my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,1);   my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
  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);
Line 281  sub edit_reaction_button { Line 331  sub edit_reaction_button {
     my $id_es=&Apache::lonnet::escape($id);      my $id_es=&Apache::lonnet::escape($id);
     my $field_es=&Apache::lonnet::escape($field);      my $field_es=&Apache::lonnet::escape($field);
     my $reaction_es=&Apache::lonnet::escape($reaction);      my $reaction_es=&Apache::lonnet::escape($reaction);
       my $docopen=&Apache::lonhtmlcommon::javascript_docopen();
     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.document.open('text/html','replace');   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" 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>');   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>');
     }      }
 </script>  </script>
 <input type='button' value='Edit Reaction' onClick="javascript:create_reaction_window_${id}_${field}();void(0);" />  <input type='button' value='Edit Answer' onClick="javascript:create_reaction_window_${id}_${field}();void(0);" />
 EDITREACTION  EDITREACTION
     return $result;      return $result;
 }  }
Line 304  sub start_reactionresponse { Line 355  sub start_reactionresponse {
  my $partid = $Apache::inputtags::part;   my $partid = $Apache::inputtags::part;
  my $id = $Apache::inputtags::response['-1'];   my $id = $Apache::inputtags::response['-1'];
  my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"};   my $reaction=$Apache::lonhomework::history{"resource.$partid.$id.submission"};
    if ($reaction eq '') {  $reaction=&Apache::lonxml::get_param('initial',$parstack,$safeeval); }
  my $status=$Apache::inputtags::status['-1'];   my $status=$Apache::inputtags::status['-1'];
  if ($status eq 'CAN_ANSWER') {   if ($status eq 'CAN_ANSWER') {
     $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction);      $result.=&edit_reaction_button($id,"HWVAL_$id",$reaction);
Line 320  sub start_reactionresponse { Line 372  sub start_reactionresponse {
  $result .='<nobr>'.   $result .='<nobr>'.
     &Apache::edit::text_arg('Answer:','answer',$token,40);      &Apache::edit::text_arg('Answer:','answer',$token,40);
  $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'</nobr>';   $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('answer'),$answer).'</nobr>';
    my $initial=&Apache::lonxml::get_param('initial',$parstack,$safeeval);
    $result.='<nobr>'.
       &Apache::edit::text_arg('Initial Reaction:','initial',$token,40);
    $result .=&edit_reaction_button($id,&Apache::edit::html_element_name('initial'),$initial).'</nobr>';
   
  $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,'answer');       $safeeval,'answer',
        'initial');
  if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }   if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); }
     }      }
     return $result;      return $result;
Line 333  sub start_reactionresponse { Line 390  sub start_reactionresponse {
 sub end_reactionresponse {  sub end_reactionresponse {
     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' && &Apache::response::submitted()) {
  &Apache::response::setup_params($$tagstack[-1],$safeeval);   &Apache::response::setup_params($$tagstack[-1],$safeeval);
  my $response = &Apache::response::getresponse();   my $response = &Apache::response::getresponse();
  if ( $response =~ /[^\s]/) {   if ( $response =~ /[^\s]/) {
Line 345  sub end_reactionresponse { Line 402  sub end_reactionresponse {
     my $ad;      my $ad;
     foreach my $answer (@answers) {      foreach my $answer (@answers) {
  &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");   &Apache::lonxml::debug("submitted a $response for $answer<br \>\n");
  if ($response eq $answer) {   if (&chem_standard_order($response) eq 
       &chem_standard_order($answer)) {
     $ad='EXACT_ANS';      $ad='EXACT_ANS';
  } else {   } else {
     $ad='INCORRECT';      $ad='INCORRECT';
  }   }
     }      }
       if ($ad && $Apache::lonhomework::type eq 'survey') {
    $ad='SUBMITTED';
       }
     &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;
  }   }
Removed from v.1.33  
changed lines
  Added in v.1.45

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