version 1.11, 2003/07/01 21:10:43
|
version 1.34, 2004/06/07 21:56:24
|
Line 35 BEGIN {
|
Line 35 BEGIN {
|
&Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse')); |
&Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse')); |
} |
} |
|
|
sub seperate_jme_window { |
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 { |
my ($smile_input,$jme_input,$molecule,$options)=@_; |
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 79 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 102 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" /> |
<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> |
Line 90 You have to enable Java and JavaScript o
|
Line 119 You have to enable Java and JavaScript o
|
</body> |
</body> |
</html> |
</html> |
CHEMPAGE |
CHEMPAGE |
$body=&HTML::Entities::encode($body); |
$body=&HTML::Entities::encode($body,'<>&"'); |
$body=~s/\n/ /g; |
$body=~s/\n/ /g; |
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.document.open('text/html','replace');editor.document.writeln('$body')" /> |
Line 104 sub start_organicresponse {
|
Line 133 sub start_organicresponse {
|
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 112 sub start_organicresponse {
|
Line 142 sub start_organicresponse {
|
$molecule=&Apache::lonxml::get_param('molecule',$parstack, |
$molecule=&Apache::lonxml::get_param('molecule',$parstack, |
$safeeval); |
$safeeval); |
} |
} |
my $multipart=&Apache::lonxml::get_param('multipart',$parstack, |
my $options=&Apache::lonxml::get_param('options',$parstack, |
$safeeval); |
$safeeval); |
if ($multipart eq 'yes') { |
$result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$options); |
$multipart = 'multipart'; |
|
} else { |
|
$multipart =''; |
|
} |
|
$result=&seperate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,$multipart); |
|
$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); |
|
my $options=&Apache::lonxml::get_param('options',$parstack, |
|
$safeeval); |
|
if ($options !~ /multipart/) { $options.=',multipart'; } |
$result .='<nobr>'. |
$result .='<nobr>'. |
&Apache::edit::text_arg('Starting Molecule:','molecule', |
&Apache::edit::text_arg('Starting Molecule:','molecule', |
$token,40); |
$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,'multipart'); |
$molecule,$options); |
$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::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,'multipart'); |
$jmeanswer,$options); |
$result .='</nobr>'. |
$result .='</nobr><br />'; |
&Apache::edit::select_arg('Multipart:','multipart', |
$result .=&Apache::edit::checked_arg('Options:','options', |
['no','yes'],$token); |
[ ['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', |
'multipart'); |
'options'); |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
if ($constructtag) { $result = &Apache::edit::rebuild_tag($token); } |
} |
} |
return $result; |
return $result; |
Line 159 sub end_organicresponse {
|
Line 192 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'})) { |
&Apache::response::setup_params($$tagstack[-1]); |
&Apache::response::setup_params($$tagstack[-1],$safeeval); |
my $response = &Apache::response::getresponse(); |
my $response = &Apache::response::getresponse(); |
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 180 sub end_organicresponse {
|
Line 216 sub end_organicresponse {
|
} |
} |
} 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; |
Line 190 sub start_organicstructure {
|
Line 234 sub start_organicstructure {
|
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,'multipart'); |
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; |
Line 250 sub start_reactionresponse {
|
Line 326 sub start_reactionresponse {
|
my $result; |
my $result; |
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('reactionresponse'); |
} elsif ($target eq 'web') { |
} elsif ($target eq 'web') { |
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"}; |
$result.=&edit_reaction_button($id,"HWVAL_$id",$reaction); |
my $status=$Apache::inputtags::status['-1']; |
|
if ($status eq 'CAN_ANSWER') { |
|
$result.=&edit_reaction_button($id,"HWVAL_$id",$reaction); |
|
} |
|
if ( &Apache::response::show_answer() ) { |
|
my $ans=&Apache::lonxml::get_param('answer',$parstack,$safeeval); |
|
$ans=~s/(\\|\')/\\$1/g; |
|
$Apache::inputtags::answertxt{$id}=&Apache::run::run("return &chemparse('$ans');",$safeeval); |
|
} |
} elsif ($target eq "edit") { |
} elsif ($target eq "edit") { |
$result .=&Apache::edit::tag_start($target,$token); |
$result .=&Apache::edit::tag_start($target,$token); |
my $answer=&Apache::lonxml::get_param('answer',$parstack, |
my $answer=&Apache::lonxml::get_param('answer',$parstack, |
Line 276 sub end_reactionresponse {
|
Line 361 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' && defined($ENV{'form.submitted'})) { |
&Apache::response::setup_params($$tagstack[-1]); |
&Apache::response::setup_params($$tagstack[-1],$safeeval); |
my $response = &Apache::response::getresponse(); |
my $response = &Apache::response::getresponse(); |
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 (&chem_standard_order($response) eq |
$ad='INCORRECT'; |
&chem_standard_order($answer)) { |
|
$ad='EXACT_ANS'; |
|
} 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; |
} |
} |
} 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('reactionresponse'); |
|
foreach my $answer (@answers) { |
|
$result.=&Apache::response::answer_part('reactionresponse', |
|
$answer); |
|
} |
|
$result.=&Apache::response::answer_footer('reactionresponse'); |
} |
} |
&Apache::response::end_response; |
&Apache::response::end_response; |
return $result; |
return $result; |