loncom/homework/chemresponse.pm - diff

Return to chemresponse.pm CVS log

Up to [LON-CAPA] / loncom / homework

Diff for /loncom/homework/chemresponse.pm between versions 1.23 and 1.66

version 1.23, 2003/11/10 23:26:42	version 1.66, 2006/05/30 12:45:36
Line 30 package Apache::chemresponse;	Line 30 package Apache::chemresponse;
use strict;	use strict;
use Apache::lonxml;	use Apache::lonxml;
use Apache::lonnet;	use Apache::lonnet;
	use Apache::lonlocal;
	use lib '/home/httpd/lib/perl/';
	use LONCAPA;


BEGIN {	BEGIN {
&Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse'));	&Apache::lonxml::register('Apache::chemresponse',('organicresponse','organicstructure','reactionresponse','chem'));
}	}

sub seperate_jme_window {	sub chem_standard_order {
my ($smile_input,$jme_input,$molecule,$options)=@_;	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,$shown_text)=@_;
my $smilesection;	my $smilesection;
if (defined($smile_input)) {	if (defined($smile_input)) {
$smilesection=<<SMILESECTION;	$smilesection=<<SMILESECTION;
Line 53 JMESECTION	Line 84 JMESECTION
}	}

if ($molecule) { $molecule='<param name="jme" value="'.$molecule.'" />'; }	if ($molecule) { $molecule='<param name="jme" value="'.$molecule.'" />'; }
my $body=<<CHEMPAGE;	my $insert_answer;
<html>	if ($shown_text eq '') {
<head>	$insert_answer=
<title>Molecule Editor</title>	'<input type="button" name="submit" value="Insert Answer" onclick="javascript:submitSmiles();" />';
<script language="JavaScript">	}

	my $js = <<CHEMJS;
	<script type="text/javascript">
function submitSmiles() {	function submitSmiles() {
jmeFile = document.applets.JME.jmeFile();	jmeFile = document.applets.JME.jmeFile();
if (jmeFile == "") {	if (jmeFile == "") {
Line 71 function submitSmiles() {	Line 105 function submitSmiles() {
function openHelpWindow() {	function openHelpWindow() {
window.open("/adm/jme/jme_help.html","","scrollbars=yes,resizable=yes,width=500,height=600");	window.open("/adm/jme/jme_help.html","","scrollbars=yes,resizable=yes,width=500,height=600");
}	}
	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>
<applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="97%" height="78%">	<form>
	<table width="440"><tr>
	<td></td>
	<td align="right">
	<select onchange="javascript:substituent(options[selectedIndex].text)">
	<option>Select substituent</option>
	<option>-C(=O)OH</option>
	<option>-C(=O)OMe</option>
	<option>-OC(=O)Me</option>
	<option>-CMe3</option>
	<option>-CF3</option>
	<option>-CCl3</option>
	<option>-NO2</option>
	<option>-SO2-NH2</option>
	<option>-NH-SO2-Me</option>
	<option>-NMe2</option>
	<option>-C#N</option>
	<option>-C#C-Me</option>
	<option>-C#CH</option>
	</select>
	</td></tr>
	</table>
	<applet code="JME.class" name="JME" archive="/adm/jme/JME.jar" width="440" height="390" mayscript>
You have to enable Java and JavaScript on your machine.	You have to enable Java and JavaScript on your machine.
$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>
<form>	<br />
<input type="button" name="submit" value="Insert Answer" onClick = "submitSmiles();" />	$insert_answer
<br />	<br />
<input type="button" value=" Close " onClick = "window.close()" />	<input type="button" value=" Close " onclick = "javascript:window.close()" />

<input type="button" value=" Help " onClick = "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 $docopen=&Apache::lonhtmlcommon::javascript_docopen();
	my $display=&mt('Draw Molecule');
	if (defined($shown_text)) { $display=&mt($shown_text); }
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="$display" onclick="javascript:editor=window.open($nothing,'jmeedit','width=500,height=500,menubar=no,scrollbars=no,resizable=yes');editor.$docopen;editor.document.write('$body');editor.document.close();editor.focus()" />
CHEMINPUT	CHEMINPUT
return $result;	return $result;
}	}

	sub jme_img {
	my ($jme,$smile,$width,$options)=@_;
	my $id=&Apache::loncommon::get_cgi_id();
	my $result='<img alt="'.$smile.'" src="/cgi-bin/convertjme.pl?'.$id.'"';
	if ($options =~ /border/) { $result.= ' border="1"'; }
	$result.=' />';
	&Apache::lonnet::appenv('cgi.'.$id.'.JME' =>
	&escape($jme),
	'cgi.'.$id.'.PNG' => 1,
	'cgi.'.$id.'.WIDTH' => $width);
	return $result;
	}

sub start_organicresponse {	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 $jmeanswer=&Apache::lonxml::get_param('jmeanswer',$parstack,
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);	$safeeval);
	if ( &Apache::response::show_answer() && $jmeanswer ne '') {
	my $options=&Apache::lonxml::get_param('options',$parstack,
	$safeeval);
	my $width=&Apache::lonxml::get_param('width',$parstack,
	$safeeval);
	my (@answers)=&Apache::lonxml::get_param_var('answer',$parstack,
	$safeeval);
	$result.=&jme_img($jmeanswer,$answers[0],$width,$options);
	} else {
	my $molecule;
	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);
	my $shown_text;
	if (&Apache::response::show_answer()) {
	$shown_text="Show Your Last Answer";
	}
	$result=&separate_jme_window("HWVAL_$id","MOLECULE_$id",$molecule,
	$options,$shown_text);
	$result.= '<input type="hidden" name="MOLECULE_'.$id.'" value="" />';
}	}
my $options=&Apache::lonxml::get_param('options',$parstack,
$safeeval);
$result=&seperate_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 128 sub start_organicresponse {	Line 229 sub start_organicresponse {
$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,$options);	$molecule,$options);
$result .='</nobr><br /><nobr>';	$result .='</nobr><br /><nobr>';
Line 137 sub start_organicresponse {	Line 238 sub start_organicresponse {
$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,$options);	$jmeanswer,$options);
$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 stereochemistry'],
['multipart','Multipart Structures'],	['multipart','Multipart Structures'],
['nostereo','No stereochemistry'],	['nostereo','No stereochemistry'],
['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;
}	}

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'})) {
&Apache::response::setup_params($$tagstack[-1]);	my $partid = $Apache::inputtags::part;
	my $id = $Apache::inputtags::response['-1'];

	if ($target eq 'grade'
	&& &Apache::response::submitted()
	&& $Apache::lonhomework::type eq 'exam') {

	&Apache::response::scored_response($partid,$id);

	} elsif ($target eq 'grade'
	&& &Apache::response::submitted()
	&& $Apache::lonhomework::type ne 'exam') {

	&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 $id = $Apache::inputtags::response['-1'];
my (@answers)=&Apache::lonxml::get_param_var('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;
Line 182 sub end_organicresponse {	Line 297 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"};
}	}
} elsif ($target eq "edit") {	} elsif ($target eq "edit") {
$result.= &Apache::edit::tag_end($target,$token,'');	$result.= &Apache::edit::tag_end($target,$token,'');
Line 197 sub end_organicresponse {	Line 315 sub end_organicresponse {
}	}
$result.=&Apache::response::answer_footer('organicresponse');	$result.=&Apache::response::answer_footer('organicresponse');
}	}
&Apache::response::end_response;
	if ($target eq 'grade' \|\| $target eq 'web' \|\| $target eq 'answer' \|\|
	$target eq 'tex' \|\| $target eq 'analyze') {
	&Apache::lonxml::increment_counter(&Apache::response::repetition());
	}
	&Apache::response::end_response();
return $result;	return $result;
}	}

Line 213 sub start_organicstructure {	Line 336 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') {
my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,1);	my $texwidth=&Apache::lonxml::get_param('texwidth',$parstack,$safeeval,undef,1);
	my $webwidth=&Apache::lonxml::get_param('width', $parstack, $safeeval);
	my $webheight=&Apache::lonxml::get_param('height', $parstack, $safeeval);
	if (!$webheight) { $webheight = $webwidth; }
if (!$texwidth) { $texwidth='90'; }	if (!$texwidth) { $texwidth='90'; }
	$result = "%DYNAMICIMAGE:$webwidth:$webheight:$texwidth\n";
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 $filename = $ENV{'user.name'}.'_'.$ENV{'user.domain'}.	my $filename = $env{'user.name'}.'_'.$env{'user.domain'}.
'_'.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 247 sub start_organicstructure {	Line 374 sub start_organicstructure {
$options.= ',multipart,number';	$options.= ',multipart,number';
}	}

$result .=&seperate_jme_window(undef,	$result .=&separate_jme_window(undef,
&Apache::edit::html_element_name('molecule'),	&Apache::edit::html_element_name('molecule'),
$molecule,$options);	$molecule,$options);
$result.="</nobr><br />";	$result.="</nobr><br />";
Line 255 sub start_organicstructure {	Line 382 sub start_organicstructure {
[ ['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();
} 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',
Line 277 sub end_organicstructure {	Line 404 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 $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.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('$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>
<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 298 sub start_reactionresponse {	Line 438 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);	if ($reaction eq '') { $reaction=&Apache::lonxml::get_param('initial',$parstack,$safeeval); }
	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);
	if (!$Apache::lonxml::default_homework_loaded) {
	&Apache::lonxml::default_homework_load($safeeval);
	}
	@Apache::scripttag::parser_env = @_;
	$Apache::inputtags::answertxt{$id}=&Apache::run::run("return &chemparse(q\0$ans\0);",$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 310 sub start_reactionresponse {	Line 463 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 323 sub start_reactionresponse {	Line 481 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'})) {
&Apache::response::setup_params($$tagstack[-1]);	my $partid = $Apache::inputtags::part;
	my $id = $Apache::inputtags::response['-1'];

	if ($target eq 'grade'
	&& &Apache::response::submitted()
	&& $Apache::lonhomework::type eq 'exam') {

	&Apache::response::scored_response($partid,$id);

	} elsif ($target eq 'grade'
	&& &Apache::response::submitted()
	&& $Apache::lonhomework::type ne 'exam') {

	&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 $id = $Apache::inputtags::response['-1'];
my (@answers)=&Apache::lonxml::get_param_var('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;
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;
}	}
Line 356 sub end_reactionresponse {	Line 529 sub end_reactionresponse {
}	}
$result.=&Apache::response::answer_footer('reactionresponse');	$result.=&Apache::response::answer_footer('reactionresponse');
}	}
&Apache::response::end_response;
	if ($target eq 'grade' \|\| $target eq 'web' \|\| $target eq 'answer' \|\|
	$target eq 'tex' \|\| $target eq 'analyze') {
	&Apache::lonxml::increment_counter(&Apache::response::repetition());
	}
	&Apache::response::end_response();
	return $result;
	}

	sub start_chem {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
	my $result = '';
	my $inside = &Apache::lonxml::get_all_text_unbalanced("/chem",$parser);
	if ($target eq 'tex' \|\| $target eq 'web') {
	$inside=&Apache::run::evaluate($inside,$safeeval,$$parstack[-1]);
	if (!$Apache::lonxml::default_homework_loaded) {
	&Apache::lonxml::default_homework_load($safeeval);
	}
	@Apache::scripttag::parser_env = @_;
	$result=&Apache::run::run("return &chemparse(q\0$inside\0);",$safeeval);
	}
	return $result;
	}

	sub end_chem {
	my ($target,$token,$tagstack,$parstack,$parser,$safeeval,$style) = @_;
	my $result = '';
return $result;	return $result;
}	}

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

Removed from v.1.23
changed lines
	Added in v.1.66